From efc470f0ac7587707665e92701e3937c9b6cc78d Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 17 May 2014 03:27:17 -0400
Subject: [PATCH] Merge branch 'dev-text2html'

---
 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 45c91e3..0d0a691 100644
--- a/program/localization/en_US/messages.inc
+++ b/program/localization/en_US/messages.inc
@@ -139,7 +139,7 @@
 $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.';

--
Gitblit v1.9.1