diff options
Diffstat (limited to 'program/steps')
| -rw-r--r-- | program/steps/mail/compose.inc | 4 | ||||
| -rw-r--r-- | program/steps/settings/edit_identity.inc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index 4449ea0b2..38749675e 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -827,7 +827,7 @@ function rcmail_create_forward_body($body, $bodyIsHtml) if (!$bodyIsHtml) { - $prefix = "\n\n\n-------- Original Message --------\n"; + $prefix = "\n\n\n-------- " . rcube_label('originalmessage') . " --------\n"; $prefix .= 'Subject: ' . $MESSAGE->subject . "\n"; $prefix .= 'Date: ' . $MESSAGE->headers->date . "\n"; $prefix .= 'From: ' . $MESSAGE->get_header('from') . "\n"; @@ -848,7 +848,7 @@ function rcmail_create_forward_body($body, $bodyIsHtml) $body = rcmail_wash_html($body, array('safe' => $MESSAGE->is_safe), $cid_map); $prefix = sprintf( - "<br /><p>-------- Original Message --------</p>" . + "<br /><p>-------- " . rcube_label('originalmessage') . " --------</p>" . "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tbody>" . "<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">Subject: </th><td>%s</td></tr>" . "<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">Date: </th><td>%s</td></tr>" . diff --git a/program/steps/settings/edit_identity.inc b/program/steps/settings/edit_identity.inc index 426c18ed0..a42e8d091 100644 --- a/program/steps/settings/edit_identity.inc +++ b/program/steps/settings/edit_identity.inc @@ -28,7 +28,7 @@ if (($_GET['_iid'] || $_POST['_iid']) && $RCMAIL->action=='edit-identity') { if (is_array($IDENTITY_RECORD)) $OUTPUT->set_env('iid', $IDENTITY_RECORD['identity_id']); else { - $OUTPUT->show_message('databaserror', 'error'); + $OUTPUT->show_message('dberror', 'error'); // go to identities page rcmail_overwrite_action('identities'); return; |