From a034fb0b82dc586bdec10523100f628a2ecf0fe4 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Sun, 8 Nov 2009 23:22:13 +0100 Subject: Revert "* check usage of 'people' in UI and change it to 'users' or something else in most places" This reverts commit 81b4a381d9ddc71ed8a53c074ea10910882d3156. IMO "user" is a bit impersonal and we shouldn't go changing the tone of the UI willy-nilly when we're updating localisations. --- actions/imsettings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actions/imsettings.php') diff --git a/actions/imsettings.php b/actions/imsettings.php index 49c7b2a0e..b5bf72f45 100644 --- a/actions/imsettings.php +++ b/actions/imsettings.php @@ -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'); -- cgit v1.2.3-54-g00ecf From c7961fe6dc033d1d40ab7d7f9bb994492ae4ea7b Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Sun, 8 Nov 2009 23:26:16 +0100 Subject: Revert "More specifics on 'address'" This reverts commit 1872d07602f50b4991d0da26aca3a5d775338e47. "instant messages address" is very awkward phrasing; prefer not to be changing UI in such ways while updating localisations. --- actions/imsettings.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'actions/imsettings.php') diff --git a/actions/imsettings.php b/actions/imsettings.php index b5bf72f45..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?)'), -- cgit v1.2.3-54-g00ecf