From 4b8ae3e33937b4dacd2acb17d98050684ce41823 Mon Sep 17 00:00:00 2001 From: Mike Cochrane Date: Sun, 13 Jul 2008 22:58:53 -0400 Subject: [PATCH] Resolve conflict darcs-hash:20080714025853-533db-e215a2ab0277acafc1c01d2c12c20ec452ed53e2.gz --- actions/imsettings.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/actions/imsettings.php b/actions/imsettings.php index 70aff35f55..d1ed48efb3 100644 --- a/actions/imsettings.php +++ b/actions/imsettings.php @@ -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'));