Reworked MessageComposer

- Added To, Cc, Bcc and Recommend friends - Added group support - Show state of the friends in real time - Save state of the window in profile - Translated into german Added "Message group" to PeersDialog git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3541 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2024-10-01 02:35:48 -04:00 · 2010-09-27 21:05:52 +00:00 · 2010-09-27 21:05:52 +00:00 · 627b0ca54a
commit 627b0ca54a
parent baac505c15
16 changed files with 2361 additions and 1447 deletions
--- a/retroshare-gui/src/gui/ForumsDialog.cpp
+++ b/retroshare-gui/src/gui/ForumsDialog.cpp
@ -1723,7 +1723,7 @@ void ForumsDialog::replytomessage()
        std::string cited_text(doc.toPlainText().toStdString()) ;

        nMsgDialog->insertPastedText(cited_text) ;
-        nMsgDialog->addRecipient( msgInfo.srcId ) ;
+        nMsgDialog->addRecipient(MessageComposer::TO, msgInfo.srcId, false);
        nMsgDialog->show();
        nMsgDialog->activateWindow();

--- a/retroshare-gui/src/gui/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/MessagesDialog.cpp
@ -789,7 +789,7 @@ void MessagesDialog::replytomessage()
    std::string cited_text(doc.toPlainText().toStdString()) ;

    nMsgDialog->insertPastedText(cited_text) ;
-    nMsgDialog->addRecipient( msgInfo.srcId ) ;
+    nMsgDialog->addRecipient(MessageComposer::TO, msgInfo.srcId, false);
    nMsgDialog->show();
    nMsgDialog->activateWindow();

@ -836,13 +836,13 @@ void MessagesDialog::replyallmessage()
    std::string cited_text(doc.toPlainText().toStdString()) ;

    nMsgDialog->insertPastedText(cited_text) ;
-    nMsgDialog->addRecipient( msgInfo.srcId ) ;
+    nMsgDialog->addRecipient(MessageComposer::TO, msgInfo.srcId, false);

    std::list<std::string> tl ( msgInfo.msgto );

    for ( std::list<std::string>::iterator tli = tl.begin(); tli!= tl.end(); tli++ )
    {
-        nMsgDialog->addRecipient( *tli ) ;
+        nMsgDialog->addRecipient(MessageComposer::TO, *tli, false) ;
    }

    nMsgDialog->show();
--- a/retroshare-gui/src/gui/MessengerWindow.cpp
+++ b/retroshare-gui/src/gui/MessengerWindow.cpp
@ -1075,7 +1075,7 @@ void MessengerWindow::sendMessage()
        return;

    std::string id = peer->data(COLUMN_DATA, ROLE_ID).toString().toStdString();
-    MessageComposer::msgFriend(id);
+    MessageComposer::msgFriend(id, false);
 }

 void MessengerWindow::changeAvatarClicked()
--- a/retroshare-gui/src/gui/PeersDialog.cpp
+++ b/retroshare-gui/src/gui/PeersDialog.cpp
@ -406,6 +406,10 @@ void PeersDialog::peertreeWidgetCostumPopupMenu( QPoint point )
            {
                bool standard = c->data(COLUMN_DATA, ROLE_STANDARD).toBool();

+                contextMnu.addAction(QIcon(IMAGE_MSG), tr("Message group"), this, SLOT(msgfriend()));
+
+                contextMnu.addSeparator();
+
                action = contextMnu.addAction(QIcon(IMAGE_EDIT), tr("Edit group"), this, SLOT(editGroup()));
                action->setDisabled(standard);

@ -426,7 +430,7 @@ void PeersDialog::peertreeWidgetCostumPopupMenu( QPoint point )
 //                action = contextMnu.addAction(QIcon(IMAGE_EXPORTFRIEND), tr("Export Friend"), this, SLOT(exportfriend()));

                if (type == TYPE_GPG) {
-                    contextMnu.addAction(QIcon(IMAGE_EXPORTFRIEND), tr("Recomend this Friend to..."), this, SLOT(recommendfriend()));
+                    contextMnu.addAction(QIcon(IMAGE_EXPORTFRIEND), tr("Recommend this Friend to..."), this, SLOT(recommendfriend()));
                }

                contextMnu.addAction(QIcon(IMAGE_CONNECT), tr("Connect To Friend"), this, SLOT(connectfriend()));
@ -1129,7 +1133,7 @@ void PeersDialog::msgfriend()
        return;

    std::string id = peer->data(COLUMN_DATA, ROLE_ID).toString().toStdString();
-    MessageComposer::msgFriend(id);
+    MessageComposer::msgFriend(id, (peer->type() == TYPE_GROUP));
 }

 void PeersDialog::recommendfriend()
--- a/retroshare-gui/src/gui/SharedFilesDialog.cpp
+++ b/retroshare-gui/src/gui/SharedFilesDialog.cpp
@ -605,7 +605,7 @@ void SharedFilesDialog::recommendFilesTo( std::string rsid )
 	nMsgDialog->newMsg();
 	nMsgDialog->insertTitleText("Recommendation(s)");
 	nMsgDialog->insertMsgText(rsPeers->getPeerName(rsPeers->getOwnId())+" recommends " + ( (files_info.size()>1)?"a list of files":"a file")+" to you");
-	nMsgDialog->addRecipient(rsid) ;
+        nMsgDialog->addRecipient(MessageComposer::TO, rsid, false) ;

 	nMsgDialog->sendMessage();
 	nMsgDialog->close();
@ -633,7 +633,7 @@ void SharedFilesDialog::recommendFilesToMsg( std::string rsid )
 	nMsgDialog->show();

 	std::cout << "recommending to " << rsid << std::endl ;
-	nMsgDialog->addRecipient(rsid) ;
+        nMsgDialog->addRecipient(MessageComposer::TO, rsid, false) ;

 	/* window will destroy itself! */
 }
--- a/retroshare-gui/src/gui/chat/PopupChatDialog.cpp
+++ b/retroshare-gui/src/gui/chat/PopupChatDialog.cpp
@ -395,7 +395,7 @@ void PopupChatDialog::chatFriend(std::string id)

    /* info dialog */
    if ((QMessageBox::question(NULL, tr("Friend not Online"),tr("Your Friend is offline \nDo you want to send them a Message instead"),QMessageBox::Yes|QMessageBox::No, QMessageBox::Yes))== QMessageBox::Yes) {
-        MessageComposer::msgFriend(id);
+        MessageComposer::msgFriend(id, false);
    } else {
        if (firstId.empty() == false) {
            getPrivateChat(firstId, RS_CHAT_OPEN_NEW | RS_CHAT_REOPEN | RS_CHAT_FOCUS);
--- a/retroshare-gui/src/gui/common/StatusDefs.cpp
+++ b/retroshare-gui/src/gui/common/StatusDefs.cpp
@ -21,10 +21,11 @@

 #include <QCoreApplication>
 #include <retroshare/rsstatus.h>
+#include <retroshare/rspeers.h>

 #include "StatusDefs.h"

-const QString StatusDefs::name(unsigned int status)
+const QString StatusDefs::name(const unsigned int status)
 {
    switch (status) {
    case RS_STATUS_OFFLINE:
@ -43,7 +44,7 @@ const QString StatusDefs::name(unsigned int status)
    return "";
 }

-const char *StatusDefs::imageIM(unsigned int status)
+const char *StatusDefs::imageIM(const unsigned int status)
 {
    switch (status) {
    case RS_STATUS_OFFLINE:
@ -62,7 +63,7 @@ const char *StatusDefs::imageIM(unsigned int status)
    return "";
 }

-const char *StatusDefs::imageUser(unsigned int status)
+const char *StatusDefs::imageUser(const unsigned int status)
 {
    switch (status) {
    case RS_STATUS_OFFLINE:
@ -81,7 +82,7 @@ const char *StatusDefs::imageUser(unsigned int status)
    return "";
 }

-const QString StatusDefs::tooltip(unsigned int status)
+const QString StatusDefs::tooltip(const unsigned int status)
 {
    switch (status) {
    case RS_STATUS_OFFLINE:
@ -100,7 +101,7 @@ const QString StatusDefs::tooltip(unsigned int status)
    return "";
 }

-const QColor StatusDefs::textColor(unsigned int status)
+const QColor StatusDefs::textColor(const unsigned int status)
 {
    switch (status) {
    case RS_STATUS_OFFLINE:
@ -119,7 +120,7 @@ const QColor StatusDefs::textColor(unsigned int status)
    return Qt::black;
 }

-const QFont StatusDefs::font(unsigned int status)
+const QFont StatusDefs::font(const unsigned int status)
 {
    QFont font;

--- a/retroshare-gui/src/gui/common/StatusDefs.h
+++ b/retroshare-gui/src/gui/common/StatusDefs.h
@ -29,13 +29,13 @@
 class StatusDefs
 {
 public:
-    static const QString name(unsigned int status);
-    static const char*   imageIM(unsigned int status);
-    static const char*   imageUser(unsigned int status);
-    static const QString tooltip(unsigned int status);
+    static const QString name(const unsigned int status);
+    static const char*   imageIM(const unsigned int status);
+    static const char*   imageUser(const unsigned int status);
+    static const QString tooltip(const unsigned int status);

-    static const QColor  textColor(unsigned int status);
-    static const QFont   font(unsigned int status);
+    static const QColor  textColor(const unsigned int status);
+    static const QFont   font(const unsigned int status);
 };

 #endif
--- a/retroshare-gui/src/gui/feeds/ChatMsgItem.cpp
+++ b/retroshare-gui/src/gui/feeds/ChatMsgItem.cpp
@ -199,7 +199,7 @@ void ChatMsgItem::sendMsg()
    MessageComposer *nMsgDialog = new MessageComposer();
    nMsgDialog->newMsg();

-    nMsgDialog->addRecipient( mPeerId ) ;
+    nMsgDialog->addRecipient(MessageComposer::TO, mPeerId, false);
    nMsgDialog->show();
    nMsgDialog->activateWindow();

--- a/retroshare-gui/src/gui/feeds/MsgItem.cpp
+++ b/retroshare-gui/src/gui/feeds/MsgItem.cpp
@ -268,7 +268,7 @@ void MsgItem::replyMsg()
    std::string cited_text(doc.toPlainText().toStdString()) ;

    nMsgDialog->insertPastedText(cited_text) ;
-    nMsgDialog->addRecipient( msgInfo.srcId ) ;
+    nMsgDialog->addRecipient(MessageComposer::TO, msgInfo.srcId, false);
    nMsgDialog->show();
    nMsgDialog->activateWindow();

--- a/retroshare-gui/src/gui/feeds/PeerItem.cpp
+++ b/retroshare-gui/src/gui/feeds/PeerItem.cpp
@ -305,7 +305,7 @@ void PeerItem::sendMsg()
    MessageComposer *nMsgDialog = new MessageComposer();
    nMsgDialog->newMsg();

-    nMsgDialog->addRecipient( mPeerId ) ;
+    nMsgDialog->addRecipient(MessageComposer::TO, mPeerId, false);
    nMsgDialog->show();
    nMsgDialog->activateWindow();

--- a/retroshare-gui/src/gui/msgs/MessageComposer.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
--- a/retroshare-gui/src/gui/msgs/MessageComposer.h
+++ b/retroshare-gui/src/gui/msgs/MessageComposer.h
@ -23,7 +23,6 @@
 #define _MESSAGECOMPOSER_H

 #include <QMainWindow>
-#include <QSettings>
 #include <retroshare/rstypes.h>
 #include "ui_MessageComposer.h"

@ -33,17 +32,22 @@ class QFontComboBox;
 class QTextEdit;
 class QTextCharFormat;
 class AttachFileItem;
+class RSTreeWidgetItemCompareRole;

 class MessageComposer : public QMainWindow 
 {
    Q_OBJECT

+public:
+    enum enumType { TO, CC, BCC };
+
 public:
    /** Default Constructor */

    MessageComposer(QWidget *parent = 0, Qt::WFlags flags = 0);
+    ~MessageComposer();

-  static void msgFriend(std::string id);
+    static void msgFriend(std::string id, bool group);
    static void recommendFriend(std::list <std::string> &peerids);

    void  newMsg(std::string msgId = "");
@ -57,9 +61,8 @@ public:
    void  insertForwardPastedText(std::string msg);
    void  insertHtmlText(std::string msg);
    void  insertMsgText(std::string msg);
-  void  addRecipient(std::string id) ;
+    void  addRecipient(enumType type, const std::string &id, bool group);
    void  Create_New_Image_Tag(const QString urlremoteorlocal);
- QSettings setter;

 public slots:

@ -73,14 +76,15 @@ public slots:

 protected:
    void closeEvent (QCloseEvent * event);
+    bool eventFilter(QObject *obj, QEvent *ev);

 private slots:

    /* toggle Contacts DockWidget */
+    void on_contactsdockWidget_visibilityChanged(bool visible);
    void toggleContacts();

    /* for toggling flags */
-  void togglePersonItem( QTreeWidgetItem *item, int col );
    void toggleRecommendItem( QTreeWidgetItem *item, int col );

    void fileNew();
@ -123,7 +127,17 @@ private slots:
    void clearFilter();
    void titleChanged();

+    // Add to To/Cc/Bcc address fields
+    void btnClickEvent();
+    void recommendButtonClicked();
+    void editingRecipientFinished();
+
+    void groupsChanged(int type);
+    void peerStatusChanged(const QString& peer_id, int status);
+
 private:
+    void processSettings(bool bLoad);
+
    void setTextColor(const QColor& col) ;
    void setupFileActions();
    void setupEditActions();
@ -147,13 +161,10 @@ private:
    bool FilterItem(QTreeWidgetItem *pItem, QString &sPattern);

    void calculateTitle();
+    void addEmptyRecipient();

-   /** Define the popup menus for the Context menu */
-  QMenu* contextMnu;
-  
-   /** Defines the actions for the context menu */
-  QAction* deletechannelAct;
-  QAction* createchannelmsgAct;
+    bool getRecipientFromRow(int row, enumType &type, std::string &id, bool &group);
+    void setRecipientToRow(int row, enumType type, std::string id, bool group);

    QAction *actionSave,
    *actionAlignLeft,
@ -166,6 +177,8 @@ private:
    *actionCopy,
    *actionPaste;

+    QAction *contactSidebarAction;
+
    QTreeView *channelstreeView;

    QString fileName;
@ -183,10 +196,12 @@ private:

    /* maps of files  */
    std::list<AttachFileItem *> mAttachments;
-  std::list<std::string> m_sslIds;

    bool mCheckAttachment;

+    RSTreeWidgetItemCompareRole *m_compareRole;
+    QCompleter *m_completer;
+
    /** Qt Designer generated object */
    Ui::MessageComposer ui;

@ -194,4 +209,3 @@ private:
 };

 #endif
-
--- 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>769</width>
-    <height>485</height>
+    <width>796</width>
+    <height>564</height>
   </rect>
  </property>
  <property name="contextMenuPolicy">
@ -85,11 +85,7 @@
           <item row="1" column="0">
            <widget class="QLineEdit" name="filterPatternLineEdit">
             <property name="toolTip">
-              <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;p style=&quot; margin-top:0px; 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;Search Friends&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              <string>Search Friends</string>
             </property>
            </widget>
           </item>
@ -169,6 +165,9 @@ border-image: url(:/images/closepressed.png)
             <height>0</height>
            </size>
           </property>
+           <property name="selectionMode">
+            <enum>QAbstractItemView::ExtendedSelection</enum>
+           </property>
           <property name="sortingEnabled">
            <bool>true</bool>
           </property>
@ -179,6 +178,74 @@ border-image: url(:/images/closepressed.png)
           </column>
          </widget>
         </item>
+         <item row="3" column="0">
+          <layout class="QVBoxLayout" name="verticalLayout_4">
+           <item>
+            <layout class="QHBoxLayout" name="horizontalLayout">
+             <item>
+              <widget class="QPushButton" name="addToButton">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="text">
+                <string>&gt;&gt; To</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
+           <item>
+            <layout class="QHBoxLayout" name="horizontalLayout_2">
+             <item>
+              <widget class="QPushButton" name="addCcButton">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="text">
+                <string>&gt;&gt; Cc</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QPushButton" name="addBccButton">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="text">
+                <string>&gt;&gt; Bcc</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
+           <item>
+            <layout class="QHBoxLayout" name="horizontalLayout_3">
+             <item>
+              <widget class="QPushButton" name="addRecommendButton">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="text">
+                <string>&gt;&gt; Recommend</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
+          </layout>
+         </item>
        </layout>
       </widget>
      </widget>
@ -191,34 +258,7 @@ border-image: url(:/images/closepressed.png)
         <property name="verticalSpacing">
          <number>2</number>
         </property>
-         <item row="0" column="0">
-          <layout class="QHBoxLayout">
-           <property name="spacing">
-            <number>6</number>
-           </property>
-           <property name="margin">
-            <number>0</number>
-           </property>
-           <item>
-            <widget class="QLabel" name="label">
-             <property name="font">
-              <font>
-               <pointsize>10</pointsize>
-               <weight>75</weight>
-               <bold>true</bold>
-              </font>
-             </property>
-             <property name="text">
-              <string>Subject:</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLineEdit" name="titleEdit"/>
-           </item>
-          </layout>
-         </item>
-         <item row="1" column="0">
+         <item row="5" column="0">
          <widget class="QFrame" name="frame">
           <property name="styleSheet">
            <string notr="true">QFrame#frame{ 
@ -622,7 +662,7 @@ border: 1px solid #CCCCCC;}</string>
           </layout>
          </widget>
         </item>
-         <item row="2" column="0">
+         <item row="6" column="0">
          <widget class="QTextEdit" name="msgText">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
@ -635,6 +675,76 @@ border: 1px solid #CCCCCC;}</string>
           </property>
          </widget>
         </item>
+         <item row="2" column="0" rowspan="2">
+          <layout class="QHBoxLayout" name="SubjectHLayout" stretch="0,0">
+           <property name="spacing">
+            <number>6</number>
+           </property>
+           <property name="sizeConstraint">
+            <enum>QLayout::SetNoConstraint</enum>
+           </property>
+           <item>
+            <widget class="QLabel" name="label_3">
+             <property name="font">
+              <font>
+               <pointsize>10</pointsize>
+               <weight>75</weight>
+               <bold>true</bold>
+              </font>
+             </property>
+             <property name="text">
+              <string>Subject:</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLineEdit" name="titleEdit"/>
+           </item>
+          </layout>
+         </item>
+         <item row="0" column="0">
+          <widget class="QTableWidget" name="recipientWidget">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>0</width>
+             <height>68</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>16777215</width>
+             <height>68</height>
+            </size>
+           </property>
+           <property name="selectionMode">
+            <enum>QAbstractItemView::SingleSelection</enum>
+           </property>
+           <attribute name="horizontalHeaderVisible">
+            <bool>false</bool>
+           </attribute>
+           <attribute name="verticalHeaderVisible">
+            <bool>false</bool>
+           </attribute>
+           <attribute name="verticalHeaderDefaultSectionSize">
+            <number>22</number>
+           </attribute>
+           <attribute name="verticalHeaderVisible">
+            <bool>false</bool>
+           </attribute>
+           <attribute name="verticalHeaderDefaultSectionSize">
+            <number>22</number>
+           </attribute>
+           <attribute name="horizontalHeaderVisible">
+            <bool>false</bool>
+           </attribute>
+          </widget>
+         </item>
        </layout>
       </widget>
       <widget class="QWidget" name="layoutWidget_1">
@ -713,8 +823,8 @@ border: 1px solid #CCCCCC;}</string>
    <rect>
     <x>0</x>
     <y>0</y>
-     <width>769</width>
-     <height>21</height>
+     <width>796</width>
+     <height>20</height>
    </rect>
   </property>
  </widget>
@ -820,7 +930,6 @@ border: 1px solid #CCCCCC;}</string>
 </widget>
 <tabstops>
  <tabstop>msgSendList</tabstop>
-  <tabstop>titleEdit</tabstop>
  <tabstop>msgText</tabstop>
  <tabstop>msgFileList</tabstop>
 </tabstops>
--- a/retroshare-gui/src/lang/retroshare_de.qm
+++ b/retroshare-gui/src/lang/retroshare_de.qm
--- a/retroshare-gui/src/lang/retroshare_de.ts
+++ b/retroshare-gui/src/lang/retroshare_de.ts
@ -929,7 +929,22 @@ p, li { white-space: pre-wrap; }
        <translation>Kanal Beschreibung</translation>
    </message>
    <message>
-        <location line="+34"/>
+        <location line="+9"/>
+        <source>Type</source>
+        <translation type="unfinished">Typ</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Restricted - Anyone can read, limited publishing (Private Publish Key)</source>
+        <translation type="unfinished">Beschränkt - Jeder kann lesen, aber nicht jeder schreiben (Privater Veröffentlichungs-Schlüssel)</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Private - (Private Publish Key required to view Messages)</source>
+        <translation type="unfinished">Privat - (Privater Veröffentlichungsschlüssel erforderlich, um Nachrichten zu lesen)</translation>
+    </message>
+    <message>
+        <location line="+35"/>
        <source>Cancel</source>
        <translation>Abbrechen</translation>
    </message>
@ -944,7 +959,7 @@ p, li { white-space: pre-wrap; }
        <translation>Schliessen</translation>
    </message>
    <message>
-        <location filename="../gui/channels/ChannelDetails.ui" line="-89"/>
+        <location filename="../gui/channels/ChannelDetails.ui" line="-112"/>
        <source>Channel Name</source>
        <translation>Kanal-Name</translation>
    </message>
@ -1061,7 +1076,12 @@ p, li { white-space: pre-wrap; }
        <translation>Zeige Kanal-Details</translation>
    </message>
    <message>
-        <location line="+241"/>
+        <location line="+9"/>
+        <source>Share Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+232"/>
        <location line="+74"/>
        <location line="+77"/>
        <location line="+75"/>
@ -1105,11 +1125,6 @@ Keine Beschreibung</translation>
        <source>Edit Channel Details</source>
        <translation>Kanal-Details bearbeiten</translation>
    </message>
-    <message>
-        <location line="+3"/>
-        <source>Share Key</source>
-        <translation>Schlüssel freigeben</translation>
-    </message>
 </context>
 <context>
    <name>ChatMsgItem</name>
@ -2190,7 +2205,7 @@ p, li { white-space: pre-wrap; }
        <translation>Drag&apos;n&apos;Drop Dateien aus den Suchergebnissen</translation>
    </message>
    <message>
-        <location filename="../gui/channels/CreateChannelMsg.cpp" line="+288"/>
+        <location filename="../gui/channels/CreateChannelMsg.cpp" line="+290"/>
        <source>Add Extra File</source>
        <translation>Zusätzlich eine Datei hinzufügen</translation>
    </message>
@ -5040,414 +5055,448 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
    <name>MessageComposer</name>
    <message>
        <location filename="../gui/msgs/MessageComposer.ui" line="+17"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+391"/>
+        <location line="+344"/>
        <source>Compose</source>
-        <translation type="unfinished">Verfassen</translation>
+        <translation>Verfassen</translation>
    </message>
    <message>
        <location line="+49"/>
-        <location line="+709"/>
+        <location line="+819"/>
        <source>Contacts</source>
-        <translation type="unfinished">Kontakte</translation>
+        <translation>Kontakte</translation>
    </message>
    <message>
-        <location line="-694"/>
+        <location line="-804"/>
        <source>Search for Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Suche Name:</translation>
    </message>
    <message>
-        <location line="+7"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { 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;Search Friends&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { 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;Search Friends&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+31"/>
        <source>Reset</source>
-        <translation type="unfinished">Zurücksetzen</translation>
+        <translation>Zurücksetzen</translation>
    </message>
    <message>
-        <location line="+61"/>
+        <location line="+64"/>
        <source>Send To:</source>
-        <translation type="unfinished">Senden An:</translation>
+        <translation>Senden an:</translation>
    </message>
    <message>
-        <location line="+35"/>
+        <location line="+18"/>
+        <source>&gt;&gt; To</source>
+        <translation>&gt;&gt; An</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>&gt;&gt; Cc</source>
+        <translation>&gt;&gt; Cc</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&gt;&gt; Bcc</source>
+        <translation>&gt;&gt; Bcc</translation>
+    </message>
+    <message>
+        <location line="+472"/>
        <source>Subject:</source>
-        <translation type="unfinished">Betreff:</translation>
+        <translation>Betreff:</translation>
    </message>
    <message>
-        <location line="+43"/>
+        <location line="-401"/>
        <source>Paragraph</source>
-        <translation type="unfinished"></translation>
+        <translation>Absatz</translation>
    </message>
    <message>
-        <location line="+5"/>
+        <location line="-207"/>
+        <source>Search Friends</source>
+        <translation>Suche Freunde</translation>
+    </message>
+    <message>
+        <location line="+153"/>
+        <source>&gt;&gt; Recommend</source>
+        <translation>&gt;&gt; Empfehlen</translation>
+    </message>
+    <message>
+        <location line="+59"/>
        <source>Heading 1</source>
-        <translation type="unfinished"></translation>
+        <translation>Überschrift 1</translation>
    </message>
    <message>
        <location line="+5"/>
        <location line="+5"/>
        <source>Heading 2</source>
-        <translation type="unfinished"></translation>
+        <translation>Überschrift 2</translation>
    </message>
    <message>
        <location line="+5"/>
        <source>Heading 3</source>
-        <translation type="unfinished"></translation>
+        <translation>Überschrift 3</translation>
    </message>
    <message>
        <location line="+5"/>
        <source>Heading 4</source>
-        <translation type="unfinished"></translation>
+        <translation>Überschrift 4</translation>
    </message>
    <message>
        <location line="+5"/>
        <source>Heading 5</source>
-        <translation type="unfinished"></translation>
+        <translation>Überschrift 5</translation>
    </message>
    <message>
        <location line="+5"/>
        <source>Heading 6</source>
-        <translation type="unfinished"></translation>
+        <translation>Überschrift 6</translation>
    </message>
    <message>
        <location line="+24"/>
        <source>Font size</source>
-        <translation type="unfinished">Schriftgröße</translation>
+        <translation>Schriftgröße</translation>
    </message>
    <message>
        <location line="+13"/>
        <source>Increase font size</source>
-        <translation type="unfinished">Schrift vergrößern</translation>
+        <translation>Schrift vergrößern</translation>
    </message>
    <message>
        <location line="+29"/>
        <source>Decrease font size</source>
-        <translation type="unfinished">Verkleinere Schrift</translation>
+        <translation>Schrift verkleinern</translation>
    </message>
    <message>
        <location line="+35"/>
        <source>Bold</source>
-        <translation type="unfinished">Fett</translation>
+        <translation>Fett</translation>
    </message>
    <message>
        <location line="+38"/>
        <source>Underline</source>
-        <translation type="unfinished">Unterstrichen</translation>
+        <translation>Unterstrichen</translation>
    </message>
    <message>
        <location line="+38"/>
        <source>Italic</source>
-        <translation type="unfinished">Kursiv</translation>
+        <translation>Kursiv</translation>
    </message>
    <message>
        <location line="+38"/>
        <source>Select Color</source>
-        <translation type="unfinished">Text-Farbe auswählen</translation>
+        <translation>Text-Farbe auswählen</translation>
    </message>
    <message>
        <location line="+25"/>
        <source>Alignment</source>
-        <translation type="unfinished">Ausrichtung</translation>
+        <translation>Ausrichtung</translation>
    </message>
    <message>
        <location line="+34"/>
        <source>Add a Image</source>
-        <translation type="unfinished">Ein Bild hinzufügen</translation>
+        <translation>Ein Bild hinzufügen</translation>
    </message>
    <message>
        <location line="+23"/>
        <source>Sets text font to code style</source>
-        <translation type="unfinished">Setzt Schriftart auf Codestil</translation>
+        <translation>Setzt Schriftart auf Codestil</translation>
    </message>
    <message>
-        <location line="+77"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+383"/>
+        <source>To</source>
+        <translation>An</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cc</source>
+        <translation>Cc</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Bcc</source>
+        <translation>Bcc</translation>
+    </message>
+    <message>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+147"/>
        <source>Recommended Files</source>
-        <translation type="unfinished">Empfohlene Dateien</translation>
+        <translation>Empfohlene Dateien</translation>
    </message>
    <message>
        <location line="+17"/>
        <source>File Name</source>
-        <translation type="unfinished">Dateiname</translation>
+        <translation>Dateiname</translation>
    </message>
    <message>
        <location line="+5"/>
        <source>Size</source>
-        <translation type="unfinished">Grösse</translation>
+        <translation>Grösse</translation>
    </message>
    <message>
        <location line="+5"/>
        <source>Sources</source>
-        <translation type="unfinished">Quellen</translation>
+        <translation>Quellen</translation>
    </message>
    <message>
        <location line="+5"/>
        <source>Hash</source>
-        <translation type="unfinished">Prüfsumme</translation>
+        <translation>Prüfsumme</translation>
    </message>
    <message>
        <location line="+58"/>
        <source>Send</source>
-        <translation type="unfinished">Senden</translation>
+        <translation>Senden</translation>
    </message>
    <message>
        <location line="+3"/>
        <source>Send this message now</source>
-        <translation type="unfinished">Diese Nachricht jetzt senden</translation>
+        <translation>Diese Nachricht jetzt senden</translation>
    </message>
    <message>
        <location line="+9"/>
        <source>Reply</source>
-        <translation type="unfinished"></translation>
+        <translation>Antwort</translation>
    </message>
    <message>
        <location line="+12"/>
        <source>Toggle Contacts View</source>
-        <translation type="unfinished">Kontakt-Ansicht umschalten</translation>
+        <translation>Kontakt-Ansicht umschalten</translation>
    </message>
    <message>
        <location line="+9"/>
        <source>Save</source>
-        <translation type="unfinished">Speichern</translation>
+        <translation>Speichern</translation>
    </message>
    <message>
        <location line="+3"/>
        <source>Save this message</source>
-        <translation type="unfinished">Diese Nachricht speichern</translation>
+        <translation>Diese Nachricht speichern</translation>
    </message>
    <message>
        <location line="+9"/>
        <source>Attach</source>
-        <translation type="unfinished">Anhängen</translation>
+        <translation>Anhängen</translation>
    </message>
    <message>
        <location line="+3"/>
        <source>Attach File</source>
-        <translation type="unfinished">Datei Anhängen</translation>
+        <translation>Datei anhängen</translation>
    </message>
    <message>
        <location line="+12"/>
        <source>Quote</source>
-        <translation type="unfinished">Blockquote</translation>
+        <translation>Blockquote</translation>
    </message>
    <message>
        <location line="+3"/>
        <source>Add Blockquote</source>
-        <translation type="unfinished">Blockquote hinzufügen</translation>
+        <translation>Blockquote hinzufügen</translation>
    </message>
    <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+139"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-918"/>
        <source>&amp;Left</source>
-        <translation type="unfinished">&amp;Links</translation>
+        <translation>&amp;Links</translation>
    </message>
    <message>
        <location line="+3"/>
        <source>C&amp;enter</source>
-        <translation type="unfinished">&amp;Zentriert</translation>
+        <translation>&amp;Zentriert</translation>
    </message>
    <message>
        <location line="+3"/>
        <source>&amp;Right</source>
-        <translation type="unfinished">&amp;Rechts</translation>
+        <translation>&amp;Rechts</translation>
    </message>
    <message>
        <location line="+3"/>
        <source>&amp;Justify</source>
-        <translation type="unfinished">&amp;Blocksatz</translation>
+        <translation>&amp;Blocksatz</translation>
    </message>
    <message>
-        <location line="+147"/>
-        <location line="+867"/>
+        <location line="+202"/>
+        <location line="+1390"/>
        <source>Save Message</source>
-        <translation type="unfinished">Nachricht speichern</translation>
+        <translation>Nachricht speichern</translation>
    </message>
    <message>
-        <location line="-866"/>
+        <location line="-1389"/>
        <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
-        <translation type="unfinished"></translation>
+        <translation>Nachricht wurde noch nicht gesendet.
+Möchtest Du die Nachricht in den Entwürfen speichern?</translation>
    </message>
    <message>
-        <location line="-45"/>
-        <location line="+233"/>
-        <source>Compose: </source>
-        <translation type="unfinished">Verfassen: </translation>
+        <location line="+739"/>
+        <source>Unknown</source>
+        <translation>Unbekannt</translation>
    </message>
    <message>
-        <location line="+213"/>
+        <location line="+14"/>
+        <source>Unknown friend</source>
+        <translation>Unbekannter Freund</translation>
+    </message>
+    <message>
+        <location line="+176"/>
        <source>&amp;File</source>
-        <translation type="unfinished">&amp;Datei</translation>
+        <translation>&amp;Datei</translation>
    </message>
    <message>
        <location line="+5"/>
        <source>&amp;New</source>
-        <translation type="unfinished">&amp;Neu</translation>
+        <translation>&amp;Neu</translation>
    </message>
    <message>
        <location line="+5"/>
        <source>&amp;Open...</source>
-        <translation type="unfinished">O&amp;ffnen...</translation>
+        <translation>Ö&amp;ffnen...</translation>
    </message>
    <message>
        <location line="+7"/>
        <source>&amp;Save</source>
-        <translation type="unfinished">S&amp;peichern</translation>
+        <translation>S&amp;peichern</translation>
    </message>
    <message>
        <location line="+6"/>
        <source>Save &amp;As File</source>
-        <translation type="unfinished"></translation>
+        <translation>Speichern &amp;unter</translation>
    </message>
    <message>
        <location line="+4"/>
        <source>Save &amp;As Draft</source>
-        <translation type="unfinished"></translation>
+        <translation>Als &amp;Entwurf speichern</translation>
    </message>
    <message>
        <location line="+5"/>
        <source>&amp;Print...</source>
-        <translation type="unfinished">&amp;Drucken...</translation>
+        <translation>&amp;Drucken...</translation>
    </message>
    <message>
        <location line="+9"/>
        <source>&amp;Export PDF...</source>
-        <translation type="unfinished">PDF &amp;exportieren...</translation>
+        <translation>PDF &amp;exportieren...</translation>
    </message>
    <message>
        <location line="+7"/>
        <source>&amp;Quit</source>
-        <translation type="unfinished">&amp;Schliessen</translation>
+        <translation>&amp;Schliessen</translation>
    </message>
    <message>
        <location line="+8"/>
        <source>&amp;Edit</source>
-        <translation type="unfinished">&amp;Bearbeiten</translation>
+        <translation>&amp;Bearbeiten</translation>
    </message>
    <message>
        <location line="+4"/>
        <source>&amp;Undo</source>
-        <translation type="unfinished">Rü&amp;ckgängig</translation>
+        <translation>Rü&amp;ckgängig</translation>
    </message>
    <message>
        <location line="+3"/>
        <source>&amp;Redo</source>
-        <translation type="unfinished">&amp;Wiederholen</translation>
+        <translation>&amp;Wiederholen</translation>
    </message>
    <message>
        <location line="+4"/>
        <source>Cu&amp;t</source>
-        <translation type="unfinished">Auss&amp;chneiden</translation>
+        <translation>Auss&amp;chneiden</translation>
    </message>
    <message>
        <location line="+3"/>
        <source>&amp;Copy</source>
-        <translation type="unfinished">Ko&amp;pieren</translation>
+        <translation>Ko&amp;pieren</translation>
    </message>
    <message>
        <location line="+3"/>
        <source>&amp;Paste</source>
-        <translation type="unfinished">Einfü&amp;gen</translation>
+        <translation>Einfü&amp;gen</translation>
    </message>
    <message>
        <location line="+8"/>
        <source>&amp;View</source>
-        <translation type="unfinished">Anse&amp;hen</translation>
+        <translation>&amp;Ansicht</translation>
    </message>
    <message>
-        <location line="+5"/>
+        <location line="+3"/>
        <source>&amp;Contacts Sidebar</source>
-        <translation type="unfinished">&amp;Kontakt-Sidebar</translation>
+        <translation>&amp;Kontakt-Sidebar</translation>
    </message>
    <message>
-        <location line="+8"/>
+        <location line="+6"/>
        <source>&amp;Insert</source>
-        <translation type="unfinished">Ein&amp;fügen</translation>
+        <translation>Ein&amp;fügen</translation>
    </message>
    <message>
        <location line="+5"/>
        <source>&amp;Image</source>
-        <translation type="unfinished">&amp;Bild</translation>
+        <translation>&amp;Bild</translation>
    </message>
    <message>
        <location line="+4"/>
        <source>&amp;Horizontal Line</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Horizontale Linie</translation>
    </message>
    <message>
        <location line="+8"/>
        <source>&amp;Format</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Format</translation>
    </message>
    <message>
        <location line="+247"/>
        <source>Open File...</source>
-        <translation type="unfinished">Datei öffnen...</translation>
+        <translation>Datei öffnen...</translation>
    </message>
    <message>
        <location line="+1"/>
        <location line="+23"/>
        <source>HTML-Files (*.htm *.html);;All Files (*)</source>
-        <translation type="unfinished">HTML-Dateien (*.htm *.html);;Alle Dateien (*)</translation>
+        <translation>HTML-Dateien (*.htm *.html);;Alle Dateien (*)</translation>
    </message>
    <message>
        <location line="-1"/>
        <source>Save as...</source>
-        <translation type="unfinished">Speichern unter...</translation>
+        <translation>Speichern unter...</translation>
    </message>
    <message>
        <location line="+22"/>
        <source>Print Document</source>
-        <translation type="unfinished">Dokument drucken</translation>
+        <translation>Dokument drucken</translation>
    </message>
    <message>
-        <location line="+63"/>
+        <location line="+62"/>
        <source>Message has not been Sent.
 Do you want to save message ?</source>
-        <translation type="unfinished">Nachricht noch nicht versandt.
-Wollen Sie sie speichern?</translation>
+        <translation>Nachricht noch nicht versandt.
+Willst Du die Nachricht speichern ?</translation>
    </message>
    <message>
-        <location line="+20"/>
+        <location line="+24"/>
        <source>Choose Image</source>
-        <translation type="unfinished">Bild wählen</translation>
+        <translation>Bild wählen</translation>
    </message>
    <message>
        <location line="+1"/>
        <source>Image Files supported (*.png *.jpeg *.jpg *.gif)</source>
-        <translation type="unfinished">Unterstützte Bilddateien (*.png *.jpeg *.jpg *.gif)</translation>
+        <translation>Unterstützte Bilddateien (*.png *.jpeg *.jpg *.gif)</translation>
    </message>
    <message>
        <location line="+114"/>
        <source>Add Extra File</source>
-        <translation type="unfinished"></translation>
+        <translation>Zusätzliche Datei hinzufügen</translation>
    </message>
    <message>
-        <location line="-1047"/>
+        <location line="-1552"/>
        <source>Friend Recommendation</source>
-        <translation type="unfinished"></translation>
+        <translation>Freundempfehlung</translation>
    </message>
    <message>
        <location line="+1"/>
        <source>Friend Recommendation(s)</source>
-        <translation type="unfinished"></translation>
+        <translation>Freundempfehlung(en)</translation>
    </message>
    <message>
-        <location line="+272"/>
+        <location line="+500"/>
        <source>No Title</source>
        <translation>Kein Titel</translation>
    </message>
    <message>
-        <location line="-270"/>
+        <location line="-498"/>
        <source>I recommend a good friend of me, you can trust him too when you trust me. &lt;br&gt; Copy friend link and paste to Friends list</source>
-        <translation type="unfinished"></translation>
+        <translation>Ich empfehle Dir einen guten Freund von mir. Du kannst ihm vertrauen, wenn Du mir vertraust. &lt;br&gt; Kopiere den Link und füge ihn in der Freundesliste ein</translation>
    </message>
 </context>
 <context>
@ -6887,12 +6936,12 @@ p, li { white-space: pre-wrap; }
 <context>
    <name>PeersDialog</name>
    <message>
-        <location filename="../gui/PeersDialog.cpp" line="+414"/>
+        <location filename="../gui/PeersDialog.cpp" line="+423"/>
        <source>Chat</source>
        <translation>Chat</translation>
    </message>
    <message>
-        <location line="+665"/>
+        <location line="+673"/>
        <source>Save Certificate</source>
        <translation>Zertifikat speichern</translation>
    </message>
@ -6907,12 +6956,12 @@ p, li { white-space: pre-wrap; }
        <translation>Status</translation>
    </message>
    <message>
-        <location filename="../gui/PeersDialog.cpp" line="-656"/>
+        <location filename="../gui/PeersDialog.cpp" line="-661"/>
        <source>Connect To Friend</source>
        <translation>Verbinde zum Freund</translation>
    </message>
    <message>
-        <location line="-288"/>
+        <location line="-295"/>
        <source>Profile</source>
        <translation>Profil</translation>
    </message>
@ -6932,7 +6981,17 @@ p, li { white-space: pre-wrap; }
        <translation>ich</translation>
    </message>
    <message>
-        <location line="+269"/>
+        <location line="+164"/>
+        <source>Message group</source>
+        <translation>Gruppe anschreiben</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Friend Details</source>
+        <translation>Freund-Details</translation>
+    </message>
+    <message>
+        <location line="+98"/>
        <source>Expand all</source>
        <translation>Alle erweitern</translation>
    </message>
@ -6942,24 +7001,24 @@ p, li { white-space: pre-wrap; }
        <translation>Alle reduzieren</translation>
    </message>
    <message>
-        <location line="-95"/>
+        <location line="-103"/>
        <source>Message Friend</source>
        <translation>Freund anschreiben</translation>
    </message>
    <message>
-        <location line="-24"/>
+        <location line="-28"/>
        <source>&lt;strong&gt;Group&lt;/strong&gt;</source>
        <translation>&lt;strong&gt;Gruppe&lt;/strong&gt;</translation>
    </message>
    <message>
-        <location line="+13"/>
+        <location line="+17"/>
        <source>Edit group</source>
        <translation>Gruppe ändern</translation>
    </message>
    <message>
-        <location line="+12"/>
-        <source>Peer Details</source>
-        <translation>Peer-Details</translation>
+        <location line="+20"/>
+        <source>Recommend this Friend to...</source>
+        <translation>Freund weiterempfehlen...</translation>
    </message>
    <message>
        <location line="+11"/>
@ -6997,12 +7056,12 @@ p, li { white-space: pre-wrap; }
        <translation>Aus allen Gruppen entfernen</translation>
    </message>
    <message>
-        <location line="-85"/>
+        <location line="-93"/>
        <source>Remove group</source>
        <translation>Gruppe entfernen</translation>
    </message>
    <message>
-        <location line="-12"/>
+        <location line="-16"/>
        <source>&lt;strong&gt;GPG Key&lt;/strong&gt;</source>
        <translation></translation>
    </message>
@ -7012,7 +7071,7 @@ p, li { white-space: pre-wrap; }
        <translation></translation>
    </message>
    <message>
-        <location line="+627"/>
+        <location line="+639"/>
        <source>Available</source>
        <translation>Verfügbar</translation>
    </message>
@ -7226,17 +7285,12 @@ p, li { white-space: pre-wrap; }
        <translation>Status Spalte ausblenden</translation>
    </message>
    <message>
-        <location filename="../gui/PeersDialog.cpp" line="-1780"/>
+        <location filename="../gui/PeersDialog.cpp" line="-1792"/>
        <source>Friends Storm</source>
        <translation>Aktivitäten</translation>
    </message>
    <message>
-        <location line="+284"/>
-        <source>Recomend this Friend to...</source>
-        <translation>Freund weiterempfehlen...</translation>
-    </message>
-    <message>
-        <location line="+843"/>
+        <location line="+1139"/>
        <source>is typing...</source>
        <translation>tippt...</translation>
    </message>
@ -7256,12 +7310,13 @@ p, li { white-space: pre-wrap; }
        <translation>Freunde</translation>
    </message>
    <message>
-        <location filename="../gui/PeersDialog.cpp" line="-762"/>
+        <location filename="../gui/PeersDialog.cpp" line="-843"/>
+        <location line="+80"/>
        <source>Paste Friend Link</source>
        <translation>RetroShare Link einfügen</translation>
    </message>
    <message>
-        <location line="+356"/>
+        <location line="+357"/>
        <source>location</source>
        <translation>Standort</translation>
    </message>
@ -7568,7 +7623,7 @@ p, li { white-space: pre-wrap; }
        <translation>Avatar zeigen</translation>
    </message>
    <message>
-        <location line="+342"/>
+        <location line="+341"/>
        <source>File not found or file name not accepted.</source>
        <translation>Datei nicht gefunden oder Dateiname nicht akzeptiert.</translation>
    </message>
@ -7626,7 +7681,7 @@ p, li { white-space: pre-wrap; }
        <translation>Deaktiviere Emoticons</translation>
    </message>
    <message>
-        <location filename="../gui/chat/PopupChatDialog.cpp" line="-957"/>
+        <location filename="../gui/chat/PopupChatDialog.cpp" line="-956"/>
        <source>Paste retroshare Link</source>
        <translation>RetroShare Link einfügen</translation>
    </message>
@ -7651,7 +7706,7 @@ p, li { white-space: pre-wrap; }
        <translation>Zusätzlich eine Datei hinzufügen</translation>
    </message>
    <message>
-        <location line="+167"/>
+        <location line="+166"/>
        <location line="+7"/>
        <source>Drop file error.</source>
        <translation>Dateifehler bei Drag&apos;n&apos;Drop.</translation>
@ -7683,7 +7738,7 @@ p, li { white-space: pre-wrap; }
        <translation>Text Datei (*.txt );;Alle Dateien (*)</translation>
    </message>
    <message>
-        <location line="-707"/>
+        <location line="-706"/>
        <source>Your Friend is offline 
 Do you want to send them a Message instead</source>
        <translation>Dein Freund ist Offline willst du ihm stattdessen eine Nachricht senden</translation>
@ -7700,7 +7755,7 @@ Do you want to send them a Message instead</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../gui/chat/PopupChatDialog.cpp" line="+746"/>
+        <location filename="../gui/chat/PopupChatDialog.cpp" line="+745"/>
        <source>is Idle and may not reply</source>
        <translation>antwortet möglicherweise nicht, da der Status auf &quot;Untätig&quot; gesetzt wurde</translation>
    </message>
@ -7720,7 +7775,7 @@ Do you want to send them a Message instead</source>
        <translation>ist Offline.</translation>
    </message>
    <message>
-        <location line="-693"/>
+        <location line="-692"/>
        <source>is typing...</source>
        <translation>tippt...</translation>
    </message>
@ -8260,7 +8315,7 @@ p, li { white-space: pre-wrap; }
        <translation>Vielleicht ist das Passwort falsch</translation>
    </message>
    <message>
-        <location filename="../gui/RetroShareLink.cpp" line="+264"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+270"/>
        <source>File Request Confirmation</source>
        <translation>Bestätigung der Dateianforderung</translation>
    </message>
@ -9367,32 +9422,28 @@ p, li { white-space: pre-wrap; }
 <context>
    <name>ShareKey</name>
    <message>
-        <location filename="../gui/channels/ShareKey.ui" line="+14"/>
-        <source>Share Key</source>
-        <translation>Schlüssel verteilen</translation>
-    </message>
-    <message>
-        <location line="+38"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { 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:18pt; font-weight:600; color:#ffffff;&quot;&gt;Share Key&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:18pt; font-weight:600; color:#ffffff;&quot;&gt;Schlüssel verteilen&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="+52"/>
+        <location filename="../gui/channels/ShareKey.ui" line="+121"/>
        <source>check peers you would like to share private publish key with</source>
        <translation>Wähle die Nachbarn, an die du den privaten Schlüssel verteilen möchtest</translation>
    </message>
    <message>
-        <location line="+9"/>
-        <source>Share Key With</source>
-        <translation>Schlüssel verteilen an</translation>
+        <location line="-107"/>
+        <source>Share Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { 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:18pt; font-weight:600; color:#ffffff;&quot;&gt;Share Channel&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+77"/>
+        <source>Share for Friend</source>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location line="+53"/>
@ -9409,6 +9460,15 @@ p, li { white-space: pre-wrap; }
        <source>Cancel</source>
        <translation>Abbrechen</translation>
    </message>
+    <message>
+        <location line="+9"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { 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;Select the Friends with which you want to Share your Channel.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
    <message>
        <location filename="../gui/channels/ShareKey.cpp" line="+78"/>
        <source>RetroShare</source>
@ -9433,7 +9493,7 @@ p, li { white-space: pre-wrap; }
        <translation>Freigabe entfernen</translation>
    </message>
    <message>
-        <location filename="../gui/ShareManager.cpp" line="+124"/>
+        <location filename="../gui/ShareManager.cpp" line="+125"/>
        <source>If checked, the share is anonymously shared to anybody.</source>
        <translation>Wenn aktiviert, dann ist dieser Ordner anonym feigegeben.</translation>
    </message>
@ -10078,7 +10138,7 @@ Bist Du sicher?</translation>
 <context>
    <name>StatusDefs</name>
    <message>
-        <location filename="../gui/common/StatusDefs.cpp" line="+31"/>
+        <location filename="../gui/common/StatusDefs.cpp" line="+32"/>
        <source>Offline</source>
        <translation></translation>
    </message>