Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added "Copy RetroShare Link" of the selected peer in PeersDialog and NetworkDialog.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4206 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2011-05-16 22:51:08 +00:00
parent 7b4f45b686
commit e6868d4a1e
6 changed files with 127 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,6 +39,7 @@
#include "connect/ConfCertDialog.h" #include "connect/ConfCertDialog.h"
#include "settings/rsharesettings.h" #include "settings/rsharesettings.h"
#include "common/RSItemDelegate.h" #include "common/RSItemDelegate.h"
#include "RetroShareLink.h"
#include <time.h> #include <time.h>
@ -47,7 +48,8 @@
#define IMAGE_PEERDETAILS ":/images/peerdetails_16x16.png" #define IMAGE_PEERDETAILS ":/images/peerdetails_16x16.png"
#define IMAGE_AUTH ":/images/encrypted16.png" #define IMAGE_AUTH ":/images/encrypted16.png"
#define IMAGE_MAKEFRIEND ":/images/user/add_user16.png" #define IMAGE_MAKEFRIEND ":/images/user/add_user16.png"
#define IMAGE_EXPIORT ":/images/exportpeers_16x16.png" #define IMAGE_EXPORT ":/images/exportpeers_16x16.png"
#define IMAGE_COPYLINK ":/images/copyrslink.png"
/* Images for Status icons */ /* Images for Status icons */
#define IMAGE_AUTHED ":/images/accepted16.png" #define IMAGE_AUTHED ":/images/accepted16.png"
@ -245,7 +247,7 @@ void NetworkDialog::connecttreeWidgetCostumPopupMenu( QPoint point )
} }
if(peer_id == rsPeers->getGPGOwnId()) if(peer_id == rsPeers->getGPGOwnId())
{ {
QAction* exportcertAct = new QAction(QIcon(IMAGE_EXPIORT), tr( "Export my Cert" ), &contextMnu ); QAction* exportcertAct = new QAction(QIcon(IMAGE_EXPORT), tr( "Export my Cert" ), &contextMnu );
connect( exportcertAct , SIGNAL( triggered() ), this, SLOT( on_actionExportKey_activated() ) ); connect( exportcertAct , SIGNAL( triggered() ), this, SLOT( on_actionExportKey_activated() ) );
contextMnu.addAction( exportcertAct); contextMnu.addAction( exportcertAct);
} }
@ -254,6 +256,7 @@ void NetworkDialog::connecttreeWidgetCostumPopupMenu( QPoint point )
connect( peerdetailsAct , SIGNAL( triggered() ), this, SLOT( peerdetails() ) ); connect( peerdetailsAct , SIGNAL( triggered() ), this, SLOT( peerdetails() ) );
contextMnu.addAction( peerdetailsAct); contextMnu.addAction( peerdetailsAct);
contextMnu.addAction(QIcon(IMAGE_COPYLINK), tr("Copy RetroShare Link"), this, SLOT(copyLink()));
contextMnu.exec(QCursor::pos()); contextMnu.exec(QCursor::pos());
} }
@ -292,6 +295,24 @@ void NetworkDialog::peerdetails()
ConfCertDialog::showIt(getCurrentNeighbour()->text(4).toStdString(), ConfCertDialog::PageDetails); ConfCertDialog::showIt(getCurrentNeighbour()->text(4).toStdString(), ConfCertDialog::PageDetails);
} }
void NetworkDialog::copyLink()
{
QTreeWidgetItem *wi = getCurrentNeighbour();
if (wi == NULL) {
return;
}
std::string peer_id = wi->text(4).toStdString() ;
std::vector<RetroShareLink> urls;
RetroShareLink link;
if (link.createPerson(peer_id)) {
urls.push_back(link);
}
RSLinkClipboard::copyLinks(urls);
}
/** Open a QFileDialog to browse for a pem/pqi file. */ /** Open a QFileDialog to browse for a pem/pqi file. */
//void NetworkDialog::loadcert() //void NetworkDialog::loadcert()
//{ //{

1
retroshare-gui/src/gui/NetworkDialog.h
View File

@ -50,6 +50,7 @@ private slots:
void denyFriend() ; void denyFriend() ;
void deleteCert() ; void deleteCert() ;
void peerdetails(); void peerdetails();
void copyLink();
/** Create the context popup menu and it's submenus */ /** Create the context popup menu and it's submenus */
void connecttreeWidgetCostumPopupMenu( QPoint point ); void connecttreeWidgetCostumPopupMenu( QPoint point );
//void unvalidGPGkeyWidgetCostumPopupMenu( QPoint point ); //void unvalidGPGkeyWidgetCostumPopupMenu( QPoint point );

22
retroshare-gui/src/gui/PeersDialog.cpp
View File

@ -81,6 +81,7 @@
#define IMAGE_CHAT ":/images/chat.png" #define IMAGE_CHAT ":/images/chat.png"
#define IMAGE_MSG ":/images/mail_new.png" #define IMAGE_MSG ":/images/mail_new.png"
#define IMAGE_CONNECT ":/images/connect_friend.png" #define IMAGE_CONNECT ":/images/connect_friend.png"
#define IMAGE_COPYLINK ":/images/copyrslink.png"
/* Images for Status icons */ /* Images for Status icons */
#define IMAGE_AVAILABLE ":/images/user/identityavaiblecyan24.png" #define IMAGE_AVAILABLE ":/images/user/identityavaiblecyan24.png"
#define IMAGE_CONNECT2 ":/images/reload24.png" #define IMAGE_CONNECT2 ":/images/reload24.png"
@ -468,6 +469,10 @@ void PeersDialog::peertreeWidgetCostumPopupMenu( QPoint point )
contextMnu.addAction(QIcon(IMAGE_CONNECT), tr("Connect To Friend"), this, SLOT(connectfriend())); contextMnu.addAction(QIcon(IMAGE_CONNECT), tr("Connect To Friend"), this, SLOT(connectfriend()));
if (type == TYPE_GPG) {
contextMnu.addAction(QIcon(IMAGE_COPYLINK), tr("Copy RetroShare Link"), this, SLOT(copyLink()));
}
action = contextMnu.addAction(QIcon(IMAGE_PASTELINK), tr("Paste Friend Link"), this, SLOT(pastePerson())); action = contextMnu.addAction(QIcon(IMAGE_PASTELINK), tr("Paste Friend Link"), this, SLOT(pastePerson()));
if (RSLinkClipboard::empty(RetroShareLink::TYPE_PERSON)) { if (RSLinkClipboard::empty(RetroShareLink::TYPE_PERSON)) {
action->setDisabled(true); action->setDisabled(true);
@ -1217,6 +1222,23 @@ void PeersDialog::pastePerson()
RSLinkClipboard::process(RetroShareLink::TYPE_PERSON, RSLINK_PROCESS_NOTIFY_ERROR); RSLinkClipboard::process(RetroShareLink::TYPE_PERSON, RSLINK_PROCESS_NOTIFY_ERROR);
} }
void PeersDialog::copyLink()
{
QTreeWidgetItem *c = getCurrentPeer();
if (c == NULL) {
return;
}
std::vector<RetroShareLink> urls;
RetroShareLink link;
if (link.createPerson(c->data(COLUMN_DATA, ROLE_ID).toString().toStdString())) {
urls.push_back(link);
}
RSLinkClipboard::copyLinks(urls);
}
QTreeWidgetItem *PeersDialog::getCurrentPeer() QTreeWidgetItem *PeersDialog::getCurrentPeer()
{ {
/* get the current, and extract the Id */ /* get the current, and extract the Id */

1
retroshare-gui/src/gui/PeersDialog.h
View File

@ -123,6 +123,7 @@ private slots:
void msgfriend(); void msgfriend();
void recommendfriend(); void recommendfriend();
void pastePerson(); void pastePerson();
void copyLink();
void addToGroup(); void addToGroup();
void moveToGroup(); void moveToGroup();
void removeFromGroup(); void removeFromGroup();

BIN
retroshare-gui/src/lang/retroshare_de.qm
View File

Binary file not shown.

155
retroshare-gui/src/lang/retroshare_de.ts
View File

@ -19,7 +19,7 @@
<translation>Schliessen</translation> <translation>Schliessen</translation>
</message> </message>
<message> <message>
<location filename="../gui/AboutDialog.cpp" line="+62"/> <location filename="../gui/AboutDialog.cpp" line="+61"/>
<location line="+88"/> <location line="+88"/>
<source>About RetroShare %1</source> <source>About RetroShare %1</source>
<translation>Über RestroShare %1</translation> <translation>Über RestroShare %1</translation>
@ -1048,17 +1048,16 @@ 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;Arial&apos;; font-size:10pt; font-weight:600;&quot;&gt;Kanäle&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation> &lt;p style=&quot; margin-top:0px; margin-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:10pt; font-weight:600;&quot;&gt;Kanäle&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message> </message>
<message> <message>
<location line="+32"/>
<source>Add</source> <source>Add</source>
<translation>Hinzufügen</translation> <translation type="obsolete">Hinzufügen</translation>
</message> </message>
<message> <message>
<location line="+79"/> <location line="+29"/>
<source>Display</source> <source>Display</source>
<translation>Anzeige</translation> <translation>Anzeige</translation>
</message> </message>
<message> <message>
<location line="+275"/> <location line="+295"/>
<source>Set all to read</source> <source>Set all to read</source>
<translation>Alle als gelesen markieren</translation> <translation>Alle als gelesen markieren</translation>
</message> </message>
@ -1068,12 +1067,12 @@ p, li { white-space: pre-wrap; }
<translation>Aktiviere Auto-Download</translation> <translation>Aktiviere Auto-Download</translation>
</message> </message>
<message> <message>
<location line="+88"/> <location line="-293"/>
<source>Create Channel</source> <source>Create Channel</source>
<translation>Kanal erstellen</translation> <translation>Kanal erstellen</translation>
</message> </message>
<message> <message>
<location line="-225"/> <location line="+156"/>
<source>Unsubscribe</source> <source>Unsubscribe</source>
<translation>Abbestellen</translation> <translation>Abbestellen</translation>
</message> </message>
@ -1113,8 +1112,8 @@ p, li { white-space: pre-wrap; }
<translation>Andere Kanäle</translation> <translation>Andere Kanäle</translation>
</message> </message>
<message> <message>
<location filename="../gui/ChannelFeed.ui" line="-171"/> <location filename="../gui/ChannelFeed.ui" line="+188"/>
<location filename="../gui/ChannelFeed.cpp" line="+57"/> <location filename="../gui/ChannelFeed.cpp" line="+51"/>
<source>Post to Channel</source> <source>Post to Channel</source>
<translation>Kanalbeitrag erstellen</translation> <translation>Kanalbeitrag erstellen</translation>
</message> </message>
@ -1600,7 +1599,7 @@ p, li { white-space: pre-wrap; }
<translation>Übernehmen und Schliessen</translation> <translation>Übernehmen und Schliessen</translation>
</message> </message>
<message> <message>
<location filename="../gui/connect/ConfCertDialog.cpp" line="+134"/> <location filename="../gui/connect/ConfCertDialog.cpp" line="+133"/>
<location line="+201"/> <location line="+201"/>
<source>RetroShare</source> <source>RetroShare</source>
<translation></translation> <translation></translation>
@ -3688,7 +3687,7 @@ p, li { white-space: pre-wrap; }
<context> <context>
<name>ForumsDialog</name> <name>ForumsDialog</name>
<message> <message>
<location filename="../gui/ForumsDialog.cpp" line="+277"/> <location filename="../gui/ForumsDialog.cpp" line="+271"/>
<source>Subscribe to Forum</source> <source>Subscribe to Forum</source>
<translation>Forum abonnieren</translation> <translation>Forum abonnieren</translation>
</message> </message>
@ -3803,7 +3802,7 @@ p, li { white-space: pre-wrap; }
<translation>Du kannst einem anonymen Autor nicht antworten</translation> <translation>Du kannst einem anonymen Autor nicht antworten</translation>
</message> </message>
<message> <message>
<location line="-1378"/> <location line="-1377"/>
<source>Your Forums</source> <source>Your Forums</source>
<translation>Deine Foren</translation> <translation>Deine Foren</translation>
</message> </message>
@ -3836,22 +3835,21 @@ 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;Arial&apos;; font-weight:600;&quot;&gt;Foren&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation> &lt;p style=&quot; margin-top:0px; margin-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-weight:600;&quot;&gt;Foren&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message> </message>
<message> <message>
<location line="+29"/>
<source>Add</source> <source>Add</source>
<translation>Hinzufügen</translation> <translation type="obsolete">Hinzufügen</translation>
</message> </message>
<message> <message>
<location line="+44"/> <location line="+588"/>
<source>Start new Thread for Selected Forum</source> <source>Start new Thread for Selected Forum</source>
<translation>Starte ein neues Thema im ausgewählten Forum</translation> <translation>Starte ein neues Thema im ausgewählten Forum</translation>
</message> </message>
<message> <message>
<location line="+20"/> <location line="-559"/>
<source>Display</source> <source>Display</source>
<translation>Anzeige</translation> <translation>Anzeige</translation>
</message> </message>
<message> <message>
<location line="+88"/> <location line="+105"/>
<source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; }
@ -3935,12 +3933,12 @@ p, li { white-space: pre-wrap; }
<translation>Auf Beitrag antworten</translation> <translation>Auf Beitrag antworten</translation>
</message> </message>
<message> <message>
<location line="+74"/> <location line="-488"/>
<source>Create Forum</source> <source>Create Forum</source>
<translation>Forum erstellen</translation> <translation>Forum erstellen</translation>
</message> </message>
<message> <message>
<location line="-14"/> <location line="+568"/>
<source>Print</source> <source>Print</source>
<translation>Drucken</translation> <translation>Drucken</translation>
</message> </message>
@ -3950,13 +3948,13 @@ p, li { white-space: pre-wrap; }
<translation>Druckvorschau</translation> <translation>Druckvorschau</translation>
</message> </message>
<message> <message>
<location filename="../gui/ForumsDialog.cpp" line="+124"/> <location filename="../gui/ForumsDialog.cpp" line="+123"/>
<location line="+1175"/> <location line="+1175"/>
<source>Start New Thread</source> <source>Start New Thread</source>
<translation>Erstelle neues Thema</translation> <translation>Erstelle neues Thema</translation>
</message> </message>
<message> <message>
<location filename="../gui/ForumsDialog.ui" line="-170"/> <location filename="../gui/ForumsDialog.ui" line="-190"/>
<source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; }
@ -6210,7 +6208,7 @@ Willst Du die Nachricht speichern ?</translation>
<name>MessagesDialog</name> <name>MessagesDialog</name>
<message> <message>
<location filename="../gui/MessagesDialog.ui" line="+576"/> <location filename="../gui/MessagesDialog.ui" line="+576"/>
<location filename="../gui/MessagesDialog.cpp" line="+691"/> <location filename="../gui/MessagesDialog.cpp" line="+684"/>
<source>New Message</source> <source>New Message</source>
<translation>Neue Nachricht</translation> <translation>Neue Nachricht</translation>
</message> </message>
@ -6226,14 +6224,14 @@ Willst Du die Nachricht speichern ?</translation>
</message> </message>
<message> <message>
<location filename="../gui/MessagesDialog.ui" line="+393"/> <location filename="../gui/MessagesDialog.ui" line="+393"/>
<location filename="../gui/MessagesDialog.cpp" line="-403"/> <location filename="../gui/MessagesDialog.cpp" line="-396"/>
<source>Date</source> <source>Date</source>
<translation>Datum</translation> <translation>Datum</translation>
</message> </message>
<message> <message>
<location line="-5"/> <location line="-5"/>
<location filename="../gui/MessagesDialog.cpp" line="-1"/> <location filename="../gui/MessagesDialog.cpp" line="-1"/>
<location line="+861"/> <location line="+854"/>
<source>From</source> <source>From</source>
<translation>Von</translation> <translation>Von</translation>
</message> </message>
@ -6318,15 +6316,15 @@ p, li { white-space: pre-wrap; }
<message> <message>
<location line="+180"/> <location line="+180"/>
<location filename="../gui/MessagesDialog.cpp" line="-44"/> <location filename="../gui/MessagesDialog.cpp" line="-44"/>
<location line="+988"/> <location line="+986"/>
<location line="+10"/> <location line="+10"/>
<source>Inbox</source> <source>Inbox</source>
<translation>Posteingang</translation> <translation>Posteingang</translation>
</message> </message>
<message> <message>
<location line="+9"/> <location line="+9"/>
<location filename="../gui/MessagesDialog.cpp" line="-993"/> <location filename="../gui/MessagesDialog.cpp" line="-991"/>
<location line="+1006"/> <location line="+1004"/>
<location line="+8"/> <location line="+8"/>
<source>Outbox</source> <source>Outbox</source>
<translation>Postausgang</translation> <translation>Postausgang</translation>
@ -6338,7 +6336,7 @@ p, li { white-space: pre-wrap; }
</message> </message>
<message> <message>
<location line="+9"/> <location line="+9"/>
<location filename="../gui/MessagesDialog.cpp" line="-1004"/> <location filename="../gui/MessagesDialog.cpp" line="-1002"/>
<source>Sent</source> <source>Sent</source>
<translation>Gesendet</translation> <translation>Gesendet</translation>
</message> </message>
@ -6405,13 +6403,13 @@ p, li { white-space: pre-wrap; }
<translation>Speichern unter...</translation> <translation>Speichern unter...</translation>
</message> </message>
<message> <message>
<location filename="../gui/MessagesDialog.cpp" line="+760"/> <location filename="../gui/MessagesDialog.cpp" line="+758"/>
<source>Print Document</source> <source>Print Document</source>
<translation>Dokument drucken</translation> <translation>Dokument drucken</translation>
</message> </message>
<message> <message>
<location filename="../gui/MessagesDialog.ui" line="-839"/> <location filename="../gui/MessagesDialog.ui" line="-839"/>
<location filename="../gui/MessagesDialog.cpp" line="-1594"/> <location filename="../gui/MessagesDialog.cpp" line="-1585"/>
<source>Subject</source> <source>Subject</source>
<translation>Betreff</translation> <translation>Betreff</translation>
</message> </message>
@ -6446,7 +6444,7 @@ p, li { white-space: pre-wrap; }
<translation>Drucken</translation> <translation>Drucken</translation>
</message> </message>
<message> <message>
<location filename="../gui/MessagesDialog.cpp" line="+63"/> <location filename="../gui/MessagesDialog.cpp" line="+56"/>
<source>Forward selected Message</source> <source>Forward selected Message</source>
<translation>Gewählte Nachricht weiterleiten</translation> <translation>Gewählte Nachricht weiterleiten</translation>
</message> </message>
@ -6461,38 +6459,31 @@ p, li { white-space: pre-wrap; }
<translation>Weiterleiten</translation> <translation>Weiterleiten</translation>
</message> </message>
<message> <message>
<location line="-355"/>
<source>Click to sort by attachments</source> <source>Click to sort by attachments</source>
<translation>Klicken, um nach Anhang zu sortieren</translation> <translation type="obsolete">Klicken, um nach Anhang zu sortieren</translation>
</message> </message>
<message> <message>
<location line="+1"/>
<source>Click to sort by subject</source> <source>Click to sort by subject</source>
<translation>Klicken, um nach Betreff zu sortieren</translation> <translation type="obsolete">Klicken, um nach Betreff zu sortieren</translation>
</message> </message>
<message> <message>
<location line="+1"/>
<source>Click to sort by read</source> <source>Click to sort by read</source>
<translation>Klicken, um nach Gelesen / Ungelesen zu sortieren</translation> <translation type="obsolete">Klicken, um nach Gelesen / Ungelesen zu sortieren</translation>
</message> </message>
<message> <message>
<location line="+1"/>
<location line="+854"/>
<source>Click to sort by from</source> <source>Click to sort by from</source>
<translation>Klicken, um nach Von zu sortieren</translation> <translation type="obsolete">Klicken, um nach Von zu sortieren</translation>
</message> </message>
<message> <message>
<location line="-853"/>
<source>Click to sort by date</source> <source>Click to sort by date</source>
<translation>Klicken, um nach Datum zu sortieren</translation> <translation type="obsolete">Klicken, um nach Datum zu sortieren</translation>
</message> </message>
<message> <message>
<location line="+1"/>
<source>Click to sort by tags</source> <source>Click to sort by tags</source>
<translation>Klicken, um nach Schlagwörter zu sortieren</translation> <translation type="obsolete">Klicken, um nach Schlagwörter zu sortieren</translation>
</message> </message>
<message> <message>
<location line="+439"/> <location line="+89"/>
<source>Download</source> <source>Download</source>
<translation>Herunterladen</translation> <translation>Herunterladen</translation>
</message> </message>
@ -6507,12 +6498,11 @@ p, li { white-space: pre-wrap; }
<translation>Empfohlene Dateien einblenden</translation> <translation>Empfohlene Dateien einblenden</translation>
</message> </message>
<message> <message>
<location line="+273"/>
<source>Click to sort by to</source> <source>Click to sort by to</source>
<translation>Klicken, um nach Empfänger zu sortieren</translation> <translation type="obsolete">Klicken, um nach Empfänger zu sortieren</translation>
</message> </message>
<message> <message>
<location line="+623"/> <location line="+894"/>
<source>File</source> <source>File</source>
<translation>Datei</translation> <translation>Datei</translation>
</message> </message>
@ -6532,7 +6522,7 @@ p, li { white-space: pre-wrap; }
<translation>HTML-Dateien (*.htm *.html);;Alle Dateien (*)</translation> <translation>HTML-Dateien (*.htm *.html);;Alle Dateien (*)</translation>
</message> </message>
<message> <message>
<location line="-1564"/> <location line="-1562"/>
<location line="+294"/> <location line="+294"/>
<source>Reply to All</source> <source>Reply to All</source>
<translation>Allen antworten</translation> <translation>Allen antworten</translation>
@ -6551,7 +6541,7 @@ p, li { white-space: pre-wrap; }
</message> </message>
<message> <message>
<location line="-277"/> <location line="-277"/>
<location filename="../gui/MessagesDialog.cpp" line="-353"/> <location filename="../gui/MessagesDialog.cpp" line="-346"/>
<source>Content</source> <source>Content</source>
<translation>Inhalt</translation> <translation>Inhalt</translation>
</message> </message>
@ -6559,7 +6549,7 @@ p, li { white-space: pre-wrap; }
<location line="+5"/> <location line="+5"/>
<location line="+11"/> <location line="+11"/>
<location filename="../gui/MessagesDialog.cpp" line="-1"/> <location filename="../gui/MessagesDialog.cpp" line="-1"/>
<location line="+207"/> <location line="+200"/>
<source>Tags</source> <source>Tags</source>
<translation>Schlagwörter</translation> <translation>Schlagwörter</translation>
</message> </message>
@ -6571,7 +6561,7 @@ p, li { white-space: pre-wrap; }
<message> <message>
<location line="+177"/> <location line="+177"/>
<location filename="../gui/MessagesDialog.cpp" line="+628"/> <location filename="../gui/MessagesDialog.cpp" line="+628"/>
<location line="+1030"/> <location line="+1028"/>
<location line="+5"/> <location line="+5"/>
<source>Trash</source> <source>Trash</source>
<translation>Papierkorb</translation> <translation>Papierkorb</translation>
@ -6587,7 +6577,7 @@ p, li { white-space: pre-wrap; }
<translation>Ordner</translation> <translation>Ordner</translation>
</message> </message>
<message> <message>
<location filename="../gui/MessagesDialog.cpp" line="-1652"/> <location filename="../gui/MessagesDialog.cpp" line="-1650"/>
<source>Remove All Tags</source> <source>Remove All Tags</source>
<translation>Alle Schlagwörter entfernen</translation> <translation>Alle Schlagwörter entfernen</translation>
</message> </message>
@ -6618,23 +6608,23 @@ p, li { white-space: pre-wrap; }
</message> </message>
<message> <message>
<location line="+358"/> <location line="+358"/>
<location line="+1021"/> <location line="+1019"/>
<location line="+8"/> <location line="+8"/>
<source>Drafts</source> <source>Drafts</source>
<translation>Entwürfe</translation> <translation>Entwürfe</translation>
</message> </message>
<message> <message>
<location line="-992"/> <location line="-991"/>
<source>To</source> <source>To</source>
<translation>An</translation> <translation>An</translation>
</message> </message>
<message> <message>
<location line="-496"/> <location line="-495"/>
<source>Edit...</source> <source>Edit...</source>
<translation>Editieren...</translation> <translation>Editieren...</translation>
</message> </message>
<message> <message>
<location line="+1408"/> <location line="+1406"/>
<location line="+4"/> <location line="+4"/>
<location line="+4"/> <location line="+4"/>
<location line="+4"/> <location line="+4"/>
@ -6881,7 +6871,7 @@ p, li { white-space: pre-wrap; }
<context> <context>
<name>NetworkDialog</name> <name>NetworkDialog</name>
<message> <message>
<location filename="../gui/NetworkDialog.cpp" line="+436"/> <location filename="../gui/NetworkDialog.cpp" line="+457"/>
<source>Personal signature</source> <source>Personal signature</source>
<translation>Persönliche Unterschrift</translation> <translation>Persönliche Unterschrift</translation>
</message> </message>
@ -7026,7 +7016,7 @@ p, li { white-space: pre-wrap; }
<translation>Leeren</translation> <translation>Leeren</translation>
</message> </message>
<message> <message>
<location filename="../gui/NetworkDialog.cpp" line="-263"/> <location filename="../gui/NetworkDialog.cpp" line="-282"/>
<source>Deny friend</source> <source>Deny friend</source>
<translation>Blockiere Freund</translation> <translation>Blockiere Freund</translation>
</message> </message>
@ -7051,12 +7041,17 @@ p, li { white-space: pre-wrap; }
<translation>Nachbar-Details...</translation> <translation>Nachbar-Details...</translation>
</message> </message>
<message> <message>
<location line="+198"/> <location line="+4"/>
<source>Copy RetroShare Link</source>
<translation>Kopiere RetroShare Link</translation>
</message>
<message>
<location line="+213"/>
<source>Unknown</source> <source>Unknown</source>
<translation>Unbekannt</translation> <translation>Unbekannt</translation>
</message> </message>
<message> <message>
<location line="-298"/> <location line="-317"/>
<source>Authentication matrix</source> <source>Authentication matrix</source>
<translation>Authentifizierungsmatrix</translation> <translation>Authentifizierungsmatrix</translation>
</message> </message>
@ -7066,7 +7061,7 @@ p, li { white-space: pre-wrap; }
<translation>Netzwerk Ansicht</translation> <translation>Netzwerk Ansicht</translation>
</message> </message>
<message> <message>
<location line="+374"/> <location line="+393"/>
<source>yourself</source> <source>yourself</source>
<translation>selbst</translation> <translation>selbst</translation>
</message> </message>
@ -7558,12 +7553,12 @@ p, li { white-space: pre-wrap; }
<context> <context>
<name>PeersDialog</name> <name>PeersDialog</name>
<message> <message>
<location filename="../gui/PeersDialog.cpp" line="+456"/> <location filename="../gui/PeersDialog.cpp" line="+457"/>
<source>Chat</source> <source>Chat</source>
<translation>Chat</translation> <translation>Chat</translation>
</message> </message>
<message> <message>
<location line="+708"/> <location line="+712"/>
<source>Save Certificate</source> <source>Save Certificate</source>
<translation>Zertifikat speichern</translation> <translation>Zertifikat speichern</translation>
</message> </message>
@ -7578,7 +7573,7 @@ p, li { white-space: pre-wrap; }
<translation>Status</translation> <translation>Status</translation>
</message> </message>
<message> <message>
<location filename="../gui/PeersDialog.cpp" line="-695"/> <location filename="../gui/PeersDialog.cpp" line="-699"/>
<source>Connect To Friend</source> <source>Connect To Friend</source>
<translation>Verbinde zum Freund</translation> <translation>Verbinde zum Freund</translation>
</message> </message>
@ -7618,7 +7613,7 @@ p, li { white-space: pre-wrap; }
<translation>Freund-Details</translation> <translation>Freund-Details</translation>
</message> </message>
<message> <message>
<location line="+98"/> <location line="+102"/>
<source>Expand all</source> <source>Expand all</source>
<translation>Alle erweitern</translation> <translation>Alle erweitern</translation>
</message> </message>
@ -7628,7 +7623,7 @@ p, li { white-space: pre-wrap; }
<translation>Alle reduzieren</translation> <translation>Alle reduzieren</translation>
</message> </message>
<message> <message>
<location line="-103"/> <location line="-107"/>
<source>Message Friend</source> <source>Message Friend</source>
<translation>Freund anschreiben</translation> <translation>Freund anschreiben</translation>
</message> </message>
@ -7648,7 +7643,12 @@ p, li { white-space: pre-wrap; }
<translation>Freund weiterempfehlen...</translation> <translation>Freund weiterempfehlen...</translation>
</message> </message>
<message> <message>
<location line="+11"/> <location line="+6"/>
<source>Copy RetroShare Link</source>
<translation>Kopiere RetroShare Link</translation>
</message>
<message>
<location line="+9"/>
<source>Deny Friend</source> <source>Deny Friend</source>
<translation>Blockiere Freund</translation> <translation>Blockiere Freund</translation>
</message> </message>
@ -7689,7 +7689,7 @@ p, li { white-space: pre-wrap; }
<translation>Verfügbar</translation> <translation>Verfügbar</translation>
</message> </message>
<message> <message>
<location line="+432"/> <location line="+449"/>
<location line="+2"/> <location line="+2"/>
<source>New group chat</source> <source>New group chat</source>
<translation>Neuer Gruppenchat</translation> <translation>Neuer Gruppenchat</translation>
@ -7871,7 +7871,7 @@ p, li { white-space: pre-wrap; }
</message> </message>
<message> <message>
<location line="-162"/> <location line="-162"/>
<location filename="../gui/PeersDialog.cpp" line="-1515"/> <location filename="../gui/PeersDialog.cpp" line="-1536"/>
<source>Add Friend</source> <source>Add Friend</source>
<translation>Freund hinzufügen</translation> <translation>Freund hinzufügen</translation>
</message> </message>
@ -7927,7 +7927,7 @@ p, li { white-space: pre-wrap; }
<translation>Gruppe entfernen</translation> <translation>Gruppe entfernen</translation>
</message> </message>
<message> <message>
<location line="+829"/> <location line="+850"/>
<source>Do you want to remove this Friend?</source> <source>Do you want to remove this Friend?</source>
<translation>Willst du diesen Freund entfernen?</translation> <translation>Willst du diesen Freund entfernen?</translation>
</message> </message>
@ -7972,7 +7972,7 @@ p, li { white-space: pre-wrap; }
<translation>Freunde</translation> <translation>Freunde</translation>
</message> </message>
<message> <message>
<location filename="../gui/PeersDialog.cpp" line="-892"/> <location filename="../gui/PeersDialog.cpp" line="-909"/>
<location line="+80"/> <location line="+80"/>
<source>Paste Friend Link</source> <source>Paste Friend Link</source>
<translation>RetroShare Link einfügen</translation> <translation>RetroShare Link einfügen</translation>
@ -8660,7 +8660,7 @@ Do you want to send them a Message instead</source>
<context> <context>
<name>ProfileView</name> <name>ProfileView</name>
<message> <message>
<location filename="../gui/profile/ProfileView.cpp" line="+72"/> <location filename="../gui/profile/ProfileView.cpp" line="+70"/>
<source>Clear Photo</source> <source>Clear Photo</source>
<translation>Photo entfernen</translation> <translation>Photo entfernen</translation>
</message> </message>
@ -9029,7 +9029,7 @@ Lockdatei:
<translation>Die Datei wurde zur Downloadliste hinzugefügt.</translation> <translation>Die Datei wurde zur Downloadliste hinzugefügt.</translation>
</message> </message>
<message> <message>
<location filename="../gui/MessagesDialog.cpp" line="-1148"/> <location filename="../gui/MessagesDialog.cpp" line="-1146"/>
<location filename="../gui/RetroShareLink.cpp" line="+8"/> <location filename="../gui/RetroShareLink.cpp" line="+8"/>
<source>File Request canceled</source> <source>File Request canceled</source>
<translation>Dateianforderung abgebrochen</translation> <translation>Dateianforderung abgebrochen</translation>
@ -11263,7 +11263,7 @@ Du kannst die Auswahl in den Optionen zurücksetzen.</translation>
<translation>Statusnachricht</translation> <translation>Statusnachricht</translation>
</message> </message>
<message> <message>
<location line="+27"/> <location line="+24"/>
<source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; }
@ -11299,9 +11299,8 @@ p, li { white-space: pre-wrap; }
<translation>Abbrechen</translation> <translation>Abbrechen</translation>
</message> </message>
<message> <message>
<location filename="../gui/profile/StatusMessage.cpp" line="+64"/>
<source>Paste RetroShare Link</source> <source>Paste RetroShare Link</source>
<translation type="unfinished">RetroShare Link einfügen</translation> <translation type="obsolete">RetroShare Link einfügen</translation>
</message> </message>
</context> </context>
<context> <context>
@ -11393,7 +11392,7 @@ p, li { white-space: pre-wrap; }
</message> </message>
<message> <message>
<location line="+26"/> <location line="+26"/>
<location filename="../gui/feeds/SubFileItem.cpp" line="+578"/> <location filename="../gui/feeds/SubFileItem.cpp" line="+576"/>
<location line="+6"/> <location line="+6"/>
<source>Play File</source> <source>Play File</source>
<translation>Datei abspielen</translation> <translation>Datei abspielen</translation>