mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-12-28 00:49:28 -05:00
Merge pull request #2214 from defnax/activity-stream
Rename Log to Activity
This commit is contained in:
commit
672f2d1252
@ -111,7 +111,7 @@ NewsFeed::NewsFeed(QWidget *parent) : MainPage(parent), ui(new Ui::NewsFeed),
|
||||
|
||||
QString hlp_str = tr(
|
||||
" <h1><img width=\"32\" src=\":/icons/help_64.png\"> News Feed</h1> \
|
||||
<p>The Log Feed displays the last events on your network, sorted by the time you received them. \
|
||||
<p>The Activity Feed displays the last events on your network, sorted by the time you received them. \
|
||||
This gives you a summary of the activity of your friends. \
|
||||
You can configure which events to show by pressing on <b>Options</b>. </p> \
|
||||
<p>The various events shown are: \
|
||||
|
@ -69,7 +69,7 @@ public:
|
||||
virtual ~NewsFeed();
|
||||
|
||||
virtual QIcon iconPixmap() const { return QIcon(IMAGE_NEWSFEED) ; } //MainPage
|
||||
virtual QString pageName() const { return tr("Log") ; } //MainPage
|
||||
virtual QString pageName() const { return tr("Activity") ; } //MainPage
|
||||
virtual QString helpText() const { return ""; } //MainPage
|
||||
|
||||
virtual UserNotify *createUserNotify(QObject *parent) override;
|
||||
|
@ -69,7 +69,7 @@
|
||||
<item>
|
||||
<widget class="StyledLabel" name="titleBarLabel">
|
||||
<property name="text">
|
||||
<string>Log entries</string>
|
||||
<string>Activity Stream</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
Loading…
Reference in New Issue
Block a user