aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/lang_english.php
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2001-06-12 23:30:13 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2001-06-12 23:30:13 +0000
commitee2ff042db37e5d4538b0ea3c0522b04c4b19d4b (patch)
treecdce33d6fe158c864ae854e8e229a7800d8b2a35 /phpBB/language/lang_english.php
parent59b27564488edc899ec8b73c8af9f47b94ede46b (diff)
downloadforums-ee2ff042db37e5d4538b0ea3c0522b04c4b19d4b.tar
forums-ee2ff042db37e5d4538b0ea3c0522b04c4b19d4b.tar.gz
forums-ee2ff042db37e5d4538b0ea3c0522b04c4b19d4b.tar.bz2
forums-ee2ff042db37e5d4538b0ea3c0522b04c4b19d4b.tar.xz
forums-ee2ff042db37e5d4538b0ea3c0522b04c4b19d4b.zip
Found that php has an imagesize function ... doh
git-svn-id: file:///svn/phpbb/trunk@482 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/lang_english.php')
-rwxr-xr-xphpBB/language/lang_english.php21
1 files changed, 13 insertions, 8 deletions
diff --git a/phpBB/language/lang_english.php b/phpBB/language/lang_english.php
index 175dd03c7a..a91fd7211d 100755
--- a/phpBB/language/lang_english.php
+++ b/phpBB/language/lang_english.php
@@ -174,9 +174,9 @@ $lang['HTML'] = "HTML";
$lang['BBCode'] = "BBCode";
$lang['Smilies'] = "Smilies";
$lang['in_this_post'] = " in this post";
-$lang['is_ON'] = " is ON";
-$lang['is_OFF'] = " is OFF";
$lang['Notify'] = "Notify";
+$lang['is_ON'] = " is ON"; // this goes after either BBCode or HTML
+$lang['is_OFF'] = " is OFF"; // see above
$lang['Stored'] = "Your message has been entered successfully";
$lang['Click'] = "Click"; // Followed by here and then either return to topic or view message
@@ -203,10 +203,19 @@ $lang['Mark'] = "Mark";
//
$lang['Website'] = "Website";
$lang['From'] = "From";
+
$lang['Wrong_Profile'] = "You cannot modify a profile that is not your own.";
$lang['Bad_username'] = "The username you choose has been taken or is disallowed by the administrator.";
$lang['Sorry_banned_email'] = "Sorry but the email address you gave has been banned from registering on this system.";
+$lang['Avatar'] = "Avatar";
+$lang['Avatar_explain'] = "Displays a small graphic image below your details in posts. Only one image can be uploaded at a time with a width no greater than " . $board_config['avatar_max_width'] . " pixels, a height no greater than " . $board_config['avatar_max_height'] . " pixels and a file size no more than " . (round($board_config['avatar_filesize'] / 1024)) . " kB";
+$lang['Upload_Image'] = "Upload Image";
+$lang['Delete_Image'] = "Delete Image";
+$lang['Current_Image'] = "Current Image";
+
+
+
//
// Memberslist
//
@@ -400,12 +409,8 @@ $l_viewingprofile = "Viewing profile of ";
$l_hidden = "hidden";
$l_boardtemplate = "Select Template";
$l_date_format = "Date format";
-$l_avatar = "Avatar";
-$l_avatar_explain = "Use this to display a small graphic image below your user details in posts. Only one image can be uploaded at a time and the size is limited to under "; // A number will be inserted after " ... under " and followed by "kB"
-$l_kB = " kB";
-$l_Upload_Image = "Upload Image";
-$l_Delete_Image = "Delete Image";
-$l_Current_Image = "Current Image";
+
+
$l_date_format_explanation = "The syntax used is identical to the PHP <a href=\"http://www.php.net/date\" target=\"_other\">date()</a> function";
$l_password_if_changed = "You only need to supply a password if you want to change it.";
$l_password_confirm_if_changed = "You only need to confirm your password if you changed it above.";