diff --git a/actions/public.php b/actions/public.php index e4f98dacc3..f62d032ef8 100644 --- a/actions/public.php +++ b/actions/public.php @@ -95,7 +95,7 @@ class PublicAction extends Action if (!$this->notice) { // TRANS: Server error displayed when a public timeline cannot be retrieved. - $this->serverError(_('Could not retrieve public stream.')); + $this->serverError(_('Could not retrieve public timeline.')); return; } @@ -166,20 +166,20 @@ class PublicAction extends Action common_local_url('ApiTimelinePublic', array('format' => 'as')), // TRANS: Link description for public timeline feed. - _('Public Stream Feed (Activity Streams JSON)')), + _('Public Timeline Feed (Activity Streams JSON)')), new Feed(Feed::RSS1, common_local_url('publicrss'), // TRANS: Link description for public timeline feed. - _('Public Stream Feed (RSS 1.0)')), + _('Public Timeline Feed (RSS 1.0)')), new Feed(Feed::RSS2, common_local_url('ApiTimelinePublic', array('format' => 'rss')), // TRANS: Link description for public timeline feed. - _('Public Stream Feed (RSS 2.0)')), + _('Public Timeline Feed (RSS 2.0)')), new Feed(Feed::ATOM, common_local_url('ApiTimelinePublic', array('format' => 'atom')), // TRANS: Link description for public timeline feed. - _('Public Stream Feed (Atom)'))); + _('Public Timeline Feed (Atom)'))); } function showEmptyList() diff --git a/actions/restoreaccount.php b/actions/restoreaccount.php index 22f0a8e5da..81c792bd00 100644 --- a/actions/restoreaccount.php +++ b/actions/restoreaccount.php @@ -339,7 +339,7 @@ class RestoreAccountForm extends Form $this->out->elementStart('p', 'instructions'); // TRANS: Form instructions for feed restore. - $this->out->raw(_('You can upload a backed-up stream in '. + $this->out->raw(_('You can upload a backed-up timeline in '. 'Activity Streams format.')); $this->out->elementEnd('p'); diff --git a/actions/showstream.php b/actions/showstream.php index b4b7faf80a..ca7af0f2ed 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -65,11 +65,11 @@ class ShowstreamAction extends ProfileAction $base = $this->profile->getFancyName(); if (!empty($this->tag)) { if ($this->page == 1) { - // TRANS: Page title showing tagged notices in one user's stream. + // TRANS: Page title showing tagged notices in one user's timeline. // TRANS: %1$s is the username, %2$s is the hash tag. return sprintf(_('Notices by %1$s tagged %2$s'), $base, $this->tag); } else { - // TRANS: Page title showing tagged notices in one user's stream. + // TRANS: Page title showing tagged notices in one user's timeline. // TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number. return sprintf(_('Notices by %1$s tagged %2$s, page %3$d'), $base, $this->tag, $this->page); } @@ -77,7 +77,7 @@ class ShowstreamAction extends ProfileAction if ($this->page == 1) { return $base; } else { - // TRANS: Extended page title showing tagged notices in one user's stream. + // TRANS: Extended page title showing tagged notices in one user's timeline. // TRANS: %1$s is the username, %2$d is the page number. return sprintf(_('Notices by %1$s, page %2$d'), $base, @@ -205,7 +205,7 @@ class ShowstreamAction extends ProfileAction function showEmptyListMessage() { - // TRANS: First sentence of empty list message for a stream. $1%s is a user nickname. + // TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname. $message = sprintf(_('This is the timeline for %1$s, but %1$s hasn\'t posted anything yet.'), $this->user->nickname) . ' '; if (common_logged_in()) { @@ -214,7 +214,7 @@ class ShowstreamAction extends ProfileAction // TRANS: Second sentence of empty list message for a stream for the user themselves. $message .= _('Seen anything interesting recently? You haven\'t posted any notices yet, now would be a good time to start :)'); } else { - // TRANS: Second sentence of empty list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL. + // TRANS: Second sentence of empty list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL. // TRANS: This message contains a Markdown link. Keep "](" together. $message .= sprintf(_('You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%%?status_textarea=%2$s).'), $this->user->nickname, '@' . $this->user->nickname); } @@ -257,14 +257,14 @@ class ShowstreamAction extends ProfileAction function showAnonymousMessage() { if (!(common_config('site','closed') || common_config('site','inviteonly'))) { - // TRANS: Announcement for anonymous users showing a stream if site registrations are open. + // TRANS: Announcement for anonymous users showing a timeline if site registrations are open. // TRANS: This message contains a Markdown link. Keep "](" together. $m = sprintf(_('**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' . 'based on the Free Software [StatusNet](http://status.net/) tool. ' . '[Join now](%%%%action.register%%%%) to follow **%s**\'s notices and many more! ([Read more](%%%%doc.help%%%%))'), $this->user->nickname, $this->user->nickname); } else { - // TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only. + // TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only. // TRANS: This message contains a Markdown link. Keep "](" together. $m = sprintf(_('**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' . 'based on the Free Software [StatusNet](http://status.net/) tool. '),