From: Mike Cochrane <mikec@mikenz.geek.nz>
Date: Mon, 14 Jul 2008 02:58:53 +0000 (-0400)
Subject: Resolve conflict
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4b8ae3e33937b4dacd2acb17d98050684ce41823;p=quix0rs-gnu-social.git

Resolve conflict

darcs-hash:20080714025853-533db-e215a2ab0277acafc1c01d2c12c20ec452ed53e2.gz
---

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'));