7 files changed, 28 insertions, 28 deletions
diff --git a/phpBB/adm/style/acp_ban.html b/phpBB/adm/style/acp_ban.html
index 735afc9417..4c645be178 100644
--- a/phpBB/adm/style/acp_ban.html
+++ b/phpBB/adm/style/acp_ban.html
@@ -14,19 +14,19 @@
 	var ban_length = new Array();
 		ban_length[-1] = "";
 	<!-- BEGIN ban_length -->
-		ban_length['{ban_length.BAN_ID}'] = "{ban_length.LENGTH}";
+		ban_length['{ban_length.BAN_ID}'] = "{ban_length.A_LENGTH}";
 	<!-- END ban_length -->
 
 	var ban_reason = new Array();
 		ban_reason[-1] = "";
 	<!-- BEGIN ban_reason -->
-		ban_reason['{ban_reason.BAN_ID}'] = "{ban_reason.REASON}";
+		ban_reason['{ban_reason.BAN_ID}'] = "{ban_reason.A_REASON}";
 	<!-- END ban_reason -->
 
 	var ban_give_reason = new Array();
 		ban_give_reason[-1] = "";
 	<!-- BEGIN ban_give_reason -->
-		ban_give_reason['{ban_give_reason.BAN_ID}'] = "{ban_give_reason.REASON}";
+		ban_give_reason['{ban_give_reason.BAN_ID}'] = "{ban_give_reason.A_REASON}";
 	<!-- END ban_give_reason -->
 
 	function display_details(option)
@@ -88,15 +88,15 @@
 	</dl>
 	<dl>
 		<dt><label for="unbanlength">{L_BAN_LENGTH}:</label></dt>
-		<dd><input style="border: 0px;" type="text" name="unbanlength" id="unbanlength" class="full" /></dd>
+		<dd><input style="border: 0px;" type="text" name="unbanlength" id="unbanlength" class="full" disabled="disabled" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="unbanreason">{L_BAN_REASON}:</label></dt>
-		<dd><input style="border: 0px;" type="text" name="unbanreason" id="unbanreason" class="full" /></dd>
+		<dd><input style="border: 0px;" type="text" name="unbanreason" id="unbanreason" class="full" disabled="disabled" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="unbangivereason">{L_BAN_GIVE_REASON}:</label></dt>
-		<dd><input style="border: 0px;" type="text" name="unbangivereason" id="unbangivereason" class="full" /></dd>
+		<dd><input style="border: 0px;" type="text" name="unbangivereason" id="unbangivereason" class="full" disabled="disabled" /></dd>
 	</dl>
 </fieldset>
 
diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html
index 4dca3d404d..20b2fd4399 100644
--- a/phpBB/adm/style/acp_modules.html
+++ b/phpBB/adm/style/acp_modules.html
@@ -36,8 +36,8 @@
 			if (value == '{m_names.NAME}')
 			{
 	<!-- BEGIN modes -->
-				item.options[j] = new Option('{m_names.modes.VALUE}');
-				item.options[j].value = '{m_names.modes.OPTION}';
+				item.options[j] = new Option('{m_names.modes.A_VALUE}');
+				item.options[j].value = '{m_names.modes.A_OPTION}';
 				j++;
 	<!-- END modes -->
 			}
diff --git a/phpBB/adm/style/acp_permissions.html b/phpBB/adm/style/acp_permissions.html
index e54eb81d47..2d4fcfd28c 100644
--- a/phpBB/adm/style/acp_permissions.html
+++ b/phpBB/adm/style/acp_permissions.html
@@ -347,7 +347,7 @@
 	<script type="text/javascript" src="style/tooltip.js"></script>
 	<script type="text/javascript">
 	<!--
-		window.onload = function(){enable_tooltips_select('set_permissions', '{L_ROLE_DESCRIPTION}', 'role')};
+		window.onload = function(){enable_tooltips_select('set_permissions', '{LA_ROLE_DESCRIPTION}', 'role')};
 	//-->
 	</script>
 
diff --git a/phpBB/adm/style/acp_search.html b/phpBB/adm/style/acp_search.html
index 3ec8095720..a4f0a7b1f0 100644
--- a/phpBB/adm/style/acp_search.html
+++ b/phpBB/adm/style/acp_search.html
@@ -63,7 +63,7 @@
 	function popup_progress_bar(progress_type)
 	{
 	    close_waitscreen = 0;
-		window.open('{U_PROGRESS_BAR}&type=' + progress_type, '_index', 'HEIGHT=200,resizable=yes,scrollbars=no,WIDTH=400');
+		window.open('{UA_PROGRESS_BAR}&type=' + progress_type, '_index', 'HEIGHT=300,resizable=yes,scrollbars=no,WIDTH=400');
 	}
 //-->
 </script>
diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html
index a7a66f5d5e..a672db3c4c 100644
--- a/phpBB/adm/style/acp_users.html
+++ b/phpBB/adm/style/acp_users.html
@@ -348,7 +348,7 @@
 	</dl>
 	<dl> 
 		<dt><label for="dateoptions">{L_BOARD_DATE_FORMAT}:</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt>
-		<dd><select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){dE('custom_date',1);}else{dE('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = '{DEFAULT_DATEFORMAT}'; } else { document.getElementById('dateformat').value = this.value; }">{S_DATEFORMAT_OPTIONS}</select></dd>
+		<dd><select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){dE('custom_date',1);}else{dE('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = '{A_DEFAULT_DATEFORMAT}'; } else { document.getElementById('dateformat').value = this.value; }">{S_DATEFORMAT_OPTIONS}</select></dd>
 		<dd><div id="custom_date"<!-- IF not S_CUSTOM_DATEFORMAT --> style="display:none;"<!-- ENDIF -->><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" /></div></dd>
 	</dl>
 	</fieldset>
@@ -539,19 +539,19 @@
 	imageTag = false;
 
 	// Helpline messages
-	b_help = "{L_BBCODE_B_HELP}";
-	i_help = "{L_BBCODE_I_HELP}";
-	u_help = "{L_BBCODE_U_HELP}";
-	q_help = "{L_BBCODE_Q_HELP}";
-	c_help = "{L_BBCODE_C_HELP}";
-	l_help = "{L_BBCODE_L_HELP}";
-	o_help = "{L_BBCODE_O_HELP}";
-	p_help = "{L_BBCODE_P_HELP}";
-	w_help = "{L_BBCODE_W_HELP}";
-	a_help = "{L_BBCODE_A_HELP}";
-	s_help = "{L_BBCODE_S_HELP}";
-	f_help = "{L_BBCODE_F_HELP}";
-	e_help = "{L_BBCODE_E_HELP}";
+	b_help = "{LA_BBCODE_B_HELP}";
+	i_help = "{LA_BBCODE_I_HELP}";
+	u_help = "{LA_BBCODE_U_HELP}";
+	q_help = "{LA_BBCODE_Q_HELP}";
+	c_help = "{LA_BBCODE_C_HELP}";
+	l_help = "{LA_BBCODE_L_HELP}";
+	o_help = "{LA_BBCODE_O_HELP}";
+	p_help = "{LA_BBCODE_P_HELP}";
+	w_help = "{LA_BBCODE_W_HELP}";
+	a_help = "{LA_BBCODE_A_HELP}";
+	s_help = "{LA_BBCODE_S_HELP}";
+	f_help = "{LA_BBCODE_F_HELP}";
+	e_help = "{LA_BBCODE_E_HELP}";
 
 	//-->
 	</script>
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index 232e8bd3ea..41d3991810 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -12,7 +12,7 @@
 
 <script type="text/javascript">
 <!--
-var jump_page = '{L_JUMP_PAGE}:';
+var jump_page = '{LA_JUMP_PAGE}:';
 var on_page = '{ON_PAGE}';
 var per_page = '{PER_PAGE}';
 var base_url = '{BASE_URL}';
@@ -80,7 +80,7 @@ function trace(link)
 <!-- IF S_INCLUDE_SWATCH -->
 	function swatch()
 	{
-		window.open('{U_SWATCH}', '_swatch', 'height=115, resizable=yes, scrollbars=no, width=636');
+		window.open('{UA_SWATCH}', '_swatch', 'height=115, resizable=yes, scrollbars=no, width=636');
 		return false;
 	}
 <!-- ENDIF -->
diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html
index 5672e1d64b..98138debc5 100644
--- a/phpBB/adm/style/simple_header.html
+++ b/phpBB/adm/style/simple_header.html
@@ -12,7 +12,7 @@
 
 <script type="text/javascript">
 <!--
-var jump_page = '{L_JUMP_PAGE}:';
+var jump_page = '{LA_JUMP_PAGE}:';
 var on_page = '{ON_PAGE}';
 var per_page = '{PER_PAGE}';
 var base_url = '{BASE_URL}';
@@ -69,7 +69,7 @@ function marklist(id, name, state)
 <!-- IF S_INCLUDE_SWATCH -->
 	function swatch()
 	{
-		window.open('{U_SWATCH}', '_swatch', 'height=115, resizable=yes, scrollbars=no, width=636');
+		window.open('{UA_SWATCH}', '_swatch', 'height=115, resizable=yes, scrollbars=no, width=636');
 		return false;
 	}
 <!-- ENDIF -->