Merge branch 'master' into 0.9.x

This commit is contained in:
Brion Vibber 2010-10-04 15:30:10 -07:00
commit 949ede654b

View File

@ -252,14 +252,14 @@ function mail_subscribe_notify_profile($listenee, $other)
// TRANS: Main body of new-subscriber notification e-mail // TRANS: Main body of new-subscriber notification e-mail
$body = sprintf(_('%1$s is now listening to your notices on %2$s.'."\n\n". $body = sprintf(_('%1$s is now listening to your notices on %2$s.'."\n\n".
"\t".'%3\$s'."\n\n". "\t".'%3$s'."\n\n".
'%4$s'. '%4$s'.
'%5$s'. '%5$s'.
'%6$s'. '%6$s'.
"\n".'Faithfully yours,'."\n".'%7\$s.'."\n\n". "\n".'Faithfully yours,'."\n".'%7$s.'."\n\n".
"----\n". "----\n".
"Change your email address or ". "Change your email address or ".
"notification options at ".'%8\$s' ."\n"), "notification options at ".'%8$s' ."\n"),
$long_name, $long_name,
common_config('site', 'name'), common_config('site', 'name'),
$other->profileurl, $other->profileurl,