2 files changed, 147 insertions, 135 deletions
diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index a3a3e90c00..bd1e4740f4 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -1,166 +1,178 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a><h1>{L_WELCOME_PHPBB}</h1>
+<a name="maincontent"></a>
 
-<p>{L_ADMIN_INTRO}</p>
+<!-- IF S_RESTORE_PERMISSIONS -->
 
-<!-- IF S_DEBUG_EXTRA -->
-	<div class="errorbox">
-		<h3>{L_WARNING}</h3>
-		<p>{L_DEBUG_EXTRA_WARNING}</p>
-	</div>
-<!-- ENDIF -->
+	<h1>{L_PERMISSIONS_TRANSFERED}</h1>
 
-<!-- IF S_REMOVE_INSTALL -->
-	<div class="errorbox">
-		<h3>{L_WARNING}</h3>
-		<p>{L_REMOVE_INSTALL}</p>
-	</div>
-<!-- ENDIF -->
+	<p>{L_PERMISSIONS_TRANSFERED_EXPLAIN}</p>
 
-<table cellspacing="1">
-	<caption>{L_FORUM_STATS}</caption>
-	<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
-<thead>
-<tr>
-	<th>{L_STATISTIC}</th>
-	<th>{L_VALUE}</th>
-	<th>{L_STATISTIC}</th>
-	<th>{L_VALUE}</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-	<td>{L_NUMBER_POSTS}: </td>
-	<td><b>{TOTAL_POSTS}</b></td>
-	<td>{L_POSTS_PER_DAY}: </td>
-	<td><b>{POSTS_PER_DAY}</b></td>
-</tr>
-<tr>
-	<td>{L_NUMBER_TOPICS}: </td>
-	<td><b>{TOTAL_TOPICS}</b></td>
-	<td>{L_TOPICS_PER_DAY}: </td>
-	<td><b>{TOPICS_PER_DAY}</b></td>
-</tr>
-<tr>
-	<td>{L_NUMBER_USERS}: </td>
-	<td><b>{TOTAL_USERS}</b></td>
-	<td>{L_USERS_PER_DAY}: </td>
-	<td><b>{USERS_PER_DAY}</b></td>
-</tr>
-<tr>
-	<td>{L_NUMBER_FILES}: </td>
-	<td><b>{TOTAL_FILES}</b></td>
-	<td>{L_FILES_PER_DAY}: </td>
-	<td><b>{FILES_PER_DAY}</b></td>
-</tr>
-<tr>
-	<td>{L_BOARD_STARTED}: </td>
-	<td><b>{START_DATE}</b></td>
-	<td>{L_AVATAR_DIR_SIZE}: </td>
-	<td><b>{AVATAR_DIR_SIZE}</b></td>
-</tr>
-<tr>
-	<td>{L_DATABASE_SIZE}: </td>
-	<td><b>{DBSIZE}</b></td>
-	<td>{L_UPLOAD_DIR_SIZE}: </td>
-	<td><b>{UPLOAD_DIR_SIZE}</b></td>
-</tr>
-<tr>
-	<td>{L_DATABASE_SERVER_INFO}: </td>
-	<td><b>{DATABASE_INFO}</b></td>
-	<td>{L_GZIP_COMPRESSION}: </td>
-	<td><b>{GZIP_COMPRESSION}</b></td>
-</tr>
-</tbody>
-</table>
-
-<!-- IF S_ACTION_OPTIONS -->
-	<form id="stats" method="post" action="{U_ACTION}">
-	<fieldset class="quick">
-		<select name="action">{S_ACTION_OPTIONS}</select>
-
-		<input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
-	</fieldset>
-	</form>
-<!-- ENDIF -->
+<!-- ELSE -->
 
-<!-- IF .log -->
-	<h2>{L_ADMIN_LOG}</h2>
+	<h1>{L_WELCOME_PHPBB}</h1>
+
+	<p>{L_ADMIN_INTRO}</p>
+
+	<!-- IF S_DEBUG_EXTRA -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{L_DEBUG_EXTRA_WARNING}</p>
+		</div>
+	<!-- ENDIF -->
 
-	<p>{L_ADMIN_LOG_INDEX_EXPLAIN}</p>
+	<!-- IF S_REMOVE_INSTALL -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{L_REMOVE_INSTALL}</p>
+		</div>
+	<!-- ENDIF -->
 
 	<table cellspacing="1">
+		<caption>{L_FORUM_STATS}</caption>
+		<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
 	<thead>
 	<tr>
-		<th>{L_USERNAME}</th>
-		<th>{L_IP}</th>
-		<th>{L_TIME}</th>
-		<th>{L_ACTION}</th>
+		<th>{L_STATISTIC}</th>
+		<th>{L_VALUE}</th>
+		<th>{L_STATISTIC}</th>
+		<th>{L_VALUE}</th>
 	</tr>
 	</thead>
 	<tbody>
-	<!-- BEGIN log -->
-		<!-- IF log.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-
-			<td>{log.USERNAME}</td>
-			<td style="text-align: center;">{log.IP}</td>
-			<td style="text-align: center;">{log.DATE}</td>
-			<td>{log.ACTION}</td>
-		</tr>
-	<!-- END log -->
+	<tr>
+		<td>{L_NUMBER_POSTS}: </td>
+		<td><b>{TOTAL_POSTS}</b></td>
+		<td>{L_POSTS_PER_DAY}: </td>
+		<td><b>{POSTS_PER_DAY}</b></td>
+	</tr>
+	<tr>
+		<td>{L_NUMBER_TOPICS}: </td>
+		<td><b>{TOTAL_TOPICS}</b></td>
+		<td>{L_TOPICS_PER_DAY}: </td>
+		<td><b>{TOPICS_PER_DAY}</b></td>
+	</tr>
+	<tr>
+		<td>{L_NUMBER_USERS}: </td>
+		<td><b>{TOTAL_USERS}</b></td>
+		<td>{L_USERS_PER_DAY}: </td>
+		<td><b>{USERS_PER_DAY}</b></td>
+	</tr>
+	<tr>
+		<td>{L_NUMBER_FILES}: </td>
+		<td><b>{TOTAL_FILES}</b></td>
+		<td>{L_FILES_PER_DAY}: </td>
+		<td><b>{FILES_PER_DAY}</b></td>
+	</tr>
+	<tr>
+		<td>{L_BOARD_STARTED}: </td>
+		<td><b>{START_DATE}</b></td>
+		<td>{L_AVATAR_DIR_SIZE}: </td>
+		<td><b>{AVATAR_DIR_SIZE}</b></td>
+	</tr>
+	<tr>
+		<td>{L_DATABASE_SIZE}: </td>
+		<td><b>{DBSIZE}</b></td>
+		<td>{L_UPLOAD_DIR_SIZE}: </td>
+		<td><b>{UPLOAD_DIR_SIZE}</b></td>
+	</tr>
+	<tr>
+		<td>{L_DATABASE_SERVER_INFO}: </td>
+		<td><b>{DATABASE_INFO}</b></td>
+		<td>{L_GZIP_COMPRESSION}: </td>
+		<td><b>{GZIP_COMPRESSION}</b></td>
+	</tr>
 	</tbody>
 	</table>
 
-	<br />
-	<div style="text-align: right;"><a href="{U_ADMIN_LOG}">&raquo; {L_VIEW_ADMIN_LOG}</a></div>
+	<!-- IF S_ACTION_OPTIONS -->
+		<form id="stats" method="post" action="{U_ACTION}">
+		<fieldset class="quick">
+			<select name="action">{S_ACTION_OPTIONS}</select>
+
+			<input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
+		</fieldset>
+		</form>
+	<!-- ENDIF -->
 
-<!-- ENDIF -->
+	<!-- IF .log -->
+		<h2>{L_ADMIN_LOG}</h2>
 
-<!-- IF S_INACTIVE_USERS -->
-	<h2>{L_INACTIVE_USERS}</h2>
+		<p>{L_ADMIN_LOG_INDEX_EXPLAIN}</p>
 
-	<p>{L_INACTIVE_USERS_EXPLAIN}</p>
+		<table cellspacing="1">
+		<thead>
+		<tr>
+			<th>{L_USERNAME}</th>
+			<th>{L_IP}</th>
+			<th>{L_TIME}</th>
+			<th>{L_ACTION}</th>
+		</tr>
+		</thead>
+		<tbody>
+		<!-- BEGIN log -->
+			<!-- IF log.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+
+				<td>{log.USERNAME}</td>
+				<td style="text-align: center;">{log.IP}</td>
+				<td style="text-align: center;">{log.DATE}</td>
+				<td>{log.ACTION}</td>
+			</tr>
+		<!-- END log -->
+		</tbody>
+		</table>
+
+		<br />
+		<div style="text-align: right;"><a href="{U_ADMIN_LOG}">&raquo; {L_VIEW_ADMIN_LOG}</a></div>
 
-	<form id="inactive" method="post" action="{U_ACTION}">
+	<!-- ENDIF -->
 
-	<table cellspacing="1">
-	<thead>
-	<tr>
-		<th>{L_USERNAME}</th>
-		<th>{L_JOINED}</th>
-		<th>{L_LAST_VISIT}</th>
-		<th>{L_MARK}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN inactive -->
-		<!-- IF inactive.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+	<!-- IF S_INACTIVE_USERS -->
+		<h2>{L_INACTIVE_USERS}</h2>
 
-			<td><a href="{inactive.U_USER_ADMIN}">{inactive.USERNAME}</a></td>
-			<td>{inactive.DATE}</td>
-			<td>{inactive.LAST_VISIT}</td>
-			<td>&nbsp;<input type="checkbox" class="radio" name="mark[]" value="{inactive.USER_ID}" />&nbsp;</td>
-		</tr>
-	<!-- BEGINELSE -->
+		<p>{L_INACTIVE_USERS_EXPLAIN}</p>
+
+		<form id="inactive" method="post" action="{U_ACTION}">
+
+		<table cellspacing="1">
+		<thead>
 		<tr>
-			<td colspan="3" style="text-align: center;">{L_NO_INACTIVE_USERS}</td>
+			<th>{L_USERNAME}</th>
+			<th>{L_JOINED}</th>
+			<th>{L_LAST_VISIT}</th>
+			<th>{L_MARK}</th>
 		</tr>
-	<!-- END inactive -->
-	</tbody>
-	</table>
-
-	<!-- IF .inactive -->
-		<fieldset class="quick">
-			<p><a href="javascript:marklist('inactive', 'mark', true);">{L_MARK_ALL}</a> &bull; <a href="javascript:marklist('inactive', 'mark', false);">{L_UNMARK_ALL}</a></p>
-			<select name="action">{S_INACTIVE_OPTIONS}</select>
+		</thead>
+		<tbody>
+		<!-- BEGIN inactive -->
+			<!-- IF inactive.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+
+				<td><a href="{inactive.U_USER_ADMIN}">{inactive.USERNAME}</a></td>
+				<td>{inactive.DATE}</td>
+				<td>{inactive.LAST_VISIT}</td>
+				<td>&nbsp;<input type="checkbox" class="radio" name="mark[]" value="{inactive.USER_ID}" />&nbsp;</td>
+			</tr>
+		<!-- BEGINELSE -->
+			<tr>
+				<td colspan="3" style="text-align: center;">{L_NO_INACTIVE_USERS}</td>
+			</tr>
+		<!-- END inactive -->
+		</tbody>
+		</table>
+
+		<!-- IF .inactive -->
+			<fieldset class="quick">
+				<p><a href="javascript:marklist('inactive', 'mark', true);">{L_MARK_ALL}</a> &bull; <a href="javascript:marklist('inactive', 'mark', false);">{L_UNMARK_ALL}</a></p>
+				<select name="action">{S_INACTIVE_OPTIONS}</select>
+
+				<input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
+			</fieldset>
+		<!-- ENDIF -->
+
+		</form>
 
-			<input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
-		</fieldset>
 	<!-- ENDIF -->
 
-	</form>
-
 <!-- ENDIF -->
 
 <!-- INCLUDE overall_footer.html -->
 \ No newline at end of file
diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html
index 3b6d6388de..b10a87a8ea 100644
--- a/phpBB/adm/style/acp_users.html
+++ b/phpBB/adm/style/acp_users.html
@@ -83,7 +83,7 @@
 		<legend>{L_ACP_USER_OVERVIEW}</legend>
 	<dl>
 		<dt><label for="user">{L_USERNAME}:</label><br /><span>{L_NAME_CHARS_EXPLAIN}</span></dt>
-		<dd><input type="text" id="user" name="user" value="{USER}" /></dd>
+		<dd><input type="text" id="user" name="user" value="{USER}" /><!-- IF S_USER_INACTIVE --> [{L_USER_IS_INACTIVE}]<!-- ENDIF --></dd>
 		<!-- IF U_SWITCH_PERMISSIONS --><dd>[ <a href="{U_SWITCH_PERMISSIONS}">{L_USE_PERMISSIONS}</a> ]</dd><!-- ENDIF -->
 	</dl>
 	<dl>