From fc52af24f1418d6590a2d37a0d8cc31b123e38f6 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli <thomas@roundcube.net> Date: Tue, 19 Aug 2014 12:08:35 -0400 Subject: [PATCH] Fix merge error that disabled contact drag'n'drop --- plugins/password/localization/en_US.inc | 29 ++++++++++++++++++++++++----- 1 files changed, 24 insertions(+), 5 deletions(-) diff --git a/plugins/password/localization/en_US.inc b/plugins/password/localization/en_US.inc index 9794bf0..dd57c13 100644 --- a/plugins/password/localization/en_US.inc +++ b/plugins/password/localization/en_US.inc @@ -1,5 +1,21 @@ <?php +/* + +-----------------------------------------------------------------------+ + | plugins/password/localization/<lang>.inc | + | | + | Localization file of the Roundcube Webmail Password plugin | + | Copyright (C) 2012, The Roundcube Dev Team | + | | + | 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. | + | | + +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/ +*/ + $labels = array(); $labels['changepasswd'] = 'Change Password'; $labels['curpasswd'] = 'Current Password:'; @@ -9,10 +25,13 @@ $messages = array(); $messages['nopassword'] = 'Please input new password.'; $messages['nocurpassword'] = 'Please input current password.'; -$messages['passwordincorrectly'] = 'Current password incorrectly.'; -$messages['passwordinconsistency'] = 'Inconsistency of password, please try again.'; -$messages['nocryptfunction'] = 'The server is missing a function to encrypt your password - contact your system adminstrator.'; -$messages['internalerror'] = 'The server is updated more than one row in the database. This could be bad for all users. Contact your system adminstrator.'; -$messages['errorsaving'] = 'Could not save your new password to the database. Contact your system adminstrator.'; +$messages['passwordincorrect'] = 'Current password incorrect.'; +$messages['passwordinconsistency'] = 'Passwords do not match, please try again.'; +$messages['crypterror'] = 'Could not save new password. Encryption function missing.'; +$messages['connecterror'] = 'Could not save new password. Connection error.'; +$messages['internalerror'] = 'Could not save new password.'; +$messages['passwordshort'] = 'Password must be at least $length characters long.'; +$messages['passwordweak'] = 'Password must include at least one number and one punctuation character.'; +$messages['passwordforbidden'] = 'Password contains forbidden characters.'; ?> -- Gitblit v1.9.1