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

Reworked the start of a chat with a gpg id (doubleclick in friends tree).

Browse Source 
Removed the question to send a message when a chat with an offline friend is started.

Start the chat when
- only one ssl id exist (online or offline)
- only one ssl id is online
Show a messagebox when more than one ssl ids are online or all are offline.

Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4981 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-02-23 00:09:41 +00:00
parent e8f93f1569
commit 56b9fe49ea
3 changed files with 217 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
retroshare-gui/src/gui/chat/ChatDialog.cpp
View File

@ -29,7 +29,6 @@
#include "ChatLobbyDialog.h" #include "ChatLobbyDialog.h"
#include "PopupChatWindow.h" #include "PopupChatWindow.h"
#include "gui/settings/rsharesettings.h" #include "gui/settings/rsharesettings.h"
#include "gui/msgs/MessageComposer.h"
#include "gui/SoundManager.h" #include "gui/SoundManager.h"
#include <retroshare/rsiface.h> #include <retroshare/rsiface.h>
@ -206,42 +205,38 @@ void ChatDialog::init(const std::string &peerId, const QString &title)
if (!rsPeers->getPeerDetails(peerId, detail)) if (!rsPeers->getPeerDetails(peerId, detail))
return; return;
std::string firstId;
if (detail.isOnlyGPGdetail) { if (detail.isOnlyGPGdetail) {
//let's get the ssl child details, and open all the chat boxes std::list<std::string> onlineIds;
//let's get the ssl child details
std::list<std::string> sslIds; std::list<std::string> sslIds;
rsPeers->getAssociatedSSLIds(detail.gpg_id, sslIds); rsPeers->getAssociatedSSLIds(detail.gpg_id, sslIds);
for (std::list<std::string>::iterator it = sslIds.begin(); it != sslIds.end(); it++) {
if (firstId.empty()) {
firstId = *it;
}
RsPeerDetails sslDetails; if (sslIds.size() == 1) {
if (rsPeers->getPeerDetails(*it, sslDetails)) { // chat with the one ssl id (online or offline)
if (sslDetails.state & RS_PEER_STATE_CONNECTED) { getChat(sslIds.front(), RS_CHAT_OPEN | RS_CHAT_FOCUS);
getChat(*it, RS_CHAT_OPEN | RS_CHAT_FOCUS);
return;
}
}
}
} else {
if (detail.state & RS_PEER_STATE_CONNECTED) {
getChat(peerId, RS_CHAT_OPEN | RS_CHAT_FOCUS);
return; return;
} }
firstId = peerId;
}
/* info dialog */ // more than one ssl ids available, check for online
QMessageBox mb(QMessageBox::Question, tr("Friend not Online"), tr("Your Friend is offline \nDo you want to send them a Message instead"), QMessageBox::Yes | QMessageBox::No); for (std::list<std::string>::iterator it = sslIds.begin(); it != sslIds.end(); ++it) {
mb.setWindowIcon(QIcon(":/images/rstray3.png")); if (rsPeers->isOnline(*it)) {
if (mb.exec() == QMessageBox::Yes) { onlineIds.push_back(*it);
MessageComposer::msgFriend(peerId, false); }
} else {
if (firstId.empty() == false) {
getChat(firstId, RS_CHAT_OPEN | RS_CHAT_FOCUS);
} }
if (onlineIds.size() == 1) {
// chat with the online ssl id
getChat(onlineIds.front(), RS_CHAT_OPEN | RS_CHAT_FOCUS);
return;
}
// more than one ssl ids online or all offline
QMessageBox mb(QMessageBox::Warning, "RetroShare", tr("Your friend has more than one locations.\nPlease choose one of it to chat with."), QMessageBox::Ok);
mb.setWindowIcon(QIcon(":/images/rstray3.png"));
mb.exec();
} else {
getChat(peerId, RS_CHAT_OPEN | RS_CHAT_FOCUS);
} }
} }

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

Binary file not shown.

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

@ -162,6 +162,11 @@ p, li { white-space: pre-wrap; }
<source>Style Sheet</source> <source>Style Sheet</source>
<translation></translation> <translation></translation>
</message> </message>
<message>
<location filename="../gui/settings/AppearancePage.h" line="+44"/>
<source>Appearance</source>
<translation>Aussehen</translation>
</message>
</context> </context>
<context> <context>
<name>ApplicationWindow</name> <name>ApplicationWindow</name>
@ -1088,15 +1093,20 @@ p, li { white-space: pre-wrap; }
<context> <context>
<name>ChatDialog</name> <name>ChatDialog</name>
<message> <message>
<location filename="../gui/chat/ChatDialog.cpp" line="+237"/>
<source>Friend not Online</source> <source>Friend not Online</source>
<translation>Freund ist nicht online</translation> <translation type="obsolete">Freund ist nicht online</translation>
</message> </message>
<message> <message>
<location line="+0"/>
<source>Your Friend is offline <source>Your Friend is offline
Do you want to send them a Message instead</source> Do you want to send them a Message instead</source>
<translation>Dein Freund ist Offline. Möchtest du ihm stattdessen eine Nachricht senden</translation> <translation type="obsolete">Dein Freund ist Offline. Möchtest du ihm stattdessen eine Nachricht senden</translation>
</message>
<message>
<location filename="../gui/chat/ChatDialog.cpp" line="+235"/>
<source>Your friend has more than one locations.
Please choose one of it to chat with.</source>
<translation>Dein Freund besitzt mehrere Orte.
Bitte wähle einen zum chatten aus.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1423,6 +1433,11 @@ p, li { white-space: pre-wrap; }
<source>Outgoing offline message</source> <source>Outgoing offline message</source>
<translation>Ausgehehende offline Nachricht</translation> <translation>Ausgehehende offline Nachricht</translation>
</message> </message>
<message>
<location filename="../gui/settings/ChatPage.h" line="+44"/>
<source>Chat</source>
<translation>Chat</translation>
</message>
</context> </context>
<context> <context>
<name>ChatStyle</name> <name>ChatStyle</name>
@ -3101,6 +3116,11 @@ p, li { white-space: pre-wrap; }
<source>copy RetroShare link to clipboard</source> <source>copy RetroShare link to clipboard</source>
<translation>Kopiere RetroShare Link in die Zwischenablage</translation> <translation>Kopiere RetroShare Link in die Zwischenablage</translation>
</message> </message>
<message>
<location filename="../gui/settings/CryptoPage.h" line="+43"/>
<source>Security</source>
<translation>Sicherheit</translation>
</message>
</context> </context>
<context> <context>
<name>DHTStatus</name> <name>DHTStatus</name>
@ -3553,6 +3573,11 @@ Das ist nützlich, wenn Du eine externe Festplatte freigibst und die Datei nicht
<source>Automatically share incoming directory (Recommended)</source> <source>Automatically share incoming directory (Recommended)</source>
<translation>Eingehende Ordner automatisch freigeben (Empfohlen)</translation> <translation>Eingehende Ordner automatisch freigeben (Empfohlen)</translation>
</message> </message>
<message>
<location filename="../gui/settings/DirectoriesPage.h" line="+41"/>
<source>Directories</source>
<translation>Ordner</translation>
</message>
</context> </context>
<context> <context>
<name>DiscStatus</name> <name>DiscStatus</name>
@ -3908,6 +3933,11 @@ p, li { white-space: pre-wrap; }
<source>You this</source> <source>You this</source>
<translation></translation> <translation></translation>
</message> </message>
<message>
<location filename="../gui/settings/FileAssociationsPage.h" line="+57"/>
<source>Associations</source>
<translation>Verknüpfungen</translation>
</message>
</context> </context>
<context> <context>
<name>FileTransferInfoWidget</name> <name>FileTransferInfoWidget</name>
@ -4264,7 +4294,7 @@ p, li { white-space: pre-wrap; }
<translation>Unterzeichnen</translation> <translation>Unterzeichnen</translation>
</message> </message>
<message> <message>
<location filename="../gui/feeds/ForumMsgItem.cpp" line="+91"/> <location filename="../gui/feeds/ForumMsgItem.cpp" line="+92"/>
<source>Forum Post</source> <source>Forum Post</source>
<translation>Beitrag</translation> <translation>Beitrag</translation>
</message> </message>
@ -4336,6 +4366,11 @@ p, li { white-space: pre-wrap; }
<source>Expand new messages</source> <source>Expand new messages</source>
<translation>Neue Beiträge erweitern</translation> <translation>Neue Beiträge erweitern</translation>
</message> </message>
<message>
<location filename="../gui/settings/ForumPage.h" line="+42"/>
<source>Forum</source>
<translation>Forum</translation>
</message>
</context> </context>
<context> <context>
<name>ForumsDialog</name> <name>ForumsDialog</name>
@ -4800,7 +4835,7 @@ p, li { white-space: pre-wrap; }
<message> <message>
<location line="+4"/> <location line="+4"/>
<source>Location</source> <source>Location</source>
<translation>Standort</translation> <translation>Ort</translation>
</message> </message>
<message> <message>
<location line="+11"/> <location line="+11"/>
@ -5279,7 +5314,7 @@ p, li { white-space: pre-wrap; }
<translation>Neuigkeiten</translation> <translation>Neuigkeiten</translation>
</message> </message>
<message> <message>
<location line="+38"/> <location line="+39"/>
<source>Welcome to RetroShare&apos;s group chat.</source> <source>Welcome to RetroShare&apos;s group chat.</source>
<translation>Willkommen bei RetroShare&apos;s Gruppenchat.</translation> <translation>Willkommen bei RetroShare&apos;s Gruppenchat.</translation>
</message> </message>
@ -5610,17 +5645,17 @@ p, li { white-space: pre-wrap; }
<name>GenCertDialog</name> <name>GenCertDialog</name>
<message> <message>
<location filename="../gui/GenCertDialog.cpp" line="+143"/> <location filename="../gui/GenCertDialog.cpp" line="+143"/>
<location line="+22"/> <location line="+23"/>
<source>Generate GPG key Failure</source> <source>Generate GPG key Failure</source>
<translation>Fehler beim Generieren des GPG Schlüssels</translation> <translation>Fehler beim Generieren des GPG Schlüssels</translation>
</message> </message>
<message> <message>
<location line="-21"/> <location line="-22"/>
<source>Location field is required with a minimum of 3 characters</source> <source>Location field is required with a minimum of 3 characters</source>
<translation>Das Feld Ort ist mit min. 3 Zeichen zu versehen</translation> <translation>Das Feld Ort ist mit min. 3 Zeichen zu versehen</translation>
</message> </message>
<message> <message>
<location line="+22"/> <location line="+23"/>
<source>All fields are required with a minimum of 3 characters</source> <source>All fields are required with a minimum of 3 characters</source>
<translation>Alle Felder sind mit min. 3 Zeichen zu versehen</translation> <translation>Alle Felder sind mit min. 3 Zeichen zu versehen</translation>
</message> </message>
@ -5667,7 +5702,7 @@ p, li { white-space: pre-wrap; }
</message> </message>
<message> <message>
<location line="-192"/> <location line="-192"/>
<location filename="../gui/GenCertDialog.cpp" line="-159"/> <location filename="../gui/GenCertDialog.cpp" line="-160"/>
<location line="+23"/> <location line="+23"/>
<source>Create new Profile</source> <source>Create new Profile</source>
<translation>Erstelle neues Profil</translation> <translation>Erstelle neues Profil</translation>
@ -5750,7 +5785,7 @@ p, li { white-space: pre-wrap; }
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Arial&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare benutzt GPG Schlüssel für die Identität. &lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-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:8pt; font-weight:600;&quot;&gt;RetroShare benutzt GPG Schlüssel für die Identität. &lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Arial&apos;; font-size:8pt; font-weight:600;&quot;&gt;&lt;/p&gt; &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Arial&apos;; font-size:8pt; font-weight:600;&quot;&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-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:8pt; font-weight:600;&quot;&gt;Du kannst ein vorhandenes Profil (GPG Schlüssel) benutzen oder ein neues Profil erstellen.&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Arial&apos;; font-size:8pt; font-weight:600;&quot;&gt;Du kannst ein vorhandenes Profil (GPG Schlüssel) benutzen oder ein neues Profil erstellen.&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Arial&apos;; font-size:8pt; font-weight:600;&quot;&gt;Du kannst RetroShare an mehreren Standorten installieren und das selbe Profil (GPG Schlüssel) verwenden.&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:8pt; font-weight:600;&quot;&gt;Du kannst RetroShare an mehreren Orten installieren und das selbe Profil (GPG Schlüssel) verwenden.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message> </message>
<message> <message>
<location filename="../gui/GenCertDialog.cpp" line="-32"/> <location filename="../gui/GenCertDialog.cpp" line="-32"/>
@ -5783,7 +5818,7 @@ p, li { white-space: pre-wrap; }
<translation>Erstelle neues Profil</translation> <translation>Erstelle neues Profil</translation>
</message> </message>
<message> <message>
<location line="+56"/> <location line="+57"/>
<source>Generating new GPG key, please be patient: this process needs generating large prime numbers, and can take some minutes on slow computers. <source>Generating new GPG key, please be patient: this process needs generating large prime numbers, and can take some minutes on slow computers.
Fill in your GPG password when asked, to sign your new key.</source> Fill in your GPG password when asked, to sign your new key.</source>
@ -5911,6 +5946,11 @@ Gib Dein GPG Passwort wenn Du gefragt wirst ein, um Deinen neuen Schlüssel zu u
<source>Could not remove retroshare:// protocol.</source> <source>Could not remove retroshare:// protocol.</source>
<translation>Konnte retroshare:// Protokoll nicht entfernen.</translation> <translation>Konnte retroshare:// Protokoll nicht entfernen.</translation>
</message> </message>
<message>
<location filename="../gui/settings/GeneralPage.h" line="+45"/>
<source>General</source>
<translation>Allgemein</translation>
</message>
</context> </context>
<context> <context>
<name>GetStartedDialog</name> <name>GetStartedDialog</name>
@ -7877,6 +7917,11 @@ Möchtest du die Nachricht speichern ?</translation>
<source>Edit Tag</source> <source>Edit Tag</source>
<translation>Schlagwort bearbeiten</translation> <translation>Schlagwort bearbeiten</translation>
</message> </message>
<message>
<location filename="../gui/settings/MessagePage.h" line="+46"/>
<source>Message</source>
<translation>Nachricht</translation>
</message>
</context> </context>
<context> <context>
<name>MessageToaster</name> <name>MessageToaster</name>
@ -9010,6 +9055,14 @@ p, li { white-space: pre-wrap; }
<translation>Peer ID</translation> <translation>Peer ID</translation>
</message> </message>
</context> </context>
<context>
<name>NetworkPage</name>
<message>
<location filename="../gui/settings/NetworkPage.h" line="+40"/>
<source>Network</source>
<translation>Netzwerk</translation>
</message>
</context>
<context> <context>
<name>NetworkView</name> <name>NetworkView</name>
<message> <message>
@ -9254,6 +9307,11 @@ p, li { white-space: pre-wrap; }
<source>Bottom Right</source> <source>Bottom Right</source>
<translation>Unten Rechts</translation> <translation>Unten Rechts</translation>
</message> </message>
<message>
<location filename="../gui/settings/NotifyPage.h" line="+44"/>
<source>Notify</source>
<translation>Meldungen</translation>
</message>
</context> </context>
<context> <context>
<name>NotifyQt</name> <name>NotifyQt</name>
@ -9321,7 +9379,7 @@ p, li { white-space: pre-wrap; }
<message> <message>
<location line="+242"/> <location line="+242"/>
<source>Location:</source> <source>Location:</source>
<translation>Standort:</translation> <translation>Ort:</translation>
</message> </message>
<message> <message>
<location line="+13"/> <location line="+13"/>
@ -9851,6 +9909,19 @@ p, li { white-space: pre-wrap; }
<source>Description unavailable</source> <source>Description unavailable</source>
<translation>Beschreibung nicht verfügbar</translation> <translation>Beschreibung nicht verfügbar</translation>
</message> </message>
<message>
<location line="+42"/>
<source>Check this for developing plugins. They will not
be checked for the hash. However, in normal
times, checking the hash protects you from
malicious behavior of crafted plugins.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/settings/PluginsPage.h" line="+41"/>
<source>Plugins</source>
<translation>Plugins</translation>
</message>
</context> </context>
<context> <context>
<name>PopularityDefs</name> <name>PopularityDefs</name>
@ -10360,7 +10431,7 @@ p, li { white-space: pre-wrap; }
&lt;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; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt; &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; color:#76746c;&quot;&gt;Standort:&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;MS Shell Dlg 2&apos;; font-size:8pt; color:#76746c;&quot;&gt;Ort:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message> </message>
<message> <message>
<location line="+37"/> <location line="+37"/>
@ -10615,7 +10686,7 @@ Lockdatei:
<translation type="obsolete">Der Empfänger der Nachricht ist unbekannt.</translation> <translation type="obsolete">Der Empfänger der Nachricht ist unbekannt.</translation>
</message> </message>
<message> <message>
<location filename="../gui/RetroShareLink.cpp" line="+518"/> <location filename="../gui/RetroShareLink.cpp" line="+516"/>
<source>Click to add this RetroShare cert to your GPG keyring <source>Click to add this RetroShare cert to your GPG keyring
and open the Make Friend Wizard. and open the Make Friend Wizard.
</source> </source>
@ -10852,26 +10923,20 @@ und den Assistent zum Hinzufügen von Freunden zu starten.
<translation>Der Start mit einem RetroShare Link wird nur unter Windows unterstützt.</translation> <translation>Der Start mit einem RetroShare Link wird nur unter Windows unterstützt.</translation>
</message> </message>
<message> <message>
<location filename="../gui/VoipStatistics.cpp" line="+145"/>
<location line="+2"/>
<location line="+2"/>
<source>secs</source> <source>secs</source>
<translation>Sekunden</translation> <translation type="obsolete">Sekunden</translation>
</message> </message>
<message> <message>
<location line="+2"/>
<source>Old</source> <source>Old</source>
<translation>Alt</translation> <translation type="obsolete">Alt</translation>
</message> </message>
<message> <message>
<location line="+1"/>
<source>Now</source> <source>Now</source>
<translation>Jetzt</translation> <translation type="obsolete">Jetzt</translation>
</message> </message>
<message> <message>
<location line="+209"/>
<source>Round Trip Time:</source> <source>Round Trip Time:</source>
<translation>Round Trip Zeit:</translation> <translation type="obsolete">Round Trip Zeit:</translation>
</message> </message>
<message> <message>
<location filename="../gui/common/RsCollectionDialog.cpp" line="+179"/> <location filename="../gui/common/RsCollectionDialog.cpp" line="+179"/>
@ -11180,79 +11245,65 @@ p, li { white-space: pre-wrap; }
<context> <context>
<name>RSettingsWin</name> <name>RSettingsWin</name>
<message> <message>
<location filename="../gui/settings/rsettingswin.cpp" line="+133"/>
<source>General</source> <source>General</source>
<translation>Allgemein</translation> <translation type="obsolete">Allgemein</translation>
</message> </message>
<message> <message>
<location line="+4"/>
<source>Directories</source> <source>Directories</source>
<translation>Ordner</translation> <translation type="obsolete">Ordner</translation>
</message> </message>
<message> <message>
<location line="+4"/>
<source>Server</source> <source>Server</source>
<translation>Server</translation> <translation type="obsolete">Server</translation>
</message> </message>
<message> <message>
<location line="+4"/>
<source>Transfer</source> <source>Transfer</source>
<translation>Übertragung</translation> <translation type="obsolete">Übertragung</translation>
</message> </message>
<message> <message>
<location line="+4"/>
<source>Relay</source> <source>Relay</source>
<translation>Relay</translation> <translation type="obsolete">Relay</translation>
</message> </message>
<message> <message>
<location line="+4"/>
<source>Notify</source> <source>Notify</source>
<translation>Meldungen</translation> <translation type="obsolete">Meldungen</translation>
</message> </message>
<message> <message>
<location line="+4"/>
<source>Security</source> <source>Security</source>
<translation>Sicherheit</translation> <translation type="obsolete">Sicherheit</translation>
</message> </message>
<message> <message>
<location line="+12"/>
<source>Plugins</source> <source>Plugins</source>
<translation>Plugins</translation> <translation type="obsolete">Plugins</translation>
</message> </message>
<message> <message>
<location line="+8"/>
<source>Appearance</source> <source>Appearance</source>
<translation>Aussehen</translation> <translation type="obsolete">Aussehen</translation>
</message> </message>
<message> <message>
<location line="+9"/>
<source>Sound</source> <source>Sound</source>
<translation>Sound</translation> <translation type="obsolete">Sound</translation>
</message> </message>
<message> <message>
<location line="+5"/>
<source>UnknownPage</source> <source>UnknownPage</source>
<translation>Unbekannte Seite</translation> <translation type="obsolete">Unbekannte Seite</translation>
</message> </message>
<message> <message>
<location line="+27"/> <location filename="../gui/settings/rsettingswin.cpp" line="+182"/>
<source>Error Saving Configuration on page </source> <source>Error Saving Configuration on page </source>
<translation>Fehler beim Speichern der Konfiguration auf der Seite </translation> <translation>Fehler beim Speichern der Konfiguration auf der Seite </translation>
</message> </message>
<message> <message>
<location line="-57"/>
<source>Message</source> <source>Message</source>
<translation>Nachricht</translation> <translation type="obsolete">Nachricht</translation>
</message> </message>
<message> <message>
<location line="+12"/>
<source>Chat</source> <source>Chat</source>
<translation>Chat</translation> <translation type="obsolete">Chat</translation>
</message> </message>
<message> <message>
<location line="-8"/>
<source>Forum</source> <source>Forum</source>
<translation>Forum</translation> <translation type="obsolete">Forum</translation>
</message> </message>
</context> </context>
<context> <context>
@ -11352,6 +11403,11 @@ p, li { white-space: pre-wrap; }
<source>Remove Server</source> <source>Remove Server</source>
<translation>Server entfernen</translation> <translation>Server entfernen</translation>
</message> </message>
<message>
<location filename="../gui/settings/RelayPage.h" line="+44"/>
<source>Relay</source>
<translation>Relay</translation>
</message>
</context> </context>
<context> <context>
<name>RetroshareDirModel</name> <name>RetroshareDirModel</name>
@ -11604,7 +11660,7 @@ p, li { white-space: pre-wrap; }
</message> </message>
<message> <message>
<location line="+319"/> <location line="+319"/>
<location filename="../gui/SearchDialog.cpp" line="+296"/> <location filename="../gui/SearchDialog.cpp" line="+299"/>
<source>Download</source> <source>Download</source>
<translation>Herunterladen</translation> <translation>Herunterladen</translation>
</message> </message>
@ -11646,7 +11702,7 @@ p, li { white-space: pre-wrap; }
<translation>Ordner</translation> <translation>Ordner</translation>
</message> </message>
<message> <message>
<location line="+396"/> <location line="+385"/>
<source>New RetroShare Link(s)</source> <source>New RetroShare Link(s)</source>
<translation>Neu(e) RetroShare Link(s)</translation> <translation>Neu(e) RetroShare Link(s)</translation>
</message> </message>
@ -11701,7 +11757,7 @@ p, li { white-space: pre-wrap; }
<translation>Such ID</translation> <translation>Such ID</translation>
</message> </message>
<message> <message>
<location filename="../gui/SearchDialog.cpp" line="-944"/> <location filename="../gui/SearchDialog.cpp" line="-933"/>
<source>Download Notice</source> <source>Download Notice</source>
<translation>Download</translation> <translation>Download</translation>
</message> </message>
@ -11926,7 +11982,7 @@ p, li { white-space: pre-wrap; }
<message> <message>
<location line="+13"/> <location line="+13"/>
<source>Location:</source> <source>Location:</source>
<translation>Standort:</translation> <translation>Ort:</translation>
</message> </message>
<message> <message>
<location line="+13"/> <location line="+13"/>
@ -12078,7 +12134,7 @@ peers still need to trust each other to allow connection. </source>
<translation>DHT erlaubt dir das Verbinden mit Freunden, die das BitTorrent DHT benutzen <translation>DHT erlaubt dir das Verbinden mit Freunden, die das BitTorrent DHT benutzen
Das verbessert den Verbindungsaufbau. Das verbessert den Verbindungsaufbau.
Der Discovery Service sendet die Standorte und GPG Schlüssel deiner vertrauten Der Discovery Service sendet die Orte und GPG Schlüssel deiner vertrauten
Kontakte zu deinen verbundenen Freunden um bei der Suche nach neuen Freunden zu helfen. Kontakte zu deinen verbundenen Freunden um bei der Suche nach neuen Freunden zu helfen.
Die Freundschat wird nicht automatisch erstellt. Beide Freunde müssen sich vertrauen Die Freundschat wird nicht automatisch erstellt. Beide Freunde müssen sich vertrauen
um eine Verbindung zu erstellen.</translation> um eine Verbindung zu erstellen.</translation>
@ -12150,10 +12206,10 @@ Es hilft auch, wenn Sie sich hinter einer Firewall/VPN befinden.</translation>
<source>&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; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt; &lt;/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-weight:600;&quot;&gt;Warning&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; font-weight:600;&quot;&gt;Warning&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;&quot;&gt;&lt;/p&gt; &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt; font-weight:600;&quot;&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt; &lt;/span&gt;This tab contains hard-core parameters which are unlikely to need modification. Dont change them unless you really know what you&apos;re doing. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;This tab contains hard-core parameters which are unlikely to need modification. Dont change them unless you really know what you&apos;re doing. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -12177,6 +12233,11 @@ The default value is 20.</source>
<source>Dynamic DNS</source> <source>Dynamic DNS</source>
<translation>Dynamisches DNS</translation> <translation>Dynamisches DNS</translation>
</message> </message>
<message>
<location filename="../gui/settings/ServerPage.h" line="+42"/>
<source>Server</source>
<translation>Server</translation>
</message>
</context> </context>
<context> <context>
<name>Settings</name> <name>Settings</name>
@ -12186,37 +12247,31 @@ The default value is 20.</source>
<translation>Optionen</translation> <translation>Optionen</translation>
</message> </message>
<message> <message>
<location line="+89"/>
<source>Transfer</source> <source>Transfer</source>
<translation>Übertragung</translation> <translation type="obsolete">Übertragung</translation>
</message> </message>
<message> <message>
<location line="+9"/>
<source>Relays</source> <source>Relays</source>
<translation>Relays</translation> <translation type="obsolete">Relays</translation>
</message> </message>
<message> <message>
<location line="+18"/>
<source>Plugins</source> <source>Plugins</source>
<translation>Plugins</translation> <translation type="obsolete">Plugins</translation>
</message> </message>
<message> <message>
<location line="+9"/>
<source>Notify</source> <source>Notify</source>
<translation>Meldungen</translation> <translation type="obsolete">Meldungen</translation>
</message> </message>
<message> <message>
<location line="+9"/>
<source>Security</source> <source>Security</source>
<translation>Sicherheit</translation> <translation type="obsolete">Sicherheit</translation>
</message> </message>
<message> <message>
<location line="+36"/>
<source>Appearance</source> <source>Appearance</source>
<translation>Aussehen</translation> <translation type="obsolete">Aussehen</translation>
</message> </message>
<message> <message>
<location line="+114"/> <location line="+167"/>
<source>Cancel</source> <source>Cancel</source>
<translation>Abbrechen</translation> <translation>Abbrechen</translation>
</message> </message>
@ -12226,39 +12281,32 @@ The default value is 20.</source>
<translation>OK</translation> <translation>OK</translation>
</message> </message>
<message> <message>
<location line="-226"/>
<source>General</source> <source>General</source>
<translation>Allgemein</translation> <translation type="obsolete">Allgemein</translation>
</message> </message>
<message> <message>
<location line="+9"/>
<source>Server</source> <source>Server</source>
<translation>Server</translation> <translation type="obsolete">Server</translation>
</message> </message>
<message> <message>
<location line="+27"/>
<source>Directories</source> <source>Directories</source>
<translation>Ordner</translation> <translation type="obsolete">Ordner</translation>
</message> </message>
<message> <message>
<location line="+36"/>
<source>Message</source> <source>Message</source>
<translation>Nachricht</translation> <translation type="obsolete">Nachricht</translation>
</message> </message>
<message> <message>
<location line="+18"/>
<source>Chat</source> <source>Chat</source>
<translation>Chat</translation> <translation type="obsolete">Chat</translation>
</message> </message>
<message> <message>
<location line="+18"/>
<source>Sound</source> <source>Sound</source>
<translation>Sound</translation> <translation type="obsolete">Sound</translation>
</message> </message>
<message> <message>
<location line="-27"/>
<source>Forum</source> <source>Forum</source>
<translation>Forum</translation> <translation type="obsolete">Forum</translation>
</message> </message>
</context> </context>
<context> <context>
@ -12834,6 +12882,11 @@ p, li { white-space: pre-wrap; }
<source>New Msg</source> <source>New Msg</source>
<translation>Neue Nachricht</translation> <translation>Neue Nachricht</translation>
</message> </message>
<message>
<location filename="../gui/settings/SoundPage.h" line="+47"/>
<source>Sound</source>
<translation>Sound</translation>
</message>
</context> </context>
<context> <context>
<name>SoundStatus</name> <name>SoundStatus</name>
@ -12897,8 +12950,8 @@ p, li { white-space: pre-wrap; }
adding locations to an existing profile. adding locations to an existing profile.
The current identities/locations will not be affected.</source> The current identities/locations will not be affected.</source>
<translation>Öffnet ein Fenster zum Erstellen eines neuen Profiles oder <translation>Öffnet ein Fenster zum Erstellen eines neuen Profiles oder
zum Hinzufügen von Standorten zu Deinem vorhandenen Profil. zum Hinzufügen von Orten zu Deinem vorhandenen Profil.
Die aktuellen Identitäten/Standorte werden nicht geändert.</translation> Die aktuellen Identitäten/Orte werden nicht geändert.</translation>
</message> </message>
<message> <message>
<location line="+5"/> <location line="+5"/>
@ -12911,7 +12964,7 @@ p, li { white-space: pre-wrap; }
&lt;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; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans&apos;; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt; &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans&apos;; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;Create new Profile...&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;Verwalte Profile und Standorte...&lt;/span&gt;&lt;/a&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;a href=&quot;Create new Profile...&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;Verwalte Profile und Orte...&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message> </message>
<message> <message>
<location line="+69"/> <location line="+69"/>
@ -12989,7 +13042,7 @@ Lockdatei:
Your PGP passwd will not be stored. Your PGP passwd will not be stored.
This choice can be reverted in settings.</source> This choice can be reverted in settings.</source>
<translation>Das Passwort deines SSL Zertifikates (deines Standortes) wird verschlüsselt in deinem Gnome Keyring gespeichert. <translation>Das Passwort deines SSL Zertifikates (deines Ortes) wird verschlüsselt in deinem Gnome Keyring gespeichert.
Dein PGP wird nicht gespeichert. Dein PGP wird nicht gespeichert.
@ -13002,7 +13055,7 @@ Du kannst die Auswahl in den Optionen zurücksetzen.</translation>
Your PGP passwd will not be stored. Your PGP passwd will not be stored.
This choice can be reverted in settings.</source> This choice can be reverted in settings.</source>
<translation>Das Passwort deines SSL Zertifikates (deines Standortes) wird verschlüsselt in deinem Schlüsselanhänger gespeichert. <translation>Das Passwort deines SSL Zertifikates (deines Ortes) wird verschlüsselt in deinem Schlüsselanhänger gespeichert.
Dein PGP wird nicht gespeichert. Dein PGP wird nicht gespeichert.
@ -13015,7 +13068,7 @@ Du kannst die Auswahl in den Optionen zurücksetzen.</translation>
Your PGP passwd will not be stored. Your PGP passwd will not be stored.
This choice can be reverted in settings.</source> This choice can be reverted in settings.</source>
<translation>Das Passwort deines SSL Zertifikates (deines Standortes) wird verschlüsselt in der Datei keys/help.dta gespeichert- Das ist nicht sicher. <translation>Das Passwort deines SSL Zertifikates (deines Ortes) wird verschlüsselt in der Datei keys/help.dta gespeichert- Das ist nicht sicher.
Dein PGP wird nicht gespeichert. Dein PGP wird nicht gespeichert.
@ -13787,6 +13840,11 @@ p, li { white-space: pre-wrap; }
<source> MB</source> <source> MB</source>
<translation></translation> <translation></translation>
</message> </message>
<message>
<location filename="../gui/settings/TransferPage.h" line="+44"/>
<source>Transfer</source>
<translation>Übertragung</translation>
</message>
</context> </context>
<context> <context>
<name>TransfersDialog</name> <name>TransfersDialog</name>
@ -13801,7 +13859,7 @@ p, li { white-space: pre-wrap; }
<translation>Fertige ausblenden</translation> <translation>Fertige ausblenden</translation>
</message> </message>
<message> <message>
<location line="-162"/> <location line="-161"/>
<location line="+59"/> <location line="+59"/>
<source>Status</source> <source>Status</source>
<translation>Status</translation> <translation>Status</translation>
@ -13914,7 +13972,7 @@ p, li { white-space: pre-wrap; }
<translation>Übertragen</translation> <translation>Übertragen</translation>
</message> </message>
<message> <message>
<location line="+128"/> <location line="+127"/>
<source>Play</source> <source>Play</source>
<translation>Abspielen</translation> <translation>Abspielen</translation>
</message> </message>
@ -13989,7 +14047,7 @@ p, li { white-space: pre-wrap; }
<translation>Blockstrategie</translation> <translation>Blockstrategie</translation>
</message> </message>
<message> <message>
<location line="+365"/> <location line="+366"/>
<source>Queued</source> <source>Queued</source>
<translation>In Warteschleife</translation> <translation>In Warteschleife</translation>
</message> </message>
@ -14004,7 +14062,21 @@ p, li { white-space: pre-wrap; }
<translation>Übertrage</translation> <translation>Übertrage</translation>
</message> </message>
<message> <message>
<location line="+368"/> <location line="+175"/>
<source>If the hash of the downloaded data does
not correspond to the hash announced
by the file source. The data is likely
to be corrupted.
RetroShare will ask the source a detailed
map of the data; it will compare and invalidate
bad blocks, and download them again
Try to be patient!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+198"/>
<source>RetroShare</source> <source>RetroShare</source>
<translation></translation> <translation></translation>
</message> </message>
@ -14039,7 +14111,7 @@ p, li { white-space: pre-wrap; }
<translation>Soll dieser Download wirklich abgebrochen und gelöscht werden?</translation> <translation>Soll dieser Download wirklich abgebrochen und gelöscht werden?</translation>
</message> </message>
<message> <message>
<location line="-901"/> <location line="-906"/>
<source>Speed / Queue position</source> <source>Speed / Queue position</source>
<translation>Geschwindigkeits- / Warteschlangenposition</translation> <translation>Geschwindigkeits- / Warteschlangenposition</translation>
</message> </message>
@ -14076,12 +14148,7 @@ p, li { white-space: pre-wrap; }
<translation>Router Anfragen</translation> <translation>Router Anfragen</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+52"/>
<source>RTT Statistics</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+50"/>
<source>Copy RetroShare Link</source> <source>Copy RetroShare Link</source>
<translation>Kopiere RetroShare Link</translation> <translation>Kopiere RetroShare Link</translation>
</message> </message>
@ -14092,68 +14159,68 @@ p, li { white-space: pre-wrap; }
</message> </message>
<message> <message>
<location line="+12"/> <location line="+12"/>
<location line="+505"/> <location line="+506"/>
<source>Slower</source> <source>Slower</source>
<translation>Langsamer</translation> <translation>Langsamer</translation>
</message> </message>
<message> <message>
<location line="-503"/> <location line="-504"/>
<location line="+504"/> <location line="+505"/>
<location line="+2"/> <location line="+2"/>
<source>Average</source> <source>Average</source>
<translation>Durchschnitt</translation> <translation>Durchschnitt</translation>
</message> </message>
<message> <message>
<location line="-504"/> <location line="-505"/>
<location line="+503"/> <location line="+504"/>
<source>Faster</source> <source>Faster</source>
<translation>Schneller</translation> <translation>Schneller</translation>
</message> </message>
<message> <message>
<location line="-393"/> <location line="-394"/>
<source>Move in Queue...</source> <source>Move in Queue...</source>
<translation>Verschiebe in Warteschlange...</translation> <translation>Verschiebe in Warteschlange...</translation>
</message> </message>
<message> <message>
<location line="+230"/> <location line="+231"/>
<location line="+143"/> <location line="+143"/>
<location line="+135"/> <location line="+140"/>
<source>Failed</source> <source>Failed</source>
<translation>Gescheitert</translation> <translation>Gescheitert</translation>
</message> </message>
<message> <message>
<location line="-274"/> <location line="-279"/>
<location line="+140"/>
<location line="+140"/> <location line="+140"/>
<location line="+135"/>
<source>Okay</source> <source>Okay</source>
<translation>OK</translation> <translation>OK</translation>
</message> </message>
<message> <message>
<location line="-134"/> <location line="-139"/>
<location line="+135"/> <location line="+140"/>
<source>Waiting</source> <source>Waiting</source>
<translation>Warte</translation> <translation>Warte</translation>
</message> </message>
<message> <message>
<location line="-134"/> <location line="-139"/>
<source>Downloading</source> <source>Downloading</source>
<translation>Ladend</translation> <translation>Ladend</translation>
</message> </message>
<message> <message>
<location line="-130"/> <location line="-130"/>
<location line="+131"/> <location line="+131"/>
<location line="+135"/> <location line="+140"/>
<location line="+1"/> <location line="+1"/>
<source>Complete</source> <source>Complete</source>
<translation>Vollständig</translation> <translation>Vollständig</translation>
</message> </message>
<message> <message>
<location line="-132"/> <location line="-137"/>
<source>Unknown</source> <source>Unknown</source>
<translation>Unbekannt</translation> <translation>Unbekannt</translation>
</message> </message>
<message> <message>
<location line="+48"/> <location line="+53"/>
<source>version: </source> <source>version: </source>
<translation>Version: </translation> <translation>Version: </translation>
</message> </message>
@ -14163,12 +14230,12 @@ p, li { white-space: pre-wrap; }
<translation>Hochladend</translation> <translation>Hochladend</translation>
</message> </message>
<message> <message>
<location line="-131"/> <location line="-136"/>
<source>Checking...</source> <source>Checking...</source>
<translation>Überprüfe...</translation> <translation>Überprüfe...</translation>
</message> </message>
<message> <message>
<location line="-530"/> <location line="-531"/>
<source>Force Check</source> <source>Force Check</source>
<translation>Erzwinge Überprüfung</translation> <translation>Erzwinge Überprüfung</translation>
</message> </message>
@ -14542,14 +14609,6 @@ p, li { white-space: pre-wrap; }
<translation>Durchsuchen</translation> <translation>Durchsuchen</translation>
</message> </message>
</context> </context>
<context>
<name>VoipStatistics</name>
<message>
<location filename="../gui/VoipStatistics.ui" line="+14"/>
<source>VoipTest Statistics</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>misc</name> <name>misc</name>
<message> <message>