diff options
| author | Aleksander Machniak <alec@alec.pl> | 2014-05-17 09:27:17 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2014-05-17 09:27:17 +0200 |
| commit | efc470f0ac7587707665e92701e3937c9b6cc78d (patch) | |
| tree | 6674f2f57526f086e02755142f46901db74469c5 /program/localization/en_US/messages.inc | |
| parent | f1aaca6807742f7a890db152395d5c293b6e4e66 (diff) | |
| parent | c0a5aa5f5ff38ac7b8a650b07c134b7b86deb27f (diff) | |
Merge branch 'dev-text2html'
Conflicts:
program/js/app.js
Fix handling magic_quotes in rcube_text2html and rcube_html2text - move
stripslashes from these classes to action files
Diffstat (limited to 'program/localization/en_US/messages.inc')
| -rw-r--r-- | program/localization/en_US/messages.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/program/localization/en_US/messages.inc b/program/localization/en_US/messages.inc index 45c91e3d0..0d0a6916c 100644 --- a/program/localization/en_US/messages.inc +++ b/program/localization/en_US/messages.inc @@ -139,7 +139,7 @@ $messages['importmessagesuccess'] = 'Successfully imported $nr messages'; $messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file'; $messages['opnotpermitted'] = 'Operation not permitted!'; $messages['nofromaddress'] = 'Missing e-mail address in selected identity.'; -$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?'; +$messages['editorwarning'] = 'Switching editor type may cause text formatting to be lost. Do you wish to continue?'; $messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>'; $messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.'; $messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.'; |