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, 4 insertions, 4 deletions

diff --git a/actions/imsettings.php b/actions/imsettings.php
index 49c7b2a0e..f57933b43 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -69,7 +69,7 @@ class ImsettingsAction extends ConnectSettingsAction
     {
         return _('You can send and receive notices through '.
                  'Jabber/GTalk [instant messages](%%doc.im%%). '.
-                 'Configure your instant messages address and settings below.');
+                 'Configure your address and settings below.');
     }
 
     /**
@@ -97,7 +97,7 @@ class ImsettingsAction extends ConnectSettingsAction
                                           'action' =>
                                           common_local_url('imsettings')));
         $this->elementStart('fieldset', array('id' => 'settings_im_address'));
-        $this->element('legend', null, _('IM address'));
+        $this->element('legend', null, _('Address'));
         $this->hidden('token', common_session_token());
 
         if ($user->jabber) {
@@ -111,7 +111,7 @@ class ImsettingsAction extends ConnectSettingsAction
             if ($confirm) {
                 $this->element('p', 'form_unconfirmed', $confirm->address);
                 $this->element('p', 'form_note',
-                               sprintf(_('Awaiting confirmation on this IM address. '.
+                               sprintf(_('Awaiting confirmation on this address. '.
                                          'Check your Jabber/GTalk account for a '.
                                          'message with further instructions. '.
                                          '(Did you add %s to your buddy list?)'),
@@ -151,7 +151,7 @@ class ImsettingsAction extends ConnectSettingsAction
         $this->elementStart('li');
         $this->checkbox('jabberreplies',
                         _('Send me replies through Jabber/GTalk '.
-                          'from users I am not subscribed to.'),
+                          'from people I\'m not subscribed to.'),
                         $user->jabberreplies);
         $this->elementEnd('li');
         $this->elementStart('li');