Resolve conflict
darcs-hash:20080714025853-533db-e215a2ab0277acafc1c01d2c12c20ec452ed53e2.gz
This commit is contained in:
parent
d9aea8cb9a
commit
4b8ae3e339
|
@ -52,10 +52,7 @@ class ImsettingsAction extends SettingsAction {
|
|||
common_element_start('p');
|
||||
common_element('span', 'address unconfirmed', $confirm->address);
|
||||
common_element('span', 'input_instructions',
|
||||
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?)',
|
||||
jabber_daemon_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?)'), jabber_daemon_address()));
|
||||
common_hidden('jabber', $confirm->address);
|
||||
common_element_end('p');
|
||||
common_submit('cancel', _('Cancel'));
|
||||
|
|
Loading…
Reference in New Issue
Block a user