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 /actions/imsettings.php | |
| parent | b7e2e3fd2b7e36f75c810a599334c2ca8abcca55 (diff) | |
| parent | da444f8a15043f326aa9a629ba5f0b25bc35b1e5 (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'actions/imsettings.php')
| -rw-r--r-- | actions/imsettings.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/actions/imsettings.php b/actions/imsettings.php index f57933b43..49c7b2a0e 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 address and settings below.'); + 'Configure your instant messages 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, _('Address')); + $this->element('legend', null, _('IM 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 address. '. + sprintf(_('Awaiting confirmation on this IM 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 people I\'m not subscribed to.'), + 'from users I am not subscribed to.'), $user->jabberreplies); $this->elementEnd('li'); $this->elementStart('li'); |