diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-06-12 00:54:15 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-06-12 00:54:15 +0000 |
| commit | f8ad3c0c2cf65f73a0416700e5832cc4c8885021 (patch) | |
| tree | 00750f336e15278f8a16db0ee9263fdfe0f65661 /phpBB/language | |
| parent | 89f08f53cb39857cff059a730eedee480766342f (diff) | |
| download | forums-f8ad3c0c2cf65f73a0416700e5832cc4c8885021.tar forums-f8ad3c0c2cf65f73a0416700e5832cc4c8885021.tar.gz forums-f8ad3c0c2cf65f73a0416700e5832cc4c8885021.tar.bz2 forums-f8ad3c0c2cf65f73a0416700e5832cc4c8885021.tar.xz forums-f8ad3c0c2cf65f73a0416700e5832cc4c8885021.zip | |
Final updates for tonight
git-svn-id: file:///svn/phpbb/trunk@477 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
| -rwxr-xr-x | phpBB/language/lang_english.php | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/phpBB/language/lang_english.php b/phpBB/language/lang_english.php index a5d26ca349..c9ab6e2bdc 100755 --- a/phpBB/language/lang_english.php +++ b/phpBB/language/lang_english.php @@ -6,7 +6,11 @@ * copyright : (C) 2001 The phpBB Group * email : support@phpbb.com * +<<<<<<< lang_english.php * $Id$ +======= + * $Id$ +>>>>>>> 1.42 * * ***************************************************************************/ @@ -160,12 +164,14 @@ $lang['Edit_Post'] = "Edit Post"; // $lang['Inbox'] = "Inbox"; $lang['Sent'] = "Sent"; +$lang['Outbox'] = "Outbox"; +$lang['Saved'] = "Saved"; $lang['Flag'] = "Flag"; $lang['Subject'] = "Subject"; $lang['From'] = "From"; $lang['To'] = "To"; -$lang['Date'] = "Date"; - +$lang['Date'] = "Date"; +$lang['Mark'] = "Mark"; // // Profiles/Registration @@ -174,6 +180,8 @@ $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."; + // // Memberslist |