diff options
| author | Andrew <browner12@gmail.com> | 2014-02-11 09:55:48 +0100 |
|---|---|---|
| committer | Andrew <browner12@gmail.com> | 2014-02-11 09:55:48 +0100 |
| commit | b6d8b962e44202a74c9b9321a4a53f61a753fccf (patch) | |
| tree | 2d3c533a55964a0d124f7cd6bb1d3d98c7b84056 /system/language | |
| parent | 41713aaa665189dd0a191c333c73c4a7b9f37c78 (diff) | |
| parent | 29e12641a1bb952f493462db6757ae12c7da1f2c (diff) | |
Merge branch 'develop' into patch-1
Conflicts:
system/libraries/Calendar.php
Diffstat (limited to 'system/language')
| -rw-r--r-- | system/language/english/ftp_lang.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/language/english/ftp_lang.php b/system/language/english/ftp_lang.php index 042ab55df..f0e89ff69 100644 --- a/system/language/english/ftp_lang.php +++ b/system/language/english/ftp_lang.php @@ -26,7 +26,7 @@ */ defined('BASEPATH') OR exit('No direct script access allowed'); -$lang['ftp_no_connection'] = 'Unable to locate a valid connection ID. Please make sure you are connected before peforming any file routines.'; +$lang['ftp_no_connection'] = 'Unable to locate a valid connection ID. Please make sure you are connected before performing any file routines.'; $lang['ftp_unable_to_connect'] = 'Unable to connect to your FTP server using the supplied hostname.'; $lang['ftp_unable_to_login'] = 'Unable to login to your FTP server. Please check your username and password.'; $lang['ftp_unable_to_mkdir'] = 'Unable to create the directory you have specified.'; |