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

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

This commit is contained in:
Evan Prodromou 2011-05-05 12:09:10 -07:00
parent f8c3458216 d906ee1bcb
commit 763229aede
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
actions/all.php
View File

@ -86,9 +86,12 @@ class AllAction extends ProfileAction
{
$user = common_current_user();
if ($user->id == $this->user->id) {
// TRANS: Title of a user's own start page.
return _('Home timeline');
} else {
$profile = $this->user->getProfile();
// TRANS: Title of another user's start page.
// TRANS: %s is the other user's name.
return sprintf(_("%s's home timeline"), $profile->getBestName());
}
}

2
actions/login.php
View File

@ -228,7 +228,7 @@ class LoginAction extends Action
$this->elementStart('ul', 'form_data');
$this->elementStart('li');
// TRANS: Field label on login page.
$this->input('nickname', _('Username or email'));
$this->input('nickname', _('Username or email address'));
$this->elementEnd('li');
$this->elementStart('li');
// TRANS: Field label on login page.

13
lib/searchaction.php
View File

@ -129,21 +129,22 @@ class SearchAction extends Action
$message = _("* Make sure all words are spelled correctly.
* Try different keywords.
* Try more general keywords.
* Try fewer keywords.
");
* Try fewer keywords.");
$message .= "\n";
if (!common_config('site', 'private')) {
$qe = urlencode($q);
$message .= "\n";
// Don't change these long strings to HEREDOC; xgettext won't pick them up.
// TRANS: Standard search suggestions shown when a search does not give any results.
$message .= sprintf(_("
You can also try your search on other engines:
$message .= sprintf(_("You can also try your search on other engines:
* [Twingly](http://www.twingly.com/search?q=%s&content=microblog&site=%%%%site.server%%%%)
* [Tweet scan](http://www.tweetscan.com/indexi.php?s=%s)
* [Google](http://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)
* [Yahoo](http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)
* [Collecta](http://collecta.com/#q=%s)
"), $qe, $qe, $qe, $qe, $qe);
* [Collecta](http://collecta.com/#q=%s)"), $qe, $qe, $qe, $qe, $qe);
$message .= "\n";
}
$this->elementStart('div', 'help instructions');
$this->raw(common_markup_to_html($message));

2
plugins/Directory/actions/groupdirectory.php
View File

@ -125,7 +125,7 @@ class GroupdirectoryAction extends Action
return _m("After you join a group you can send messages to all other members\n".
"using the syntax \"!groupname\".\n\n".
"Browse groups, or search for groups on by their name, location or topic.\n".
"Separate the terms by spaces; they must be three characters or more.\n");
"Separate the terms by spaces; they must be three characters or more.") . "\n";
}
/**