summaryrefslogtreecommitdiff
path: root/actions/imsettings.php
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2009-11-10 00:43:58 -0800
committerZach Copley <zach@status.net>2009-11-10 00:43:58 -0800
commitcae06a49ea60cacb926f27b18b88a8a7f801f011 (patch)
tree4a1a8b448666f1dd7ff1a8395d7ce75ef4933956 /actions/imsettings.php
parentdbb86f948684cd5a5a49f6881f50082698fd39d1 (diff)
parent223fee2ad1430e827830265c9fe97f4d025bb060 (diff)
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 ...
Diffstat (limited to 'actions/imsettings.php')
-rw-r--r--actions/imsettings.php8
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');