GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x

Browse Source
This commit is contained in:
Evan Prodromou
2011-08-16 15:59:06 -04:00
parent 632ed129eb fd4c72bf85
commit 827b13a2a4
1435 changed files with 12184 additions and 16748 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/mail.php
View File

@@ -750,7 +750,7 @@ function mail_notify_attn($user, $notice)
// TRANS: Body of @-reply notification e-mail.
// TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
// TRANS: %3$s is a URL to the notice, %4$s is the notice text,
// TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
// TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
// TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
$body = sprintf(_("%1\$s just sent a notice to your attention (an '@-reply') on %2\$s.\n\n".
"The notice is here:\n\n".

4
lib/peopletaglist.php
View File

@@ -169,8 +169,8 @@ class PeopletagListItem extends Widget
array('href' => common_local_url('peopletagged',
array('tagger' => $this->profile->nickname,
'tag' => $this->peopletag->tag))),
// TRANS: Link description for link to list of users tagged with a tag.
_('Tagged'));
// TRANS: Link description for link to list of users tagged with a tag (so part of a list).
_('Listed'));
$this->out->raw($this->peopletag->taggedCount());
$this->out->elementEnd('span');