Merge branch 'release-1.0' of github.com:roundcube/roundcubemail into relea...

Aleksander Machniak

2014-11-15 7e34e4c5b5dac037435d0fc2c6db1f71199006e0

 plugins/password/localization/en_CA.inc

@@ -15,7 +15,6 @@

 For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
*/
$labels['changepasswd']  = 'Change Password';
$labels['curpasswd']  = 'Current Password:';
$labels['newpasswd']  = 'New Password:';
$labels['confpasswd']  = 'Confirm New Password:';