mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-12-24 23:19:29 -05:00
renamed Friends storm back to News Feed
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4025 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax
parent
bf7810aab2
commit
e5385c533e
@ -64,7 +64,7 @@ p, li { white-space: pre-wrap; }
|
||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt; font-weight:600;">Friends Storm</span></p></body></html></string>
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt; font-weight:600;">News Feed</span></p></body></html></string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
||||
@ -150,7 +150,7 @@ PeersDialog::PeersDialog(QWidget *parent)
|
||||
ui.peertabWidget->setTabPosition(QTabWidget::North);
|
||||
ui.peertabWidget->addTab(new ProfileWidget(), tr("Profile"));
|
||||
NewsFeed *newsFeed = new NewsFeed();
|
||||
newsFeedTabIndex = ui.peertabWidget->addTab(newsFeed, tr("Friends Storm"));
|
||||
newsFeedTabIndex = ui.peertabWidget->addTab(newsFeed, tr("News Feed"));
|
||||
ui.peertabWidget->tabBar()->setIconSize(QSize(10, 10));
|
||||
|
||||
/* get the current text and text color of the tab bar */
|
||||
|
||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
@ -2722,7 +2722,7 @@ p, li { white-space: pre-wrap; }
|
||||
</message>
|
||||
<message>
|
||||
<location line="+48"/>
|
||||
<location filename="../gui/DetailsDialog.cpp" line="+41"/>
|
||||
<location filename="../gui/DetailsDialog.cpp" line="+42"/>
|
||||
<source>Comments</source>
|
||||
<translation>Kommentare</translation>
|
||||
</message>
|
||||
@ -3566,7 +3566,7 @@ p, li { white-space: pre-wrap; }
|
||||
<translation>Forum abbestellen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+5"/>
|
||||
<location line="+7"/>
|
||||
<source>New Forum</source>
|
||||
<translation>Neues Forum</translation>
|
||||
</message>
|
||||
@ -3581,7 +3581,12 @@ p, li { white-space: pre-wrap; }
|
||||
<translation>Forum-Details bearbeiten</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+5"/>
|
||||
<location line="+4"/>
|
||||
<source>Restore Publish Rights for Forum</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+8"/>
|
||||
<source>Mark all as read</source>
|
||||
<translation>Alle als gelesen markieren</translation>
|
||||
</message>
|
||||
@ -3611,7 +3616,7 @@ p, li { white-space: pre-wrap; }
|
||||
<translation>Alle reduzieren</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+87"/>
|
||||
<location line="+94"/>
|
||||
<source>Hide</source>
|
||||
<translation>Verbergen</translation>
|
||||
</message>
|
||||
@ -3660,7 +3665,7 @@ p, li { white-space: pre-wrap; }
|
||||
<translation>Du kannst einem anonymen Autor nicht antworten</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="-1275"/>
|
||||
<location line="-1291"/>
|
||||
<source>Your Forums</source>
|
||||
<translation>Deine Foren</translation>
|
||||
</message>
|
||||
@ -3802,8 +3807,8 @@ p, li { white-space: pre-wrap; }
|
||||
<translation>Druckvorschau</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../gui/ForumsDialog.cpp" line="+112"/>
|
||||
<location line="+1084"/>
|
||||
<location filename="../gui/ForumsDialog.cpp" line="+121"/>
|
||||
<location line="+1091"/>
|
||||
<source>Start New Thread</source>
|
||||
<translation>Erstelle neues Thema</translation>
|
||||
</message>
|
||||
@ -3831,7 +3836,7 @@ p, li { white-space: pre-wrap; }
|
||||
<translation>Inhalt</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../gui/ForumsDialog.cpp" line="-1071"/>
|
||||
<location filename="../gui/ForumsDialog.cpp" line="-1078"/>
|
||||
<location line="+3"/>
|
||||
<source>Mark as read</source>
|
||||
<translation>Als gelesen markieren</translation>
|
||||
@ -6971,17 +6976,29 @@ p, li { white-space: pre-wrap; }
|
||||
<context>
|
||||
<name>NewsFeed</name>
|
||||
<message>
|
||||
<location filename="../gui/NewsFeed.ui" line="+63"/>
|
||||
<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; }
|
||||
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt; font-weight:600;">Friends Storm</span></p></body></html></source>
|
||||
<translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<translation type="obsolete"><!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; }
|
||||
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt; font-weight:600;">Aktivitäten</span></p></body></html></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../gui/NewsFeed.ui" line="+63"/>
|
||||
<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; }
|
||||
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt; font-weight:600;">News Feed</span></p></body></html></source>
|
||||
<translation><!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; }
|
||||
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt; font-weight:600;">Neuigkeiten</span></p></body></html></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+72"/>
|
||||
@ -7425,7 +7442,12 @@ p, li { white-space: pre-wrap; }
|
||||
<translation>Freund anschreiben</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="-82"/>
|
||||
<location line="-304"/>
|
||||
<source>News Feed</source>
|
||||
<translation>Neuigkeiten</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+222"/>
|
||||
<source>Paste RetroShare Link</source>
|
||||
<translation>RetroShare Link einfügen</translation>
|
||||
</message>
|
||||
@ -7759,12 +7781,11 @@ p, li { white-space: pre-wrap; }
|
||||
<translation>Status Spalte ausblenden</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../gui/PeersDialog.cpp" line="-1857"/>
|
||||
<source>Friends Storm</source>
|
||||
<translation>Aktivitäten</translation>
|
||||
<translation type="obsolete">Aktivitäten</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+1210"/>
|
||||
<location filename="../gui/PeersDialog.cpp" line="-647"/>
|
||||
<source>is typing...</source>
|
||||
<translation>tippt...</translation>
|
||||
</message>
|
||||
@ -8465,7 +8486,7 @@ Do you want to send them a Message instead</source>
|
||||
<context>
|
||||
<name>ProfileView</name>
|
||||
<message>
|
||||
<location filename="../gui/profile/ProfileView.cpp" line="+70"/>
|
||||
<location filename="../gui/profile/ProfileView.cpp" line="+72"/>
|
||||
<source>Clear Photo</source>
|
||||
<translation>Photo entfernen</translation>
|
||||
</message>
|
||||
@ -10932,7 +10953,7 @@ p, li { white-space: pre-wrap; }
|
||||
</message>
|
||||
<message>
|
||||
<location line="+26"/>
|
||||
<location filename="../gui/feeds/SubFileItem.cpp" line="+576"/>
|
||||
<location filename="../gui/feeds/SubFileItem.cpp" line="+578"/>
|
||||
<location line="+6"/>
|
||||
<source>Play File</source>
|
||||
<translation>Datei abspielen</translation>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user