From 7c8fd8031038e7958ef4dbb059e86decd6fefa28 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak <alec@alec.pl> Date: Sat, 30 Jun 2012 12:41:18 -0400 Subject: [PATCH] Show explicit error message when provided hostname is invalid (#1488550) --- program/localization/en_US/messages.inc | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/program/localization/en_US/messages.inc b/program/localization/en_US/messages.inc index aae086e..cabc999 100644 --- a/program/localization/en_US/messages.inc +++ b/program/localization/en_US/messages.inc @@ -7,7 +7,10 @@ | | | Language file of the Roundcube Webmail client | | Copyright (C) 2005-2010, The Roundcube Dev Team | - | Licensed under the GNU GPL | + | | + | Licensed under the GNU General Public License version 3 or | + | any later version with exceptions for skins & plugins. | + | See the README file for a full license statement. | | | +-----------------------------------------------------------------------+ | Author: Thomas Bruederli <roundcube@gmail.com> | @@ -18,16 +21,19 @@ */ $messages = array(); +$messages['errortitle'] = 'An error occurred!'; $messages['loginfailed'] = 'Login failed.'; $messages['cookiesdisabled'] = 'Your browser does not accept cookies.'; $messages['sessionerror'] = 'Your session is invalid or expired.'; -$messages['imaperror'] = 'Connection to IMAP server failed.'; +$messages['storageerror'] = 'Connection to storage server failed.'; $messages['servererror'] = 'Server Error!'; $messages['servererrormsg'] = 'Server Error: $msg'; $messages['dberror'] = 'Database Error!'; +$messages['requesttimedout'] = 'Request timed out'; $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.'; $messages['errornoperm'] = 'Unable to perform operation. Permission denied.'; $messages['invalidrequest'] = 'Invalid request! No data was saved.'; +$messages['invalidhost'] = 'Invalid server name.'; $messages['nomessagesfound'] = 'No messages found in this mailbox.'; $messages['loggedout'] = 'You have successfully terminated the session. Good bye!'; $messages['mailboxempty'] = 'Mailbox is empty.'; @@ -109,12 +115,14 @@ $messages['removingmember'] = 'Removing contact(s) from the group...'; $messages['receiptsent'] = 'Successfully sent a read receipt.'; $messages['errorsendingreceipt'] = 'Could not send the receipt.'; +$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?'; $messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.'; $messages['forbiddencharacter'] = 'Folder name contains a forbidden character.'; $messages['selectimportfile'] = 'Please select a file to upload.'; $messages['addresswriterror'] = 'The selected address book is not writeable.'; $messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.'; $messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.'; +$messages['nogroupassignmentschanged'] = 'No group assignments changed.'; $messages['importwait'] = 'Importing, please wait...'; $messages['importerror'] = 'Import failed! The uploaded file is not a valid vCard file.'; $messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>'; -- Gitblit v1.9.1