diff --git a/phpBB/admin/admin_board.php b/phpBB/admin/admin_board.php index ab9764c962..38bbe46f6b 100644 --- a/phpBB/admin/admin_board.php +++ b/phpBB/admin/admin_board.php @@ -134,7 +134,56 @@ $template->assign_vars(array( "L_DISABLE_PRIVATE_MESSAGING" => $lang['Disable_privmsg'], "L_ENABLED" => $lang['Enabled'], "L_DISABLED" => $lang['Disabled'], - + "L_ABILITIES_SETTINGS" => $lang['Abilities_settings'], + "L_FLOOD_INTERVAL" => $lang['Flood_Interval'], + "L_FLOOD_INTERVAL_EXPLAIN" => $lang['Flood_Interval_explain'], + "L_TOPICS_PER_PAGE" => $lang['Topics_per_page'], + "L_POSTS_PER_PAGE" => $lang['Posts_per_page'], + "L_HOT_THRESHOLD" => $lang['Hot_threshold'], + "L_DEFAULT_STYLE" => $lang['Default_style'], + "L_OVERRIDE_STYLE" => $lang['Override_style'], + "L_OVERRIDE_STYLE_EXPLAIN" => $lang['Override_style_explain'], + "L_DEFAULT_LANGUAGE" => $lang['Default_language'], + "L_DATE_FORMAT" => $lang['Date_format'], + "L_SYSTEM_TIMEZONE" => $lang['System_timezone'], + "L_ENABLE_GZIP" => $lang['Enable_gzip'], + "L_ENABLE_PRUNE" => $lang['Enable_prune'], + "L_ALLOW_HTML" => $lang['Allow_HTML'], + "L_ALLOW_BBCODE" => $lang['Allow_BBCode'], + "L_ALLOWED_TAGS" => $lang['Allowed_tags'], + "L_ALLOWED_TAGS_EXPLAIN" => $lang['Allowed_tags_explain'], + "L_ALLOW_SMILIES" => $lang['Allow_smilies'], + "L_SMILIES_PATH" => $lang['Smilies_path'], + "L_SMILIES_PATH_EXPLAIN" => $lang['Smilies_path_explain'], + "L_ALLOW_SIG" => $lang['Allow_sig'], + "L_MAX_SIG_LENGTH" => $lang['Max_sig_length'], + "L_MAX_SIG_LENGTH_EXPLAIN" => $lang['Max_sig_length_explain'], + "L_ALLOW_NAME_CHANGE" => $lang['Allow_name_change'], + "L_AVATAR_SETTINGS" => $lang['Avatar_settings'], + "L_ALLOW_LOCAL" => $lang['Allow_local'], + "L_ALLOW_REMOTE" => $lang['Allow_remote'], + "L_ALLOW_REMOTE_EXPLAIN" => $lang['Allow_remote_explain'], + "L_ALLOW_UPLOAD" => $lang['Allow_upload'], + "L_MAX_FILESIZE" => $lang['Max_filesize'], + "L_MAX_FILESIZE_EXPLAIN" => $lang['Max_filesize_explain'], + "L_MAX_AVATAR_SIZE" => $lang['Max_avatar_size'], + "L_MAX_AVATAR_SIZE_EXPLAIN" => $lang['Max_avatar_size_explain'], + "L_AVATAR_STORAGE_PATH" => $lang['Avatar_storage_path'], + "L_AVATAR_STORAGE_PATH_EXPLAIN" => $lang['Avatar_storage_path_explain'], + "L_AVATAR_GALLERY_PATH" => $lang['Avatar_gallery_path'], + "L_AVATAR_GALLERY_PATH_EXPLAIN" => $lang['Avatar_gallery_path_explain'], + "L_COPPA_SETTINGS" => $lang['COPPA_settings'], + "L_COPPA_FAX" => $lang['COPPA_fax'], + "L_COPPA_MAIL" => $lang['COPPA_mail'], + "L_COPPA_MAIL_EXPLAIN" => $lang['COPPA_mail_explain'], + "L_EMAIL_SETTINGS" => $lang['Email_settings'], + "L_ADMIN_EMAIL" => $lang['Admin_email'], + "L_EMAIL_SIG" => $lang['Email_sig'], + "L_EMAIL_SIG_EXPLAIN" => $lang['Email_sig_explain'], + "L_USE_SMTP" => $lang['Use_SMTP'], + "L_USE_SMTP_EXPLAIN" => $lang['Use_SMTP_explain'], + "L_SMTP_SERVER" => $lang['SMTP_server'], + "SITENAME" => $new['sitename'], "SITE_DESCRIPTION" => $new['site_desc'], "ACTIVATION_NONE" => USER_ACTIVATION_NONE, diff --git a/phpBB/language/lang_english/lang_main.php b/phpBB/language/lang_english/lang_main.php index 47ab5b13c7..b30ab9c639 100644 --- a/phpBB/language/lang_english/lang_main.php +++ b/phpBB/language/lang_english/lang_main.php @@ -945,6 +945,56 @@ $lang['Site_name'] = "Site name"; $lang['Site_desc'] = "Site description"; $lang['Acct_activation'] = "Enable account activation"; +$lang['Abilities_settings'] = "User/Forum Ability Settings"; +$lang['Flood_Interval'] = "Flood Interval"; +$lang['Flood_Interval_explain'] = "Number of seconds a user must wait between posts"; +$lang['Topics_per_page'] = "Topics Per Page"; +$lang['Posts_per_page'] = "Posts Per Page"; +$lang['Hot_threshold'] = "Hot Threshold"; +$lang['Default_style'] = "Default Style"; +$lang['Override_style'] = "Override user style"; +$lang['Override_style_explain'] = "Replaces users style with the default"; +$lang['Default_language'] = "Default Language"; +$lang['Date_format'] = "Date Format"; +$lang['System_timezone'] = "System Timezone"; +$lang['Enable_gzip'] = "Enable GZip Compression"; +$lang['Enable_prune'] = "Enable Forum Pruning"; +$lang['Allow_HTML'] = "Allow HTML"; +$lang['Allow_BBCode'] = "Allow BBCode"; +$lang['Allowed_tags'] = "Allowed HTML tags"; +$lang['Allowed_tags_explain'] = "Seperate tags with commas"; +$lang['Allow_smilies'] = "Allow Smilies"; +$lang['Smilies_path'] = "Smilies Storage Path"; +$lang['Smilies_path_explain'] = "Path under your phpBB root dir, e.g. images/smilies"; +$lang['Allow_sig'] = "Allow Signatures"; +$lang['Max_sig_length'] = "Maximum signature length"; +$lang['Max_sig_length_explain'] = "Most number of characters allowed in a users signature"; +$lang['Allow_name_change'] = "Allow Name Change"; +$lang['Avatar_settings'] = "Avatar Settings"; +$lang['Allow_local'] = "Allow local gallery avatars"; +$lang['Allow_remote'] = "Allow remote avatars"; +$lang['Allow_remote_explain'] = "Avatars linked from another website"; +$lang['Allow_upload'] = "Allow avatar uploading"; +$lang['Max_filesize'] = "Max. Avatar File Size"; +$lang['Max_filesize_explain'] = "For uploaded avatar files"; +$lang['Max_avatar_size'] = "Max. Avatar Size"; +$lang['Max_avatar_size_explain'] = "(height x width)"; +$lang['Avatar_storage_path'] = "Avatar Storage Path"; +$lang['Avatar_storage_path_explain'] = "Path under your phpBB root dir, e.g. images/avatars"; +$lang['Avatar_gallery_path'] = "Avatar Gallery Path"; +$lang['Avatar_gallery_path_explain'] = "Path under your phpBB root dir for pre-loaded images, e.g. images/avatars/gallery"; +$lang['COPPA_settings'] = "COPPA Settings"; +$lang['COPPA_fax'] = "COPPA Fax Number"; +$lang['COPPA_mail'] = "COPPA Mailing Address"; +$lang['COPPA_mail_explain'] = "This is the mailing address where parents will send COPPA registration forms"; +$lang['Email_settings'] = "Email Settings"; +$lang['Admin_email'] = "Admin Email Address"; +$lang['Email_sig'] = "Email Signature"; +$lang['Email_sig_explain'] = "This text will be attached to all emails the board sends"; +$lang['Use_SMTP'] = "Use SMTP for delivery"; +$lang['Use_SMTP_explain'] = "Say yes if you want or have to send email via a server instead of the local mail function"; +$lang['SMTP_server'] = "SMTP Server Address"; + $lang['Disable_privmsg'] = "Disable Private Messaging"; $lang['Inbox_limits'] = "Max posts in Inbox"; $lang['Sentbox_limits'] = "Max posts in Sentbox"; @@ -1116,8 +1166,7 @@ $lang['Download_config'] = "Download Config"; $lang['ftp_choose'] = "Choose Download Method"; $lang['Attempt_ftp'] = "Attempt to ftp config file into place:"; $lang['Send_file'] = "Just send the file to me and I'll ftp it manually:"; -$lang['ftp_option'] = "
Since the ftp extensions are loaded in php you may will also be given -the option of first trying to automatically ftp the config file into place."; +$lang['ftp_option'] = "
Since the ftp extensions are loaded in php you may will also be given the option of first trying to automatically ftp the config file into place."; $lang['ftp_instructs'] = "You have chosen to attempt to ftp the file to your phpBB installation automagically. Please enter the information below to facilitate this process. Note that the FTP Path should be the exact path via ftp to your phpBB2 installation as if you were ftping to it."; $lang['ftp_path'] = "FTP Path to phpBB2:"; $lang['ftp_username'] = "Your FTP Username:"; diff --git a/phpBB/templates/subSilver/admin/board_config_body.tpl b/phpBB/templates/subSilver/admin/board_config_body.tpl index 7757264bb9..49bc31cdcd 100644 --- a/phpBB/templates/subSilver/admin/board_config_body.tpl +++ b/phpBB/templates/subSilver/admin/board_config_body.tpl @@ -8,59 +8,59 @@ {L_GENERAL_SETTINGS} - {L_SITE_NAME}: + {L_SITE_NAME} - {L_SITE_DESCRIPTION}: + {L_SITE_DESCRIPTION} - {L_ACCT_ACTIVATION}: + {L_ACCT_ACTIVATION} {L_NO}ne   User   Admin - Flood Interval:
Number of seconds a user must wait between posts + {L_FLOOD_INTERVAL}
{L_FLOOD_INTERVAL_EXPLAIN} - Topics Per Page + {L_TOPICS_PER_PAGE} - Posts Per Page + {L_POSTS_PER_PAGE} - Hot Threshold + {L_HOT_THRESHOLD} - Default Style: + {L_DEFAULT_STYLE} {STYLE_SELECT} - Override user style:
Replaces users style with the default + {L_OVERRIDE_STYLE}
{L_OVERRIDE_STYLE_EXPLAIN} {L_YES}   {L_NO} - Default Language: + {L_DEFAULT_LANGUAGE} {LANG_SELECT} - Date Format:
{L_DATE_FORMAT_EXPLAIN} + {L_DATE_FORMAT}
{L_DATE_FORMAT_EXPLAIN} - System Timezone: + {L_SYSTEM_TIMEZONE} {TIMEZONE_SELECT} - Enable GZip Compression: + {L_ENABLE_GZIP} {L_YES}   {L_NO} - Enable Forum Pruning: + {L_ENABLE_PRUNE} {L_YES}   {L_NO} @@ -83,115 +83,107 @@ - User/Forum Ability Settings + {L_ABILITIES_SETTINGS} - Allow HTML + {L_ALLOW_HTML} {L_YES}   {L_NO} - Allowed HTML tags
Seperate tags with commas + {L_ALLOWED_TAGS}
{L_ALLOWED_TAGS_EXPLAIN} - Allow BBCode + {L_ALLOW_BBCODE} {L_YES}   {L_NO} - Allow Smilies + {L_ALLOW_SMILIES} {L_YES}   {L_NO} - Smilies Storage Path
Path under your phpBB root dir, e.g. images/smilies + {L_SMILIES_PATH}
{L_SMILIES_PATH_EXPLAIN} - Allow Signatures + {L_ALLOW_SIG} {L_YES}   {L_NO} - Maximum signature length
Number of characters allowed + {L_MAX_SIG_LENGTH}
{L_MAX_SIG_LENGTH_EXPLAIN} - Allow Name Change + {L_ALLOW_NAME_CHANGE} {L_YES}   {L_NO} - Avatar Settings + {L_AVATAR_SETTINGS} - Allow local gallery avatars + {L_ALLOW_LOCAL} {L_YES}   {L_NO} - Allow remote avatars
Avatars linked from another website + {L_ALLOW_REMOTE}
{L_ALLOW_REMOTE_EXPLAIN} {L_YES}   {L_NO} - Allow avatar uploading + {L_ALLOW_UPLOAD} {L_YES}   {L_NO} - Max. Avatar File Size
For uploaded avatar files + {L_MAX_FILESIZE}
{L_MAX_FILESIZE_EXPLAIN} Bytes - Max. Avatar Size
- (height x width) + {L_MAX_AVATAR_SIZE}
+ {L_MAX_AVATAR_SIZE_EXPLAIN} x - Avatar Storage Path
Path under your phpBB root dir, e.g. images/avatars + {L_AVATAR_STORAGE_PATH}
{L_AVATAR_STORAGE_PATH_EXPLAIN} - Avatar Gallery Path
Path under your phpBB root dir for pre-loaded images, e.g. images/avatars/gallery + {L_AVATAR_GALLERY_PATH}
{L_AVATAR_GALLERY_PATH_EXPLAIN} - COPPA Settings + {L_COPPA_SETTINGS} - COPPA Fax Number + {L_COPPA_FAX} - COPPA Mailing Address
This is the mailing address where parents will send COPPA registration forms + {L_COPPA_MAIL}
{L_COPPA_MAIL_EXPLAIN} - Email Settings + {L_EMAIL_SETTINGS} - Admin Email Address + {L_ADMIN_EMAIL} - Email Signature
This text will be attached to all emails the board sends + {L_EMAIL_SIG}
{L_EMAIL_SIG_EXPLAIN} - Use SMTP for delivery
Say {L_YES} if you want or have to send email via a server instead of the local mail function + {L_USE_SMTP}
{L_USE_SMTP_EXPLAIN} {L_YES}   {L_NO} - SMTP Server + {L_SMPT_SERVER} - - SMTP Username - - - - SMTP Password - - - {S_HIDDEN_FIELDS} + {S_HIDDEN_FIELDS}