3 files changed, 34 insertions, 31 deletions
diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php
index 0fe5c16375..d701a2d513 100644
--- a/phpBB/language/en/acp/attachments.php
+++ b/phpBB/language/en/acp/attachments.php
@@ -59,7 +59,9 @@ $lang = array_merge($lang, array(
 	'ATTACH_QUOTA_EXPLAIN'				=> 'Maximum drive space available for attachments in total, 0 is unlimited.',
 	'ATTACH_TO_POST'					=> 'Attach file to post',
 
+	'CAT_FLASH_FILES'			=> 'Flash Files',
 	'CAT_IMAGES'				=> 'Images',
+	'CAT_QUICKTIME_FILES'		=> 'Quicktime Media',
 	'CAT_RM_FILES'				=> 'Real Media Streams',
 	'CAT_WM_FILES'				=> 'Window Media Streams',
 	'CREATE_GROUP'				=> 'Create new group',
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 705682e94a..dc66d8261e 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -396,7 +396,7 @@ $lang = array_merge($lang, array(
 	'SMTP_DIGEST_MD5'				=> 'DIGEST-MD5',
 	'SMTP_LOGIN'					=> 'LOGIN',
 	'SMTP_PASSWORD'					=> 'SMTP Password',
-	'SMTP_PASSWORD_EXPLAIN'			=> 'Only enter a password if your smtp server requires it.',
+	'SMTP_PASSWORD_EXPLAIN'			=> 'Only enter a password if your SMTP server requires it.',
 	'SMTP_PLAIN'					=> 'PLAIN',
 	'SMTP_POP_BEFORE_SMTP'			=> 'POP-BEFORE-SMTP',
 	'SMTP_PORT'						=> 'SMTP Server Port',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 1ec3fb6091..40f62e4608 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -360,36 +360,37 @@ $lang = array_merge($lang, array(
 	'ONLINE_USER_TOTAL'			=> 'In total there is <strong>%d</strong> user online :: ',
 	'OPTIONS'					=> 'Options',
 
-	'PAGE_OF'			=> 'Page <strong>%1$d</strong> of <strong>%2$d</strong>',
-	'PASSWORD'			=> 'Password',
-	'PM'				=> 'PM',
-	'POSTING_MESSAGE'	=> 'Posting message in %s',
-	'POST'				=> 'Post',
-	'POST_ANNOUNCEMENT'	=> 'Announce',
-	'POST_STICKY'		=> 'Sticky',
-	'POSTED'			=> 'Posted',
-	'POSTED_IN_FORUM'	=> 'in',
-	'POSTED_ON_DATE'	=> 'on',
-	'POSTS'				=> 'Posts',
-	'POSTS_UNAPPROVED'	=> 'At least one post in this topic has not been approved',
-	'POST_BY_AUTHOR'	=> 'by',
-	'POST_BY_FOE'		=> 'This post was made by <strong>%1$s</strong> who is currently on your ignore list. %2$sDisplay this post%3$s.',
-	'POST_DAY'			=> '%.2f posts per day',
-	'POST_DETAILS'		=> 'Post details',
-	'POST_NEW_TOPIC'	=> 'Post new topic',
-	'POST_PCT'			=> '%.2f%% of all posts',
-	'POST_PCT_ACTIVE'	=> '%.2f%% of your posts',
-	'POST_REPORTED'		=> 'Click to view report',
-	'POST_SUBJECT'		=> 'Post subject',
-	'POST_TIME'			=> 'Post time',
-	'POST_UNAPPROVED'	=> 'This post is waiting for approval',
-	'PREVIEW'			=> 'Preview',
-	'PREVIOUS'			=> 'Previous',
-	'PRIVACY'			=> 'Privacy policy',
-	'PRIVATE_MESSAGE'	=> 'Private Message',
-	'PRIVATE_MESSAGES'	=> 'Private Messages',
-	'PRIVATE_MESSAGING'	=> 'Private Messaging',
-	'PROFILE'			=> 'User Control Panel',
+	'PAGE_OF'				=> 'Page <strong>%1$d</strong> of <strong>%2$d</strong>',
+	'PASSWORD'				=> 'Password',
+	'PLAY_QUICKTIME_FILE'	=> 'Play quicktime file',
+	'PM'					=> 'PM',
+	'POSTING_MESSAGE'		=> 'Posting message in %s',
+	'POST'					=> 'Post',
+	'POST_ANNOUNCEMENT'		=> 'Announce',
+	'POST_STICKY'			=> 'Sticky',
+	'POSTED'				=> 'Posted',
+	'POSTED_IN_FORUM'		=> 'in',
+	'POSTED_ON_DATE'		=> 'on',
+	'POSTS'					=> 'Posts',
+	'POSTS_UNAPPROVED'		=> 'At least one post in this topic has not been approved',
+	'POST_BY_AUTHOR'		=> 'by',
+	'POST_BY_FOE'			=> 'This post was made by <strong>%1$s</strong> who is currently on your ignore list. %2$sDisplay this post%3$s.',
+	'POST_DAY'				=> '%.2f posts per day',
+	'POST_DETAILS'			=> 'Post details',
+	'POST_NEW_TOPIC'		=> 'Post new topic',
+	'POST_PCT'				=> '%.2f%% of all posts',
+	'POST_PCT_ACTIVE'		=> '%.2f%% of your posts',
+	'POST_REPORTED'			=> 'Click to view report',
+	'POST_SUBJECT'			=> 'Post subject',
+	'POST_TIME'				=> 'Post time',
+	'POST_UNAPPROVED'		=> 'This post is waiting for approval',
+	'PREVIEW'				=> 'Preview',
+	'PREVIOUS'				=> 'Previous',
+	'PRIVACY'				=> 'Privacy policy',
+	'PRIVATE_MESSAGE'		=> 'Private Message',
+	'PRIVATE_MESSAGES'		=> 'Private Messages',
+	'PRIVATE_MESSAGING'		=> 'Private Messaging',
+	'PROFILE'				=> 'User Control Panel',
 
 	'READING_FORUM'				=> 'Viewing topics in %s',
 	'READING_GLOBAL_ANNOUNCE'	=> 'Reading global announcement',