diff options
| author | Mike Cochrane <mikec@mikenz.geek.nz> | 2008-07-13 22:58:53 -0400 |
|---|---|---|
| committer | Mike Cochrane <mikec@mikenz.geek.nz> | 2008-07-13 22:58:53 -0400 |
| commit | 4b8ae3e33937b4dacd2acb17d98050684ce41823 (patch) | |
| tree | c811be150fe6cb6f761c77f1dda7d4923e68f688 /actions/imsettings.php | |
| parent | d9aea8cb9a99f3af302fc197314ba4da18e24723 (diff) | |
Resolve conflict
darcs-hash:20080714025853-533db-e215a2ab0277acafc1c01d2c12c20ec452ed53e2.gz
Diffstat (limited to 'actions/imsettings.php')
| -rw-r--r-- | actions/imsettings.php | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/actions/imsettings.php b/actions/imsettings.php index 70aff35f5..d1ed48efb 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')); |