diff options
| author | Evan Prodromou <evan@status.net> | 2009-11-10 14:26:49 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-11-10 14:26:49 -0500 |
| commit | 7ae10c27b0725a7108b63a788affd4d07e37afdc (patch) | |
| tree | 92f952319071ba770136d3e69a82e51040ecb6b5 /lib/mail.php | |
| parent | 8d5c2b3129a1d7cefd78e311d5cbbe9ab426bb72 (diff) | |
| parent | 737fe763471bcb6ebd95c318363308a33e28e889 (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
lib/util.php
Diffstat (limited to 'lib/mail.php')
| -rw-r--r-- | lib/mail.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/mail.php b/lib/mail.php index 79630b721..5218059e9 100644 --- a/lib/mail.php +++ b/lib/mail.php @@ -467,7 +467,7 @@ function mail_notify_nudge($from, $to) "these days and is inviting you to post some news.\n\n". "So let's hear from you :)\n\n". "%3\$s\n\n". - "Do not reply to this email. It will not get to them.\n\n". + "Don't reply to this email; it won't get to them.\n\n". "With kind regards,\n". "%4\$s\n"), $from_profile->getBestName(), @@ -516,7 +516,7 @@ function mail_notify_message($message, $from=null, $to=null) "------------------------------------------------------\n\n". "You can reply to their message here:\n\n". "%4\$s\n\n". - "Do not reply to this email. It will not get to them.\n\n". + "Don't reply to this email; it won't get to them.\n\n". "With kind regards,\n". "%5\$s\n"), $from_profile->getBestName(), @@ -532,7 +532,7 @@ function mail_notify_message($message, $from=null, $to=null) /** * notify a user that one of their notices has been chosen as a 'fave' * - * Does not check that the user has an email address nor if they + * Doesn't check that the user has an email address nor if they * want to receive notification of faves. Maybe this happens higher * up the stack...? * |