diff options
| author | Evan Prodromou <evan@status.net> | 2009-11-08 17:06:41 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-11-08 17:06:41 -0500 |
| commit | 111f6a775daf9334adb05c9f8e539d682238f4dd (patch) | |
| tree | ce98d1968560538272e53a79ef4551b194eb1ab8 /lib | |
| parent | b7e2e3fd2b7e36f75c810a599334c2ca8abcca55 (diff) | |
| parent | da444f8a15043f326aa9a629ba5f0b25bc35b1e5 (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/action.php | 2 | ||||
| -rw-r--r-- | lib/subs.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/action.php b/lib/action.php index 80f398fbd..34b17063a 100644 --- a/lib/action.php +++ b/lib/action.php @@ -456,7 +456,7 @@ class Action extends HTMLOutputter // lawsuit _('Help'), _('Help me!'), false, 'nav_help'); if ($user || !common_config('site', 'private')) { $this->menuItem(common_local_url('peoplesearch'), - _('Search'), _('Search for people or text'), false, 'nav_search'); + _('Search'), _('Search for users or text'), false, 'nav_search'); } Event::handle('EndPrimaryNav', array($this)); } diff --git a/lib/subs.php b/lib/subs.php index 68c89c842..934380b76 100644 --- a/lib/subs.php +++ b/lib/subs.php @@ -45,7 +45,7 @@ function subs_subscribe_user($user, $other_nickname) function subs_subscribe_to($user, $other) { if ($user->isSubscribed($other)) { - return _('Already subscribed!.'); + return _('Already subscribed!'); } if ($other->hasBlocked($user)) { |