diff --git a/phpBB/language/en/lang_admin.php b/phpBB/language/en/lang_admin.php
index 705cf58404..e0a9acccdc 100644
--- a/phpBB/language/en/lang_admin.php
+++ b/phpBB/language/en/lang_admin.php
@@ -412,6 +412,7 @@ $lang += array(
 	'acl_f_reply'		=> 'Can reply to posts',
 	'acl_f_quote'		=> 'Can quote posts',
 	'acl_f_edit'		=> 'Can edit own posts',
+	'acl_f_lock'		=> 'Can lock own topics',
 	'acl_f_delete'		=> 'Can delete own posts',
 	'acl_f_poll'		=> 'Can create polls',
 	'acl_f_vote'		=> 'Can vote in polls',
@@ -592,6 +593,8 @@ $lang += array(
 	'SMILIES_PATH_EXPLAIN'		=> 'Path under your phpBB root dir, e.g. images/smilies',
 	'ICONS_PATH'				=> 'Post icons storage path',
 	'ICONS_PATH_EXPLAIN'		=> 'Path under your phpBB root dir, e.g. images/icons',
+	'UPLOAD_ICONS_PATH'			=> 'Extension group icons storage path',
+	'UPLOAD_ICONS_PATH_EXPLAIN'	=> 'Path under your phpBB root dir, e.g. images/upload_icons',
 	'RANKS_PATH'				=> 'Rank image storage path',
 	'RANKS_PATH_EXPLAIN'		=> 'Path under your phpBB root dir, e.g. images/ranks',
 );
@@ -833,6 +836,8 @@ $lang += array(
 	'AUTO_PRUNE_FREQ_EXPLAIN'	=> 'Time in days between pruning events.',
 	'AUTO_PRUNE_DAYS'			=> 'Auto-prune Post Age',
 	'AUTO_PRUNE_DAYS_EXPLAIN'	=> 'Number of days since last post after which topic is removed.', 
+	'AUTO_PRUNE_VIEWED'			=> 'Auto-prune Post Viewed Age',
+	'AUTO_PRUNE_VIEWED_EXPLAIN'	=> 'Number of days since topic was viewed after which topic is removed.',
 	'PRUNE_OLD_POLLS'			=> 'Prune Old Polls',
 	'PRUNE_OLD_POLLS_EXPLAIN'	=> 'Removes topics with polls not voted in for post age days.',
 	'PRUNE_FINISHED_POLLS'		=> 'Prune Closed Polls',
diff --git a/phpBB/language/en/lang_main.php b/phpBB/language/en/lang_main.php
index 283c918f6d..746e2db06b 100644
--- a/phpBB/language/en/lang_main.php
+++ b/phpBB/language/en/lang_main.php
@@ -404,6 +404,8 @@ $lang = array(
 	'RULES_EDIT_CANNOT'		=> 'You <b>cannot</b> edit your posts in this forum',
 	'RULES_DELETE_CAN'		=> 'You <b>can</b> delete your posts in this forum',
 	'RULES_DELETE_CANNOT'	=> 'You <b>cannot</b> delete your posts in this forum',
+	'RULES_LOCK_CAN'		=> 'You <b>can</b> lock your topics in this forum',
+	'RULES_LOCK_CANNOT'		=> 'You <b>cannot</b> lock your topics in this forum',
 	'RULES_VOTE_CAN'		=> 'You <b>can</b> vote in polls in this forum',
 	'RULES_VOTE_CANNOT'		=> 'You <b>cannot</b> vote in polls in this forum',
 
@@ -420,6 +422,8 @@ $lang = array(
 	'NO_UNREAD_POSTS'	=> 'There are no new unread posts for this topic.', 
 
 	'LOGIN_VIEWFORUM'	=> 'The board administrator requires you to be registered and logged in to view this forum.', 
+	'LOGIN_NOTIFY_TOPIC'	=> 'You have been notified about this topic, please login to view it.',
+	'LOGIN_NOTIFY_FORUM'	=> 'You have been notified about this forum, please login to view it.',
 	'STOP_WATCHING_FORUM'	=> 'Unsubscribe Forum',
 	'START_WATCHING_FORUM'	=> 'Subscribe Forum',
 	'NOT_WATCHING_FORUM'	=> 'You no subscribe to updates on this forum',
@@ -575,8 +579,8 @@ $lang += array(
 	'TOO_MANY_SMILIES'			=> 'Your message contains too many emoticons.',
 	'UNAUTHORISED_BBCODE'		=> 'You cannot use certain bbcodes: ',
 	'QUOTE_DEPTH_EXCEEDED'		=> 'You may embed only %1$d quotes within each other.',
-	'Forum_locked'				=> 'This forum is locked you cannot post, reply to or edit topics',
-	'Topic_locked'				=> 'This topic is locked you cannot edit posts or make replies',
+	'FORUM_LOCKED'				=> 'This forum is locked you cannot post, reply to or edit topics',
+	'TOPIC_LOCKED'				=> 'This topic is locked you cannot edit posts or make replies',
 
 	'USER_CANNOT_POST'		=> 'You cannot post in this forum',
 	'USER_CANNOT_REPLY'		=> 'You cannot reply in this forum',