diff --git a/retroshare-gui/src/gui/MessengerWindow.cpp b/retroshare-gui/src/gui/MessengerWindow.cpp index ca7c457aa..c96c67898 100644 --- a/retroshare-gui/src/gui/MessengerWindow.cpp +++ b/retroshare-gui/src/gui/MessengerWindow.cpp @@ -334,7 +334,7 @@ void MessengerWindow::messengertreeWidgetCostumPopupMenu( QPoint point ) recommendfriendAct->setDisabled(true); } - QAction* pastePersonAct = new QAction(QIcon(IMAGE_PASTELINK), tr( "Paste retroshare Link" ), &contextMnu ); + QAction* pastePersonAct = new QAction(QIcon(IMAGE_PASTELINK), tr( "Paste RetroShare Link" ), &contextMnu ); if(!RSLinkClipboard::empty(RetroShareLink::TYPE_PERSON)) { connect( pastePersonAct , SIGNAL( triggered() ), this, SLOT( pastePerson() ) ); } else { diff --git a/retroshare-gui/src/gui/PeersDialog.cpp b/retroshare-gui/src/gui/PeersDialog.cpp index 324959b2f..39be3b30e 100644 --- a/retroshare-gui/src/gui/PeersDialog.cpp +++ b/retroshare-gui/src/gui/PeersDialog.cpp @@ -166,14 +166,8 @@ PeersDialog::PeersDialog(QWidget *parent) connect(ui.Sendbtn, SIGNAL(clicked()), this, SLOT(sendMsg())); connect(ui.emoticonBtn, SIGNAL(clicked()), this, SLOT(smileyWidgetgroupchat())); - ui.lineEdit->setContextMenuPolicy(Qt::CustomContextMenu) ; connect(ui.lineEdit,SIGNAL(customContextMenuRequested(QPoint)),this,SLOT(contextMenu(QPoint))); - pasteLinkAct = new QAction(QIcon(":/images/pasterslink.png"), tr( "Paste retroshare Link" ), this ); - connect( pasteLinkAct , SIGNAL( triggered() ), this, SLOT( pasteLink() ) ); - - connect( ui.msgText, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(displayInfoChatMenu(const QPoint&))); - connect(ui.textboldChatButton, SIGNAL(clicked()), this, SLOT(setFont())); connect(ui.textunderlineChatButton, SIGNAL(clicked()), this, SLOT(setFont())); connect(ui.textitalicChatButton, SIGNAL(clicked()), this, SLOT(setFont())); @@ -346,15 +340,16 @@ void PeersDialog::pasteLink() ui.lineEdit->insertHtml(RSLinkClipboard::toHtml()) ; } -void PeersDialog::contextMenu( QPoint point ) +void PeersDialog::contextMenu(QPoint point) { - if(RSLinkClipboard::empty()) - return ; + QMenu *contextMnu = ui.lineEdit->createStandardContextMenu(); - QMenu contextMnu(this); - contextMnu.addAction( pasteLinkAct); + contextMnu->addSeparator(); + QAction *action = contextMnu->addAction(QIcon(":/images/pasterslink.png"), tr("Paste RetroShare Link"), this, SLOT(pasteLink())); + action->setDisabled(RSLinkClipboard::empty()); - contextMnu.exec(QCursor::pos()); + contextMnu->exec(QCursor::pos()); + delete(contextMnu); } void PeersDialog::peertreeWidgetCostumPopupMenu( QPoint point ) @@ -1672,15 +1667,6 @@ void PeersDialog::on_actionClearChat_triggered() ui.msgText->clear(); } -void PeersDialog::displayInfoChatMenu(const QPoint& pos) -{ - // Log Menu - QMenu myChatMenu(this); - myChatMenu.addAction(ui.actionClearChat); - // XXX: Why mapToGlobal() is not enough? - myChatMenu.exec(mapToGlobal(pos)+QPoint(0,80)); -} - void PeersDialog::smileyWidgetgroupchat() { Emoticons::showSmileyWidget(this, ui.emoticonBtn, SLOT(addSmileys()), true); diff --git a/retroshare-gui/src/gui/PeersDialog.h b/retroshare-gui/src/gui/PeersDialog.h index 393c860f5..dec0d9c34 100644 --- a/retroshare-gui/src/gui/PeersDialog.h +++ b/retroshare-gui/src/gui/PeersDialog.h @@ -85,8 +85,6 @@ public slots: void on_actionClearChat_triggered(); void on_actionMessageHistory_triggered(); - void displayInfoChatMenu(const QPoint& pos); - // called by notifyQt when another peer is typing (in group chant and private chat) void updatePeerStatusString(const QString& peer_id,const QString& status_string,bool is_private_chat) ; @@ -198,9 +196,6 @@ private: /* (2) Utility Fns */ QTreeWidgetItem *getCurrentPeer(); - /** Defines the actions for the context menu */ - QAction* pasteLinkAct; - IMHistoryKeeper historyKeeper; ChatStyle style; diff --git a/retroshare-gui/src/gui/PeersDialog.ui b/retroshare-gui/src/gui/PeersDialog.ui index 77278324b..f88f19f3e 100644 --- a/retroshare-gui/src/gui/PeersDialog.ui +++ b/retroshare-gui/src/gui/PeersDialog.ui @@ -721,6 +721,9 @@ background: white;} 200 + + 200 + Friends @@ -938,9 +941,6 @@ p, li { white-space: pre-wrap; } 60 - - Qt::DefaultContextMenu - QTextEdit#msgText{border: 1px solid #CCCCCC; background: white;} @@ -1002,6 +1002,9 @@ background: white;} 0 + + Qt::CustomContextMenu + QTextEdit#lineEdit{border: 1px solid #CCCCCC; } diff --git a/retroshare-gui/src/gui/TransfersDialog.cpp b/retroshare-gui/src/gui/TransfersDialog.cpp index a2b398274..5e52decbf 100644 --- a/retroshare-gui/src/gui/TransfersDialog.cpp +++ b/retroshare-gui/src/gui/TransfersDialog.cpp @@ -262,9 +262,9 @@ TransfersDialog::TransfersDialog(QWidget *parent) connect( clearcompletedAct , SIGNAL( triggered() ), this, SLOT( clearcompleted() ) ); - copylinkAct = new QAction(QIcon(IMAGE_COPYLINK), tr( "Copy retroshare Link" ), this ); + copylinkAct = new QAction(QIcon(IMAGE_COPYLINK), tr( "Copy RetroShare Link" ), this ); connect( copylinkAct , SIGNAL( triggered() ), this, SLOT( copyLink() ) ); - pastelinkAct = new QAction(QIcon(IMAGE_PASTELINK), tr( "Paste retroshare Link" ), this ); + pastelinkAct = new QAction(QIcon(IMAGE_PASTELINK), tr( "Paste RetroShare Link" ), this ); connect( pastelinkAct , SIGNAL( triggered() ), this, SLOT( pasteLink() ) ); queueDownAct = new QAction(QIcon(":/images/go-down.png"), tr("Down"), this); connect(queueDownAct, SIGNAL(triggered()), this, SLOT(priorityQueueDown())); diff --git a/retroshare-gui/src/gui/chat/PopupChatDialog.cpp b/retroshare-gui/src/gui/chat/PopupChatDialog.cpp index 960174422..fe9e9ca88 100644 --- a/retroshare-gui/src/gui/chat/PopupChatDialog.cpp +++ b/retroshare-gui/src/gui/chat/PopupChatDialog.cpp @@ -130,8 +130,6 @@ PopupChatDialog::PopupChatDialog(const std::string &id, const QString &name, QWi connect(NotifyQt::getInstance(), SIGNAL(peerStatusChanged(const QString&, int)), this, SLOT(updateStatus(const QString&, int))); connect(NotifyQt::getInstance(), SIGNAL(peerHasNewCustomStateString(const QString&, const QString&)), this, SLOT(updatePeersCustomStateString(const QString&, const QString&))); - std::cerr << "Connecting custom context menu" << std::endl; - ui.chattextEdit->setContextMenuPolicy(Qt::CustomContextMenu) ; connect(ui.chattextEdit,SIGNAL(customContextMenuRequested(QPoint)),this,SLOT(contextMenu(QPoint))); // Create the status bar @@ -164,9 +162,6 @@ PopupChatDialog::PopupChatDialog(const std::string &id, const QString &name, QWi colorChanged(mCurrentColor); fontChanged(mCurrentFont); - pasteLinkAct = new QAction(QIcon(":/images/pasterslink.png"), tr( "Paste retroshare Link" ), this ); - connect( pasteLinkAct , SIGNAL( triggered() ), this, SLOT( pasteLink() ) ); - updateAvatar() ; updatePeerAvatar(id) ; @@ -432,14 +427,16 @@ void PopupChatDialog::pasteLink() void PopupChatDialog::contextMenu( QPoint point ) { - std::cerr << "In context menu" << std::endl ; - if(RSLinkClipboard::empty()) - return ; + std::cerr << "In context menu" << std::endl ; - QMenu contextMnu(this); - contextMnu.addAction( pasteLinkAct); + QMenu *contextMnu = ui.chattextEdit->createStandardContextMenu(); - contextMnu.exec(QCursor::pos()); + contextMnu->addSeparator(); + QAction *action = contextMnu->addAction(QIcon(":/images/pasterslink.png"), tr("Paste RetroShare Link"), this, SLOT(pasteLink())); + action->setDisabled(RSLinkClipboard::empty()); + + contextMnu->exec(QCursor::pos()); + delete(contextMnu); } void PopupChatDialog::resetStatusBar() diff --git a/retroshare-gui/src/gui/chat/PopupChatDialog.h b/retroshare-gui/src/gui/chat/PopupChatDialog.h index 97e80a073..fb584273d 100644 --- a/retroshare-gui/src/gui/chat/PopupChatDialog.h +++ b/retroshare-gui/src/gui/chat/PopupChatDialog.h @@ -50,6 +50,7 @@ public: static void updateAllAvatars(); static void privateChatChanged(int list, int type); + void updateStatusString(const QString& peer_id, const QString& statusString); void updatePeerAvatar(const std::string&); std::string getPeerId() { return dialogId; } QString getTitle() { return dialogName; } @@ -60,18 +61,6 @@ public: void activate(); public slots: - void pasteLink() ; - void contextMenu(QPoint) ; - - void smileyWidget(); - void addSmiley(); - - void fileHashingFinished(AttachFileItem* file); - - void resetStatusBar() ; - void updateStatusTyping() ; - void updateStatusString(const QString& peer_id, const QString& statusString) ; - void updateStatus(const QString &peer_id, int status); protected: @@ -92,6 +81,17 @@ protected: void updateAvatar(); private slots: + void pasteLink() ; + void contextMenu(QPoint) ; + + void fileHashingFinished(AttachFileItem* file); + + void smileyWidget(); + void addSmiley(); + + void resetStatusBar() ; + void updateStatusTyping() ; + void on_actionMessageHistory_triggered(); void addExtraFile(); void addExtraPicture(); @@ -125,7 +125,6 @@ private: QAction *actionTextBold; QAction *actionTextUnderline; QAction *actionTextItalic; - QAction *pasteLinkAct ; std::string dialogId; QString dialogName; diff --git a/retroshare-gui/src/gui/chat/PopupChatDialog.ui b/retroshare-gui/src/gui/chat/PopupChatDialog.ui index 5fb26625e..c3934cbcf 100644 --- a/retroshare-gui/src/gui/chat/PopupChatDialog.ui +++ b/retroshare-gui/src/gui/chat/PopupChatDialog.ui @@ -789,6 +789,9 @@ p, li { white-space: pre-wrap; } 30 + + Qt::CustomContextMenu + QTextEdit{border: 1px solid #B8B6B1; border-radius: 6px; diff --git a/retroshare-gui/src/gui/forums/CreateForumMsg.cpp b/retroshare-gui/src/gui/forums/CreateForumMsg.cpp index e86e5817d..f4886635d 100644 --- a/retroshare-gui/src/gui/forums/CreateForumMsg.cpp +++ b/retroshare-gui/src/gui/forums/CreateForumMsg.cpp @@ -66,26 +66,21 @@ CreateForumMsg::CreateForumMsg(std::string fId, std::string pId) /** context menu searchTablewidget2 **/ void CreateForumMsg::forumMessageCostumPopupMenu( QPoint point ) { - QMenu contextMnu (this); + QMenu *contextMnu = ui.forumMessage->createStandardContextMenu(); - QAction *pasteLinkAct = new QAction(QIcon(":/images/pasterslink.png"), tr( "Paste retroshare Link" ), &contextMnu ); - QAction *pasteLinkFullAct = new QAction(QIcon(":/images/pasterslink.png"), tr( "Paste retroshare Link Full" ), &contextMnu ); + contextMnu->addSeparator(); + QAction *pasteLinkAct = contextMnu->addAction(QIcon(":/images/pasterslink.png"), tr("Paste RetroShare Link"), this, SLOT(pasteLink())); + QAction *pasteLinkFullAct = contextMnu->addAction(QIcon(":/images/pasterslink.png"), tr("Paste full RetroShare Link"), this, SLOT(pasteLinkFull())); if (RSLinkClipboard::empty()) { pasteLinkAct->setDisabled (true); pasteLinkFullAct->setDisabled (true); - } else { - connect(pasteLinkAct , SIGNAL(triggered()), this, SLOT(pasteLink())); - connect(pasteLinkFullAct , SIGNAL(triggered()), this, SLOT(pasteLinkFull())); } - contextMnu.addAction(pasteLinkAct); - contextMnu.addAction(pasteLinkFullAct); - - contextMnu.exec(QCursor::pos()); + contextMnu->exec(QCursor::pos()); + delete(contextMnu); } - void CreateForumMsg::newMsg() { /* clear all */ diff --git a/retroshare-gui/src/gui/forums/CreateForumMsg.ui b/retroshare-gui/src/gui/forums/CreateForumMsg.ui index 5f0745f57..dbcfa998a 100644 --- a/retroshare-gui/src/gui/forums/CreateForumMsg.ui +++ b/retroshare-gui/src/gui/forums/CreateForumMsg.ui @@ -187,7 +187,7 @@ border: 1px solid #CCCCCC;} - Paste retroshare link + Paste RetroShare Link @@ -262,7 +262,7 @@ p, li { white-space: pre-wrap; } 0 0 440 - 60 + 57 diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.cpp b/retroshare-gui/src/gui/msgs/MessageComposer.cpp index 2136e0b2d..f7024069f 100644 --- a/retroshare-gui/src/gui/msgs/MessageComposer.cpp +++ b/retroshare-gui/src/gui/msgs/MessageComposer.cpp @@ -151,12 +151,15 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WFlags flags) connect(ui.msgText, SIGNAL(currentCharFormatChanged(const QTextCharFormat &)), this, SLOT(currentCharFormatChanged(const QTextCharFormat &))); connect(ui.msgText, SIGNAL(cursorPositionChanged()), this, SLOT(cursorPositionChanged())); + connect(ui.msgText,SIGNAL(customContextMenuRequested(QPoint)),this,SLOT(contextMenu(QPoint))); connect(ui.msgText->document(), SIGNAL(modificationChanged(bool)), actionSave, SLOT(setEnabled(bool))); connect(ui.msgText->document(), SIGNAL(modificationChanged(bool)), this, SLOT(setWindowModified(bool))); connect(ui.msgText->document(), SIGNAL(undoAvailable(bool)), actionUndo, SLOT(setEnabled(bool))); connect(ui.msgText->document(), SIGNAL(redoAvailable(bool)), actionRedo, SLOT(setEnabled(bool))); + connect(ui.msgFileList, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextMenuFileList(QPoint))); + setWindowModified(ui.msgText->document()->isModified()); actionSave->setEnabled(ui.msgText->document()->isModified()); actionUndo->setEnabled(ui.msgText->document()->isUndoAvailable()); @@ -448,6 +451,50 @@ void MessageComposer::closeEvent (QCloseEvent * event) } } +void MessageComposer::contextMenu(QPoint) +{ + QMenu *contextMnu = ui.msgText->createStandardContextMenu(); + + contextMnu->addSeparator(); + QAction *action = contextMnu->addAction(QIcon(":/images/pasterslink.png"), tr("Paste RetroShare Link"), this, SLOT(pasteLink())); + action->setDisabled(RSLinkClipboard::empty()); + + contextMnu->exec(QCursor::pos()); + delete(contextMnu); +} + +void MessageComposer::pasteLink() +{ + ui.msgText->insertHtml(RSLinkClipboard::toHtml()) ; +} + +void MessageComposer::contextMenuFileList(QPoint) +{ + QMenu contextMnu(this); + + QAction *action = contextMnu.addAction(QIcon(":/images/pasterslink.png"), tr("Paste RetroShare Link"), this, SLOT(pasteRecommended())); + action->setDisabled(RSLinkClipboard::empty(RetroShareLink::TYPE_FILE)); + + contextMnu.exec(QCursor::pos()); +} + +void MessageComposer::pasteRecommended() +{ + std::vector links; + RSLinkClipboard::pasteLinks(links); + + for (uint32_t i = 0; i < links.size(); i++) { + if (links[i].valid() && links[i].type() == RetroShareLink::TYPE_FILE) { + FileInfo fileInfo; + fileInfo.fname = links[i].name().toStdString(); + fileInfo.hash = links[i].hash().toStdString(); + fileInfo.size = links[i].size(); + + addFile(fileInfo); + } + } +} + static void setNewCompleter(QTableWidget *tableWidget, QCompleter *completer) { int rowCount = tableWidget->rowCount(); diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.h b/retroshare-gui/src/gui/msgs/MessageComposer.h index f17ffeb87..a9b111a3f 100644 --- a/retroshare-gui/src/gui/msgs/MessageComposer.h +++ b/retroshare-gui/src/gui/msgs/MessageComposer.h @@ -84,8 +84,11 @@ protected: virtual void dropEvent(QDropEvent *event); private slots: - /* toggle Contacts DockWidget */ + void contextMenu(QPoint); + void pasteLink(); + void contextMenuFileList(QPoint); + void pasteRecommended(); void on_contactsdockWidget_visibilityChanged(bool visible); void toggleContacts(); diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.ui b/retroshare-gui/src/gui/msgs/MessageComposer.ui index 4b835db42..6c5dd6c6f 100644 --- a/retroshare-gui/src/gui/msgs/MessageComposer.ui +++ b/retroshare-gui/src/gui/msgs/MessageComposer.ui @@ -696,6 +696,9 @@ border: 1px solid #CCCCCC;} 4 + + Qt::CustomContextMenu + Qt::TextEditorInteraction @@ -809,6 +812,9 @@ border: 1px solid #CCCCCC;} 0 + + Qt::CustomContextMenu + true diff --git a/retroshare-gui/src/lang/retroshare_de.qm b/retroshare-gui/src/lang/retroshare_de.qm index 2a295181e..bcfaaf0ef 100644 Binary files a/retroshare-gui/src/lang/retroshare_de.qm and b/retroshare-gui/src/lang/retroshare_de.qm differ diff --git a/retroshare-gui/src/lang/retroshare_de.ts b/retroshare-gui/src/lang/retroshare_de.ts index 073a42520..fcb878cd3 100644 --- a/retroshare-gui/src/lang/retroshare_de.ts +++ b/retroshare-gui/src/lang/retroshare_de.ts @@ -2405,12 +2405,7 @@ p, li { white-space: pre-wrap; } Forum - - Paste retroshare link - RetroShare Link einfügen - - - + Forum Post Beitrag @@ -2435,17 +2430,18 @@ p, li { white-space: pre-wrap; } Erstelle Forumbeitrag - - Paste retroshare Link + + + Paste RetroShare Link RetroShare Link einfügen - - Paste retroshare Link Full + + Paste full RetroShare Link Vollen RetroShare Link einfügen - + In Reply to Als Antwort auf @@ -2465,7 +2461,7 @@ p, li { white-space: pre-wrap; } Zusätzliche Datei hinzufügen - + Attach File Datei anhängen @@ -2681,10 +2677,6 @@ p, li { white-space: pre-wrap; } Status: - - Priority - Priorität - Priority: @@ -2975,10 +2967,6 @@ Das ist nützlich, wenn Du eine externe Festplatte freigibst und die Datei nicht EmailPage - - Invite Friend by Email - Einladung per E-Mail versenden - Invite Friends by Email @@ -4231,10 +4219,6 @@ Fill in your GPG password when asked, to sign your new key. Idle Time Zeit bis zur Untätigkeit - - seconds - Sekunden - GraphFrame @@ -4274,7 +4258,7 @@ Fill in your GPG password when asked, to sign your new key. GraphWidget - + Click and drag the nodes around, and zoom with the mouse wheel or the '+' and '-' keys @@ -4793,10 +4777,6 @@ p, li { white-space: pre-wrap; } IntroPage - - This wizard will help you to connect to your friend(s) to RetroShare network. There are three possible ways to do this: - Dieser Assistent wird Dir helfen, dich mit Deinen Freunden zu verbinden. Es gibt 3 Möglichkeiten: - &Make friend with selected friends of my friends @@ -5072,7 +5052,7 @@ p, li { white-space: pre-wrap; } MainWindow - + Network Netzwerk @@ -5352,18 +5332,18 @@ Bitte gib etwas Speicher frei und drücke OK. MessageComposer - + Compose Verfassen - + Contacts Kontakte - + Search for Name: Suche Name: @@ -5393,12 +5373,12 @@ Bitte gib etwas Speicher frei und drücke OK. >> Bcc - + Subject: Betreff: - + Paragraph Absatz @@ -5509,12 +5489,12 @@ Bitte gib etwas Speicher frei und drücke OK. Bcc - + Recommended Files Empfohlene Dateien - + File Name Dateiname @@ -5579,7 +5559,7 @@ Bitte gib etwas Speicher frei und drücke OK. Blockquote hinzufügen - + &Left &Links @@ -5600,19 +5580,25 @@ Bitte gib etwas Speicher frei und drücke OK. - + Save Message Nachricht speichern - + Message has not been Sent. Do you want to save message to draft box? Nachricht wurde noch nicht gesendet. Möchtest Du die Nachricht in den Entwürfen speichern? - + + + Paste RetroShare Link + RetroShare Link einfügen + + + Re: Re: @@ -5812,17 +5798,17 @@ Willst Du die Nachricht speichern ? Datei nicht gefunden oder Dateiname nicht akzeptiert. - + Friend Recommendation(s) Freundempfehlung(en) - + No Title Kein Titel - + I recommend a good friend of me, you can trust him too when you trust me. <br> Copy friend link and paste to Friends list Ich empfehle Dir einen guten Freund von mir. Du kannst ihm vertrauen, wenn Du mir vertraust. <br> Kopiere den Link und füge ihn in der Freundesliste ein @@ -6328,7 +6314,12 @@ p, li { white-space: pre-wrap; } Peer-Details - + + Paste RetroShare Link + RetroShare Link einfügen + + + Export Friend Zertifikat des Freundes exportieren @@ -6424,18 +6415,13 @@ p, li { white-space: pre-wrap; } Recomend this Friend to... Freund weiterempfehlen... - - - Paste retroshare Link - RetroShare Link einfügen - RetroShare Messenger - + @@ -6513,42 +6499,67 @@ p, li { white-space: pre-wrap; } NetworkDialog - - + + Select a pem/pqi File Wählen einer PEM- oder PQI-Datei - - + + File Not Found Datei nicht gefunden - - + + %1 does not exist. Would you like to create it? %1 ist nicht vorhanden. Möchten Sie es jetzt erstellen? - - + + Failed to Create File Es ist nicht gelungen, die Datei zu erstellen - - + + Unable to create %1 [%2] Kann %1 [%2] nicht erstellen - + + Personal signature + + + + + GPG key signed by you + + + + + Marginally trusted peer + + + + + Fully trusted peer + + + + + Untrusted peer + + + + Has authenticated me Hat mich authentifiziert - + has authenticated you. Right-click and select 'make friend' to be able to connect. hat mich authentifiziert. @@ -6651,10 +6662,6 @@ p, li { white-space: pre-wrap; } Create a new Profile Erstelle ein neues Profil - - Welcome to RetroShare. - Willkommen bei RetroShare. - Network @@ -6671,21 +6678,13 @@ p, li { white-space: pre-wrap; } Show keys that are not validated by the GPG web of trust Zeige Schlüssel, die nicht vom web of trust bestätigt sind - - Log - Log - Clear Leeren - RetroShare %1 started. - RetroShare %1 gestartet. - - - + Deny friend Blockiere Freund @@ -6710,12 +6709,12 @@ p, li { white-space: pre-wrap; } Nachbar-Details... - + Unknown Unbekannt - + Authentication matrix Authentifizierungsmatrix @@ -6725,27 +6724,7 @@ p, li { white-space: pre-wrap; } Netzwerk Ansicht - - Authenticated - Authentifiziert - - - - GPG key signed - GPG Schlüssel unterzeichnet - - - - Not Authenticated - Nicht authentifiziert - - - - GPG key not signed - GPG Schlüssel nicht unterzeichnet - - - + yourself selbst @@ -6768,46 +6747,6 @@ p, li { white-space: pre-wrap; } Sorry, certificate file creation failed Zertifikat-Datei konnte nicht erstellt werden - - UPNP is active. - UPNP ist aktiv. - - - UPNP not found or not enabled. - UPNP wurde nicht gefunden oder ist nicht aktiviert. - - - DHT is running. - DHT ist gestartet. - - - DHT is off. - DHT ist ausgeschaltet. - - - Stun external address detection is working. - Stun externe Adresserkennung arbeitet. - - - Stun is not working. - Stun arbeitet nicht. - - - Local network detected - Lokales Netzwerk gefunden - - - No local network detected - Kein lokales Netzwerk gefunden - - - ip found via external address finder - Ip gefunden via externem IP Adress-Finder - - - external address finder didn't found anything - Externer IP Adress-Finder hat nichts gefunden - Network Status @@ -6891,32 +6830,12 @@ p, li { white-space: pre-wrap; } - Refresh - Erneuern - - - - Basic + Redraw - - Friends - Freunde - - - - Extended - - - - - Display mode: - - - - - Friends level: + + Friendship level: @@ -7046,10 +6965,6 @@ p, li { white-space: pre-wrap; } Friend Connect Verbinde zu Freund - - Peer Connect - Verbinde zu Nachbar - New Message @@ -7126,10 +7041,6 @@ p, li { white-space: pre-wrap; } OnlineToaster - - Peer Online - Nachbar Online - Friend Online @@ -7148,7 +7059,7 @@ p, li { white-space: pre-wrap; } PeerItem - + Remove Item Entferne Element @@ -7293,7 +7204,7 @@ p, li { white-space: pre-wrap; } PeersDialog - + Chat Chat @@ -7308,7 +7219,7 @@ p, li { white-space: pre-wrap; } Zertifikate (*.pqi) - + Status Status @@ -7318,17 +7229,12 @@ p, li { white-space: pre-wrap; } Verbinde zum Freund - + Profile Profil - - Paste retroshare Link - RetroShare Link einfügen - - - + Welcome to RetroShare's group chat. Willkommen bei RetroShare's Gruppenchat. @@ -7338,7 +7244,7 @@ p, li { white-space: pre-wrap; } ich - + Group Gruppe @@ -7373,7 +7279,12 @@ p, li { white-space: pre-wrap; } Freund anschreiben - + + Paste RetroShare Link + RetroShare Link einfügen + + + Recommend this Friend to... Freund weiterempfehlen... @@ -7424,12 +7335,12 @@ p, li { white-space: pre-wrap; } Neuer Gruppenchat - + Add Extra File Zusätzliche Datei hinzufügen - + Drop file error. Dateifehler bei Drag'n'Drop. @@ -7455,7 +7366,7 @@ p, li { white-space: pre-wrap; } Unterstrichen - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -7473,7 +7384,7 @@ p, li { white-space: pre-wrap; } Hinzufügen - + Add or Change your Avatar Wähle oder ändere dein Avatar Bild @@ -7537,7 +7448,7 @@ p, li { white-space: pre-wrap; } - + Add Friend Freund hinzufügen @@ -7617,7 +7528,7 @@ p, li { white-space: pre-wrap; } Willst du diesen Freund entfernen? - + Save as... Speichern unter... @@ -7627,7 +7538,7 @@ p, li { white-space: pre-wrap; } Text Datei (*.txt );;Alle Dateien (*) - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -7640,7 +7551,7 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Anzeige</span></p></body></html> - + Hide Offline Friends Verstecke offline Freunde @@ -7650,12 +7561,12 @@ p, li { white-space: pre-wrap; } Status Spalte ausblenden - + Friends Storm Aktivitäten - + is typing... tippt... @@ -7978,7 +7889,7 @@ p, li { white-space: pre-wrap; } PopupChatDialog - + Hide Avatar Avatar verstecken @@ -7988,7 +7899,7 @@ p, li { white-space: pre-wrap; } Avatar zeigen - + File not found or file name not accepted. Datei nicht gefunden oder Dateiname nicht akzeptiert. @@ -7999,24 +7910,24 @@ p, li { white-space: pre-wrap; } - + Bold Fett - - + + Underline Unterstrichen - - + + Italic Kursiv - + Set Font Schriftart setzen @@ -8026,7 +7937,7 @@ p, li { white-space: pre-wrap; } Textfarbe - + Clear offline messages Entferne offline Nachrichten @@ -8041,12 +7952,12 @@ p, li { white-space: pre-wrap; } Nachrichtenverlauf - + Send Senden - + Clear Chat Chat-Chronik löschen @@ -8056,22 +7967,17 @@ p, li { white-space: pre-wrap; } Deaktiviere Emoticons - - Paste retroshare Link - RetroShare Link einfügen - - - + Strike Durchgestrichen - + Add Extra File Zusätzlich eine Datei hinzufügen - + Drop file error. Dateifehler bei Drag'n'Drop. @@ -8082,12 +7988,12 @@ p, li { white-space: pre-wrap; } Ordner können nicht für Drag'n'Drop genutzt werden. Nur Dateien werden akzeptiert. - + Add a File for your Friend Füge eine Datei für deinen Freund hinzu - + Save Chat History Chat Verlauf speichern @@ -8103,18 +8009,18 @@ p, li { white-space: pre-wrap; } Text Datei (*.txt );;Alle Dateien (*) - + Your Friend is offline Do you want to send them a Message instead Dein Freund ist Offline willst du ihm stattdessen eine Nachricht senden - + Attach a Picture Bild anhängen - + is Idle and may not reply antwortet möglicherweise nicht, da der Status auf "Untätig" gesetzt wurde @@ -8134,7 +8040,12 @@ Do you want to send them a Message instead ist Offline. - + + Paste RetroShare Link + RetroShare Link einfügen + + + is typing... tippt... @@ -8144,7 +8055,7 @@ Do you want to send them a Message instead Schliessen - + Friend not Online Freund ist nicht online @@ -8319,7 +8230,7 @@ Do you want to send them a Message instead ProfileView - + Clear Photo Photo entfernen @@ -8724,15 +8635,7 @@ p, li { white-space: pre-wrap; } Link ist fehlerhaft. - File Request - Dateianfrage - - - Process of RetroShare links is not implemented. Please use copy instead. - Die Verarbeitung der Links ist noch nicht implementiert. Bitte kopiere den Link stattdessen. - - - + Deny friend Blockiere Freund @@ -9507,32 +9410,6 @@ p, li { white-space: pre-wrap; } Schließe alle Suchergebnisse - - SendLinkDialog - - - Send RetroShare link - Sende RetroShare Link - - - - Send - Senden - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:22pt; color:#ffffff;">Send RetroShare Link</span></p></body></html> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:22pt; color:#ffffff;">Sende RetroShare Link</span></p></body></html> - - ServerPage @@ -10006,7 +9883,7 @@ p, li { white-space: pre-wrap; } SharedFilesDialog - + Download Herunterladen @@ -10065,22 +9942,22 @@ p, li { white-space: pre-wrap; } - + Open File Datei öffnen - + Open Folder Ordner öffnen - + Set command for opening this file Setze eine Regel zum Öffnen dieser Datei - + Copy retroshare Link Kopiere RetroShare Link @@ -10100,7 +9977,7 @@ p, li { white-space: pre-wrap; } Sende RetroShare Link - + Copy retroshare Links to Clipboard Kopiere RetroShare Links in die Zwischenablage @@ -10120,7 +9997,7 @@ p, li { white-space: pre-wrap; } Sende RetroShare Links (HTML) - + Send retroshare Links to Cloud Sende RetroShare Links an die Verknüpfungs-Wolke @@ -10130,20 +10007,20 @@ p, li { white-space: pre-wrap; } Füge die Links zur Verknüpfungs-Wolke hinzu - - + + Recommend in a message to Empfehle in einer Nachricht an - + RetroShare Link RetroShare Link - + @@ -10306,7 +10183,7 @@ p, li { white-space: pre-wrap; } <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"><html><head><meta name="qrichtext" content="1" /><style type="text/css">p, li { white-space: pre-wrap; }</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"><p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><span style=" font-size:18pt; color:#55aaff;">Anmeldung</span></p><p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:18pt; color:#55aaff;"></p></body></html> - + Login Failure Anmeldefehler @@ -10696,7 +10573,7 @@ p, li { white-space: pre-wrap; } - + Play File Datei abspielen @@ -11084,17 +10961,7 @@ p, li { white-space: pre-wrap; } Details... - - Copy retroshare Link - Kopiere RetroShare Link - - - - Paste retroshare Link - RetroShare Link einfügen - - - + Down Runter @@ -11201,7 +11068,17 @@ p, li { white-space: pre-wrap; } Prüfsumme - + + Copy RetroShare Link + Kopiere RetroShare Link + + + + Paste RetroShare Link + RetroShare Link einfügen + + + Slower Langsamer