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

- Added blocking of embedded images (+ settings) to forums and messages

Browse source 
- Added image support for forum messages
- Renamed LinkTextBrowser to RSTextBrowser
- Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6752 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2013-09-23 19:53:26 +00:00
parent 8ffc0e05de
commit 6b1613d8bb
31 changed files with 907 additions and 454 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/FeedReader/gui/FeedReaderMessageWidget.ui
View file

@ -265,7 +265,7 @@
</item>
</layout>
</widget>
<widget class="LinkTextBrowser" name="msgText">
<widget class="RSTextBrowser" name="msgText">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
@ -287,9 +287,9 @@
</widget>
<customwidgets>
<customwidget>
<class>LinkTextBrowser</class>
<class>RSTextBrowser</class>
<extends>QTextBrowser</extends>
<header>gui/common/LinkTextBrowser.h</header>
<header>gui/common/RSTextBrowser.h</header>
</customwidget>
<customwidget>
<class>LineEditClear</class>

26
plugins/FeedReader/lang/FeedReader_en.ts
View file

@ -352,59 +352,59 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderDialog.cpp" line="521"/>
<location filename="../gui/FeedReaderDialog.cpp" line="524"/>
<source>No name</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderDialog.cpp" line="733"/>
<location filename="../gui/FeedReaderDialog.cpp" line="736"/>
<source>Add new folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderDialog.cpp" line="734"/>
<location filename="../gui/FeedReaderDialog.cpp" line="737"/>
<source>Please enter a name for the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderDialog.cpp" line="740"/>
<location filename="../gui/FeedReaderDialog.cpp" line="793"/>
<location filename="../gui/FeedReaderDialog.cpp" line="743"/>
<location filename="../gui/FeedReaderDialog.cpp" line="796"/>
<source>Create folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderDialog.cpp" line="740"/>
<location filename="../gui/FeedReaderDialog.cpp" line="793"/>
<location filename="../gui/FeedReaderDialog.cpp" line="743"/>
<location filename="../gui/FeedReaderDialog.cpp" line="796"/>
<source>Cannot create folder.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderDialog.cpp" line="766"/>
<location filename="../gui/FeedReaderDialog.cpp" line="769"/>
<source>Remove folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderDialog.cpp" line="766"/>
<location filename="../gui/FeedReaderDialog.cpp" line="769"/>
<source>Remove feed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderDialog.cpp" line="766"/>
<location filename="../gui/FeedReaderDialog.cpp" line="769"/>
<source>Do you want to remove the folder %1?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderDialog.cpp" line="766"/>
<location filename="../gui/FeedReaderDialog.cpp" line="769"/>
<source>Do you want to remove the feed %1?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderDialog.cpp" line="786"/>
<location filename="../gui/FeedReaderDialog.cpp" line="789"/>
<source>Edit folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/FeedReaderDialog.cpp" line="787"/>
<location filename="../gui/FeedReaderDialog.cpp" line="790"/>
<source>Please enter a new name for the folder</source>
<translation type="unfinished"></translation>
</message>