aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-08-05 15:49:28 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-08-05 15:49:28 +0000
commitb4b901b82552e639cae00c4dc38542cf6fe2d873 (patch)
tree27a02a9b1861ef07cd22dd19e6b970a82945e490 /phpBB/language/en
parent0a007bd5d746892459201306363c38cbdec36bc2 (diff)
downloadforums-b4b901b82552e639cae00c4dc38542cf6fe2d873.tar
forums-b4b901b82552e639cae00c4dc38542cf6fe2d873.tar.gz
forums-b4b901b82552e639cae00c4dc38542cf6fe2d873.tar.bz2
forums-b4b901b82552e639cae00c4dc38542cf6fe2d873.tar.xz
forums-b4b901b82552e639cae00c4dc38542cf6fe2d873.zip
- fixed some bugs
- made imageset naming more consistent - updated every schema to be consistent and also fixed it (every db should install fine now) - git-svn-id: file:///svn/phpbb/trunk@6237 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en')
-rw-r--r--phpBB/language/en/acp/styles.php181
-rw-r--r--phpBB/language/en/common.php2
-rw-r--r--phpBB/language/en/email/admin_send_email.txt3
-rwxr-xr-xphpBB/language/en/install.php2
4 files changed, 101 insertions, 87 deletions
diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index 141768c2dd..4819230026 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -136,103 +136,114 @@ $lang = array_merge($lang, array(
'IMAGESET_UPDATED' => 'Imageset updated successfully',
'ITALIC' => 'Italic',
- 'IMG_ATTACH_PROGRESS_BAR' => 'Attachment upload progress bar',
-
- 'IMG_BTN_POST' => 'New topic',
- 'IMG_BTN_REPLY' => 'Reply topic',
- 'IMG_BTN_LOCKED' => 'Topic locked',
- 'IMG_BTN_POST_PM' => 'New message',
- 'IMG_BTN_REPLY_PM' => 'Reply message',
- 'IMG_BTN_DELETE' => 'Delete post',
- 'IMG_BTN_QUOTE' => 'Quote post',
- 'IMG_BTN_PROFILE' => 'Show profile',
- 'IMG_BTN_EMAIL' => 'Send email',
- 'IMG_BTN_SEARCH' => 'Search posts',
- 'IMG_BTN_WWW' => 'Website',
- 'IMG_BTN_INFO' => 'Show post details',
- 'IMG_BTN_EDIT' => 'Edit post',
- 'IMG_BTN_AIM' => 'AIM',
- 'IMG_BTN_ICQ' => 'ICQ',
- 'IMG_BTN_JABBER' => 'Jabber',
- 'IMG_BTN_YIM' => 'YIM',
- 'IMG_BTN_MSNM' => 'MSNM',
- 'IMG_BTN_ONLINE' => 'User online',
- 'IMG_BTN_OFFLINE' => 'User offline',
- 'IMG_BTN_REPORT' => 'Report post',
- 'IMG_BTN_WARN' => 'Warn user',
- 'IMG_BTN_PM' => 'Send message',
- 'IMG_BTN_FRIEND' => 'Add as friend',
- 'IMG_BTN_FOE' => 'Add as foe',
-
'IMG_CAT_BUTTONS' => 'Localised buttons',
'IMG_CAT_CUSTOM' => 'Custom images',
'IMG_CAT_FOLDERS' => 'Topic icons',
'IMG_CAT_FORUMS' => 'Forum icons',
'IMG_CAT_ICONS' => 'General icons',
- 'IMG_CAT_KARMA' => 'Karma images',
'IMG_CAT_LOGOS' => 'Logos',
'IMG_CAT_POLLS' => 'Polling images',
'IMG_CAT_UI' => 'General user interface elements',
'IMG_CAT_USER' => 'Additional images',
- 'IMG_FOLDER' => 'Topic',
- 'IMG_FOLDER_ANNOUNCE' => 'Announcement',
- 'IMG_FOLDER_ANNOUNCE_NEW' => 'Announcement new posts',
- 'IMG_FOLDER_ANNOUNCE_POST' => 'Announcement posted to',
- 'IMG_FOLDER_ANNOUNCE_NEW_POST' => 'Announcement posted to new',
- 'IMG_FOLDER_GLOBAL' => 'Global',
- 'IMG_FOLDER_GLOBAL_NEW' => 'Global new posts',
- 'IMG_FOLDER_GLOBAL_POST' => 'Global posted to',
- 'IMG_FOLDER_GLOBAL_NEW_POST' => 'Global posted to new',
- 'IMG_FOLDER_HOT' => 'Topic hot',
- 'IMG_FOLDER_HOT_NEW' => 'Topic hot new posts',
- 'IMG_FOLDER_HOT_POST' => 'Topic hot posted to',
- 'IMG_FOLDER_HOT_NEW_POST' => 'Topic hot posted to new',
- 'IMG_FOLDER_LOCK' => 'Topic locked',
- 'IMG_FOLDER_LOCK_NEW' => 'Topic locked new',
- 'IMG_FOLDER_LOCK_POST' => 'Topic locked posted to',
- 'IMG_FOLDER_LOCK_NEW_POST' => 'Topic locked posted to new',
- 'IMG_FOLDER_LOCK_ANNOUNCE' => 'Announcement locked',
- 'IMG_FOLDER_LOCK_ANNOUNCE_NEW' => 'Announcement locked new posts',
- 'IMG_FOLDER_LOCK_ANNOUNCE_POST' => 'Announcement locked posted to',
- 'IMG_FOLDER_LOCK_ANNOUNCE_NEW_POST' => 'Announcement locked posted to new',
- 'IMG_FOLDER_LOCK_GLOBAL' => 'Global locked',
- 'IMG_FOLDER_LOCK_GLOBAL_NEW' => 'Global locked new posts',
- 'IMG_FOLDER_LOCK_GLOBAL_POST' => 'Global locked posted to',
- 'IMG_FOLDER_LOCK_GLOBAL_NEW_POST' => 'Global locked posted to new',
- 'IMG_FOLDER_LOCK_STICKY' => 'Sticky topic locked',
- 'IMG_FOLDER_LOCK_STICKY_POST' => 'Sticky topic locked posted to',
- 'IMG_FOLDER_LOCK_STICKY_NEW' => 'Sticky topic locked new posts',
- 'IMG_FOLDER_LOCK_STICKY_NEW_POST' => 'Sticky topic locked posted to new',
- 'IMG_FOLDER_MOVED' => 'Topic moved',
- 'IMG_FOLDER_NEW' => 'Topic new posts',
- 'IMG_FOLDER_NEW_POST' => 'Topic posted to new',
- 'IMG_FOLDER_POST' => 'Topic posted to',
- 'IMG_FOLDER_STICKY' => 'Sticky topic',
- 'IMG_FOLDER_STICKY_POST' => 'Sticky topic posted to',
- 'IMG_FOLDER_STICKY_NEW' => 'Sticky topic new posts',
- 'IMG_FOLDER_STICKY_NEW_POST' => 'Sticky topic posted to new',
-
- 'IMG_FORUM' => 'Forum',
- 'IMG_FORUM_NEW' => 'Forum new posts',
- 'IMG_FORUM_LOCKED' => 'Forum locked',
- 'IMG_FORUM_LINK' => 'Forum link',
- 'IMG_ICON_UNAPPROVED' => 'Post unapproved',
- 'IMG_ICON_REPORTED' => 'Post reported',
- 'IMG_ICON_ATTACH' => 'Attachment',
- 'IMG_ICON_POST' => 'Minipost',
- 'IMG_ICON_POST_NEW' => 'New minipost',
- 'IMG_ICON_POST_LATEST' => 'Last post',
- 'IMG_ICON_POST_NEWEST' => 'Newest post',
- 'IMG_KARMA_LEFT' => 'Karma left end',
- 'IMG_KARMA_CENTER' => 'Karma centre',
- 'IMG_KARMA_RIGHT' => 'Karma right end',
+ 'IMG_SITE_LOGO' => 'Main Logo',
+ 'IMG_UPLOAD_BAR' => 'Upload progress bar',
'IMG_POLL_LEFT' => 'Poll left end',
- 'IMG_POLL_RIGHT' => 'Poll right end',
'IMG_POLL_CENTER' => 'Poll centre',
- 'IMG_SITE_LOGO' => 'Main Logo',
- 'IMG_SUB_FORUM' => 'Subforum',
- 'IMG_SUB_FORUM_NEW' => 'Subforum new posts',
+ 'IMG_POLL_RIGHT' => 'Poll right end',
+ 'IMG_ICON_FRIEND' => 'Add as friend',
+ 'IMG_ICON_FOE' => 'Add as foe',
+
+ 'IMG_FORUM_LINK' => 'Forum link',
+ 'IMG_FORUM_READ' => 'Forum',
+ 'IMG_FORUM_READ_LOCKED' => 'Forum locked',
+ 'IMG_FORUM_READ_SUBFORUM' => 'Subforum',
+ 'IMG_FORUM_UNREAD' => 'Forum new posts',
+ 'IMG_FORUM_UNREAD_LOCKED' => 'Forum new posts locked',
+ 'IMG_FORUM_UNREAD_SUBFORUM' => 'Subforum new posts',
+
+ 'IMG_TOPIC_MOVED' => 'Topic moved',
+
+ 'IMG_TOPIC_READ' => 'Topic',
+ 'IMG_TOPIC_READ_MINE' => 'Topic posted to',
+ 'IMG_TOPIC_READ_HOT' => 'Topic hot',
+ 'IMG_TOPIC_READ_HOT_MINE' => 'Topic hot posted to',
+ 'IMG_TOPIC_READ_LOCKED' => 'Topic locked',
+ 'IMG_TOPIC_READ_LOCKED_MINE' => 'Topic locked posted to',
+
+ 'IMG_TOPIC_UNREAD' => 'Topic new posts',
+ 'IMG_TOPIC_UNREAD_MINE' => 'Topic posted to new',
+ 'IMG_TOPIC_UNREAD_HOT' => 'Topic hot new posts',
+ 'IMG_TOPIC_UNREAD_HOT_MINE' => 'Topic hot posted to new',
+ 'IMG_TOPIC_UNREAD_LOCKED' => 'Topic locked new',
+ 'IMG_TOPIC_UNREAD_LOCKED_MINE' => 'Topic locked posted to new',
+
+ 'IMG_STICKY_READ' => 'Sticky topic',
+ 'IMG_STICKY_READ_MINE' => 'Sticky topic posted to',
+ 'IMG_STICKY_READ_LOCKED' => 'Sticky topic locked',
+ 'IMG_STICKY_READ_LOCKED_MINE' => 'Sticky topic locked posted to',
+ 'IMG_STICKY_UNREAD' => 'Sticky topic new posts',
+ 'IMG_STICKY_UNREAD_MINE' => 'Sticky topic posted to new',
+ 'IMG_STICKY_UNREAD_LOCKED' => 'Sticky topic locked new posts',
+ 'IMG_STICKY_UNREAD_LOCKED_MINE' => 'Sticky topic locked posted to new',
+
+ 'IMG_ANNOUNCE_READ' => 'Announcement',
+ 'IMG_ANNOUNCE_READ_MINE' => 'Announcement posted to',
+ 'IMG_ANNOUNCE_READ_LOCKED' => 'Announcement locked',
+ 'IMG_ANNOUNCE_READ_LOCKED_MINE' => 'Announcement locked posted to',
+ 'IMG_ANNOUNCE_UNREAD' => 'Announcement new posts',
+ 'IMG_ANNOUNCE_UNREAD_MINE' => 'Announcement posted to new',
+ 'IMG_ANNOUNCE_UNREAD_LOCKED' => 'Announcement locked new posts',
+ 'IMG_ANNOUNCE_UNREAD_LOCKED_MINE' => 'Announcement locked posted to new',
+
+ 'IMG_GLOBAL_READ' => 'Global',
+ 'IMG_GLOBAL_READ_MINE' => 'Global posted to',
+ 'IMG_GLOBAL_READ_LOCKED' => 'Global locked',
+ 'IMG_GLOBAL_READ_LOCKED_MINE' => 'Global locked posted to',
+ 'IMG_GLOBAL_UNREAD' => 'Global new posts',
+ 'IMG_GLOBAL_UNREAD_MINE' => 'Global posted to new',
+ 'IMG_GLOBAL_UNREAD_LOCKED' => 'Global locked new posts',
+ 'IMG_GLOBAL_UNREAD_LOCKED_MINE' => 'Global locked posted to new',
+
+ 'IMG_PM_READ' => 'Read private message',
+ 'IMG_PM_UNREAD' => 'Unread private message',
+
+ 'IMG_ICON_CONTACT_AIM' => 'AIM',
+ 'IMG_ICON_CONTACT_EMAIL' => 'Send email',
+ 'IMG_ICON_CONTACT_ICQ' => 'ICQ',
+ 'IMG_ICON_CONTACT_JABBER' => 'Jabber',
+ 'IMG_ICON_CONTACT_MSNM' => 'MSNM',
+ 'IMG_ICON_CONTACT_PM' => 'Send message',
+ 'IMG_ICON_CONTACT_YAHOO' => 'YIM',
+ 'IMG_ICON_CONTACT_WWW' => 'Website',
+
+ 'IMG_ICON_POST_DELETE' => 'Delete post',
+ 'IMG_ICON_POST_EDIT' => 'Edit post',
+ 'IMG_ICON_POST_INFO' => 'Show post details',
+ 'IMG_ICON_POST_QUOTE' => 'Quote post',
+ 'IMG_ICON_POST_REPORT' => 'Report post',
+ 'IMG_ICON_POST_TARGET' => 'Minipost',
+ 'IMG_ICON_POST_TARGET_UNREAD' => 'New minipost',
+
+
+ 'IMG_ICON_TOPIC_ATTACH' => 'Attachment',
+ 'IMG_ICON_TOPIC_LATEST' => 'Last post',
+ 'IMG_ICON_TOPIC_NEWEST' => 'Last unread post',
+ 'IMG_ICON_TOPIC_REPORTED' => 'Post reported',
+ 'IMG_ICON_TOPIC_UNAPPROVED' => 'Post unapproved',
+
+ 'IMG_ICON_USER_ONLINE' => 'User online',
+ 'IMG_ICON_USER_OFFLINE' => 'User offline',
+ 'IMG_ICON_USER_PROFILE' => 'Show profile',
+ 'IMG_ICON_USER_SEARCH' => 'Search posts',
+ 'IMG_ICON_USER_WARN' => 'Warn user',
+
+ 'IMG_BUTTON_PM_FORWARD' => 'Forward private message',
+ 'IMG_BUTTON_PM_NEW' => 'New private message',
+ 'IMG_BUTTON_PM_REPLY' => 'Reply private message',
+ 'IMG_BUTTON_TOPIC_LOCKED' => 'Topic locked',
+ 'IMG_BUTTON_TOPIC_NEW' => 'New topic',
+ 'IMG_BUTTON_TOPIC_REPLY' => 'Reply topic',
'IMG_USER_ICON1' => 'User defined image 1',
'IMG_USER_ICON2' => 'User defined image 2',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index b799f1ae6b..18348278ab 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -557,7 +557,7 @@ $lang = array_merge($lang, array(
'VIEW_BOOKMARKS' => 'View bookmarks',
'VIEW_FORUM_LOGS' => 'View Logs',
'VIEW_LATEST_POST' => 'View latest post',
- 'VIEW_NEWEST_POST' => 'View newest post',
+ 'VIEW_NEWEST_POST' => 'View latest unread post',
'VIEW_NOTES' => 'View user notes',
'VIEW_ONLINE_TIME' => 'This data is based on users active over the past %d minute',
'VIEW_ONLINE_TIMES' => 'This data is based on users active over the past %d minutes',
diff --git a/phpBB/language/en/email/admin_send_email.txt b/phpBB/language/en/email/admin_send_email.txt
index a0da5e28ba..5fd5592f7c 100644
--- a/phpBB/language/en/email/admin_send_email.txt
+++ b/phpBB/language/en/email/admin_send_email.txt
@@ -10,3 +10,6 @@ Message sent to you follows:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
{MESSAGE}
+
+
+{EMAIL_SIG}
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index f92b1c3751..0383fa6ef7 100755
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -99,7 +99,7 @@ $lang = array_merge($lang, array(
'DLL_MYSQL4' => 'MySQL 4.x/5.x',
'DLL_MYSQLI' => 'MySQL 4.1.x/5.x with MySQLi Extension',
'DLL_ORACLE' => 'Oracle',
- 'DLL_POSTGRES' => 'PostgreSQL 7.x',
+ 'DLL_POSTGRES' => 'PostgreSQL 7.x/8.x',
'DLL_SQLITE' => 'SQLite',
'DLL_XML' => 'XML support [ Jabber ]',
'DLL_ZLIB' => 'zlib Compression support [ gz, .tar.gz, .zip ]',
generated by cgit v1.2.1 (git 2.21.0) at 2025-05-05 18:21:17 +0000