Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-11 16:13:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added (and modified) patch from Imanuel

Browse source 
- Added ability to style the system messages in chat (e.g. Lobby management)
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5130 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-05-01 12:58:28 +00:00
parent c331098203
commit 8bd1b7aa4a
21 changed files with 232 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

2
retroshare-gui/src/gui/FriendsDialog.cpp
View file

@ -373,7 +373,7 @@ void FriendsDialog::publicChatChanged(int type)
void FriendsDialog::addChatMsg(bool incoming, bool history, const QString &name, const QDateTime &sendTime, const QDateTime &recvTime, const QString &message) void FriendsDialog::addChatMsg(bool incoming, bool history, const QString &name, const QDateTime &sendTime, const QDateTime &recvTime, const QString &message)
{ {
unsigned int formatFlag = CHAT_FORMATMSG_EMBED_LINKS; unsigned int formatFlag = CHAT_FORMATMSG_EMBED_LINKS | CHAT_FORMATMSG_OPTIMIZE;
// embed smileys ? // embed smileys ?
if (Settings->valueFromGroup("Chat", "Emoteicons_GroupChat", true).toBool()) { if (Settings->valueFromGroup("Chat", "Emoteicons_GroupChat", true).toBool()) {

13
retroshare-gui/src/gui/chat/ChatStyle.cpp
View file

@ -43,6 +43,7 @@
hincoming.htm - incoming history messages hincoming.htm - incoming history messages
houtgoing.htm - outgoing history messages houtgoing.htm - outgoing history messages
ooutgoing.htm - outgoing offline messages (private chat) ooutgoing.htm - outgoing offline messages (private chat)
system.htm - system messages
main.css - stylesheet main.css - stylesheet
variants - directory with variants (optional) variants - directory with variants (optional)
@ -116,7 +117,8 @@ enum enumGetStyle
GETSTYLE_OUTGOING, GETSTYLE_OUTGOING,
GETSTYLE_HINCOMING, GETSTYLE_HINCOMING,
GETSTYLE_HOUTGOING, GETSTYLE_HOUTGOING,
GETSTYLE_OOUTGOING GETSTYLE_OOUTGOING,
GETSTYLE_SYSTEM
}; };
/* Default constructor */ /* Default constructor */
@ -226,6 +228,9 @@ static QString getStyle(const QDir &styleDir, const QString &styleVariant, enumG
case GETSTYLE_OOUTGOING: case GETSTYLE_OOUTGOING:
fileHtml.setFileName(QFileInfo(styleDir, "ooutgoing.htm").absoluteFilePath()); fileHtml.setFileName(QFileInfo(styleDir, "ooutgoing.htm").absoluteFilePath());
break; break;
case GETSTYLE_SYSTEM:
fileHtml.setFileName(QFileInfo(styleDir, "system.htm").absoluteFilePath());
break;
default: default:
return ""; return "";
} }
@ -283,6 +288,9 @@ QString ChatStyle::formatMessage(enumFormatMessage type, const QString &name, co
case FORMATMSG_OOUTGOING: case FORMATMSG_OOUTGOING:
style = getStyle(m_styleDir, m_styleVariant, GETSTYLE_OOUTGOING); style = getStyle(m_styleDir, m_styleVariant, GETSTYLE_OOUTGOING);
break; break;
case FORMATMSG_SYSTEM:
style = getStyle(m_styleDir, m_styleVariant, GETSTYLE_SYSTEM);
break;
} }
if (style.isEmpty()) { if (style.isEmpty()) {
@ -300,6 +308,9 @@ QString ChatStyle::formatMessage(enumFormatMessage type, const QString &name, co
if (flag & CHAT_FORMATMSG_EMBED_LINKS) { if (flag & CHAT_FORMATMSG_EMBED_LINKS) {
formatFlag |= RSHTML_FORMATTEXT_EMBED_LINKS; formatFlag |= RSHTML_FORMATTEXT_EMBED_LINKS;
} }
if (flag & CHAT_FORMATMSG_OPTIMIZE) {
formatFlag |= RSHTML_FORMATTEXT_OPTIMIZE;
}
QString msg = RsHtml::formatText(message, formatFlag); QString msg = RsHtml::formatText(message, formatFlag);

4
retroshare-gui/src/gui/chat/ChatStyle.h
View file

@ -33,12 +33,13 @@
#define CHAT_FORMATMSG_EMBED_SMILEYS 1 #define CHAT_FORMATMSG_EMBED_SMILEYS 1
#define CHAT_FORMATMSG_EMBED_LINKS 2 #define CHAT_FORMATMSG_EMBED_LINKS 2
#define CHAT_FORMATMSG_SYSTEM 4 #define CHAT_FORMATMSG_SYSTEM 4
#define CHAT_FORMATMSG_OPTIMIZE 8
/* Flags for ChatStyle::formatText */ /* Flags for ChatStyle::formatText */
#define CHAT_FORMATTEXT_EMBED_SMILEYS 1 #define CHAT_FORMATTEXT_EMBED_SMILEYS 1
#define CHAT_FORMATTEXT_EMBED_LINKS 2 #define CHAT_FORMATTEXT_EMBED_LINKS 2
#define FORMATMSG_COUNT 5 #define FORMATMSG_COUNT 6
class ChatStyleInfo class ChatStyleInfo
{ {
@ -67,6 +68,7 @@ public:
FORMATMSG_HINCOMING = 2, FORMATMSG_HINCOMING = 2,
FORMATMSG_HOUTGOING = 3, FORMATMSG_HOUTGOING = 3,
FORMATMSG_OOUTGOING = 4, FORMATMSG_OOUTGOING = 4,
FORMATMSG_SYSTEM = 5,
// FORMATMSG_COUNT // FORMATMSG_COUNT
}; };

4
retroshare-gui/src/gui/chat/ChatWidget.cpp
View file

@ -305,7 +305,7 @@ void ChatWidget::addChatMsg(bool incoming, const QString &name, const QDateTime
std::cout << "ChatWidget::addChatMsg message : " << message.toStdString() << std::endl; std::cout << "ChatWidget::addChatMsg message : " << message.toStdString() << std::endl;
#endif #endif
unsigned int formatFlag = CHAT_FORMATMSG_EMBED_LINKS; unsigned int formatFlag = CHAT_FORMATMSG_EMBED_LINKS | CHAT_FORMATMSG_OPTIMIZE;
// embed smileys ? // embed smileys ?
if (Settings->valueFromGroup(QString("Chat"), QString::fromUtf8("Emoteicons_PrivatChat"), true).toBool()) { if (Settings->valueFromGroup(QString("Chat"), QString::fromUtf8("Emoteicons_PrivatChat"), true).toBool()) {
@ -315,6 +315,8 @@ void ChatWidget::addChatMsg(bool incoming, const QString &name, const QDateTime
ChatStyle::enumFormatMessage type; ChatStyle::enumFormatMessage type;
if (chatType == TYPE_OFFLINE) { if (chatType == TYPE_OFFLINE) {
type = ChatStyle::FORMATMSG_OOUTGOING; type = ChatStyle::FORMATMSG_OOUTGOING;
} else if (chatType == TYPE_SYSTEM) {
type = ChatStyle::FORMATMSG_SYSTEM;
} else if (chatType == TYPE_HISTORY) { } else if (chatType == TYPE_HISTORY) {
type = incoming ? ChatStyle::FORMATMSG_HINCOMING : ChatStyle::FORMATMSG_HOUTGOING; type = incoming ? ChatStyle::FORMATMSG_HINCOMING : ChatStyle::FORMATMSG_HOUTGOING;
} else { } else {

2
retroshare-gui/src/gui/chat/HandleRichText.cpp
View file

@ -182,7 +182,7 @@ QString formatText(const QString &text, unsigned int flag)
if (flag & RSHTML_FORMATTEXT_REMOVE_COLOR) { if (flag & RSHTML_FORMATTEXT_REMOVE_COLOR) {
optimizeFlag |= RSHTML_OPTIMIZEHTML_REMOVE_COLOR; optimizeFlag |= RSHTML_OPTIMIZEHTML_REMOVE_COLOR;
} }
if (optimizeFlag) { if (optimizeFlag || (flag & RSHTML_FORMATTEXT_OPTIMIZE)) {
optimizeHtml(formattedText, optimizeFlag); optimizeHtml(formattedText, optimizeFlag);
} }

1
retroshare-gui/src/gui/chat/HandleRichText.h
View file

@ -39,6 +39,7 @@
#define RSHTML_FORMATTEXT_REMOVE_FONT 4 #define RSHTML_FORMATTEXT_REMOVE_FONT 4
#define RSHTML_FORMATTEXT_REMOVE_COLOR 8 #define RSHTML_FORMATTEXT_REMOVE_COLOR 8
#define RSHTML_FORMATTEXT_CLEANSTYLE (RSHTML_FORMATTEXT_REMOVE_FONT | RSHTML_FORMATTEXT_REMOVE_COLOR) #define RSHTML_FORMATTEXT_CLEANSTYLE (RSHTML_FORMATTEXT_REMOVE_FONT | RSHTML_FORMATTEXT_REMOVE_COLOR)
#define RSHTML_FORMATTEXT_OPTIMIZE 16
/* Flags for RsHtml::formatText */ /* Flags for RsHtml::formatText */
#define RSHTML_OPTIMIZEHTML_REMOVE_FONT 2 #define RSHTML_OPTIMIZEHTML_REMOVE_FONT 2

6
retroshare-gui/src/gui/images.qrc
View file

@ -493,6 +493,7 @@
<file>qss/chat/standard/private/hincoming.htm</file> <file>qss/chat/standard/private/hincoming.htm</file>
<file>qss/chat/standard/private/houtgoing.htm</file> <file>qss/chat/standard/private/houtgoing.htm</file>
<file>qss/chat/standard/private/ooutgoing.htm</file> <file>qss/chat/standard/private/ooutgoing.htm</file>
<file>qss/chat/standard/private/system.htm</file>
<file>qss/chat/standard/private/main.css</file> <file>qss/chat/standard/private/main.css</file>
<file>qss/chat/standard/private/variants/Standard.css</file> <file>qss/chat/standard/private/variants/Standard.css</file>
<file>qss/chat/standard/public/info.xml</file> <file>qss/chat/standard/public/info.xml</file>
@ -501,6 +502,7 @@
<file>qss/chat/standard/public/hincoming.htm</file> <file>qss/chat/standard/public/hincoming.htm</file>
<file>qss/chat/standard/public/houtgoing.htm</file> <file>qss/chat/standard/public/houtgoing.htm</file>
<file>qss/chat/standard/public/ooutgoing.htm</file> <file>qss/chat/standard/public/ooutgoing.htm</file>
<file>qss/chat/standard/public/system.htm</file>
<file>qss/chat/standard/public/main.css</file> <file>qss/chat/standard/public/main.css</file>
<file>qss/chat/standard/public/variants/Standard.css</file> <file>qss/chat/standard/public/variants/Standard.css</file>
<file>qss/chat/standard/history/info.xml</file> <file>qss/chat/standard/history/info.xml</file>
@ -509,6 +511,7 @@
<file>qss/chat/standard/history/hincoming.htm</file> <file>qss/chat/standard/history/hincoming.htm</file>
<file>qss/chat/standard/history/houtgoing.htm</file> <file>qss/chat/standard/history/houtgoing.htm</file>
<file>qss/chat/standard/history/ooutgoing.htm</file> <file>qss/chat/standard/history/ooutgoing.htm</file>
<file>qss/chat/standard/history/system.htm</file>
<file>qss/chat/standard/history/main.css</file> <file>qss/chat/standard/history/main.css</file>
<file>qss/chat/standard/history/variants/Standard.css</file> <file>qss/chat/standard/history/variants/Standard.css</file>
<file>qss/chat/compact/private/info.xml</file> <file>qss/chat/compact/private/info.xml</file>
@ -517,6 +520,7 @@
<file>qss/chat/compact/private/hincoming.htm</file> <file>qss/chat/compact/private/hincoming.htm</file>
<file>qss/chat/compact/private/houtgoing.htm</file> <file>qss/chat/compact/private/houtgoing.htm</file>
<file>qss/chat/compact/private/ooutgoing.htm</file> <file>qss/chat/compact/private/ooutgoing.htm</file>
<file>qss/chat/compact/private/system.htm</file>
<file>qss/chat/compact/private/main.css</file> <file>qss/chat/compact/private/main.css</file>
<file>qss/chat/compact/private/variants/Standard.css</file> <file>qss/chat/compact/private/variants/Standard.css</file>
<file>qss/chat/compact/private/variants/Colored.css</file> <file>qss/chat/compact/private/variants/Colored.css</file>
@ -526,6 +530,7 @@
<file>qss/chat/compact/public/hincoming.htm</file> <file>qss/chat/compact/public/hincoming.htm</file>
<file>qss/chat/compact/public/houtgoing.htm</file> <file>qss/chat/compact/public/houtgoing.htm</file>
<file>qss/chat/compact/public/ooutgoing.htm</file> <file>qss/chat/compact/public/ooutgoing.htm</file>
<file>qss/chat/compact/public/system.htm</file>
<file>qss/chat/compact/public/main.css</file> <file>qss/chat/compact/public/main.css</file>
<file>qss/chat/compact/public/variants/Standard.css</file> <file>qss/chat/compact/public/variants/Standard.css</file>
<file>qss/chat/compact/public/variants/Colored.css</file> <file>qss/chat/compact/public/variants/Colored.css</file>
@ -535,6 +540,7 @@
<file>qss/chat/compact/history/hincoming.htm</file> <file>qss/chat/compact/history/hincoming.htm</file>
<file>qss/chat/compact/history/houtgoing.htm</file> <file>qss/chat/compact/history/houtgoing.htm</file>
<file>qss/chat/compact/history/ooutgoing.htm</file> <file>qss/chat/compact/history/ooutgoing.htm</file>
<file>qss/chat/compact/history/system.htm</file>
<file>qss/chat/compact/history/main.css</file> <file>qss/chat/compact/history/main.css</file>
<file>qss/chat/compact/history/variants/Standard.css</file> <file>qss/chat/compact/history/variants/Standard.css</file>
<file>smileys/amorous.png</file> <file>smileys/amorous.png</file>

9
retroshare-gui/src/gui/qss/chat/compact/history/main.css
View file

@ -64,3 +64,12 @@
.ooutgoingName { .ooutgoingName {
color: #244578; color: #244578;
} }
.incomingTable {
}
.incomingTime {
}
.incomingName {
}

11
retroshare-gui/src/gui/qss/chat/compact/history/system.htm Normal file
View file

@ -0,0 +1,11 @@
<style type="text/css">
%css-style%
</style>
<table class='systemTable' width='100%'>
<tr><td>
<span class='systemTime'>%date% %time%</span>
<span class='name systemName'>%name%:</span>
%message%
</td></tr>
</table>

7
retroshare-gui/src/gui/qss/chat/compact/private/system.htm Normal file
View file

@ -0,0 +1,7 @@
<style type="text/css">
%css-style%
</style>
<span class='time'>%time%</span>
<span class='name systemName'>%name%:</span>
%message%

4
retroshare-gui/src/gui/qss/chat/compact/public/main.css
View file

@ -21,3 +21,7 @@
.ooutgoingTime { .ooutgoingTime {
color:#808080; color:#808080;
} }
.systemTime {
color:#808080;
}

7
retroshare-gui/src/gui/qss/chat/compact/public/system.htm Normal file
View file

@ -0,0 +1,7 @@
<style type="text/css">
%css-style%
</style>
<span class='systemTime'>%time%</span>
<span class='name systemName'>%name%:</span>
%message%

10
retroshare-gui/src/gui/qss/chat/standard/history/main.css
View file

@ -69,3 +69,13 @@
.ooutgoingTime { .ooutgoingTime {
color: #244578; color: #244578;
} }
.incomingTable {
color: #000000;
}
.systemHeader {
}
.systemTime {
}

15
retroshare-gui/src/gui/qss/chat/standard/history/system.htm Normal file
View file

@ -0,0 +1,15 @@
<style type="text/css">
%css-style%
</style>
<table class='systemTable' width='100%'>
<tr>
<td class='header systemHeader'>%name%</td>
<td width='130' align='right' class='time systemTime'>[%date% %time%]</td>
</tr>
</table>
<table class='systemTable' width='100%'>
<tr>
<td>%message%</td>
</tr>
</table>

3
retroshare-gui/src/gui/qss/chat/standard/private/main.css
View file

@ -34,3 +34,6 @@
border-color:#fafafa #e3e3e3 #e3e3e3 #fafafa; border-color:#fafafa #e3e3e3 #e3e3e3 #fafafa;
color: #244578; color: #244578;
} }
.systemHeader {
}

14
retroshare-gui/src/gui/qss/chat/standard/private/system.htm Normal file
View file

@ -0,0 +1,14 @@
<style type="text/css">
%css-style%
</style>
<table class='systemHeader' width='100%'>
<tr>
<td class='name'>%name%</td>
<td width='130' align='right' class='time'>%time%</td>
</tr>
</table>
<table width='100%'>
<tr>
<td>%message%</td>
</tr>
</table>

6
retroshare-gui/src/gui/qss/chat/standard/public/main.css
View file

@ -41,3 +41,9 @@
.ooutgoingName { .ooutgoingName {
color:#FF0000; color:#FF0000;
} }
.systemTime {
}
.systemName {
}

7
retroshare-gui/src/gui/qss/chat/standard/public/system.htm Normal file
View file

@ -0,0 +1,7 @@
<style type="text/css">
%css-style%
</style>
<span class='systemTime'>%time%</span>
<span class='name systemName'>%name%</span><br>
%message%

11
retroshare-gui/src/gui/settings/ChatPage.cpp
View file

@ -206,11 +206,12 @@ void ChatPage::setPreviewMessages(QString &stylePath, QString styleVariant, QTex
QString nameOutgoing = tr("Outgoing"); QString nameOutgoing = tr("Outgoing");
QDateTime timestmp = QDateTime::fromTime_t(time(NULL)); QDateTime timestmp = QDateTime::fromTime_t(time(NULL));
textBrowser->append(style.formatMessage(ChatStyle::FORMATMSG_HINCOMING, nameIncoming, timestmp, tr("Incoming message in history"), CHAT_FORMATTEXT_EMBED_SMILEYS)); textBrowser->append(style.formatMessage(ChatStyle::FORMATMSG_HINCOMING, nameIncoming, timestmp, tr("Incoming message in history"), CHAT_FORMATTEXT_EMBED_SMILEYS | CHAT_FORMATMSG_OPTIMIZE));
textBrowser->append(style.formatMessage(ChatStyle::FORMATMSG_HOUTGOING, nameOutgoing, timestmp, tr("Outgoing message in history"), CHAT_FORMATTEXT_EMBED_SMILEYS)); textBrowser->append(style.formatMessage(ChatStyle::FORMATMSG_HOUTGOING, nameOutgoing, timestmp, tr("Outgoing message in history"), CHAT_FORMATTEXT_EMBED_SMILEYS | CHAT_FORMATMSG_OPTIMIZE));
textBrowser->append(style.formatMessage(ChatStyle::FORMATMSG_INCOMING, nameIncoming, timestmp, tr("Incoming message"), CHAT_FORMATTEXT_EMBED_SMILEYS)); textBrowser->append(style.formatMessage(ChatStyle::FORMATMSG_INCOMING, nameIncoming, timestmp, tr("Incoming message"), CHAT_FORMATTEXT_EMBED_SMILEYS | CHAT_FORMATMSG_OPTIMIZE));
textBrowser->append(style.formatMessage(ChatStyle::FORMATMSG_OUTGOING, nameOutgoing, timestmp, tr("Outgoing message"), CHAT_FORMATTEXT_EMBED_SMILEYS)); textBrowser->append(style.formatMessage(ChatStyle::FORMATMSG_OUTGOING, nameOutgoing, timestmp, tr("Outgoing message"), CHAT_FORMATTEXT_EMBED_SMILEYS | CHAT_FORMATMSG_OPTIMIZE));
textBrowser->append(style.formatMessage(ChatStyle::FORMATMSG_OOUTGOING, nameOutgoing, timestmp, tr("Outgoing offline message"), CHAT_FORMATTEXT_EMBED_SMILEYS)); textBrowser->append(style.formatMessage(ChatStyle::FORMATMSG_OOUTGOING, nameOutgoing, timestmp, tr("Outgoing offline message"), CHAT_FORMATTEXT_EMBED_SMILEYS | CHAT_FORMATMSG_OPTIMIZE));
textBrowser->append(style.formatMessage(ChatStyle::FORMATMSG_SYSTEM, tr("System"), timestmp, tr("System message"), CHAT_FORMATTEXT_EMBED_SMILEYS | CHAT_FORMATMSG_OPTIMIZE));
} }
void ChatPage::fillPreview(QListWidget *listWidget, QComboBox *comboBox, QTextBrowser *textBrowser) void ChatPage::fillPreview(QListWidget *listWidget, QComboBox *comboBox, QTextBrowser *textBrowser)

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

Binary file not shown.

171
retroshare-gui/src/lang/retroshare_de.ts
View file

@ -1472,6 +1472,16 @@ p, li { white-space: pre-wrap; }
<source>Outgoing offline message</source> <source>Outgoing offline message</source>
<translation>Ausgehende offline Nachricht</translation> <translation>Ausgehende offline Nachricht</translation>
</message> </message>
<message>
<location line="+1"/>
<source>System</source>
<translation>System</translation>
</message>
<message>
<location line="+0"/>
<source>System message</source>
<translation>Systemnachricht</translation>
</message>
<message> <message>
<location filename="../gui/settings/ChatPage.h" line="+44"/> <location filename="../gui/settings/ChatPage.h" line="+44"/>
<source>Chat</source> <source>Chat</source>
@ -1481,7 +1491,7 @@ p, li { white-space: pre-wrap; }
<context> <context>
<name>ChatStyle</name> <name>ChatStyle</name>
<message> <message>
<location filename="../gui/chat/ChatStyle.cpp" line="+443"/> <location filename="../gui/chat/ChatStyle.cpp" line="+454"/>
<source>Standard style for group chat</source> <source>Standard style for group chat</source>
<translation>Standard Stil für den Gruppenchat</translation> <translation>Standard Stil für den Gruppenchat</translation>
</message> </message>
@ -1625,12 +1635,17 @@ p, li { white-space: pre-wrap; }
<translation>Schriftart auf den Standard setzen</translation> <translation>Schriftart auf den Standard setzen</translation>
</message> </message>
<message> <message>
<location filename="../gui/chat/ChatWidget.cpp" line="+367"/> <location filename="../gui/chat/ChatWidget.cpp" line="+380"/>
<source>Paste RetroShare Link</source> <source>Paste RetroShare Link</source>
<translation>RetroShare Link einfügen</translation> <translation>RetroShare Link einfügen</translation>
</message> </message>
<message> <message>
<location line="+39"/> <location line="+2"/>
<source>Paste own certificate link</source>
<translation>Füge eigenen Zertifikat Link ein</translation>
</message>
<message>
<location line="+38"/>
<source>is typing...</source> <source>is typing...</source>
<translation>tippt...</translation> <translation>tippt...</translation>
</message> </message>
@ -2861,7 +2876,7 @@ p, li { white-space: pre-wrap; }
</message> </message>
<message> <message>
<location line="+185"/> <location line="+185"/>
<location filename="../gui/forums/CreateForumMsg.cpp" line="+76"/> <location filename="../gui/forums/CreateForumMsg.cpp" line="+77"/>
<source>Paste RetroShare Link</source> <source>Paste RetroShare Link</source>
<translation>RetroShare Link einfügen</translation> <translation>RetroShare Link einfügen</translation>
</message> </message>
@ -2870,6 +2885,11 @@ p, li { white-space: pre-wrap; }
<source>Paste full RetroShare Link</source> <source>Paste full RetroShare Link</source>
<translation>Vollen RetroShare Link einfügen</translation> <translation>Vollen RetroShare Link einfügen</translation>
</message> </message>
<message>
<location line="+1"/>
<source>Paste own certificate link</source>
<translation>Füge eigenen Zertifikat Link ein</translation>
</message>
<message> <message>
<location line="+24"/> <location line="+24"/>
<source>In Reply to</source> <source>In Reply to</source>
@ -5134,12 +5154,12 @@ 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-size:16pt; color:#ffffff;&quot;&gt;Freundschaftsanfrage&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-size:16pt; color:#ffffff;&quot;&gt;Freundschaftsanfrage&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message> </message>
<message> <message>
<location line="+244"/> <location line="+209"/>
<source>Confirm</source> <source>Confirm</source>
<translation>Bestätigen</translation> <translation>Bestätigen</translation>
</message> </message>
<message> <message>
<location line="-205"/> <location line="-170"/>
<source>Peer Info</source> <source>Peer Info</source>
<translation>Nachbar Info</translation> <translation>Nachbar Info</translation>
</message> </message>
@ -5154,9 +5174,8 @@ p, li { white-space: pre-wrap; }
<translation>Peer ID</translation> <translation>Peer ID</translation>
</message> </message>
<message> <message>
<location line="+14"/>
<source>RetroShare ID</source> <source>RetroShare ID</source>
<translation>RetroShare ID</translation> <translation type="obsolete">RetroShare ID</translation>
</message> </message>
<message> <message>
<source>Your trust in this peer is:</source> <source>Your trust in this peer is:</source>
@ -5175,7 +5194,7 @@ p, li { white-space: pre-wrap; }
<translation type="obsolete">Voll </translation> <translation type="obsolete">Voll </translation>
</message> </message>
<message> <message>
<location line="+63"/> <location line="+42"/>
<source>You have a friend request.</source> <source>You have a friend request.</source>
<translation>Du hast eine Freundschaftsanfrage.</translation> <translation>Du hast eine Freundschaftsanfrage.</translation>
</message> </message>
@ -5224,13 +5243,13 @@ p, li { white-space: pre-wrap; }
</message> </message>
<message> <message>
<location filename="../gui/connect/FriendRequest.cpp" line="+75"/> <location filename="../gui/connect/FriendRequest.cpp" line="+75"/>
<location line="+27"/> <location line="+21"/>
<source>RetroShare</source> <source>RetroShare</source>
<translation>RetroShare</translation> <translation>RetroShare</translation>
</message> </message>
<message> <message>
<location line="-26"/> <location line="-20"/>
<location line="+27"/> <location line="+21"/>
<source>Error : cannot get peer details.</source> <source>Error : cannot get peer details.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -5257,12 +5276,12 @@ p, li { white-space: pre-wrap; }
<message> <message>
<location line="+35"/> <location line="+35"/>
<source>Signature Failure</source> <source>Signature Failure</source>
<translation type="unfinished">Signatur Fehler</translation> <translation>Signatur Fehler</translation>
</message> </message>
<message> <message>
<location line="+1"/> <location line="+1"/>
<source>Maybe password is wrong</source> <source>Maybe password is wrong</source>
<translation type="unfinished">Vielleicht ist das Passwort falsch</translation> <translation>Vielleicht ist das Passwort falsch</translation>
</message> </message>
</context> </context>
<context> <context>
@ -7609,7 +7628,7 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
<name>MessageComposer</name> <name>MessageComposer</name>
<message> <message>
<location filename="../gui/msgs/MessageComposer.ui" line="+17"/> <location filename="../gui/msgs/MessageComposer.ui" line="+17"/>
<location filename="../gui/msgs/MessageComposer.cpp" line="+703"/> <location filename="../gui/msgs/MessageComposer.cpp" line="+743"/>
<source>Compose</source> <source>Compose</source>
<translation>Verfassen</translation> <translation>Verfassen</translation>
</message> </message>
@ -7628,7 +7647,7 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
<translation type="obsolete">Zurücksetzen</translation> <translation type="obsolete">Zurücksetzen</translation>
</message> </message>
<message> <message>
<location filename="../gui/msgs/MessageComposer.cpp" line="-499"/> <location filename="../gui/msgs/MessageComposer.cpp" line="-537"/>
<source>Send To:</source> <source>Send To:</source>
<translation>Senden an:</translation> <translation>Senden an:</translation>
</message> </message>
@ -7759,7 +7778,7 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
<translation>Setzt Schriftart auf Codestil</translation> <translation>Setzt Schriftart auf Codestil</translation>
</message> </message>
<message> <message>
<location filename="../gui/msgs/MessageComposer.cpp" line="+966"/> <location filename="../gui/msgs/MessageComposer.cpp" line="+1023"/>
<source>To</source> <source>To</source>
<translation>An</translation> <translation>An</translation>
</message> </message>
@ -7844,7 +7863,7 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
<translation>Blockquote hinzufügen</translation> <translation>Blockquote hinzufügen</translation>
</message> </message>
<message> <message>
<location filename="../gui/msgs/MessageComposer.cpp" line="-1052"/> <location filename="../gui/msgs/MessageComposer.cpp" line="-1109"/>
<source>&amp;Left</source> <source>&amp;Left</source>
<translation>&amp;Links</translation> <translation>&amp;Links</translation>
</message> </message>
@ -7864,13 +7883,23 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
<translation>&amp;Blocksatz</translation> <translation>&amp;Blocksatz</translation>
</message> </message>
<message> <message>
<location line="+244"/> <location line="+247"/>
<location line="+1503"/> <source>wants to be friend with you on RetroShare</source>
<translation>möchte mit dir in RetroShare befreundet sein</translation>
</message>
<message>
<location line="+23"/>
<source>Hi %1,&lt;br&gt;%2 wants to be friend with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks.&lt;br&gt;The RetroShare Team</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+12"/>
<location line="+1522"/>
<source>Save Message</source> <source>Save Message</source>
<translation>Nachricht speichern</translation> <translation>Nachricht speichern</translation>
</message> </message>
<message> <message>
<location line="-1502"/> <location line="-1521"/>
<source>Message has not been Sent. <source>Message has not been Sent.
Do you want to save message to draft box?</source> Do you want to save message to draft box?</source>
<translation>Nachricht wurde noch nicht gesendet. <translation>Nachricht wurde noch nicht gesendet.
@ -7908,7 +7937,7 @@ Möchtest Du die Nachricht in den Entwürfen speichern?</translation>
<translation>Freund-Details</translation> <translation>Freund-Details</translation>
</message> </message>
<message> <message>
<location line="+420"/> <location line="+429"/>
<source>Re:</source> <source>Re:</source>
<translation>Re:</translation> <translation>Re:</translation>
</message> </message>
@ -7918,18 +7947,18 @@ Möchtest Du die Nachricht in den Entwürfen speichern?</translation>
<translation>Fwd:</translation> <translation>Fwd:</translation>
</message> </message>
<message> <message>
<location line="+79"/> <location line="+86"/>
<location line="+119"/> <location line="+122"/>
<source>RetroShare</source> <source>RetroShare</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location line="-119"/> <location line="-122"/>
<source>Do you want to send the message without a subject ?</source> <source>Do you want to send the message without a subject ?</source>
<translation>Möchtest Du die Nachricht ohne Betreff senden ?</translation> <translation>Möchtest Du die Nachricht ohne Betreff senden ?</translation>
</message> </message>
<message> <message>
<location line="+119"/> <location line="+122"/>
<source>Please insert at least one recipient.</source> <source>Please insert at least one recipient.</source>
<translation>Bitte geben sie mindestens einen Empfänger ein.</translation> <translation>Bitte geben sie mindestens einen Empfänger ein.</translation>
</message> </message>
@ -8109,7 +8138,7 @@ Möchtest du die Nachricht speichern ?</translation>
<translation type="obsolete">Datei nicht gefunden oder Dateiname nicht akzeptiert.</translation> <translation type="obsolete">Datei nicht gefunden oder Dateiname nicht akzeptiert.</translation>
</message> </message>
<message> <message>
<location line="-1679"/> <location line="-1736"/>
<source>Friend Recommendation(s)</source> <source>Friend Recommendation(s)</source>
<translation>Freundempfehlung(en)</translation> <translation>Freundempfehlung(en)</translation>
</message> </message>
@ -8306,7 +8335,7 @@ p, li { white-space: pre-wrap; }
<translation>Erweitern</translation> <translation>Erweitern</translation>
</message> </message>
<message> <message>
<location line="+271"/> <location line="+277"/>
<source>File</source> <source>File</source>
<translation>Datei</translation> <translation>Datei</translation>
</message> </message>
@ -8467,7 +8496,7 @@ p, li { white-space: pre-wrap; }
<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="+610"/> <location filename="../gui/MessagesDialog.cpp" line="+622"/>
<source>New Message</source> <source>New Message</source>
<translation>Neue Nachricht</translation> <translation>Neue Nachricht</translation>
</message> </message>
@ -8493,14 +8522,14 @@ p, li { white-space: pre-wrap; }
</message> </message>
<message> <message>
<location filename="../gui/MessagesDialog.ui" line="-409"/> <location filename="../gui/MessagesDialog.ui" line="-409"/>
<location filename="../gui/MessagesDialog.cpp" line="-398"/> <location filename="../gui/MessagesDialog.cpp" line="-408"/>
<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="+731"/> <location line="+748"/>
<source>From</source> <source>From</source>
<translation>Von</translation> <translation>Von</translation>
</message> </message>
@ -8570,16 +8599,16 @@ p, li { white-space: pre-wrap; }
</message> </message>
<message> <message>
<location line="+175"/> <location line="+175"/>
<location filename="../gui/MessagesDialog.cpp" line="-63"/> <location filename="../gui/MessagesDialog.cpp" line="-66"/>
<location line="+824"/> <location line="+839"/>
<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="-830"/> <location filename="../gui/MessagesDialog.cpp" line="-845"/>
<location line="+843"/> <location line="+858"/>
<location line="+8"/> <location line="+8"/>
<source>Outbox</source> <source>Outbox</source>
<translation>Postausgang</translation> <translation>Postausgang</translation>
@ -8591,7 +8620,7 @@ p, li { white-space: pre-wrap; }
</message> </message>
<message> <message>
<location line="+9"/> <location line="+9"/>
<location filename="../gui/MessagesDialog.cpp" line="-843"/> <location filename="../gui/MessagesDialog.cpp" line="-858"/>
<source>Sent</source> <source>Sent</source>
<translation>Gesendet</translation> <translation>Gesendet</translation>
</message> </message>
@ -8644,7 +8673,7 @@ p, li { white-space: pre-wrap; }
</message> </message>
<message> <message>
<location line="-410"/> <location line="-410"/>
<location filename="../gui/MessagesDialog.cpp" line="-682"/> <location filename="../gui/MessagesDialog.cpp" line="-696"/>
<source>Subject</source> <source>Subject</source>
<translation>Betreff</translation> <translation>Betreff</translation>
</message> </message>
@ -8664,7 +8693,7 @@ p, li { white-space: pre-wrap; }
<translation>Gekennzeichnet</translation> <translation>Gekennzeichnet</translation>
</message> </message>
<message> <message>
<location line="+163"/> <location line="+173"/>
<source>Edit</source> <source>Edit</source>
<translation>Bearbeiten</translation> <translation>Bearbeiten</translation>
</message> </message>
@ -8684,7 +8713,7 @@ p, li { white-space: pre-wrap; }
<translation>Weiterleiten</translation> <translation>Weiterleiten</translation>
</message> </message>
<message> <message>
<location filename="../gui/MessagesDialog.cpp" line="-393"/> <location filename="../gui/MessagesDialog.cpp" line="-403"/>
<source>Click to sort by attachments</source> <source>Click to sort by attachments</source>
<translation>Klicken, um nach Anhang zu sortieren</translation> <translation>Klicken, um nach Anhang zu sortieren</translation>
</message> </message>
@ -8700,12 +8729,12 @@ p, li { white-space: pre-wrap; }
</message> </message>
<message> <message>
<location line="+1"/> <location line="+1"/>
<location line="+723"/> <location line="+740"/>
<source>Click to sort by from</source> <source>Click to sort by from</source>
<translation>Klicken, um nach Von zu sortieren</translation> <translation>Klicken, um nach Von zu sortieren</translation>
</message> </message>
<message> <message>
<location line="-722"/> <location line="-739"/>
<source>Click to sort by date</source> <source>Click to sort by date</source>
<translation>Klicken, um nach Datum zu sortieren</translation> <translation>Klicken, um nach Datum zu sortieren</translation>
</message> </message>
@ -8715,13 +8744,23 @@ p, li { white-space: pre-wrap; }
<translation>Klicken, um nach Schlagwörter zu sortieren</translation> <translation>Klicken, um nach Schlagwörter zu sortieren</translation>
</message> </message>
<message> <message>
<location line="+724"/> <location line="+226"/>
<source>System</source>
<translation>System</translation>
</message>
<message>
<location line="+489"/>
<source>No system messages available.</source>
<translation>Keine Systemnachrichten vorhanden.</translation>
</message>
<message>
<location line="+26"/>
<source>Click to sort by to</source> <source>Click to sort by to</source>
<translation>Klicken, um nach Empfänger zu sortieren</translation> <translation>Klicken, um nach Empfänger zu sortieren</translation>
</message> </message>
<message> <message>
<location filename="../gui/MessagesDialog.ui" line="-9"/> <location filename="../gui/MessagesDialog.ui" line="-9"/>
<location filename="../gui/MessagesDialog.cpp" line="-681"/> <location filename="../gui/MessagesDialog.cpp" line="-698"/>
<source>Reply to All</source> <source>Reply to All</source>
<translation>Allen antworten</translation> <translation>Allen antworten</translation>
</message> </message>
@ -8747,8 +8786,8 @@ p, li { white-space: pre-wrap; }
</message> </message>
<message> <message>
<location line="+172"/> <location line="+172"/>
<location filename="../gui/MessagesDialog.cpp" line="+598"/> <location filename="../gui/MessagesDialog.cpp" line="+612"/>
<location line="+870"/> <location line="+885"/>
<location line="+5"/> <location line="+5"/>
<source>Trash</source> <source>Trash</source>
<translation>Papierkorb</translation> <translation>Papierkorb</translation>
@ -8759,7 +8798,7 @@ p, li { white-space: pre-wrap; }
<translation>Ordner</translation> <translation>Ordner</translation>
</message> </message>
<message> <message>
<location filename="../gui/MessagesDialog.cpp" line="-1193"/> <location filename="../gui/MessagesDialog.cpp" line="-1212"/>
<source>Mark as read</source> <source>Mark as read</source>
<translation>Als gelesen markieren</translation> <translation>Als gelesen markieren</translation>
</message> </message>
@ -8784,29 +8823,29 @@ p, li { white-space: pre-wrap; }
<translation>Papierkorb leeren</translation> <translation>Papierkorb leeren</translation>
</message> </message>
<message> <message>
<location line="+245"/> <location line="+249"/>
<location line="+859"/> <location line="+874"/>
<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="-809"/> <location line="-821"/>
<source>To</source> <source>To</source>
<translation>An</translation> <translation>An</translation>
</message> </message>
<message> <message>
<location line="-722"/> <location line="-739"/>
<source>Click to sort by star</source> <source>Click to sort by star</source>
<translation>Klicken, um nach Kennzeichnung zu sortieren</translation> <translation>Klicken, um nach Kennzeichnung zu sortieren</translation>
</message> </message>
<message> <message>
<location line="+697"/> <location line="+711"/>
<source>No starred messages available. Stars let you give messages a special status to make them easier to find. To star a message, click on the light grey star beside any message.</source> <source>No starred messages available. Stars let you give messages a special status to make them easier to find. To star a message, click on the light grey star beside any message.</source>
<translation>Es sind keine gekennzeichneten Nachrichten vorhanden. Durch die Kennzeichnung kannst du Nachrichten mit einem speziellen Status versehen, sodass sie leichter zu finden sind. Klicke zum Kennzeichnen einer Nachricht auf den hellgrauen Stern neben der jeweiligen Nachricht.</translation> <translation>Es sind keine gekennzeichneten Nachrichten vorhanden. Durch die Kennzeichnung kannst du Nachrichten mit einem speziellen Status versehen, sodass sie leichter zu finden sind. Klicke zum Kennzeichnen einer Nachricht auf den hellgrauen Stern neben der jeweiligen Nachricht.</translation>
</message> </message>
<message> <message>
<location line="+754"/> <location line="+769"/>
<location line="+4"/> <location line="+4"/>
<location line="+4"/> <location line="+4"/>
<location line="+4"/> <location line="+4"/>
@ -8943,7 +8982,7 @@ p, li { white-space: pre-wrap; }
</message> </message>
<message> <message>
<location line="-20"/> <location line="-20"/>
<location filename="../gui/feeds/MsgItem.cpp" line="+204"/> <location filename="../gui/feeds/MsgItem.cpp" line="+209"/>
<source>Expand</source> <source>Expand</source>
<translation>Erweitern</translation> <translation>Erweitern</translation>
</message> </message>
@ -9454,11 +9493,12 @@ p, li { white-space: pre-wrap; }
</message> </message>
<message> <message>
<location line="+15"/> <location line="+15"/>
<location line="+68"/>
<source>Message</source> <source>Message</source>
<translation>Nachricht</translation> <translation>Nachricht</translation>
</message> </message>
<message> <message>
<location line="+7"/> <location line="-61"/>
<source>Channel Post</source> <source>Channel Post</source>
<translation>Kanalbeitrag</translation> <translation>Kanalbeitrag</translation>
</message> </message>
@ -9469,12 +9509,12 @@ p, li { white-space: pre-wrap; }
</message> </message>
<message> <message>
<location line="+7"/> <location line="+7"/>
<location line="+90"/> <location line="+106"/>
<source>Download completed</source> <source>Download completed</source>
<translation>Download fertig</translation> <translation>Download fertig</translation>
</message> </message>
<message> <message>
<location line="-83"/> <location line="-99"/>
<location line="+7"/> <location line="+7"/>
<location line="+7"/> <location line="+7"/>
<location line="+7"/> <location line="+7"/>
@ -9483,7 +9523,7 @@ p, li { white-space: pre-wrap; }
<translation>Kombiniert</translation> <translation>Kombiniert</translation>
</message> </message>
<message> <message>
<location line="+29"/> <location line="+45"/>
<source>Toasters</source> <source>Toasters</source>
<translation></translation> <translation></translation>
</message> </message>
@ -9508,7 +9548,8 @@ p, li { white-space: pre-wrap; }
<translation>Chat Lobbie</translation> <translation>Chat Lobbie</translation>
</message> </message>
<message> <message>
<location line="+7"/> <location line="-74"/>
<location line="+81"/>
<source>Connect attempt</source> <source>Connect attempt</source>
<translation>Verbindungsversuch</translation> <translation>Verbindungsversuch</translation>
</message> </message>
@ -9528,8 +9569,8 @@ p, li { white-space: pre-wrap; }
<translation>Abstand Y</translation> <translation>Abstand Y</translation>
</message> </message>
<message> <message>
<location line="-210"/> <location line="-226"/>
<location line="+125"/> <location line="+141"/>
<location line="+110"/> <location line="+110"/>
<source>Private Chat</source> <source>Private Chat</source>
<translation>Privater Chat</translation> <translation>Privater Chat</translation>
@ -9560,12 +9601,12 @@ p, li { white-space: pre-wrap; }
<translation>Zeige Systemabschnitts-Nachricht an</translation> <translation>Zeige Systemabschnitts-Nachricht an</translation>
</message> </message>
<message> <message>
<location line="-289"/> <location line="-305"/>
<source>Add feeds at end</source> <source>Add feeds at end</source>
<translation>Feeds am Ende anfügen</translation> <translation>Feeds am Ende anfügen</translation>
</message> </message>
<message> <message>
<location filename="../gui/settings/NotifyPage.cpp" line="+200"/> <location filename="../gui/settings/NotifyPage.cpp" line="+208"/>
<source>Top Left</source> <source>Top Left</source>
<translation>Oben Links</translation> <translation>Oben Links</translation>
</message> </message>
@ -10924,7 +10965,7 @@ Lockdatei:
<translation type="obsolete">Die Datei wurde zur Downloadliste hinzugefügt.</translation> <translation type="obsolete">Die Datei wurde zur Downloadliste hinzugefügt.</translation>
</message> </message>
<message> <message>
<location filename="../gui/msgs/MessageWidget.cpp" line="-295"/> <location filename="../gui/msgs/MessageWidget.cpp" line="-301"/>
<source>File Request canceled</source> <source>File Request canceled</source>
<translation>Dateianforderung abgebrochen</translation> <translation>Dateianforderung abgebrochen</translation>
</message> </message>
@ -10984,7 +11025,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="+516"/> <location filename="../gui/RetroShareLink.cpp" line="+551"/>
<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>
@ -10993,7 +11034,7 @@ und den Assistent zum Hinzufügen von Freunden zu starten.
</translation> </translation>
</message> </message>
<message> <message>
<location line="+266"/> <location line="+278"/>
<source>Add file</source> <source>Add file</source>
<translation>Datei hinzufügen</translation> <translation>Datei hinzufügen</translation>
</message> </message>