6 files changed, 32 insertions, 32 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 98db554843..0c6014bc24 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* acp common [English]
+* acp_common [English]
 *
 * @package language
 * @version $Id$
@@ -57,7 +57,7 @@ $lang = array_merge($lang, array(
 	'ACP_BOARD_MANAGEMENT'		=> 'Board management',
 	'ACP_BOARD_SETTINGS'		=> 'Board settings',
 	'ACP_BOTS'					=> 'Spiders/Robots',
-	
+
 	'ACP_CAPTCHA'				=> 'CAPTCHA',
 
 	'ACP_CAT_DATABASE'			=> 'Database',
@@ -75,14 +75,14 @@ $lang = array_merge($lang, array(
 	'ACP_COOKIE_SETTINGS'		=> 'Cookie settings',
 	'ACP_CRITICAL_LOGS'			=> 'Error log',
 	'ACP_CUSTOM_PROFILE_FIELDS'	=> 'Custom profile fields',
-	
+
 	'ACP_DATABASE'				=> 'Database management',
 	'ACP_DISALLOW'				=> 'Disallow',
 	'ACP_DISALLOW_USERNAMES'	=> 'Disallow usernames',
-	
+
 	'ACP_EMAIL_SETTINGS'		=> 'E-mail settings',
 	'ACP_EXTENSION_GROUPS'		=> 'Manage extension groups',
-	
+
 	'ACP_FORUM_BASED_PERMISSIONS'	=> 'Forum based permissions',
 	'ACP_FORUM_LOGS'				=> 'Forum logs',
 	'ACP_FORUM_MANAGEMENT'			=> 'Forum management',
@@ -99,20 +99,20 @@ $lang = array_merge($lang, array(
 	'ACP_GROUPS_MANAGE'				=> 'Manage groups',
 	'ACP_GROUPS_MANAGEMENT'			=> 'Group management',
 	'ACP_GROUPS_PERMISSIONS'		=> 'Groups’ permissions',
-	
+
 	'ACP_ICONS'					=> 'Topic icons',
 	'ACP_ICONS_SMILIES'			=> 'Topic icons/smilies',
 	'ACP_IMAGESETS'				=> 'Imagesets',
 	'ACP_INACTIVE_USERS'		=> 'Inactive users',
 	'ACP_INDEX'					=> 'ACP index',
-	
+
 	'ACP_JABBER_SETTINGS'		=> 'Jabber settings',
-	
+
 	'ACP_LANGUAGE'				=> 'Language management',
 	'ACP_LANGUAGE_PACKS'		=> 'Language packs',
 	'ACP_LOAD_SETTINGS'			=> 'Load settings',
 	'ACP_LOGGING'				=> 'Logging',
-	
+
 	'ACP_MAIN'					=> 'ACP index',
 	'ACP_MANAGE_EXTENSIONS'		=> 'Manage extensions',
 	'ACP_MANAGE_FORUMS'			=> 'Manage forums',
@@ -125,9 +125,9 @@ $lang = array_merge($lang, array(
 	'ACP_MODULE_MANAGEMENT'		=> 'Module management',
 	'ACP_MOD_LOGS'				=> 'Moderator log',
 	'ACP_MOD_ROLES'				=> 'Moderator roles',
-	
+
 	'ACP_ORPHAN_ATTACHMENTS'	=> 'Orphaned attachments',
-	
+
 	'ACP_PERMISSIONS'			=> 'Permissions',
 	'ACP_PERMISSION_MASKS'		=> 'Permission masks',
 	'ACP_PERMISSION_ROLES'		=> 'Permission roles',
@@ -137,9 +137,9 @@ $lang = array_merge($lang, array(
 	'ACP_PRUNE_FORUMS'			=> 'Prune forums',
 	'ACP_PRUNE_USERS'			=> 'Prune users',
 	'ACP_PRUNING'				=> 'Pruning',
-	
+
 	'ACP_QUICK_ACCESS'			=> 'Quick access',
-	
+
 	'ACP_RANKS'					=> 'Ranks',
 	'ACP_REASONS'				=> 'Report/denial reasons',
 	'ACP_REGISTER_SETTINGS'		=> 'User registration settings',
@@ -158,10 +158,10 @@ $lang = array_merge($lang, array(
 	'ACP_STYLE_COMPONENTS'		=> 'Style components',
 	'ACP_STYLE_MANAGEMENT'		=> 'Style management',
 	'ACP_STYLES'				=> 'Styles',
-	
+
 	'ACP_TEMPLATES'				=> 'Templates',
 	'ACP_THEMES'				=> 'Themes',
-	
+
 	'ACP_UPDATE'					=> 'Updating',
 	'ACP_USERS_FORUM_PERMISSIONS'	=> 'Users’ forum permissions',
 	'ACP_USERS_LOGS'				=> 'User logs',
@@ -188,7 +188,7 @@ $lang = array_merge($lang, array(
 	'ACP_VIEW_FORUM_PERMISSIONS'		=> 'View forum-based permissions',
 	'ACP_VIEW_GLOBAL_MOD_PERMISSIONS'	=> 'View global moderation permissions',
 	'ACP_VIEW_USER_PERMISSIONS'			=> 'View user-based permissions',
-	
+
 	'ACP_WORDS'					=> 'Word censoring',
 
 	'ACTION'				=> 'Action',
@@ -242,7 +242,7 @@ $lang = array_merge($lang, array(
 	'NOTIFY'				=> 'Notification',
 	'NO_ADMIN'				=> 'You are not authorised to administrate this board.',
 	'NO_EMAILS_DEFINED'		=> 'No valid e-mail addresses found.',
-	'NO_PASSWORD_SUPPLIED'	=> 'You need to enter your password to access the Administration Control Panel.',	
+	'NO_PASSWORD_SUPPLIED'	=> 'You need to enter your password to access the Administration Control Panel.',
 
 	'OFF'					=> 'Off',
 	'ON'					=> 'On',
@@ -252,7 +252,7 @@ $lang = array_merge($lang, array(
 	'PARSE_URLS'						=> 'Parse links',
 	'PERMISSIONS_TRANSFERRED'			=> 'Permissions transferred',
 	'PERMISSIONS_TRANSFERRED_EXPLAIN'	=> 'You currently have the permissions from %1$s. You are able to browse the board with this user’s permissions, but not access the administration control panel since admin permissions were not transferred. You can <a href="%2$s"><strong>revert to your permission set</strong></a> at any time.',
-	'PIXEL'								=> 'px',	
+	'PIXEL'								=> 'px',
 	'PROCEED_TO_ACP'					=> '%sProceed to the ACP%s',
 
 	'REMIND'							=> 'Remind',
@@ -404,7 +404,7 @@ $lang = array_merge($lang, array(
 
 	'LOG_ACL_TRANSFER_PERMISSIONS'		=> '<strong>Permissions transferred from</strong><br />» %s',
 	'LOG_ACL_RESTORE_PERMISSIONS'		=> '<strong>Own permissions restored after using permissions from</strong><br />» %s',
-	
+
 	'LOG_ADMIN_AUTH_FAIL'		=> '<strong>Failed administration login attempt</strong>',
 	'LOG_ADMIN_AUTH_SUCCESS'	=> '<strong>Successful administration login</strong>',
 
@@ -498,7 +498,7 @@ $lang = array_merge($lang, array(
 
 	'LOG_ERROR_JABBER'		=> '<strong>Jabber error</strong><br />» %s',
 	'LOG_ERROR_EMAIL'		=> '<strong>E-mail error</strong><br />» %s',
-	
+
 	'LOG_FORUM_ADD'							=> '<strong>Created new forum</strong><br />» %s',
 	'LOG_FORUM_DEL_FORUM'					=> '<strong>Deleted forum</strong><br />» %s',
 	'LOG_FORUM_DEL_FORUMS'					=> '<strong>Deleted forum and its subforums</strong><br />» %s',
diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index d5b4f0015d..8f090667b4 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* acp_permissions (phpBB Permission Set) [English]
+* acp_permissions_phpbb (phpBB Permission Set) [English]
 *
 * @package language
 * @version $Id$
@@ -35,7 +35,7 @@ if (empty($lang) || !is_array($lang))
 
 /**
 *	MODDERS PLEASE NOTE
-*	
+*
 *	You are able to put your permission sets into a separate file too by
 *	prefixing the new file with permissions_ and putting it into the acp
 *	language folder.
diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php
index 961ca2612c..ebde75cfaa 100644
--- a/phpBB/language/en/acp/posting.php
+++ b/phpBB/language/en/acp/posting.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* posting [English]
+* acp_posting [English]
 *
 * @package language
 * @version $Id$
@@ -103,7 +103,7 @@ $lang = array_merge($lang, array(
 	'DISPLAY_POSTING_NO'		=> 'Not on posting page',
 
 
-	
+
 	'EDIT_ICONS'				=> 'Edit icons',
 	'EDIT_SMILIES'				=> 'Edit smilies',
 	'EMOTION'					=> 'Emotion',
@@ -207,7 +207,7 @@ $lang = array_merge($lang, array(
 	'ADD_RANK'				=> 'Add new rank',
 
 	'MUST_SELECT_RANK'		=> 'You must select a rank.',
-	
+
 	'NO_ASSIGNED_RANK'		=> 'No special rank assigned.',
 	'NO_RANK_TITLE'			=> 'You haven’t specified a title for the rank.',
 	'NO_UPDATE_RANKS'		=> 'The rank was successfully deleted. However user accounts using this rank were not updated. You will need to manually reset the rank on these accounts.',
@@ -243,12 +243,12 @@ $lang = array_merge($lang, array(
 	'ACP_REASONS_EXPLAIN'	=> 'Here you can manage the reasons used in reports and denial messages when disapproving posts. There is one default reason (marked with a *) you are not able to remove, this reason is normally used for custom messages if no reason fits.',
 	'ADD_NEW_REASON'		=> 'Add new reason',
 	'AVAILABLE_TITLES'		=> 'Available localised reason titles',
-	
+
 	'IS_NOT_TRANSLATED'			=> 'Reason has <strong>not</strong> been localised.',
 	'IS_NOT_TRANSLATED_EXPLAIN'	=> 'Reason has <strong>not</strong> been localised. If you want to provide the localised form, specify the correct key from the language files report reasons section.',
 	'IS_TRANSLATED'				=> 'Reason has been localised.',
 	'IS_TRANSLATED_EXPLAIN'		=> 'Reason has been localised. If the title you enter here is specified within the language files report reasons section, the localised form of the title and description will be used.',
-	
+
 	'NO_REASON'					=> 'Reason could not be found.',
 	'NO_REASON_INFO'			=> 'You have to specify a title and a description for this reason.',
 	'NO_REMOVE_DEFAULT_REASON'	=> 'You are not able to remove the default reason “Other”.',
diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php
index 808f6fdc10..354d432d51 100644
--- a/phpBB/language/en/help_faq.php
+++ b/phpBB/language/en/help_faq.php
@@ -144,7 +144,7 @@ $help = array(
 	),
 	array(
 		0 => 'Why did I receive a warning?',
-		1 => 'Each board administrator has their own set of rules for their site. If you have broken a rule, you may issued a warning. Please note that this is the board administrator’s decision, and the phpBB Group has nothing to do with the warnings on the given site. Contact the board administrator if you are unsure about why you were issued a warning.'
+		1 => 'Each board administrator has their own set of rules for their site. If you have broken a rule, you may be issued a warning. Please note that this is the board administrator’s decision, and the phpBB Group has nothing to do with the warnings on the given site. Contact the board administrator if you are unsure about why you were issued a warning.'
 	),
 	array(
 		0 => 'How can I report posts to a moderator?',
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index 2f238ffa37..f53babdc69 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -223,7 +223,7 @@ $lang = array_merge($lang, array(
 	'NO_POST_SELECTED'				=> 'You must select at least one post to perform this action.',
 	'NO_REASON_DISAPPROVAL'			=> 'Please give an appropriate reason for disapproval.',
 	'NO_REPORT'						=> 'No report found',
-	'NO_REPORTS'					=> 'No reports found',	
+	'NO_REPORTS'					=> 'No reports found',
 	'NO_REPORT_SELECTED'			=> 'You must select at least one report to perform this action.',
 	'NO_TOPIC_ICON'					=> 'None',
 	'NO_TOPIC_SELECTED'				=> 'You must select at least one topic to perform this action.',
@@ -273,8 +273,8 @@ $lang = array_merge($lang, array(
 	'REPORT_TOTAL'				=> 'In total there is <strong>1</strong> report to review.',
 	'RESYNC'					=> 'Resync',
 	'RETURN_MESSAGE'			=> '%sReturn to the message%s',
-	'RETURN_NEW_FORUM'			=> '%sReturn to the new forum%s',
-	'RETURN_NEW_TOPIC'			=> '%sReturn to the new topic%s',
+	'RETURN_NEW_FORUM'			=> '%sGo to the new forum%s',
+	'RETURN_NEW_TOPIC'			=> '%sGo to the new topic%s',
 	'RETURN_POST'				=> '%sReturn to the post%s',
 	'RETURN_QUEUE'				=> '%sReturn to the queue%s',
 	'RETURN_REPORTS'			=> '%sReturn to the reports%s',
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index c24a2a173e..76878c8f7c 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -77,7 +77,7 @@ $lang = array_merge($lang, array(
 	'DELETE_MESSAGE'			=> 'Delete message',
 	'DELETE_MESSAGE_CONFIRM'	=> 'Are you sure you want to delete this message?',
 	'DELETE_OWN_POSTS'			=> 'Sorry but you can only delete your own posts.',
-	'DELETE_POST_CONFIRM'		=> 'Are you sure you want to delete this message?',
+	'DELETE_POST_CONFIRM'		=> 'Are you sure you want to delete this post?',
 	'DELETE_POST_WARN'			=> 'Once deleted the post cannot be recovered',
 	'DISABLE_BBCODE'			=> 'Disable BBCode',
 	'DISABLE_MAGIC_URL'			=> 'Do not automatically parse URLs',