From e3f4165d6997127b7421f4db3e9ef831f79bf446 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sun, 13 Jul 2008 17:56:01 -0400 Subject: conflict resolution after pulling from mikenz darcs-hash:20080713215601-84dde-371d54221d9ffbed500e8d3c9e0ad4bb15bd5c30.gz --- actions/imsettings.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'actions/imsettings.php') diff --git a/actions/imsettings.php b/actions/imsettings.php index 368cd8b9e..904516f24 100644 --- a/actions/imsettings.php +++ b/actions/imsettings.php @@ -52,9 +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?)', + 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'); -- cgit v1.2.3-54-g00ecf