wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve conflict

Browse Source 
darcs-hash:20080714025853-533db-e215a2ab0277acafc1c01d2c12c20ec452ed53e2.gz
This commit is contained in:
Mike Cochrane 2008-07-13 22:58:53 -04:00
parent d9aea8cb9a
commit 4b8ae3e339
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
actions/imsettings.php
View File

@ -52,10 +52,7 @@ class ImsettingsAction extends SettingsAction {
common_element_start('p'); common_element_start('p');
common_element('span', 'address unconfirmed', $confirm->address); common_element('span', 'address unconfirmed', $confirm->address);
common_element('span', 'input_instructions', common_element('span', 'input_instructions',
sprintf(_('Awaiting confirmation on this address. Check your ' . 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()));
'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_hidden('jabber', $confirm->address);
common_element_end('p'); common_element_end('p');
common_submit('cancel', _('Cancel')); common_submit('cancel', _('Cancel'));