aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2001-09-25 23:22:42 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2001-09-25 23:22:42 +0000
commit0def8048964599f6f821517e164fc69ba4a0fb0d (patch)
tree00be4e42ab8e2e53133af8b859485ea019597ba2 /phpBB/language
parent2a228a29ed4955b98bf5a16b29d9df2dcd93d064 (diff)
downloadforums-0def8048964599f6f821517e164fc69ba4a0fb0d.tar
forums-0def8048964599f6f821517e164fc69ba4a0fb0d.tar.gz
forums-0def8048964599f6f821517e164fc69ba4a0fb0d.tar.bz2
forums-0def8048964599f6f821517e164fc69ba4a0fb0d.tar.xz
forums-0def8048964599f6f821517e164fc69ba4a0fb0d.zip
Admin definable max sig size
git-svn-id: file:///svn/phpbb/trunk@1087 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
-rwxr-xr-xphpBB/language/lang_english.php15
1 files changed, 13 insertions, 2 deletions
diff --git a/phpBB/language/lang_english.php b/phpBB/language/lang_english.php
index 13f39cdc2d..3f58f5aebb 100755
--- a/phpBB/language/lang_english.php
+++ b/phpBB/language/lang_english.php
@@ -459,10 +459,12 @@ $lang['to_return_index'] = "to return to the index";
$lang['Password_mismatch'] = "The passwords you entered did not match";
$lang['Invalid_username'] = "The username you requested has been taken or disallowed";
+$lang['Signature_too_long'] = "Your signature is too long";
$lang['Fields_empty'] = "You must fill in the required fields";
$lang['Avatar_filetype'] = "The avatar filetype must be .jpg, .gif or .png";
-$lang['Avatar_filesize'] = "The avatar image file size must more than 0 kB and less than " . round($board_config['avatar_filesize'] / 1024) . " kB";
-$lang['Avatar_imagesize'] = "The avatar must be less than " . $board_config['avatar_max_width'] . " pixels wide and " . $board_config['avatar_max_height'] . " pixels high";
+$lang['Avatar_filesize'] = "The avatar image file size must be more than 0 kB and less than"; // followed by xx kB, xx being the size
+$lang['kB'] = "kB";
+$lang['Avatar_imagesize'] = "The avatar must be less than " . $board_config['avatar_max_width'] . " pixels wide and " . $board_config['avatar_max_height'] . " pixels high";
$lang['Welcome_subject'] = "Welcome to " . $board_config['sitename'] . " Forums";
$lang['New_account_subject'] = "New user account";
@@ -832,13 +834,22 @@ $lang['Ban_update_sucessful'] = "The banlist has been updated sucessfully";
// Configuration
+$lang['General_Config'] = "General Configuration";
+$lang['Config_explain'] = "The form below will allow you to customize all the general board options. For User and Forum configurations use the related links on the left hand side.";
+$lang['General_settings'] = "General Board Settings";
+$lang['Site_name'] = "Site name";
+$lang['Acct_activation'] = "Enable account activation";
+
+
$lang['Config_updated'] = "Forum Configuration Updated Sucessfully";
+
// Forum Management
$lang['Remove'] = "Remove";
$lang['Action'] = "Action";
$lang['Update_order'] = "Update Order";
+
// Smiley Management
$lang['smile_remove_err'] = "Error Deleting Smiley!";
$lang['smiley_return'] = "Return to smiley listing";