Merge branch '0.9.x' into finish-account-api

* 0.9.x: (26 commits)
  just sent a http 200 for the check-fancy from install.php
  Add a new event: CanUserChangeField
  shorten flag notification and include a class
  Added flag icon for UserFlag plugin
  Fixed notice option alignment in IE
  add a method to Theme class to list available themes
  Updated Realtime plugin to use the util's NoticeReply object
  Localisation updates from translatewiki.net (2009-11-08)
  Update pot again
  Rebuild pot file *without* --join-existing to get rid of the cruft. Not sure why "--join-existing" must be in. Only thing I can think of is manual additions, which I could not find.
  Revert "More precise field label"
  Remove more contractions
  Revert "* [Cc]an't -> [Cc]annot"
  Revert "More specifics on 'address'"
  * [Cc]an't -> [Cc]annot
  Revert "* check usage of 'people' in UI and change it to 'users' or something else in most places"
  add utilities for calculating local and installation theme root dirs
  Harmonise UI message "No such user."
  Restructure theme.php to define a class Theme
  entity_action responses look more inactive now
  ...

1 files changed, 6 insertions, 6 deletions

diff --git a/actions/register.php b/actions/register.php
index 584ad3ead..c4f6760aa 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -82,14 +82,14 @@ class RegisterAction extends Action
         }
 
         if (common_config('site', 'inviteonly') && empty($this->code)) {
-            $this->clientError(_('Sorry. Only those invited can register.'));
+            $this->clientError(_('Sorry, only invited people can register.'));
             return false;
         }
 
         if (!empty($this->code)) {
             $this->invite = Invitation::staticGet('code', $this->code);
             if (empty($this->invite)) {
-                $this->clientError(_('Sorry. This is an invalid invitation code.'));
+                $this->clientError(_('Sorry, invalid invitation code.'));
                 return false;
             }
             // Store this in case we need it
@@ -174,7 +174,7 @@ class RegisterAction extends Action
             $bio      = $this->trimmed('bio');
             $location = $this->trimmed('location');
 
-            // We don't trim these... whitespace is OK in a password!
+            // We do not trim these... whitespace is OK in a password!
             $password = $this->arg('password');
             $confirm  = $this->arg('confirm');
 
@@ -186,7 +186,7 @@ class RegisterAction extends Action
             }
 
             if (common_config('site', 'inviteonly') && !($code && $invite)) {
-                $this->clientError(_('Sorry. Only those invited can register.'));
+                $this->clientError(_('Sorry, only invited people can register.'));
                 return;
             }
 
@@ -401,7 +401,7 @@ class RegisterAction extends Action
         }
 
         if (common_config('site', 'inviteonly') && !($code && $invite)) {
-            $this->clientError(_('Sorry. Only those invited can register.'));
+            $this->clientError(_('Sorry, only invited people can register.'));
             return;
         }
 
@@ -542,7 +542,7 @@ class RegisterAction extends Action
                            '(%%%%action.imsettings%%%%) '.
                            'so you can send notices '.
                            'through instant messages.' . "\n" .
-                           '* [Search for users](%%%%action.peoplesearch%%%%) '.
+                           '* [Search for people](%%%%action.peoplesearch%%%%) '.
                            'that you may know or '.
                            'that share your interests. ' . "\n" .
                            '* Update your [profile settings]'.