Merge branch 'ticket/igorw/9556' into develop

* ticket/igorw/9556:
  [ticket/9556] Drop php closing tags, add trailing newline

Conflicts:
	phpBB/includes/constants.php

phpBB/language/en/acp/attachments.php

@@ -170,5 +170,3 @@ $lang = array_merge($lang, array(
 	'UPLOAD_ICON'					=> 'Upload icon',
 	'UPLOAD_NOT_DIR'				=> 'The upload location you specified does not appear to be a directory.',
 ));
-
-?>

phpBB/language/en/acp/ban.php

@@ -78,5 +78,3 @@ $lang = array_merge($lang, array(
 	'USER_UNBAN'				=> 'Un-ban or un-exclude usernames',
 	'USER_UNBAN_EXPLAIN'		=> 'You can unban (or un-exclude) multiple users in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded users are emphasised.',
 ));
-
-?>

phpBB/language/en/acp/board.php

@@ -540,5 +540,3 @@ $lang = array_merge($lang, array(
 	'JAB_USERNAME'				=> 'Jabber username or JID',
 	'JAB_USERNAME_EXPLAIN'		=> 'Specify a registered username or a valid JID. The username will not be checked for validity. If you only specify a username, then your JID will be the username and the server you specified above. Else, specify a valid JID, for example user@jabber.org.',
 ));
-
-?>

phpBB/language/en/acp/bots.php

@@ -69,5 +69,3 @@ $lang = array_merge($lang, array(
 	'NO_BOT'		=> 'Found no bot with the specified ID.',
 	'NO_BOT_GROUP'	=> 'Unable to find special bot group.',
 ));
-
-?>

phpBB/language/en/acp/common.php

@@ -738,5 +738,3 @@ $lang = array_merge($lang, array(
 	'LOG_WORD_DELETE'		=> '<strong>Deleted word censor</strong><br />» %s',
 	'LOG_WORD_EDIT'			=> '<strong>Edited word censor</strong><br />» %s',
 ));
-
-?>

phpBB/language/en/acp/database.php

@@ -72,5 +72,3 @@ $lang = array_merge($lang, array(
 	'TABLE_SELECT'		=> 'Table select',
 	'TABLE_SELECT_ERROR'=> 'You must select at least one table.',
 ));
-
-?>

phpBB/language/en/acp/email.php

@@ -63,5 +63,3 @@ $lang = array_merge($lang, array(
 	'NO_EMAIL_MESSAGE'		=> 'You must enter a message.',
 	'NO_EMAIL_SUBJECT'		=> 'You must specify a subject for your message.',
 ));
-
-?>

phpBB/language/en/acp/forums.php

@@ -156,5 +156,3 @@ $lang = array_merge($lang, array(
 
 	'UNLOCKED'			=> 'Unlocked',
 ));
-
-?>

phpBB/language/en/acp/groups.php

@@ -128,5 +128,3 @@ $lang = array_merge($lang, array(
 	'USER_GROUP_DEFAULT_EXPLAIN'	=> 'Saying yes here will set this group as the default group for the added users.',
 	'USER_GROUP_LEADER'				=> 'Set as group leader',
 ));
-
-?>

phpBB/language/en/acp/language.php

@@ -98,5 +98,3 @@ $lang = array_merge($lang, array(
 
 	'WRONG_LANGUAGE_FILE'		=> 'Selected language file is invalid.',
 ));
-
-?>

phpBB/language/en/acp/modules.php

@@ -80,5 +80,3 @@ $lang = array_merge($lang, array(
 
 	'SELECT_MODULE'			=> 'Select a module',
 ));
-
-?>

phpBB/language/en/acp/permissions.php

@@ -285,5 +285,3 @@ $lang = array_merge($lang, array(
 	'WRONG_PERMISSION_TYPE'				=> 'Wrong permission type selected.',
 	'WRONG_PERMISSION_SETTING_FORMAT'	=> 'The permission settings are in a wrong format, phpBB is not able to process them correctly.',
 ));
-
-?>

phpBB/language/en/acp/permissions_phpbb.php

@@ -237,5 +237,3 @@ $lang = array_merge($lang, array(
 	'acl_a_backup'		=> array('lang' => 'Can backup/restore database', 'cat' => 'misc'),
 	'acl_a_search'		=> array('lang' => 'Can manage search backends and settings', 'cat' => 'misc'),
 ));
-
-?>

phpBB/language/en/acp/posting.php

@@ -276,5 +276,3 @@ $lang = array_merge($lang, array(
 
 	'USED_IN_REPORTS'		=> 'Used in reports',
 ));
-
-?>

phpBB/language/en/acp/profile.php

@@ -152,5 +152,3 @@ $lang = array_merge($lang, array(
 
 	'VISIBILITY_OPTION'				=> 'Visibility options',
 ));
-
-?>

phpBB/language/en/acp/prune.php

@@ -87,5 +87,3 @@ $lang = array_merge($lang, array(
 
 	'TOPICS_PRUNED'		=> 'Topics pruned',
 ));
-
-?>

phpBB/language/en/acp/search.php

@@ -105,5 +105,3 @@ $lang = array_merge($lang, array(
 	'YES_SEARCH_UPDATE'						=> 'Enable fulltext updating',
 	'YES_SEARCH_UPDATE_EXPLAIN'				=> 'Updating of fulltext indexes when posting, overridden if search is disabled.',
 ));
-
-?>

phpBB/language/en/acp/styles.php

@@ -430,5 +430,3 @@ $lang = array_merge($lang, array(
 	'UNSET'					=> 'Undefined',
 
 ));
-
-?>

phpBB/language/en/acp/users.php

@@ -138,5 +138,3 @@ $lang = array_merge($lang, array(
 	'USER_WARNING_LOG_DELETED'		=> 'No information available. Possibly the log entry has been deleted.',
 	'USER_TOOLS'					=> 'Basic tools',
 ));
-
-?>