diff options
| -rw-r--r-- | system/language/english/date_lang.php | 96 | ||||
| -rw-r--r-- | system/language/english/email_lang.php | 2 | ||||
| -rw-r--r-- | system/language/english/ftp_lang.php | 16 | ||||
| -rw-r--r-- | system/language/english/imglib_lang.php | 10 | ||||
| -rw-r--r-- | system/language/english/profiler_lang.php | 1 | ||||
| -rw-r--r-- | system/language/english/upload_lang.php | 38 | ||||
| -rw-r--r-- | user_guide/changelog.html | 1 |
7 files changed, 89 insertions, 75 deletions
diff --git a/system/language/english/date_lang.php b/system/language/english/date_lang.php index 02ebe7386..6b18aa7be 100644 --- a/system/language/english/date_lang.php +++ b/system/language/english/date_lang.php @@ -1,49 +1,49 @@ -<?php - -$lang['date_year'] = "Year"; -$lang['date_years'] = "Years"; -$lang['date_month'] = "Month"; -$lang['date_months'] = "Months"; -$lang['date_week'] = "Week"; -$lang['date_weeks'] = "Weeks"; -$lang['date_day'] = "Day"; -$lang['date_days'] = "Days"; -$lang['date_hour'] = "Hour"; -$lang['date_hours'] = "Hours"; -$lang['date_minute'] = "Minute"; -$lang['date_minutes'] = "Minutes"; -$lang['date_second'] = "Second"; -$lang['date_seconds'] = "Seconds"; - -$lang['UM12'] = "(UTC - 12:00) Enitwetok, Kwajalien"; -$lang['UM11'] = "(UTC - 11:00) Nome, Midway Island, Samoa"; -$lang['UM10'] = "(UTC - 10:00) Hawaii"; -$lang['UM9'] = "(UTC - 9:00) Alaska"; -$lang['UM8'] = "(UTC - 8:00) Pacific Time"; -$lang['UM7'] = "(UTC - 7:00) Mountain Time"; -$lang['UM6'] = "(UTC - 6:00) Central Time, Mexico City"; -$lang['UM5'] = "(UTC - 5:00) Eastern Time, Bogota, Lima, Quito"; -$lang['UM4'] = "(UTC - 4:00) Atlantic Time, Caracas, La Paz"; -$lang['UM25'] = "(UTC - 3:30) Newfoundland"; -$lang['UM3'] = "(UTC - 3:00) Brazil, Buenos Aires, Georgetown, Falkland Is."; -$lang['UM2'] = "(UTC - 2:00) Mid-Atlantic, Ascention Is., St Helena"; -$lang['UM1'] = "(UTC - 1:00) Azores, Cape Verde Islands"; -$lang['UTC'] = "(UTC) Casablanca, Dublin, Edinburgh, London, Lisbon, Monrovia"; -$lang['UP1'] = "(UTC + 1:00) Berlin, Brussels, Copenhagen, Madrid, Paris, Rome"; -$lang['UP2'] = "(UTC + 2:00) Kaliningrad, South Africa, Warsaw"; -$lang['UP3'] = "(UTC + 3:00) Baghdad, Riyadh, Moscow, Nairobi"; -$lang['UP25'] = "(UTC + 3:30) Tehran"; -$lang['UP4'] = "(UTC + 4:00) Adu Dhabi, Baku, Muscat, Tbilisi"; -$lang['UP35'] = "(UTC + 4:30) Kabul"; -$lang['UP5'] = "(UTC + 5:00) Islamabad, Karachi, Tashkent"; -$lang['UP45'] = "(UTC + 5:30) Bombay, Calcutta, Madras, New Delhi"; -$lang['UP6'] = "(UTC + 6:00) Almaty, Colomba, Dhakra"; -$lang['UP7'] = "(UTC + 7:00) Bangkok, Hanoi, Jakarta"; -$lang['UP8'] = "(UTC + 8:00) Beijing, Hong Kong, Perth, Singapore, Taipei"; -$lang['UP9'] = "(UTC + 9:00) Osaka, Sapporo, Seoul, Tokyo, Yakutsk"; -$lang['UP85'] = "(UTC + 9:30) Adelaide, Darwin"; -$lang['UP10'] = "(UTC + 10:00) Melbourne, Papua New Guinea, Sydney, Vladivostok"; -$lang['UP11'] = "(UTC + 11:00) Magadan, New Caledonia, Solomon Islands"; -$lang['UP12'] = "(UTC + 12:00) Auckland, Wellington, Fiji, Marshall Island"; - +<?php
+
+$lang['date_year'] = "Year";
+$lang['date_years'] = "Years";
+$lang['date_month'] = "Month";
+$lang['date_months'] = "Months";
+$lang['date_week'] = "Week";
+$lang['date_weeks'] = "Weeks";
+$lang['date_day'] = "Day";
+$lang['date_days'] = "Days";
+$lang['date_hour'] = "Hour";
+$lang['date_hours'] = "Hours";
+$lang['date_minute'] = "Minute";
+$lang['date_minutes'] = "Minutes";
+$lang['date_second'] = "Second";
+$lang['date_seconds'] = "Seconds";
+
+$lang['UM12'] = "(UTC - 12:00) Eniwetok, Kwajalein";
+$lang['UM11'] = "(UTC - 11:00) Nome, Midway Island, Samoa";
+$lang['UM10'] = "(UTC - 10:00) Hawaii";
+$lang['UM9'] = "(UTC - 9:00) Alaska";
+$lang['UM8'] = "(UTC - 8:00) Pacific Time";
+$lang['UM7'] = "(UTC - 7:00) Mountain Time";
+$lang['UM6'] = "(UTC - 6:00) Central Time, Mexico City";
+$lang['UM5'] = "(UTC - 5:00) Eastern Time, Bogota, Lima, Quito";
+$lang['UM4'] = "(UTC - 4:00) Atlantic Time, Caracas, La Paz";
+$lang['UM25'] = "(UTC - 3:30) Newfoundland";
+$lang['UM3'] = "(UTC - 3:00) Brazil, Buenos Aires, Georgetown, Falkland Is.";
+$lang['UM2'] = "(UTC - 2:00) Mid-Atlantic, Ascension Is., St. Helena";
+$lang['UM1'] = "(UTC - 1:00) Azores, Cape Verde Islands";
+$lang['UTC'] = "(UTC) Casablanca, Dublin, Edinburgh, London, Lisbon, Monrovia";
+$lang['UP1'] = "(UTC + 1:00) Berlin, Brussels, Copenhagen, Madrid, Paris, Rome";
+$lang['UP2'] = "(UTC + 2:00) Kaliningrad, South Africa, Warsaw";
+$lang['UP3'] = "(UTC + 3:00) Baghdad, Riyadh, Moscow, Nairobi";
+$lang['UP25'] = "(UTC + 3:30) Tehran";
+$lang['UP4'] = "(UTC + 4:00) Abu Dhabi, Baku, Muscat, Tbilisi";
+$lang['UP35'] = "(UTC + 4:30) Kabul";
+$lang['UP5'] = "(UTC + 5:00) Islamabad, Karachi, Tashkent";
+$lang['UP45'] = "(UTC + 5:30) Mumbai, Kolkata, Chennai, New Delhi";
+$lang['UP6'] = "(UTC + 6:00) Almaty, Colomba, Dhaka";
+$lang['UP7'] = "(UTC + 7:00) Bangkok, Hanoi, Jakarta";
+$lang['UP8'] = "(UTC + 8:00) Beijing, Hong Kong, Perth, Singapore, Taipei";
+$lang['UP9'] = "(UTC + 9:00) Osaka, Sapporo, Seoul, Tokyo, Yakutsk";
+$lang['UP85'] = "(UTC + 9:30) Adelaide, Darwin";
+$lang['UP10'] = "(UTC + 10:00) Melbourne, Papua New Guinea, Sydney, Vladivostok";
+$lang['UP11'] = "(UTC + 11:00) Magadan, New Caledonia, Solomon Islands";
+$lang['UP12'] = "(UTC + 12:00) Auckland, Wellington, Fiji, Marshall Islands";
+
?>
\ No newline at end of file diff --git a/system/language/english/email_lang.php b/system/language/english/email_lang.php index 040e0eaa3..f02686509 100644 --- a/system/language/english/email_lang.php +++ b/system/language/english/email_lang.php @@ -10,7 +10,7 @@ $lang['email_send_failure_sendmail'] = "Unable to send email using PHP Sendmail. $lang['email_send_failure_smtp'] = "Unable to send email using PHP SMTP. Your server might not be configured to send mail using this method.";
$lang['email_sent'] = "Your message has been successfully sent using the following protocol: %s";
$lang['email_no_socket'] = "Unable to open a socket to Sendmail. Please check settings.";
-$lang['email_no_hostname'] = "You did not specify a SMTP hostname";
+$lang['email_no_hostname'] = "You did not specify a SMTP hostname.";
$lang['email_smtp_error'] = "The following SMTP error was encountered: %s";
$lang['email_no_smtp_unpw'] = "Error: You must assign a SMTP username and password.";
$lang['email_failed_smtp_login'] = "Failed to send AUTH LOGIN command. Error: %s";
diff --git a/system/language/english/ftp_lang.php b/system/language/english/ftp_lang.php index a891ae5fc..0b7087a6c 100644 --- a/system/language/english/ftp_lang.php +++ b/system/language/english/ftp_lang.php @@ -1 +1,15 @@ -<?php
$lang['ftp_no_connection'] = "Unable to locate a valid connection ID. Please make sure you are connected before peforming 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_makdir'] = "Unable to create the directory you have specified.";
$lang['ftp_unable_to_changedir'] = "Unable to change directories.";
$lang['ftp_unable_to_chmod'] = "Unable to set file permissions. Please check your path. Note: This feature is only available in PHP 5 or higher.";
$lang['ftp_unable_to_upload'] = "Unable to upload the specified file. Please check your path.";
$lang['ftp_no_source_file'] = "Unable to locate the source file. Please check your path.";
$lang['ftp_unable_to_remame'] = "Unable to rename the file.";
$lang['ftp_unable_to_delete'] = "Unable to delete the file.";
$lang['ftp_unable_to_move'] = "Unable to move the file. Please make sure the destination directory exists.";
?>
\ No newline at end of file +<?php
+
+$lang['ftp_no_connection'] = "Unable to locate a valid connection ID. Please make sure you are connected before peforming 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_makdir'] = "Unable to create the directory you have specified.";
+$lang['ftp_unable_to_changedir'] = "Unable to change directories.";
+$lang['ftp_unable_to_chmod'] = "Unable to set file permissions. Please check your path. Note: This feature is only available in PHP 5 or higher.";
+$lang['ftp_unable_to_upload'] = "Unable to upload the specified file. Please check your path.";
+$lang['ftp_no_source_file'] = "Unable to locate the source file. Please check your path.";
+$lang['ftp_unable_to_remame'] = "Unable to rename the file.";
+$lang['ftp_unable_to_delete'] = "Unable to delete the file.";
+$lang['ftp_unable_to_move'] = "Unable to move the file. Please make sure the destination directory exists.";
+
+?>
\ No newline at end of file diff --git a/system/language/english/imglib_lang.php b/system/language/english/imglib_lang.php index 1921027f9..520f17f35 100644 --- a/system/language/english/imglib_lang.php +++ b/system/language/english/imglib_lang.php @@ -2,19 +2,19 @@ $lang['imglib_source_image_required'] = "You must specify a source image in your preferences.";
$lang['imglib_gd_required'] = "The GD image library is required for this feature.";
-$lang['imglib_gd_required_for_props'] = "Your server must support the GD image library in order to determine the image properties";
+$lang['imglib_gd_required_for_props'] = "Your server must support the GD image library in order to determine the image properties.";
$lang['imglib_unsupported_imagecreate'] = "Your server does not support the GD function required to process this type of image.";
$lang['imglib_gif_not_supported'] = "GIF images are often not supported due to licensing restrictions. You may have to use JPG or PNG images instead.";
-$lang['imglib_jpg_not_supported'] = "JPG images are not supported";
-$lang['imglib_png_not_supported'] = "PNG images are not supported";
+$lang['imglib_jpg_not_supported'] = "JPG images are not supported.";
+$lang['imglib_png_not_supported'] = "PNG images are not supported.";
$lang['imglib_jpg_or_png_required'] = "The image resize protocol specified in your preferences only works with JPEG or PNG image types.";
$lang['imglib_copy_error'] = "An error was encountered while attempting to replace the file. Please make sure your file directory is writable.";
$lang['imglib_rotate_unsupported'] = "Image rotation does not appear to be supported by your server.";
$lang['imglib_libpath_invalid'] = "The path to your image library is not correct. Please set the correct path in your image preferences.";
$lang['imglib_image_process_failed'] = "Image processing failed. Please verify that your server supports the chosen protocol and that the path to your image library is correct.";
$lang['imglib_rotation_angle_required'] = "An angle of rotation is required to rotate the image.";
-$lang['imglib_writing_failed_gif'] = "GIF image ";
-$lang['imglib_invalid_path'] = "The path to the image is not correct";
+$lang['imglib_writing_failed_gif'] = "GIF image.";
+$lang['imglib_invalid_path'] = "The path to the image is not correct.";
$lang['imglib_copy_failed'] = "The image copy routine failed.";
$lang['imglib_missing_font'] = "Unable to find a font to use.";
diff --git a/system/language/english/profiler_lang.php b/system/language/english/profiler_lang.php index b3a0dd3ba..219a83856 100644 --- a/system/language/english/profiler_lang.php +++ b/system/language/english/profiler_lang.php @@ -12,5 +12,4 @@ $lang['profiler_no_post'] = 'No POST data exists'; $lang['profiler_no_get'] = 'No GET data exists'; $lang['profiler_no_uri'] = 'No URI data exists'; $lang['profiler_no_memory'] = 'Memory Usage Unavailable'; - ?>
\ No newline at end of file diff --git a/system/language/english/upload_lang.php b/system/language/english/upload_lang.php index ab155acd2..fa6d7c9fb 100644 --- a/system/language/english/upload_lang.php +++ b/system/language/english/upload_lang.php @@ -1,20 +1,20 @@ -<?php - -$lang['upload_userfile_not_set'] = "Unable to find a post variable called userfile."; -$lang['upload_file_exceeds_limit'] = "The uploaded file exceeds the maximum allowed size in your PHP configuration file"; -$lang['upload_file_exceeds_form_limit'] = "The uploaded file exceeds the maximum size allowed by the submission form."; -$lang['upload_file_partial'] = "The file was only partially uploaded"; -$lang['upload_no_temp_directory'] = "The temporary folder is missing."; -$lang['upload_unable_to_write_file'] = "The file could not be written to disk."; -$lang['upload_stopped_by_extension'] = "The file upload was stopped by extension."; -$lang['upload_no_file_selected'] = "You did not select a file to upload"; -$lang['upload_invalid_filetype'] = "The filetype you are attempting to upload is not allowed"; -$lang['upload_invalid_filesize'] = "The file you are attempting to upload is larger than the permitted size"; -$lang['upload_invalid_dimensions'] = "The image you are attempting to upload exceedes the maximum height or width"; -$lang['upload_destination_error'] = "A problem was encountered while attempting to move the uploaded file to the final destination."; -$lang['upload_no_filepath'] = "The upload path does not appear to be valid."; -$lang['upload_no_file_types'] = "You have not specified any allowed file types."; -$lang['upload_bad_filename'] = "The file name you submitted already exists on the server."; -$lang['upload_not_writable'] = "The upload destination folder does not appear to be writable."; - +<?php
+
+$lang['upload_userfile_not_set'] = "Unable to find a post variable called userfile.";
+$lang['upload_file_exceeds_limit'] = "The uploaded file exceeds the maximum allowed size in your PHP configuration file.";
+$lang['upload_file_exceeds_form_limit'] = "The uploaded file exceeds the maximum size allowed by the submission form.";
+$lang['upload_file_partial'] = "The file was only partially uploaded.";
+$lang['upload_no_temp_directory'] = "The temporary folder is missing.";
+$lang['upload_unable_to_write_file'] = "The file could not be written to disk.";
+$lang['upload_stopped_by_extension'] = "The file upload was stopped by extension.";
+$lang['upload_no_file_selected'] = "You did not select a file to upload.";
+$lang['upload_invalid_filetype'] = "The filetype you are attempting to upload is not allowed.";
+$lang['upload_invalid_filesize'] = "The file you are attempting to upload is larger than the permitted size.";
+$lang['upload_invalid_dimensions'] = "The image you are attempting to upload exceedes the maximum height or width.";
+$lang['upload_destination_error'] = "A problem was encountered while attempting to move the uploaded file to the final destination.";
+$lang['upload_no_filepath'] = "The upload path does not appear to be valid.";
+$lang['upload_no_file_types'] = "You have not specified any allowed file types.";
+$lang['upload_bad_filename'] = "The file name you submitted already exists on the server.";
+$lang['upload_not_writable'] = "The upload destination folder does not appear to be writable.";
+
?>
\ No newline at end of file diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 8b086fb44..8889e279d 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -163,6 +163,7 @@ Change Log <li>Fixed a bug (#3289) in the File Helper where temp files in directories being tested with is_really_writable() were not being handled properly</li>
<li>Fixed a bug (#3279) where the Email class was sending the wrong Content-Transfer-Encoding for some character sets.</li>
<li>Fixed a bug (#3268) where the Router could leave '/' as the path.</li>
+ <li>Fixed a series of grammatical and spelling errors in the language files.</li>
<li>Fixed a bug in <kbd>highlight_phrase()</kbd> that caused an error with slashes.</li>
<li>Fixed a bug: $field_names[] vs $Ffield_names[] in postgre and sqlite drivers.</li>
<li>Fixed a bug in the <a href="./libraries/file_uploading.html">upload library</a> when allowed_files wasn't defined.</li>
|