diff --git a/phpBB/adm/style/acp_email.html b/phpBB/adm/style/acp_email.html index a44b276bee..5744136230 100644 --- a/phpBB/adm/style/acp_email.html +++ b/phpBB/adm/style/acp_email.html @@ -39,8 +39,8 @@
-
-
+
+

diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index 9279cb9b9b..41d00a3b41 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -4,9 +4,9 @@ -

{L_PERMISSIONS_TRANSFERED}

+

{L_PERMISSIONS_TRANSFERRED}

-

{L_PERMISSIONS_TRANSFERED_EXPLAIN}

+

{L_PERMISSIONS_TRANSFERRED_EXPLAIN}

diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html index 5a949ec38f..555ad399ec 100644 --- a/phpBB/docs/INSTALL.html +++ b/phpBB/docs/INSTALL.html @@ -271,7 +271,7 @@ p a {

All .php, .inc, .sql, .cfg, .html and .txt files should be uploaded in ASCII mode, while all graphics should be uploaded in BINARY mode. If you are unfamiliar with what this means please refer to your FTP client documentation. In most cases this is all handled transparantly by your ftp client but if you encounter problems later you should be sure the files where uploaded correctly as described here.

-

phpBB3 comes supplied with english as its standard language. However a number of seperate packs for different languages are available. If you are not a native english speaker you may wish to install one or more of these packages before continuing. The installation process below will allow you to select a default language from those available (you can of course change this default at a later stage). For more details of language packs, where to obtain them and how to install them please see the README.

+

phpBB3 comes supplied with english as its standard language. However a number of separate packs for different languages are available. If you are not a native english speaker you may wish to install one or more of these packages before continuing. The installation process below will allow you to select a default language from those available (you can of course change this default at a later stage). For more details of language packs, where to obtain them and how to install them please see the README.

Once all the files have been uploaded to your site you should point your browser at this location with the addition of install/. For example if your domain name is www.mydomain.tld and you placed phpBB3 in a directory /phpBB3 off your web root you would enter http://www.mydomain.tld/phpBB3/install/ or (alternatively) http://www.mydomain.tld/phpBB3/install/index.php into your browser. When you have done this you should see the phpBB3 Installation screen appear.

diff --git a/phpBB/docs/auth_api.html b/phpBB/docs/auth_api.html index edf23350ae..8e624eae83 100644 --- a/phpBB/docs/auth_api.html +++ b/phpBB/docs/auth_api.html @@ -216,7 +216,7 @@ body { $auth = new auth(); -

Once an instance of the class has been created you are free to call the various methods it contains. Please note that should you wish to use the auth_admin methods you will need to instantiate this seperately but in the same way.

+

Once an instance of the class has been created you are free to call the various methods it contains. Please note that should you wish to use the auth_admin methods you will need to instantiate this separately but in the same way.

Top @@ -349,9 +349,9 @@ $result = acl_getf_global(option)
-

A number of additional methods are available related to auth. These handle more basic functions such as adding user and group permissions, new options and clearing the user cache. These methods are contained within a seperate class, auth_admin. This can be found in includes/acp/auth.php.

+

A number of additional methods are available related to auth. These handle more basic functions such as adding user and group permissions, new options and clearing the user cache. These methods are contained within a separate class, auth_admin. This can be found in includes/acp/auth.php.

-

To use any methods this class contains it first needs to be instantiated seperately from auth. This is achieved in the same way as auth:

+

To use any methods this class contains it first needs to be instantiated separately from auth. This is achieved in the same way as auth:

 $auth_admin = new auth_admin();
diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html
index 0549671b95..9126cedf0e 100644
--- a/phpBB/docs/coding-guidelines.html
+++ b/phpBB/docs/coding-guidelines.html
@@ -256,7 +256,7 @@ p a {
 
 	
Files containing only classes:

 	
-	
Do not forget to comment the class. Classes need a seperate @package definition, it is the same as the header package name. Apart from this special case the above statement for files containing only functions needs to be applied to classes and it's methods too.

+	
Do not forget to comment the class. Classes need a separate @package definition, it is the same as the header package name. Apart from this special case the above statement for files containing only functions needs to be applied to classes and it's methods too.

 
 	
Code following the header but only functions/classes file:

 
@@ -291,7 +291,7 @@ class ...
 	
The following packages are defined, and related new features/functions should be placed within the mentioned files/locations, as well as specifying the correct package name. The package names are bold within this list:

 
 	
    
-		
  • phpBB3
    Core files and all files not assigned to a seperate package
    • 
+		
  • phpBB3
    Core files and all files not assigned to a separate package
    • 
 		
  • acm
    /includes/acm, /includes/cache.php
    Cache System
    • 
 		
  • acp
    /adm, /includes/acp, /includes/functions_admin.php
    Administration Control Panel
    • 
 		
  • dbal
    /includes/db
    Database Abstraction Layer.
    Base class is dbal
@@ -1018,7 +1018,7 @@ trigger_error($user->lang['NO_FORUM']);
 	
-trigger_error('NO_APPROPIATE_MODE', E_USER_ERROR);
+trigger_error('NO_APPROPRIATE_MODE', E_USER_ERROR);

Url formatting

@@ -1089,7 +1089,7 @@ append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=group&

Use div container/css for styling and table for data representation.

-

The seperate catXXXX and thXXX classes are gone. When defining a header cell just use <th> rather than <th class="thHead"> etc. Similarly for cat, don't use <td class="catLeft"> use <td class="cat"> etc.

+

The separate catXXXX and thXXX classes are gone. When defining a header cell just use <th> rather than <th class="thHead"> etc. Similarly for cat, don't use <td class="catLeft"> use <td class="cat"> etc.

Try to retain consistency of basic layout and class useage, i.e. _EXPLAIN text should generally be placed below the title it explains, e.g. {L_POST_USERNAME}<br /><span class="gensmall">{L_POST_USERNAME_EXPLAIN}</span> is the typical way of handling this ... there may be exceptions and this isn't a hard and fast rule.

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 4216464718..fa6b604c7b 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -153,7 +153,7 @@ class acp_board 'bump_interval' => array('lang' => 'BUMP_INTERVAL', 'validate' => 'int', 'type' => 'custom', 'method' => 'bump_interval', 'explain' => true), 'topics_per_page' => array('lang' => 'TOPICS_PER_PAGE', 'validate' => 'int', 'type' => 'text:3:4', 'explain' => false), 'posts_per_page' => array('lang' => 'POSTS_PER_PAGE', 'validate' => 'int', 'type' => 'text:3:4', 'explain' => false), - 'hot_threshold' => array('lang' => 'HOT_THRESHOLD', 'validate' => 'int', 'type' => 'text:3:4', 'explain' => false), + 'hot_threshold' => array('lang' => 'HOT_THRESHOLD', 'validate' => 'int', 'type' => 'text:3:4', 'explain' => true), 'max_poll_options' => array('lang' => 'MAX_POLL_OPTIONS', 'validate' => 'int', 'type' => 'text:4:4', 'explain' => false), 'max_post_chars' => array('lang' => 'CHAR_LIMIT', 'validate' => 'int', 'type' => 'text:4:6', 'explain' => true), 'max_post_smilies' => array('lang' => 'SMILIES_LIMIT', 'validate' => 'int', 'type' => 'text:4:4', 'explain' => true), diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php index 991b368a01..6b2904b245 100644 --- a/phpBB/includes/acp/acp_email.php +++ b/phpBB/includes/acp/acp_email.php @@ -38,7 +38,7 @@ class acp_email { // Error checking needs to go here ... if no subject and/or no message then skip // over the send and return to the form - $use_queue = (isset($_POST['send_immediatly'])) ? false : true; + $use_queue = (isset($_POST['send_immediately'])) ? false : true; $priority = request_var('mail_priority_flag', MAIL_NORMAL_PRIORITY); if (!$subject) diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index 9b1388a13d..978587a650 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -403,10 +403,8 @@ class acp_forums } // Make sure no direct child forums are able to be selected as parents. - $childs = get_forum_branch($forum_id, 'children'); - $exclude_forums = array(); - foreach ($childs as $row) + foreach (get_forum_branch($forum_id, 'children') as $row) { $exclude_forums[] = $row['forum_id']; } diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php index 06761d0fac..7147431259 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -381,7 +381,7 @@ class acp_groups $group_perm_from = request_var('group_perm_from', 0); // Copy permissions? - // If the user has the a_authgroups permission and at least one additional permission ability set the permissions are fully transfered. + // If the user has the a_authgroups permission and at least one additional permission ability set the permissions are fully transferred. // We do not limit on one auth category because this can lead to incomplete permissions being tricky to fix for the admin, roles being assigned or added non-default permissions. // Since the user only has the option to copy permissions from non leader managed groups this seems to be a good compromise. if ($group_perm_from && $action == 'add' && $auth->acl_get('a_authgroups') && $auth->acl_gets('a_aauth', 'a_fauth', 'a_mauth', 'a_uauth')) diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index d7e327e4d3..fad9ad47b7 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -43,7 +43,7 @@ class acp_main 'S_RESTORE_PERMISSIONS' => true, 'U_RESTORE_PERMISSIONS' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=restore_perm'), 'PERM_FROM' => $perm_from, - 'L_PERMISSIONS_TRANSFERED_EXPLAIN' => sprintf($user->lang['PERMISSIONS_TRANSFERED_EXPLAIN'], $perm_from, append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=restore_perm')), + 'L_PERMISSIONS_TRANSFERRED_EXPLAIN' => sprintf($user->lang['PERMISSIONS_TRANSFERRED_EXPLAIN'], $perm_from, append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=restore_perm')), )); return; diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php index 24a9ed832f..2eb45b4972 100644 --- a/phpBB/includes/acp/acp_modules.php +++ b/phpBB/includes/acp/acp_modules.php @@ -1025,14 +1025,6 @@ class acp_modules return $this->lang_name($target['module_langname']); } - - /** - * Check if the module or her childs hold the management module(s) - */ - function is_management_module($module_id) - { - - } } ?> \ No newline at end of file diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php index 4dcb8876e1..1dfda1b684 100644 --- a/phpBB/includes/acp/acp_search.php +++ b/phpBB/includes/acp/acp_search.php @@ -532,7 +532,7 @@ class acp_search /** * Initialises a search backend object * - * @return false if no error occured else an error message + * @return false if no error occurred else an error message */ function init_search($type, &$search, &$error) { diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index b301f6d2ce..8dc09ca1db 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -2095,7 +2095,7 @@ parse_css_file = {PARSE_CSS_FILE} ); } - // User has submitted form and no errors have occured + // User has submitted form and no errors have occurred if ($update && !sizeof($error)) { $sql_ary = array( @@ -2558,7 +2558,7 @@ parse_css_file = {PARSE_CSS_FILE} $style_row['style_active'] = request_var('style_active', 1); $style_row['style_default'] = request_var('style_default', 0); - // User has submitted form and no errors have occured + // User has submitted form and no errors have occurred if ($update && !sizeof($error)) { if ($mode == 'style') @@ -2693,7 +2693,7 @@ parse_css_file = {PARSE_CSS_FILE} } } - // User has submitted form and no errors have occured + // User has submitted form and no errors have occurred if ($update && !sizeof($error)) { if ($mode == 'style') diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index db34574b72..e3b7138189 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2115,7 +2115,7 @@ function bump_topic_allowed($forum_id, $topic_bumped, $last_post_time, $topic_po * @param string $words An array of words which should be contained in the result, has to be a valid part of a PCRE pattern (escape with preg_quote!) * @param int $length The desired length of the resulting text, however the result might be shorter or longer than this value * -* @return string Context of the specified words seperated by "..." +* @return string Context of the specified words separated by "..." */ function get_context($text, $words, $length = 400) { diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 4b40525881..31880d69cf 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -2616,7 +2616,7 @@ function get_remote_file($host, $directory, $filename, &$errstr, &$errno, $port * Tidy Warnings * Remove all warnings which have now expired from the database * The duration of a warning can be defined by the administrator -* This only removes the warning and reduces the assosciated count, +* This only removes the warning and reduces the associated count, * it does not remove the user note recording the contents of the warning */ function tidy_warnings() diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php index 85db5646b1..d4034d7019 100644 --- a/phpBB/includes/functions_convert.php +++ b/phpBB/includes/functions_convert.php @@ -301,7 +301,7 @@ function get_config_value($config_name) } /** -* Convert an IP address from the hexidecimal notation to normal dotted-quad notation +* Convert an IP address from the hexadecimal notation to normal dotted-quad notation */ function decode_ip($int_ip) { @@ -1207,7 +1207,7 @@ function update_folder_pm_count() $db->sql_freeresult($result); } -// Functions mainly used by the main converter script +// Functions mainly used by the main convertor script function path($path, $path_relative = true) { diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 8ee887e09b..1d96d5c4dd 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -982,7 +982,7 @@ class smtp_class { fputs($this->socket, $command . "\r\n"); - (!$private_info) ? $this->add_backtrace("# $command") : $this->add_backtrace('# Ommitting sensitive information'); + (!$private_info) ? $this->add_backtrace("# $command") : $this->add_backtrace('# Omitting sensitive information'); // We could put additional code here } diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index ef5afdecd8..62cdb99596 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -9,7 +9,7 @@ */ /** -* Fill smiley templates (or just the variables) with smileys, either in a window or inline +* Fill smiley templates (or just the variables) with smilies, either in a window or inline */ function generate_smilies($mode, $forum_id) { diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php index 9296d254e5..7677f4ba34 100644 --- a/phpBB/includes/functions_privmsgs.php +++ b/phpBB/includes/functions_privmsgs.php @@ -17,7 +17,7 @@ if (!defined('IN_PHPBB')) /* Ability to simply add own rules by doing three things: - 1) Add an appropiate constant + 1) Add an appropriate constant 2) Add a new check array to the global_privmsgs_rules variable and the condition array (if one is required) 3) Add a new language variable to ucp.php @@ -313,7 +313,7 @@ function check_rule(&$rules, &$rule_row, &$message_row, $user_id) } /** -* Place new messages into appropiate folder +* Place new messages into appropriate folder */ function place_pm_into_folder(&$global_privmsgs_rules, $release = false) { @@ -347,7 +347,7 @@ function place_pm_into_folder(&$global_privmsgs_rules, $release = false) AND t.folder_id = " . PRIVMSGS_NO_BOX . ' AND t.msg_id = p.msg_id'; - // Just place into the appropiate arrays if no rules need to be checked + // Just place into the appropriate arrays if no rules need to be checked if (!$user_message_rules) { $result = $db->sql_query($retrieve_sql); @@ -420,7 +420,7 @@ function place_pm_into_folder(&$global_privmsgs_rules, $release = false) $db->sql_freeresult($result); } - // Now place into the appropiate folder + // Now place into the appropriate folder foreach ($check_rows as $row) { // Add membership if set diff --git a/phpBB/includes/functions_template.php b/phpBB/includes/functions_template.php index 3c7259fe0a..e7ef24a49a 100644 --- a/phpBB/includes/functions_template.php +++ b/phpBB/includes/functions_template.php @@ -112,7 +112,7 @@ class template_compile // if they wish to display < and > $this->remove_php_tags($code); - // Pull out all block/statement level elements and seperate plain text + // Pull out all block/statement level elements and separate plain text preg_match_all('#(.*?)#s', $code, $matches); $php_blocks = $matches[1]; $code = preg_replace('#.*?#s', '', $code); @@ -209,7 +209,7 @@ class template_compile $template_php .= (!$no_echo) ? ((!empty($trim_check_text)) ? $text_blocks[$i] : '') . ((!empty($compile_blocks[$i])) ? $compile_blocks[$i] : '') : ((!empty($trim_check_text)) ? $text_blocks[$i] : '') . ((!empty($compile_blocks[$i])) ? $compile_blocks[$i] : ''); } - // There will be a number of occassions where we switch into and out of + // There will be a number of occasions where we switch into and out of // PHP mode instantaneously. Rather than "burden" the parser with this // we'll strip out such occurences, minimising such switching $template_php = str_replace(' ?>sql_freeresult($result); } - // If no data was returned one or more of the following occured: + // If no data was returned one or more of the following occurred: // Key didn't match one in the DB // User does not exist // User is inactive @@ -1446,7 +1446,7 @@ class user extends session // $lang == $this->lang // $help == $this->help - // - add appropiate variables here, name them as they are used within the language file... + // - add appropriate variables here, name them as they are used within the language file... if (!$use_db) { if ((include($this->lang_path . (($use_help) ? 'help_' : '') . "$lang_file.$phpEx")) === false) diff --git a/phpBB/includes/template.php b/phpBB/includes/template.php index a2e04e4ab4..259874488d 100644 --- a/phpBB/includes/template.php +++ b/phpBB/includes/template.php @@ -473,7 +473,7 @@ class template } /** - * Include a seperate template + * Include a separate template * @access private */ function _tpl_include($filename, $include = true) diff --git a/phpBB/includes/ucp/ucp_pm.php b/phpBB/includes/ucp/ucp_pm.php index b9c069e47e..b1f016e149 100644 --- a/phpBB/includes/ucp/ucp_pm.php +++ b/phpBB/includes/ucp/ucp_pm.php @@ -239,7 +239,7 @@ class ucp_pm handle_mark_actions($user->data['user_id'], $mark_option); } - // If new messages arrived, place them into the appropiate folder + // If new messages arrived, place them into the appropriate folder $num_not_moved = $num_removed = 0; if ($user->data['user_new_privmsg'] && $action == 'view_folder') diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index 714f5ec0aa..ce6087f424 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -574,8 +574,6 @@ function compose_pm($id, $mode, $action) // Preview if (!sizeof($error) && $preview) { - $post_time = ($action == 'edit') ? $post_time : $current_time; - $preview_message = $message_parser->format_display($enable_bbcode, $enable_urls, $enable_smilies, false); $preview_signature = $user->data['user_sig']; diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php index bdde227e95..043441c54b 100644 --- a/phpBB/install/convertors/functions_phpbb20.php +++ b/phpBB/install/convertors/functions_phpbb20.php @@ -894,7 +894,7 @@ function phpbb_convert_authentication($mode) // Let us see if guests/registered users have access to these forums... foreach ($parent_forums as $row) { - // Get the childs... + // Get the children $branch = $forum_ids = array(); foreach ($forums as $key => $_row) diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 5b909a1fe6..8fd30020a1 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -8,7 +8,7 @@ * */ -$updates_to_version = '3.0.B4'; +$updates_to_version = '3.0.B5'; if (defined('IN_PHPBB') && defined('IN_INSTALL')) { diff --git a/phpBB/install/index.php b/phpBB/install/index.php index b02fc5d973..0a8a45b771 100755 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -600,7 +600,7 @@ class module } /** - * Generate the relevant HTML for an input field and the assosciated label and explanatory text + * Generate the relevant HTML for an input field and the associated label and explanatory text */ function input_field($name, $type, $value='', $options='') { diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index a62b122014..117c2f64fa 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -1010,7 +1010,7 @@ class install_update extends module return; } - // Check for existance, else abort immediatly + // Check for existance, else abort immediately if (!file_exists($this->old_location . $original_file) || !file_exists($this->new_location . $original_file)) { trigger_error($user->lang['INCOMPLETE_UPDATE_FILES'], E_USER_ERROR); diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php index 247e045416..121069a6f8 100644 --- a/phpBB/language/en/acp/attachments.php +++ b/phpBB/language/en/acp/attachments.php @@ -134,11 +134,11 @@ $lang = array_merge($lang, array( 'SECURE_DOWNLOAD_NOTICE' => 'Secure Downloads are not enabled. The settings below will be applied after enabling secure downloads.', 'SECURE_DOWNLOAD_UPDATE_SUCCESS'=> 'The IP list has been updated successfully.', 'SECURE_EMPTY_REFERRER' => 'Allow empty referrer', - 'SECURE_EMPTY_REFERRER_EXPLAIN' => 'Secure downloads are based on referrers. Do you want to allow downloads for those ommitting the referrer?', + 'SECURE_EMPTY_REFERRER_EXPLAIN' => 'Secure downloads are based on referrers. Do you want to allow downloads for those omitting the referrer?', 'SETTINGS_CAT_IMAGES' => 'Image category settings', 'SPECIAL_CATEGORY' => 'Special category', 'SPECIAL_CATEGORY_EXPLAIN' => 'Special categories differ between the way presented within posts.', - 'SUCCESSFULLY_UPLOADED' => 'Succeessfully uploaded', + 'SUCCESSFULLY_UPLOADED' => 'Successfully uploaded', 'SUCCESS_EXTENSION_GROUP_ADD' => 'Extension group successfully added', 'SUCCESS_EXTENSION_GROUP_EDIT' => 'Extension group successfully updated', diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index ebd6f7ff36..865a68d60b 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -139,7 +139,8 @@ $lang = array_merge($lang, array( 'EDIT_TIME_EXPLAIN' => 'Limits the time available to edit a new post. Setting the value to 0 disables this behaviour.', 'FLOOD_INTERVAL' => 'Flood interval', 'FLOOD_INTERVAL_EXPLAIN' => 'Number of seconds a user must wait between posting new messages. To enable users to ignore this alter their permissions.', - 'HOT_THRESHOLD' => 'Posts per topic threshold required for the hot topic annotation. Set to 0 to disable hot topics.', + 'HOT_THRESHOLD' => 'Hot topic threshold', + 'HOT_THRESHOLD_EXPLAIN' => 'Posts per topic threshold required for the hot topic annotation. Set to 0 to disable hot topics.', 'MAX_POLL_OPTIONS' => 'Maximum number of poll options', 'MAX_POST_FONT_SIZE' => 'Maximum font size per post', 'MAX_POST_FONT_SIZE_EXPLAIN' => 'Maximum font size allowed in a post. Set to 0 for unlimited font size.', @@ -165,13 +166,13 @@ $lang = array_merge($lang, array( 'MAX_SIG_FONT_SIZE' => 'Maximum signature font size', 'MAX_SIG_FONT_SIZE_EXPLAIN' => 'Maximum font size allowed in user signatures. Set to 0 for unlimited size.', 'MAX_SIG_IMG_HEIGHT' => 'Maximum signature image height', - 'MAX_SIG_IMG_HEIGHT_EXPLAIN' => 'Maximum height of an image/flash file in user signatures. Set to 0 for unlimited size.', + 'MAX_SIG_IMG_HEIGHT_EXPLAIN' => 'Maximum height of an image/flash file in user signatures. Set to 0 for unlimited height.', 'MAX_SIG_IMG_WIDTH' => 'Maximum signature image width', - 'MAX_SIG_IMG_WIDTH_EXPLAIN' => 'Maximum width of an image/flash file in user signatures. Set to 0 for unlimited size.', + 'MAX_SIG_IMG_WIDTH_EXPLAIN' => 'Maximum width of an image/flash file in user signatures. Set to 0 for unlimited width.', 'MAX_SIG_LENGTH' => 'Maximum signature length', 'MAX_SIG_LENGTH_EXPLAIN' => 'Maximum number of characters in user signatures.', 'MAX_SIG_SMILIES' => 'Maximum smilies per signature', - 'MAX_SIG_SMILIES_EXPLAIN' => 'Maximum smilies allowed in user signatures. Set to 0 for unlimited size.', + 'MAX_SIG_SMILIES_EXPLAIN' => 'Maximum smilies allowed in user signatures. Set to 0 for unlimited smilies.', 'MAX_SIG_URLS' => 'Maximum signature links', 'MAX_SIG_URLS_EXPLAIN' => 'Maximum number of links in user signatures. Set to 0 for unlimited links.', )); @@ -411,14 +412,14 @@ $lang = array_merge($lang, array( 'ERR_JAB_CONNECT' => 'Could not connect to Jabber server.', 'ERR_JAB_PASSCHG' => 'Could not change password.', 'ERR_JAB_PASSFAIL' => 'Password update failed, %s.', - 'ERR_JAB_REGISTER' => 'An error occured trying to register this account, %s.', + 'ERR_JAB_REGISTER' => 'An error occurred trying to register this account, %s.', 'ERR_JAB_USERNAME' => 'The username specified already exists, please choose an alternative.', 'JAB_CHANGED' => 'Jabber account changed successfully.', 'JAB_ENABLE' => 'Enable Jabber', 'JAB_ENABLE_EXPLAIN' => 'Enables use of jabber messaging and notifications', 'JAB_PACKAGE_SIZE' => 'Jabber package size', - 'JAB_PACKAGE_SIZE_EXPLAIN' => 'This is the number of messages sent in one package. If set to 0 the message is sent immediately and gets not queued for later sending.', + 'JAB_PACKAGE_SIZE_EXPLAIN' => 'This is the number of messages sent in one package. If set to 0 the message is sent immediately and is not queued for later sending.', 'JAB_PASSWORD' => 'Jabber password', 'JAB_PASS_CHANGED' => 'Jabber password changed successfully.', 'JAB_PORT' => 'Jabber port', diff --git a/phpBB/language/en/acp/bots.php b/phpBB/language/en/acp/bots.php index 875af18b9b..d06a90d363 100644 --- a/phpBB/language/en/acp/bots.php +++ b/phpBB/language/en/acp/bots.php @@ -48,7 +48,7 @@ $lang = array_merge($lang, array( 'BOT_LANG_EXPLAIN' => 'The language presented to the bot as it browses.', 'BOT_LAST_VISIT' => 'Last visit', 'BOT_IP' => 'Bot IP address', - 'BOT_IP_EXPLAIN' => 'Partial matches are allowed, seperate addresses with a comma.', + 'BOT_IP_EXPLAIN' => 'Partial matches are allowed, separate addresses with a comma.', 'BOT_NAME' => 'Bot name', 'BOT_NAME_EXPLAIN' => 'Used only for your own information.', 'BOT_NEVER' => 'Never', diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 09f6ddcc35..d58c83a7ea 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -248,21 +248,21 @@ $lang = array_merge($lang, array( 'PARSE_BBCODE' => 'Parse BBCode', 'PARSE_SMILIES' => 'Parse smilies', 'PARSE_URLS' => 'Parse links', - 'PERMISSIONS_TRANSFERED' => 'Permissions transfered', - 'PERMISSIONS_TRANSFERED_EXPLAIN' => 'You are currently having the permissions from %1$s. You are able to browse the forum with the users permissions but not access the administration control panel since admin permissions were not transfered. You are able to revert to your permission set at any time.', + 'PERMISSIONS_TRANSFERRED' => 'Permissions transferred', + 'PERMISSIONS_TRANSFERRED_EXPLAIN' => 'You are currently having the permissions from %1$s. You are able to browse the forum with the users permissions but not access the administration control panel since admin permissions were not transferred. You are able to revert to your permission set at any time.', 'PIXEL' => 'px', 'PROCEED_TO_ACP' => '%sProceed to the ACP%s', 'REMIND' => 'Remind', 'REORDER' => 'Reorder', - 'RESYNC' => 'Resyncronise', + 'RESYNC' => 'Resynchronise', 'RETURN_TO' => 'Return to…', 'SELECT_ANONYMOUS' => 'Select anonymous user', 'SELECT_OPTION' => 'Select option', 'UCP' => 'User Control Panel', - 'USERNAMES_EXPLAIN' => 'Place each username on a seperate line', + 'USERNAMES_EXPLAIN' => 'Place each username on a separate line', 'USER_CONTROL_PANEL' => 'User Control Panel', 'WARNING' => 'Warning', @@ -320,9 +320,9 @@ $lang = array_merge($lang, array( 'RESET_DATE' => 'Reset date', 'RESET_ONLINE' => 'Reset online', - 'RESYNC_POSTCOUNTS' => 'Resyncronise post counts', - 'RESYNC_POST_MARKING' => 'Resyncronise dotted topics', - 'RESYNC_STATS' => 'Resyncronise statistics', + 'RESYNC_POSTCOUNTS' => 'Resynchronise post counts', + 'RESYNC_POST_MARKING' => 'Resynchronise dotted topics', + 'RESYNC_STATS' => 'Resynchronise statistics', 'STATISTIC' => 'Statistic', @@ -348,7 +348,7 @@ $lang = array_merge($lang, array( 'INACTIVE_REASON_REMIND' => 'Forced user account reactivation', 'INACTIVE_REASON_UNKNOWN' => 'Unknown', 'INACTIVE_USERS' => 'Inactive users', - 'INACTIVE_USERS_EXPLAIN' => 'This is a list of users who have registered but whos accounts are inactive. You can activate, delete or remind (by sending an email) these users if you wish.', + 'INACTIVE_USERS_EXPLAIN' => 'This is a list of users who have registered but whose accounts are inactive. You can activate, delete or remind (by sending an email) these users if you wish.', 'INACTIVE_USERS_EXPLAIN_INDEX' => 'This is a list of the last 10 registered users who have inactive accounts. A full list is available from the appropriate menu item or by following the link below from where you can activate, delete or remind (by sending an email) these users if you wish.', 'NO_INACTIVE_USERS' => 'No inactive users', @@ -386,7 +386,7 @@ $lang = array_merge($lang, array( 'LOG_ACL_DEL_MOD_LOCAL_M_' => 'Removed Moderators from %1$s
» %2$s', 'LOG_ACL_DEL_FORUM_LOCAL_F_' => 'Removed User/Group forum permissions from %1$s
» %2$s', - 'LOG_ACL_TRANSFER_PERMISSIONS' => 'Permissions transfered from
» %s', + 'LOG_ACL_TRANSFER_PERMISSIONS' => 'Permissions transferred from
» %s', 'LOG_ACL_RESTORE_PERMISSIONS' => 'Own permissions restored after using permissions from
» %s', 'LOG_ADMIN_AUTH_FAIL' => 'Failed administration login attempt', @@ -466,7 +466,7 @@ $lang = array_merge($lang, array( 'LOG_DB_BACKUP' => 'Database backup', 'LOG_DB_RESTORE' => 'Database restore', - 'LOG_DOWNLOAD_EXCLUDE_IP' => 'Exluded IP/hostname from download list
» %s', + 'LOG_DOWNLOAD_EXCLUDE_IP' => 'Excluded IP/hostname from download list
» %s', 'LOG_DOWNLOAD_IP' => 'Added IP/hostname to download list
» %s', 'LOG_DOWNLOAD_REMOVE_IP' => 'Removed IP/hostname from download list
» %s', @@ -572,9 +572,9 @@ $lang = array_merge($lang, array( 'LOG_RESET_DATE' => 'Board start date reset', 'LOG_RESET_ONLINE' => 'Most users online reset', - 'LOG_RESYNC_POSTCOUNTS' => 'User post counts resyncronised', - 'LOG_RESYNC_POST_MARKING' => 'Dotted topics resyncronised', - 'LOG_RESYNC_STATS' => 'Post, topic and user statistics resyncronised', + 'LOG_RESYNC_POSTCOUNTS' => 'User post counts resynchronised', + 'LOG_RESYNC_POST_MARKING' => 'Dotted topics resynchronised', + 'LOG_RESYNC_STATS' => 'Post, topic and user statistics resynchronised', 'LOG_STYLE_ADD' => 'Added new style
» %s', 'LOG_STYLE_DELETE' => 'Deleted style
» %s', diff --git a/phpBB/language/en/acp/email.php b/phpBB/language/en/acp/email.php index f959eb21bb..1fdd833f94 100644 --- a/phpBB/language/en/acp/email.php +++ b/phpBB/language/en/acp/email.php @@ -43,7 +43,7 @@ $lang = array_merge($lang, array( 'LOG_SESSION' => 'Log mail session to critical log', - 'SEND_IMMEDIATLY' => 'Send immediately', + 'SEND_IMMEDIATELY' => 'Send immediately', 'SEND_TO_GROUP' => 'Send to group', 'SEND_TO_USERS' => 'Send to users', 'SEND_TO_USERS_EXPLAIN' => 'Entering names here will override any group selected above. Enter each username on a new line.', diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php index f6a2e88d84..443241702b 100644 --- a/phpBB/language/en/acp/forums.php +++ b/phpBB/language/en/acp/forums.php @@ -93,7 +93,7 @@ $lang = array_merge($lang, array( 'FORUM_RULES_LINK' => 'Link to forum rules', 'FORUM_RULES_LINK_EXPLAIN' => 'You are able to enter the URL of the page/post containing your forum rules here. This setting will override the forum rules text you specified.', 'FORUM_RULES_PREVIEW' => 'Forum rules preview', - 'FORUM_RULES_TOO_LONG' => 'The forum description is too long, it must be less than 4000 characters.', + 'FORUM_RULES_TOO_LONG' => 'The forum rules must be less than 4000 characters.', 'FORUM_SETTINGS' => 'Forum settings', 'FORUM_STATUS' => 'Forum status', 'FORUM_STYLE' => 'Forum style', diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php index 4d4f08c9b3..ec40ddbdf4 100644 --- a/phpBB/language/en/acp/groups.php +++ b/phpBB/language/en/acp/groups.php @@ -33,7 +33,7 @@ if (empty($lang) || !is_array($lang)) $lang = array_merge($lang, array( 'ACP_GROUPS_MANAGE_EXPLAIN' => 'From this panel you can administrate all your usergroups, you can delete, create and edit existing groups. You may choose moderators, toggle open/closed group status and set the group name and description.', 'ADD_USERS' => 'Add users', - 'ADD_USERS_EXPLAIN' => 'Here you can add new users to the group. You may select whether this group becomes the new default for the selected users. Additionally you can define them as group leaders. Please enter each username on a seperate line.', + 'ADD_USERS_EXPLAIN' => 'Here you can add new users to the group. You may select whether this group becomes the new default for the selected users. Additionally you can define them as group leaders. Please enter each username on a separate line.', 'COPY_PERMISSIONS' => 'Copy permissions from', 'COPY_PERMISSIONS_EXPLAIN' => 'Once created, the group will have the same permissions as the one you select here.', @@ -69,7 +69,7 @@ $lang = array_merge($lang, array( 'GROUP_LIST' => 'Current members', 'GROUP_LIST_EXPLAIN' => 'This is a complete list of all the current users with membership of this group. You can delete members (except in certain special groups) or add new ones as you see fit.', 'GROUP_MEMBERS' => 'Group members', - 'GROUP_MEMBERS_EXPLAIN' => 'This is a complete listing of all the members of this usergroup. It includes seperate sections for leaders, pending and existing members. From here you can manage all aspects of who has membership of this group and what their role is. To remove a leader but keep them in the group use Demote rather than delete. Similarly use Promote to make an existing member a leader.', + 'GROUP_MEMBERS_EXPLAIN' => 'This is a complete listing of all the members of this usergroup. It includes separate sections for leaders, pending and existing members. From here you can manage all aspects of who has membership of this group and what their role is. To remove a leader but keep them in the group use Demote rather than delete. Similarly use Promote to make an existing member a leader.', 'GROUP_MESSAGE_LIMIT' => 'Group private message limit per folder', 'GROUP_MESSAGE_LIMIT_EXPLAIN' => 'This setting overrides the per-user folder message limit. A value of 0 means the user default limit will be used.', 'GROUP_MODS_ADDED' => 'New group moderators added successfully.', diff --git a/phpBB/language/en/acp/language.php b/phpBB/language/en/acp/language.php index afd79e4301..eaad88a9f7 100644 --- a/phpBB/language/en/acp/language.php +++ b/phpBB/language/en/acp/language.php @@ -47,11 +47,11 @@ $lang = array_merge($lang, array( 'LANGUAGE_DETAILS_UPDATED' => 'Language details successfully updated.', 'LANGUAGE_ENTRIES' => 'Language entries', - 'LANGUAGE_ENTRIES_EXPLAIN' => 'Here you are able to change existing language pack entries or not already translated ones.
Note: Once you changed a language file, the changes will be stored within a seperate folder for you to download. The changes will not be seen by your users until you replace the original language files at your webspace (by uploading them).', + 'LANGUAGE_ENTRIES_EXPLAIN' => 'Here you are able to change existing language pack entries or not already translated ones.
Note: Once you changed a language file, the changes will be stored within a separate folder for you to download. The changes will not be seen by your users until you replace the original language files at your webspace (by uploading them).', 'LANGUAGE_FILES' => 'Language files', 'LANGUAGE_KEY' => 'Language key', 'LANGUAGE_PACK_ALREADY_INSTALLED' => 'This language pack is already installed.', - 'LANGUAGE_PACK_DELETED' => 'The language pack %s has been removed successfully. All users using this language have been resetted to the boards default language.', + 'LANGUAGE_PACK_DELETED' => 'The language pack %s has been removed successfully. All users using this language have been reset to the boards default language.', 'LANGUAGE_PACK_DETAILS' => 'Language pack details', 'LANGUAGE_PACK_INSTALLED' => 'The language pack %s has been successfully installed.', 'LANGUAGE_PACK_ISO' => 'ISO', diff --git a/phpBB/language/en/acp/modules.php b/phpBB/language/en/acp/modules.php index 5a0d98c63b..86f02cd06f 100644 --- a/phpBB/language/en/acp/modules.php +++ b/phpBB/language/en/acp/modules.php @@ -36,7 +36,7 @@ $lang = array_merge($lang, array( 'ADD_MODULE_CONFIRM' => 'Are you sure you want to add the selected module with the selected mode?', 'ADD_MODULE_TITLE' => 'Add module', - 'CANNOT_REMOVE_MODULE' => 'Unable to remove module, it has assigned childs. Please remove or move all childs before performing this action', + 'CANNOT_REMOVE_MODULE' => 'Unable to remove module, it has assigned children. Please remove or move all children before performing this action.', 'CATEGORY' => 'Category', 'CHOOSE_MODE' => 'Choose module mode', 'CHOOSE_MODE_EXPLAIN' => 'Choose the modules mode being used.', @@ -64,7 +64,7 @@ $lang = array_merge($lang, array( 'MODULE_LANGNAME_EXPLAIN' => 'Enter the displayed module name. Use language constant if name is served from language file.', 'MODULE_TYPE' => 'Module type', - 'NO_CATEGORY_TO_MODULE' => 'Unable to turn category into module. Please remove/move all childs before performing this action.', + 'NO_CATEGORY_TO_MODULE' => 'Unable to turn category into module. Please remove/move all children before performing this action.', 'NO_MODULE' => 'No module found.', 'NO_MODULE_ID' => 'No module id specified.', 'NO_MODULE_LANGNAME' => 'No module language name specified.', diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php index 611d080255..ffc104648d 100644 --- a/phpBB/language/en/acp/permissions.php +++ b/phpBB/language/en/acp/permissions.php @@ -77,13 +77,13 @@ $lang = array_merge($lang, array( 'ACP_FORUM_PERMISSIONS_EXPLAIN' => 'Here you can alter which users and groups can access which forums. To assign moderators or define administrators please use the appropriate page.', 'ACP_GLOBAL_MODERATORS_EXPLAIN' => 'Here you can assign global moderator rights to users or groups. These moderators are like ordinary moderators except they have access to every forum on your board.', 'ACP_GROUPS_FORUM_PERMISSIONS_EXPLAIN' => 'Here you can assign forum permissions to groups.', - 'ACP_GROUPS_PERMISSIONS_EXPLAIN' => 'Here you can assign global permissions to groups - user permissions, global moderator permissions and admin permissions. User permissions include capabilities such as the use of avatars, sending private messages, etc. Global moderator permissions are blabla, administrative permissions blabla. Individual users permissions should only be changed in rare occassions, the preferred method is putting users in groups and assigning the groups permissions.', + 'ACP_GROUPS_PERMISSIONS_EXPLAIN' => 'Here you can assign global permissions to groups - user permissions, global moderator permissions and admin permissions. User permissions include capabilities such as the use of avatars, sending private messages, etc. Global moderator permissions are blabla, administrative permissions blabla. Individual users permissions should only be changed in rare occasions, the preferred method is putting users in groups and assigning the groups permissions.', 'ACP_ADMIN_ROLES_EXPLAIN' => 'Here you are able to manage the roles for administrative permissions. Roles are effective permissions, if you change a role the items having this role assigned will change it’s permissions too.', 'ACP_FORUM_ROLES_EXPLAIN' => 'Here you are able to manage the roles for forum permissions. Roles are effective permissions, if you change a role the items having this role assigned will change it’s permissions too.', 'ACP_MOD_ROLES_EXPLAIN' => 'Here you are able to manage the roles for moderative permissions. Roles are effective permissions, if you change a role the items having this role assigned will change it’s permissions too.', 'ACP_USER_ROLES_EXPLAIN' => 'Here you are able to manage the roles for user permissions. Roles are effective permissions, if you change a role the items having this role assigned will change it’s permissions too.', 'ACP_USERS_FORUM_PERMISSIONS_EXPLAIN' => 'Here you can assign forum permissions to users.', - 'ACP_USERS_PERMISSIONS_EXPLAIN' => 'Here you can assign global permissions to users - user permissions, global moderator permissions and administrator permissions. User permissions include capabilities such as the use of avatars, sending private messages, etc. Global moderator permissions are blabla, administrative permissions blabla. To alter these settings for large numbers of users the Group permissions system is the prefered method. User’s permissions should only be changed in rare occassions, the preferred method is putting users in groups and assigning the group’s permissions.', + 'ACP_USERS_PERMISSIONS_EXPLAIN' => 'Here you can assign global permissions to users - user permissions, global moderator permissions and administrator permissions. User permissions include capabilities such as the use of avatars, sending private messages, etc. Global moderator permissions are blabla, administrative permissions blabla. To alter these settings for large numbers of users the Group permissions system is the preferred method. User’s permissions should only be changed in rare occasions, the preferred method is putting users in groups and assigning the group’s permissions.', 'ACP_VIEW_ADMIN_PERMISSIONS_EXPLAIN' => 'Here you can view the effective administrative permissions assigned to the selected users/groups', 'ACP_VIEW_GLOBAL_MOD_PERMISSIONS_EXPLAIN' => 'Here you can view the global moderative permissions assigned to the selected users/groups', 'ACP_VIEW_FORUM_PERMISSIONS_EXPLAIN' => 'Here you can view the forum permissions assigned to the selected users/groups and forums', @@ -224,7 +224,7 @@ $lang = array_merge($lang, array( 'TRACE_PERMISSION' => 'Trace permission - %s', 'TRACE_SETTING' => 'Trace setting', - 'TRACE_USER_GLOBAL_YES_TOTAL_YES' => 'The forum independent user permission evaluates to YES but the total permission is already set to YES, so the the total result is kept. %sTrace global permission%s', + 'TRACE_USER_GLOBAL_YES_TOTAL_YES' => 'The forum independent user permission evaluates to YES but the total permission is already set to YES, so the total result is kept. %sTrace global permission%s', 'TRACE_USER_GLOBAL_YES_TOTAL_NEVER' => 'The forum independent user permission evaluates to YES which overwrites the current local result NEVER. %sTrace global permission%s', 'TRACE_USER_GLOBAL_NEVER_TOTAL_KEPT' => 'The forum independent user permission evaluates to NEVER which doesn’t influence the local permission. %sTrace global permission%s', 'TRACE_USER_FOUNDER' => 'The user has the founder type set, therefore admin permissions are set to YES by default.', diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php index dd9d56075c..ac8a205664 100644 --- a/phpBB/language/en/acp/permissions_phpbb.php +++ b/phpBB/language/en/acp/permissions_phpbb.php @@ -31,7 +31,7 @@ if (empty($lang) || !is_array($lang)) /** * MODDERS PLEASE NOTE * -* You are able to put your permission sets into a seperate file too by +* You are able to put your permission sets into a separate file too by * prefixing the new file with permissions_ and putting it into the acp * language folder. * diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php index f1aaa7c4b4..ab0eb04b35 100644 --- a/phpBB/language/en/acp/posting.php +++ b/phpBB/language/en/acp/posting.php @@ -68,7 +68,7 @@ $lang = array_merge($lang, array( 'TEXT' => 'Any text, including foreign characters, numbers, etc…', 'NUMBER' => 'Any series of digits', 'EMAIL' => 'A valid email address', - 'URL' => 'A valid URL using any protocol (http, ftp, etc… cannot be used for javascript exploits). If none is given, "http://" is prepended to to the string', + 'URL' => 'A valid URL using any protocol (http, ftp, etc… cannot be used for javascript exploits). If none is given, "http://" is prepended to the string', 'LOCAL_URL' => 'A local URL. The URL must be relative to the topic page and cannot contain a server name or protocol', 'COLOR' => 'A HTML color, can be either in the numeric form #FF1234 or a CSS colour keyword such as fuchsia or InactiveBorder' ) diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php index ffbfc89e10..81ca7643af 100644 --- a/phpBB/language/en/acp/search.php +++ b/phpBB/language/en/acp/search.php @@ -77,7 +77,7 @@ $lang = array_merge($lang, array( 'SEARCH_INDEX_CREATED' => 'Successfully indexed all posts in the board database.', 'SEARCH_INDEX_REMOVED' => 'Successfully deleted the search index for this backend.', 'SEARCH_INTERVAL' => 'User search flood interval', - 'SEARCH_INTERVAL_EXPLAIN' => 'Number of seconds users must wait between searches. This interval is checked independendly for each user.', + 'SEARCH_INTERVAL_EXPLAIN' => 'Number of seconds users must wait between searches. This interval is checked independently for each user.', 'SEARCH_STORE_RESULTS' => 'Search result cache length', 'SEARCH_STORE_RESULTS_EXPLAIN' => 'Cached search results will expire after this time, in seconds. Set to 0 if you want to disable search cache.', 'SEARCH_TYPE' => 'Search backend', @@ -90,7 +90,7 @@ $lang = array_merge($lang, array( 'YES_SEARCH' => 'Enable search facilities', 'YES_SEARCH_EXPLAIN' => 'Enables user facing search functionality including member search.', 'YES_SEARCH_UPDATE' => 'Enable fulltext updating', - 'YES_SEARCH_UPDATE_EXPLAIN' => 'Updating of fulltext indexes when posting, overriden if search is disabled.', + 'YES_SEARCH_UPDATE_EXPLAIN' => 'Updating of fulltext indexes when posting, overridden if search is disabled.', )); ?> \ No newline at end of file diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php index de35825e30..d5fdfcc37e 100644 --- a/phpBB/language/en/acp/styles.php +++ b/phpBB/language/en/acp/styles.php @@ -66,7 +66,7 @@ $lang = array_merge($lang, array( 'CREATE_TEMPLATE' => 'Create new template set', 'CREATE_THEME' => 'Create new theme', 'CSS_CLASS_NAME' => 'CSS class name', - 'CSS_COLOUR_EXPLAIN' => 'You can either enter a hexidecimal number for the colour or use the web safe colour swatch to select one.', + 'CSS_COLOUR_EXPLAIN' => 'You can either enter a hexadecimal number for the colour or use the web safe colour swatch to select one.', 'CURRENT_IMAGE' => 'Current image', 'CUSTOM_CLASS' => 'Custom class', 'CUSTOM_CLASS_EXPLAIN' => 'You can add additional classes to this theme if you wish. You must provide the actual CSS class name below, it must be the same as that you have or will use in your template. Please remember that class names may contain only alphanumeric characters, periods (.), colons (:), dash (-) and number/hash/pound (#). The new class will be added to class selection above.', @@ -105,7 +105,7 @@ $lang = array_merge($lang, array( 'FOREGROUND' => 'Foreground', 'FONT_COLOUR' => 'Font colour', 'FONT_FACE' => 'Font face', - 'FONT_FACE_EXPLAIN' => 'You can specify multiple fonts seperated by commas. If a user doesn’t have the first font installed the first other working font will be chosen.', + 'FONT_FACE_EXPLAIN' => 'You can specify multiple fonts separated by commas. If a user doesn’t have the first font installed the first other working font will be chosen.', 'FONT_SIZE' => 'Font size', 'GLOBAL_IMAGES' => 'Global', @@ -134,7 +134,7 @@ $lang = array_merge($lang, array( 'IMAGESET_ERR_STYLE_NAME' => 'You must supply a name for this imageset.', 'IMAGESET_EXPORT' => 'Export imageset', 'IMAGESET_EXPORT_EXPLAIN' => 'Here you can export an imageset in the form of an archive. This archive will contain all the data necessary to install the set of images on another board. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.', - 'IMAGESET_EXPORTED' => 'Imageset exported succesfully and stored in %s.', + 'IMAGESET_EXPORTED' => 'Imageset exported successfully and stored in %s.', 'IMAGESET_NAME' => 'Imageset name', 'IMAGESET_REFRESHED' => 'Imageset refreshed successfully.', 'IMAGESET_UPDATED' => 'Imageset updated successfully.', @@ -348,8 +348,8 @@ $lang = array_merge($lang, array( 'STYLE_ERR_NOT_STYLE' => 'The imported or uploaded file did not contain a valid style archive.', 'STYLE_ERR_STYLE_NAME' => 'You must supply a name for this style.', 'STYLE_EXPORT' => 'Export style', - 'STYLE_EXPORT_EXPLAIN' => 'Here you can export a style in the form of an archive. A style does not need to contain all elements but it must contain at least one. For example if you have created a new theme and imageset for a commonly used template you could simply export the theme and imageset and ommit the template. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.', - 'STYLE_EXPORTED' => 'Style exported succesfully and stored in %s.', + 'STYLE_EXPORT_EXPLAIN' => 'Here you can export a style in the form of an archive. A style does not need to contain all elements but it must contain at least one. For example if you have created a new theme and imageset for a commonly used template you could simply export the theme and imageset and omit the template. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.', + 'STYLE_EXPORTED' => 'Style exported successfully and stored in %s.', 'STYLE_IMAGESET' => 'Imageset', 'STYLE_NAME' => 'Style name', 'STYLE_TEMPLATE' => 'Template', @@ -377,7 +377,7 @@ $lang = array_merge($lang, array( 'TEMPLATE_ERR_STYLE_NAME' => 'You must supply a name for this templates.', 'TEMPLATE_EXPORT' => 'Export templates', 'TEMPLATE_EXPORT_EXPLAIN' => 'Here you can export a template set in the form of an archive. This archive will contain all the files necessary to install the templates on another board. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.', - 'TEMPLATE_EXPORTED' => 'Templates exported succesfully and stored in %s.', + 'TEMPLATE_EXPORTED' => 'Templates exported successfully and stored in %s.', 'TEMPLATE_FILE' => 'Template file', 'TEMPLATE_FILE_UPDATED' => 'Template file updated successfully.', 'TEMPLATE_LOCATION' => 'Store templates in', @@ -404,7 +404,7 @@ $lang = array_merge($lang, array( 'THEME_ERR_STYLE_NAME' => 'You must supply a name for this theme.', 'THEME_EXPORT' => 'Export Theme', 'THEME_EXPORT_EXPLAIN' => 'Here you can export a theme in the form of an archive. This archive will contain all the data necessary to install the theme on another board. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.', - 'THEME_EXPORTED' => 'Theme exported succesfully and stored in %s.', + 'THEME_EXPORTED' => 'Theme exported successfully and stored in %s.', 'THEME_LOCATION' => 'Store stylesheet in', 'THEME_LOCATION_EXPLAIN' => 'Images are always stored on the filesystem.', 'THEME_NAME' => 'Theme name', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 4ebfc44bb8..c5f2cc0e78 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -74,7 +74,7 @@ $lang = array_merge($lang, array( 'AVATAR_NO_SIZE' => 'Could not obtain width or height of linked avatar, please enter them manually.', 'AVATAR_PARTIAL_UPLOAD' => 'The uploaded file was only partially uploaded', 'AVATAR_PHP_SIZE_NA' => 'The avatar’s filesize is too large.
Could not determine the maximum size defined by PHP in php.ini.', - 'AVATAR_PHP_SIZE_OVERRUN' => 'The avatar’s filesize is too large, maximum upload size is %d MB.
Please note this is set in php.ini and cannot be overriden.', + 'AVATAR_PHP_SIZE_OVERRUN' => 'The avatar’s filesize is too large, maximum upload size is %d MB.
Please note this is set in php.ini and cannot be overridden.', 'AVATAR_URL_INVALID' => 'The URL you specified is invalid.', 'AVATAR_URL_NOT_FOUND' => 'The file specified could not be found.', 'AVATAR_WRONG_FILESIZE' => 'The avatar must be between 0 and %1d %2s.', @@ -156,7 +156,7 @@ $lang = array_merge($lang, array( 'FAQ_EXPLAIN' => 'Frequently Asked Questions', 'FILENAME' => 'Filename', 'FILESIZE' => 'Filesize', - 'FILEDATE' => 'Filedate', + 'FILEDATE' => 'File date', 'FILE_COMMENT' => 'File comment', 'FILE_NOT_FOUND' => 'The requested file could not be found', 'FIND_USERNAME' => 'Find a member', @@ -260,7 +260,7 @@ $lang = array_merge($lang, array( 'LAST_POST' => 'Last post', 'LAST_UPDATED' => 'Last updated', 'LAST_VISIT' => 'Last visit', - 'LDAP_NO_LDAP_EXTENSION' => 'LDAP extension not availible', + 'LDAP_NO_LDAP_EXTENSION' => 'LDAP extension not available', 'LDAP_NO_SERVER_CONNECTION' => 'Could not connect to LDAP server', 'LEGEND' => 'Legend', 'LOCATION' => 'Location', diff --git a/phpBB/language/en/email/admin_welcome_inactive.txt b/phpBB/language/en/email/admin_welcome_inactive.txt index 038d078230..29d5e7d818 100644 --- a/phpBB/language/en/email/admin_welcome_inactive.txt +++ b/phpBB/language/en/email/admin_welcome_inactive.txt @@ -9,7 +9,7 @@ Username: {USERNAME} Password: {PASSWORD} ---------------------------- -Your account is currently inactive, the administrator of the board will need to activate it before you can log in. You will receive another email when this has occured. +Your account is currently inactive, the administrator of the board will need to activate it before you can log in. You will receive another email when this has occurred. Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account. diff --git a/phpBB/language/en/email/coppa_resend_inactive.txt b/phpBB/language/en/email/coppa_resend_inactive.txt index 4219b20fe1..a69f9086b2 100644 --- a/phpBB/language/en/email/coppa_resend_inactive.txt +++ b/phpBB/language/en/email/coppa_resend_inactive.txt @@ -33,7 +33,7 @@ Date: _______________ ------------------------------ CUT HERE ------------------------------ -Once the administrator has recived the above form via fax or regular mail your account will be activated. +Once the administrator has received the above form via fax or regular mail your account will be activated. Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account. diff --git a/phpBB/language/en/email/coppa_welcome_inactive.txt b/phpBB/language/en/email/coppa_welcome_inactive.txt index 1586c3bf68..1cb28f65bd 100644 --- a/phpBB/language/en/email/coppa_welcome_inactive.txt +++ b/phpBB/language/en/email/coppa_welcome_inactive.txt @@ -34,7 +34,7 @@ Date: _______________ ------------------------------ CUT HERE ------------------------------ -Once the administrator has recived the above form via fax or regular mail your account will be activated. +Once the administrator has received the above form via fax or regular mail your account will be activated. Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account. diff --git a/phpBB/language/en/email/email_notify.txt b/phpBB/language/en/email/email_notify.txt index 669a7e41cb..725b52f0cc 100644 --- a/phpBB/language/en/email/email_notify.txt +++ b/phpBB/language/en/email/email_notify.txt @@ -10,7 +10,7 @@ You can find it at: {U_TOPIC} -A message from {FROM_USERNAME} may also be included below. Please note that this message has not been seen or approved by the board administrators. If you wish to complain about having received this email please contact the board administrator at {BOARD_CONTACT}. Please quote the the message headers when contacting this address. +A message from {FROM_USERNAME} may also be included below. Please note that this message has not been seen or approved by the board administrators. If you wish to complain about having received this email please contact the board administrator at {BOARD_CONTACT}. Please quote the message headers when contacting this address. ---------- diff --git a/phpBB/language/en/email/user_activate_inactive.txt b/phpBB/language/en/email/user_activate_inactive.txt index eb4e761412..a90773d48c 100644 --- a/phpBB/language/en/email/user_activate_inactive.txt +++ b/phpBB/language/en/email/user_activate_inactive.txt @@ -2,6 +2,6 @@ Subject: Your account has been deactivated Hello {USERNAME}, -Your account on "{SITENAME}" has been deactivated, most likely due to changes made to your profile. The administrator of the board will need to activate it before you can log in. You will receive another notification when this has occured. +Your account on "{SITENAME}" has been deactivated, most likely due to changes made to your profile. The administrator of the board will need to activate it before you can log in. You will receive another notification when this has occurred. {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/en/help_bbcode.php b/phpBB/language/en/help_bbcode.php index 938a767374..082b28ae1e 100644 --- a/phpBB/language/en/help_bbcode.php +++ b/phpBB/language/en/help_bbcode.php @@ -68,7 +68,7 @@ $help = array( ), array( 0 => 'Creating an Un-ordered list', - 1 => 'BBCode supports two types of lists, unordered and ordered. They are essentially the same as their HTML equivalents. An unordered list ouputs each item in your list sequentially one after the other indenting each with a bullet character. To create an unordered list you use [list][/list] and define each item within the list using [*]. For example to list your favorite colours you could use:

[list]
[*]Red
[*]Blue
[*]Yellow
[/list]

This would generate the following list:' + 1 => 'BBCode supports two types of lists, unordered and ordered. They are essentially the same as their HTML equivalents. An unordered list ouputs each item in your list sequentially one after the other indenting each with a bullet character. To create an unordered list you use [list][/list] and define each item within the list using [*]. For example to list your favourite colours you could use:

[list]
[*]Red
[*]Blue
[*]Yellow
[/list]

This would generate the following list:' ), array( 0 => 'Creating an Ordered list', @@ -80,7 +80,7 @@ $help = array( ), array( 0 => 'Linking to another site', - 1 => 'phpBB BBCode supports a number of ways of creating URIs, Uniform Resource Indicators better known as URLs.As with all the BBCode tags you can wrap URLs around any of the other tags such as [img][/img] (see next entry), [b][/b], etc. As with the formatting tags it is up to you to ensure the correct open and close order is following, for example:

[url=http://www.google.com/][img]http://www.google.com/intl/en_ALL/images/logo.gif[/url][/img]

is not correct which may lead to your post being deleted so take care.' + 1 => 'phpBB BBCode supports a number of ways of creating URIs, Uniform Resource Indicators better known as URLs.As with all the BBCode tags you can wrap URLs around any of the other tags such as [img][/img] (see next entry), [b][/b], etc. As with the formatting tags it is up to you to ensure the correct open and close order is following, for example:

[url=http://www.google.com/][img]http://www.google.com/intl/en_ALL/images/logo.gif[/url][/img]

is not correct which may lead to your post being deleted so take care.' ), array( 0 => '--', @@ -92,7 +92,7 @@ $help = array( ), array( 0 => 'Adding attachments into a post', - 1 => 'Attachments can now be placed in any part of a post by using the new [attachment=][/attachment] BBCode, if the attachments functionality has been enabled by a board administrator & if you are given the appropiate permissions to create attachments. Within the posting screen is a drop-down box for placing attachments inline.' + 1 => 'Attachments can now be placed in any part of a post by using the new [attachment=][/attachment] BBCode, if the attachments functionality has been enabled by a board administrator & if you are given the appropriate permissions to create attachments. Within the posting screen is a drop-down box for placing attachments inline.' ), array( 0 => '--', diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php index c0b8549486..5b75124859 100644 --- a/phpBB/language/en/help_faq.php +++ b/phpBB/language/en/help_faq.php @@ -172,7 +172,7 @@ $help = array( ), array( 0 => 'What are Smilies?', - 1 => 'Smilies, or Emoticons are small graphical images which can be used to express some feeling using a short code, e.g. :) means happy, :( means sad. The full list of emoticons can be seen via the posting form. Try not to overuse smileys though, they can quickly render a post unreadable and a moderator may decide to edit them out or remove the post altogether. The board administrator may also have set a limit to the number of such smilies you may use within a post.' + 1 => 'Smilies, or Emoticons are small graphical images which can be used to express some feeling using a short code, e.g. :) means happy, :( means sad. The full list of emoticons can be seen via the posting form. Try not to overuse smilies though, they can quickly render a post unreadable and a moderator may decide to edit them out or remove the post altogether. The board administrator may also have set a limit to the number of such smilies you may use within a post.' ), array( 0 => 'Can I post images?', @@ -180,7 +180,7 @@ $help = array( ), array( 0 => 'What are global announcements?', - 1 => 'Global announcements contain important information and you should read them as soon as possible. Global announcements will appear at the top of every forum and also within your User Control Panel. Whether or not you can post a gloabl announcement depends on the permissions required, these are set by the administrator.' + 1 => 'Global announcements contain important information and you should read them as soon as possible. Global announcements will appear at the top of every forum and also within your User Control Panel. Whether or not you can post a global announcement depends on the permissions required, these are set by the administrator.' ), array( 0 => 'What are announcements?', @@ -196,7 +196,7 @@ $help = array( ), array( 0 => 'What are topic icons?', - 1 => 'Topic icons are images which can be assosciated with posts to indicate their content. The ability to use topic icons depends on the permissions set by the administrator.' + 1 => 'Topic icons are images which can be associated with posts to indicate their content. The ability to use topic icons depends on the permissions set by the administrator.' ), array( 0 => '--', @@ -256,7 +256,7 @@ $help = array( ), array( 0 => 'What is my Friends and Foes list?', - 1 => 'You can use these lists to organise other members of the forum. Members added to your friends list will be listed within your User Control Panel for quick access to see their online status and to send them private messages. Subject to template support, posts from these users may also be highlighted. If you add a user to your foes list them any posts made by them will be hidden by default.' + 1 => 'You can use these lists to organise other members of the forum. Members added to your friends list will be listed within your User Control Panel for quick access to see their online status and to send them private messages. Subject to template support, posts from these users may also be highlighted. If you add a user to your foes list then any posts made by them will be hidden by default.' ), array( 0 => 'How can I add / remove users to my friends or foes list?', @@ -284,7 +284,7 @@ $help = array( ), array( 0 => 'How can I find my own posts and topics?', - 1 => 'Your own posts can be retrieved either by clicking the “Search user’s posts” within the User Control Panel or via your own profile page. To search for your topics, use the Advanced search page and fill in the various options appropiately.' + 1 => 'Your own posts can be retrieved either by clicking the “Search user’s posts” within the User Control Panel or via your own profile page. To search for your topics, use the Advanced search page and fill in the various options appropriately.' ), array( 0 => '--', diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 846334a65b..18d70cd112 100755 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -50,7 +50,7 @@ $lang = array_merge($lang, array( 'CATEGORY' => 'Category', 'CACHE_STORE' => 'Cache type', - 'CACHE_STORE_EXPLAIN' => 'The physical location where data is cached, filesystem is prefered.', + 'CACHE_STORE_EXPLAIN' => 'The physical location where data is cached, filesystem is preferred.', 'CAT_CONVERT' => 'Convert', 'CAT_INSTALL' => 'Install', 'CAT_OVERVIEW' => 'Overview', @@ -59,7 +59,7 @@ $lang = array_merge($lang, array( 'CLEAN_VERIFY' => 'Cleaning up and verifying the final structure', 'CONFIG_CONVERT' => 'Converting the configuration', 'CONFIG_FILE_UNABLE_WRITE' => 'It was not possible to write the configuration file. Alternative methods for this file to be created are presented below', - 'CONFIG_FILE_WRITTEN' => 'The configuration file has been written, you may now proceed to the next step of the installation', + 'CONFIG_FILE_WRITTEN' => 'The configuration file has been written. You may now proceed to the next step of the installation', 'CONFIG_PHPBB_EMPTY' => 'The phpBB3 config variable for "%s" is empty.', 'CONFIG_RETRY' => 'Retry', 'CONTACT_EMAIL_CONFIRM' => 'Confirm contact email', @@ -148,7 +148,7 @@ $lang = array_merge($lang, array( 'ENABLE_KEYS' => 'Re-enabling keys. This can take a while', 'FILES_OPTIONAL' => 'Optional files and directories', - 'FILES_OPTIONAL_EXPLAIN' => 'Optional - These files, directories or permissions are not required. The installation routines will attempt to use various techniques to complete if they do not exist or cannot be written to. However, the presence of these files, directories or permissions will speed installation.', + 'FILES_OPTIONAL_EXPLAIN' => 'Optional - These files, directories or permission settings are not required. The installation system will attempt to use various techniques to create them if they do not exist or cannot be written to. However, the presence of these will speed installation.', 'FILES_REQUIRED' => 'Files and Directories', 'FILES_REQUIRED_EXPLAIN' => 'Required - In order to function correctly phpBB needs to be able to access or write to certain files or directories. If you see “Not Found” you need to create the relevant file or directory. If you see “Unwriteable” you need to change the permissions on the file or directory to allow phpBB to write to it.', 'FILLING_TABLE' => 'Filling table %s', @@ -172,7 +172,7 @@ $lang = array_merge($lang, array( 'INSTALL_CONGRATS' => 'Congratulations', 'INSTALL_CONGRATS_EXPLAIN' => 'You have now successfully installed phpBB 3.0. Clicking the button below will take you to your Administration Control Panel (ACP). Take some time to examine the options available to you. Remember that help is available online via the Userguide and the Beta support forum, see the %sREADME%s for further information.

Please now delete, move or rename the install directory before you use your forum. If this directory is still present, only the Administration Control Panel (ACP) will be accessible.', 'INSTALL_INTRO' => 'Welcome to Installation', - 'INSTALL_INTRO_BODY' => 'With this option, it is possible to install phpBB onto your server.

In order to proceed, you will need the following information to hand:

+ 'INSTALL_INTRO_BODY' => 'With this option, it is possible to install phpBB onto your server.

In order to proceed, you will need the following information on hand: