mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-08-04 04:14:24 -04:00
- Moved HandleRichText from the folder "chat" to "util" and redesigned the source
- Extended RsHtml::formatText to replace the RetroShare links with an image and enabled this for the certificate links in the system messages (friend recommendation and user request) - Added new ObjectPainter for painting a button on a pixmap git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5160 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
5a3863d216
commit
dc2d6c975e
27 changed files with 470 additions and 215 deletions
Binary file not shown.
|
@ -1502,7 +1502,7 @@ p, li { white-space: pre-wrap; }
|
|||
<context>
|
||||
<name>ChatStyle</name>
|
||||
<message>
|
||||
<location filename="../gui/chat/ChatStyle.cpp" line="+454"/>
|
||||
<location filename="../gui/chat/ChatStyle.cpp" line="+443"/>
|
||||
<source>Standard style for group chat</source>
|
||||
<translation>Standard Stil für den Gruppenchat</translation>
|
||||
</message>
|
||||
|
@ -1646,7 +1646,7 @@ p, li { white-space: pre-wrap; }
|
|||
<translation>Schriftart auf den Standard setzen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../gui/chat/ChatWidget.cpp" line="+380"/>
|
||||
<location filename="../gui/chat/ChatWidget.cpp" line="+385"/>
|
||||
<source>Paste RetroShare Link</source>
|
||||
<translation>RetroShare Link einfügen</translation>
|
||||
</message>
|
||||
|
@ -4606,7 +4606,7 @@ p, li { white-space: pre-wrap; }
|
|||
<translation>Du kannst einem anonymen Autor nicht antworten</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="-1373"/>
|
||||
<location line="-1372"/>
|
||||
<source>Your Forums</source>
|
||||
<translation>Deine Foren</translation>
|
||||
</message>
|
||||
|
@ -4771,7 +4771,7 @@ p, li { white-space: pre-wrap; }
|
|||
<translation>Druckvorschau</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../gui/ForumsDialog.cpp" line="+148"/>
|
||||
<location filename="../gui/ForumsDialog.cpp" line="+147"/>
|
||||
<location line="+1127"/>
|
||||
<source>Start New Thread</source>
|
||||
<translation>Erstelle neues Thema</translation>
|
||||
|
@ -5602,7 +5602,7 @@ p, li { white-space: pre-wrap; }
|
|||
<translation>Löscht den gespeicherten und angezeigten Chat Verlauf</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../gui/FriendsDialog.cpp" line="+99"/>
|
||||
<location filename="../gui/FriendsDialog.cpp" line="+103"/>
|
||||
<source>Chat lobbies</source>
|
||||
<translation>Chat Lobbies</translation>
|
||||
</message>
|
||||
|
@ -5740,7 +5740,7 @@ p, li { white-space: pre-wrap; }
|
|||
<translation>tippt...</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+118"/>
|
||||
<location line="+117"/>
|
||||
<location line="+2"/>
|
||||
<source>New group chat</source>
|
||||
<translation>Neuer Gruppenchat</translation>
|
||||
|
@ -7222,7 +7222,7 @@ p, li { white-space: pre-wrap; }
|
|||
</message>
|
||||
<message>
|
||||
<location line="+61"/>
|
||||
<location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+364"/>
|
||||
<location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+365"/>
|
||||
<source>Copy</source>
|
||||
<translation>Kopieren</translation>
|
||||
</message>
|
||||
|
@ -7673,7 +7673,7 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
|
|||
<name>MessageComposer</name>
|
||||
<message>
|
||||
<location filename="../gui/msgs/MessageComposer.ui" line="+17"/>
|
||||
<location filename="../gui/msgs/MessageComposer.cpp" line="+744"/>
|
||||
<location filename="../gui/msgs/MessageComposer.cpp" line="+746"/>
|
||||
<source>Compose</source>
|
||||
<translation>Verfassen</translation>
|
||||
</message>
|
||||
|
@ -8390,7 +8390,17 @@ p, li { white-space: pre-wrap; }
|
|||
<translation>Druckvorschau</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../gui/msgs/MessageWidget.cpp" line="+225"/>
|
||||
<location filename="../gui/msgs/MessageWidget.cpp" line="+71"/>
|
||||
<source>Confirm %1 as friend</source>
|
||||
<translation>%1 als Freund bestätigen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+4"/>
|
||||
<source>Add %1 as friend</source>
|
||||
<translation>%1 als Freund hinzufügen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+183"/>
|
||||
<source>No subject</source>
|
||||
<translation>Kein Betreff</translation>
|
||||
</message>
|
||||
|
@ -10184,7 +10194,7 @@ p, li { white-space: pre-wrap; }
|
|||
<translation type="obsolete">Formular</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../gui/settings/PluginItem.ui" line="+241"/>
|
||||
<location filename="../gui/settings/PluginItem.ui" line="+235"/>
|
||||
<source>Status: </source>
|
||||
<translation>Status:</translation>
|
||||
</message>
|
||||
|
@ -10194,7 +10204,7 @@ p, li { white-space: pre-wrap; }
|
|||
<translation>Datei Prüfsumme:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="-84"/>
|
||||
<location line="-78"/>
|
||||
<source><!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; }
|
||||
|
@ -10207,7 +10217,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;"><a href="more"><span style=" text-decoration: underline; color:#0000ff;">mehr...</span></a></p></body></html></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+61"/>
|
||||
<location line="+55"/>
|
||||
<source>File name: </source>
|
||||
<translation>Dateiname:</translation>
|
||||
</message>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue