1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 03:04:09 +02:00

Final updates for tonight

git-svn-id: file:///svn/phpbb/trunk@477 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen
2001-06-12 00:54:15 +00:00
parent 89f08f53cb
commit f8ad3c0c2c
2 changed files with 15 additions and 7 deletions

View File

@@ -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