diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-11-09 20:50:20 -0500 | 
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-11-09 20:50:20 -0500 | 
| commit | 29fdad396d62398f9544ebcfe5ac19cdaad5b120 (patch) | |
| tree | 17874fa5144a1173ca6abd08fc65de2bdcb6f586 | |
| parent | 7987e0e68191c802f018455788c40c3b77b26929 (diff) | |
| parent | e48f5aa29caa2656b20938141937d81f2ae4dd33 (diff) | |
| download | forums-29fdad396d62398f9544ebcfe5ac19cdaad5b120.tar forums-29fdad396d62398f9544ebcfe5ac19cdaad5b120.tar.gz forums-29fdad396d62398f9544ebcfe5ac19cdaad5b120.tar.bz2 forums-29fdad396d62398f9544ebcfe5ac19cdaad5b120.tar.xz forums-29fdad396d62398f9544ebcfe5ac19cdaad5b120.zip | |
Merge PR #1045 branch 'bantu/ticket/10780' into develop
* bantu/ticket/10780:
  [ticket/10780] Use L_COLON on LDAP page.
  [ticket/10780] Use L_COLON on search backend ACP pages.
  [ticket/10780] Use L_COLON for "download all attachments".
  [ticket/10780] Use colon from language in ucp_pm_compose.php where possible.
  [ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html.
  [ticket/10780] Replace colon usage in adm template output with {L_COLON}
  [ticket/10780] Replace colon usage in template output with {L_COLON}
205 files changed, 1076 insertions, 1075 deletions
| diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html index c69dedbcfb..266b7e48b4 100644 --- a/phpBB/adm/style/acp_attachments.html +++ b/phpBB/adm/style/acp_attachments.html @@ -54,7 +54,7 @@  		<!-- ELSE -->  			<dl> -				<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt> +				<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>  				<dd>{options.CONTENT}</dd>  			</dl> @@ -78,11 +78,11 @@  		<legend>{L_SECURE_TITLE}</legend>  		<p>{L_DOWNLOAD_ADD_IPS_EXPLAIN}</p>  	<dl> -		<dt><label for="ip_hostname">{L_IP_HOSTNAME}:</label></dt> +		<dt><label for="ip_hostname">{L_IP_HOSTNAME}{L_COLON}</label></dt>  		<dd><textarea id="ip_hostname" cols="40" rows="3" name="ips"></textarea></dd>  	</dl>  	<dl> -		<dt><label for="exclude">{L_IP_EXCLUDE}:</label><br /><span>{L_EXCLUDE_ENTERED_IP}</span></dt> +		<dt><label for="exclude">{L_IP_EXCLUDE}{L_COLON}</label><br /><span>{L_EXCLUDE_ENTERED_IP}</span></dt>  		<dd><label><input type="radio" id="exclude" name="ipexclude" value="1" class="radio" /> {L_YES}</label>  			<label><input type="radio" name="ipexclude" value="0" checked="checked" class="radio" /> {L_NO}</label></dd>  	</dl> @@ -97,7 +97,7 @@  	<!-- IF S_DEFINED_IPS -->  			<p>{L_DOWNLOAD_REMOVE_IPS_EXPLAIN}</p>  		<dl> -			<dt><label for="remove_ip_hostname">{L_IP_HOSTNAME}:</label></dt> +			<dt><label for="remove_ip_hostname">{L_IP_HOSTNAME}{L_COLON}</label></dt>  			<dd><select name="unip[]" id="remove_ip_hostname" multiple="multiple" size="10">{DEFINED_IPS}</select></dd>  		</dl> @@ -172,39 +172,39 @@  			<legend>{L_LEGEND}</legend>  		<dl> -			<dt><label for="group_name">{L_GROUP_NAME}:</label></dt> +			<dt><label for="group_name">{L_GROUP_NAME}{L_COLON}</label></dt>  			<dd><input type="text" id="group_name" size="20" maxlength="100" name="group_name" value="{GROUP_NAME}" /></dd>  		</dl>  		<dl> -			<dt><label for="category">{L_SPECIAL_CATEGORY}:</label><br /><span>{L_SPECIAL_CATEGORY_EXPLAIN}</span></dt> +			<dt><label for="category">{L_SPECIAL_CATEGORY}{L_COLON}</label><br /><span>{L_SPECIAL_CATEGORY_EXPLAIN}</span></dt>  			<dd>{S_CATEGORY_SELECT}</dd>  		</dl>  		<dl> -			<dt><label for="allowed">{L_ALLOWED}:</label></dt> +			<dt><label for="allowed">{L_ALLOWED}{L_COLON}</label></dt>  			<dd><input type="checkbox" class="radio" id="allowed" name="allow_group" value="1"<!-- IF ALLOW_GROUP --> checked="checked"<!-- ENDIF --> /></dd>  		</dl>  		<dl> -			<dt><label for="allow_in_pm">{L_ALLOW_IN_PM}:</label></dt> +			<dt><label for="allow_in_pm">{L_ALLOW_IN_PM}{L_COLON}</label></dt>  			<dd><input type="checkbox" class="radio" id="allow_in_pm" name="allow_in_pm" value="1"<!-- IF ALLOW_IN_PM --> checked="checked"<!-- ENDIF --> /></dd>  		</dl>  		<dl> -			<dt><label for="upload_icon">{L_UPLOAD_ICON}:</label></dt> +			<dt><label for="upload_icon">{L_UPLOAD_ICON}{L_COLON}</label></dt>  			<dd><select name="upload_icon" id="upload_icon" onchange="update_image(this.options[selectedIndex].value);">  					<option value="no_image"<!-- IF S_NO_IMAGE --> selected="selected"<!-- ENDIF -->>{L_NO_IMAGE}</option>{S_FILENAME_LIST}  			</select></dd>  			<dd> <img <!-- IF S_NO_IMAGE -->src="{PHPBB_ROOT_PATH}images/spacer.gif"<!-- ELSE -->src="{UPLOAD_ICON_SRC}"<!-- ENDIF --> id="image_upload_icon" alt="" title="" /> </dd>  		</dl>  		<dl> -			<dt><label for="extgroup_filesize">{L_MAX_EXTGROUP_FILESIZE}:</label></dt> +			<dt><label for="extgroup_filesize">{L_MAX_EXTGROUP_FILESIZE}{L_COLON}</label></dt>  			<dd><input type="text" id="extgroup_filesize" size="3" maxlength="15" name="max_filesize" value="{EXTGROUP_FILESIZE}" /> <select name="size_select">{S_EXT_GROUP_SIZE_OPTIONS}</select></dd>  		</dl>  		<dl> -			<dt><label for="assigned_extensions">{L_ASSIGNED_EXTENSIONS}:</label></dt> +			<dt><label for="assigned_extensions">{L_ASSIGNED_EXTENSIONS}{L_COLON}</label></dt>  			<dd><div id="ext">{ASSIGNED_EXTENSIONS}</div> <span>[<a href="{U_EXTENSIONS}">{L_GO_TO_EXTENSIONS}</a> ]</span></dd>  			<dd><select name="extensions[]" id="assigned_extensions" class="narrow" onchange="show_extensions(this);" multiple="multiple" size="8">{S_EXTENSION_OPTIONS}</select></dd>  		</dl>  		<dl> -			<dt><label for="allowed_forums">{L_ALLOWED_FORUMS}:</label><br /><span>{L_ALLOWED_FORUMS_EXPLAIN}</span></dt> +			<dt><label for="allowed_forums">{L_ALLOWED_FORUMS}{L_COLON}</label><br /><span>{L_ALLOWED_FORUMS_EXPLAIN}</span></dt>  			<dd><label><input type="radio" id="allowed_forums" class="radio" name="forum_select" value="0"<!-- IF not S_FORUM_IDS --> checked="checked"<!-- ENDIF --> /> {L_ALLOW_ALL_FORUMS}</label>  				<label><input type="radio" class="radio" name="forum_select" value="1"<!-- IF S_FORUM_IDS --> checked="checked"<!-- ENDIF --> /> {L_ALLOW_SELECTED_FORUMS}</label></dd>  			<dd><select name="allowed_forums[]" multiple="multiple" size="8">{S_FORUM_ID_OPTIONS}</select></dd> @@ -254,7 +254,7 @@  		</tbody>  		</table>  		<p class="quick"> -				{L_CREATE_GROUP}: <input type="text" name="group_name" maxlength="30" /> +				{L_CREATE_GROUP}{L_COLON} <input type="text" name="group_name" maxlength="30" />  				<input class="button2" name="add" type="submit" value="{L_SUBMIT}" />  		</p>  		{S_FORM_TOKEN} @@ -348,7 +348,7 @@  			<td><a href="{orphan.U_FILE}">{orphan.REAL_FILENAME}</a></td>  			<td>{orphan.FILETIME}</td>  			<td>{orphan.FILESIZE}</td> -			<td><strong>{L_ATTACH_ID}: </strong><input type="text" name="post_id[{orphan.ATTACH_ID}]" size="7" maxlength="10" value="{orphan.POST_ID}" /></td> +			<td><strong>{L_ATTACH_ID}{L_COLON} </strong><input type="text" name="post_id[{orphan.ATTACH_ID}]" size="7" maxlength="10" value="{orphan.POST_ID}" /></td>  			<td><input type="checkbox" class="radio" name="add[{orphan.ATTACH_ID}]" /></td>  			<td><input type="checkbox" class="radio" name="delete[{orphan.ATTACH_ID}]" /></td>  		</tr> @@ -380,7 +380,7 @@  	<div class="pagination">  	<!-- IF .pagination or TOTAL_FILES --> -		{L_NUMBER_FILES}: {TOTAL_FILES} • {L_TOTAL_SIZE}: {TOTAL_SIZE} +		{L_NUMBER_FILES}{L_COLON} {TOTAL_FILES} • {L_TOTAL_SIZE}{L_COLON} {TOTAL_SIZE}  		<!-- IF .pagination -->  			• <!-- INCLUDE pagination.html -->  		<!-- ELSE --> @@ -402,8 +402,8 @@  	<!-- BEGIN attachments -->  		<!-- IF attachments.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->  			<td> -				<!-- IF attachments.S_IN_MESSAGE -->{L_EXTENSION_GROUP}: <strong><!-- IF attachments.EXT_GROUP_NAME -->{attachments.EXT_GROUP_NAME}<!-- ELSE -->{L_NO_EXT_GROUP}<!-- ENDIF --></strong><br />{attachments.L_DOWNLOAD_COUNT}<br />{L_IN} {L_PRIVATE_MESSAGE} -				<!-- ELSE --><a href="{attachments.U_FILE}" style="font-weight: bold;">{attachments.REAL_FILENAME}</a><br /><!-- IF attachments.COMMENT -->{attachments.COMMENT}<br /><!-- ENDIF -->{attachments.L_DOWNLOAD_COUNT}<br />{L_TOPIC}: <a href="{attachments.U_VIEW_TOPIC}">{attachments.TOPIC_TITLE}</a><!-- ENDIF --> +				<!-- IF attachments.S_IN_MESSAGE -->{L_EXTENSION_GROUP}{L_COLON} <strong><!-- IF attachments.EXT_GROUP_NAME -->{attachments.EXT_GROUP_NAME}<!-- ELSE -->{L_NO_EXT_GROUP}<!-- ENDIF --></strong><br />{attachments.L_DOWNLOAD_COUNT}<br />{L_IN} {L_PRIVATE_MESSAGE} +				<!-- ELSE --><a href="{attachments.U_FILE}" style="font-weight: bold;">{attachments.REAL_FILENAME}</a><br /><!-- IF attachments.COMMENT -->{attachments.COMMENT}<br /><!-- ENDIF -->{attachments.L_DOWNLOAD_COUNT}<br />{L_TOPIC}{L_COLON} <a href="{attachments.U_VIEW_TOPIC}">{attachments.TOPIC_TITLE}</a><!-- ENDIF -->  			</td>  			<td>{attachments.FILETIME}<br />{L_POST_BY_AUTHOR} {attachments.ATTACHMENT_POSTER}</td>  			<td>{attachments.FILESIZE}</td> @@ -419,14 +419,14 @@  	<!-- IF TOTAL_FILES -->  	<fieldset class="display-options"> -		{L_DISPLAY_LOG}:  {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR} +		{L_DISPLAY_LOG}{L_COLON}  {S_LIMIT_DAYS} {L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR}  		<input class="button2" type="submit" value="{L_GO}" name="sort" />  	</fieldset>  	<hr />  	<div class="pagination"> -		{L_NUMBER_FILES}: {TOTAL_FILES} • {L_TOTAL_SIZE}: {TOTAL_SIZE} +		{L_NUMBER_FILES}{L_COLON} {TOTAL_FILES} • {L_TOTAL_SIZE}{L_COLON} {TOTAL_SIZE}  		<!-- IF .pagination -->  			• <!-- INCLUDE pagination.html -->  		<!-- ELSE --> diff --git a/phpBB/adm/style/acp_ban.html b/phpBB/adm/style/acp_ban.html index d564e89312..71c737de70 100644 --- a/phpBB/adm/style/acp_ban.html +++ b/phpBB/adm/style/acp_ban.html @@ -44,26 +44,26 @@  <fieldset>  	<legend>{L_TITLE}</legend>  <dl> -	<dt><label for="ban">{L_BAN_CELL}:</label></dt> +	<dt><label for="ban">{L_BAN_CELL}{L_COLON}</label></dt>  	<dd><textarea name="ban" cols="40" rows="3" id="ban"></textarea></dd>  	<!-- IF S_USERNAME_BAN --><dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd><!-- ENDIF -->  </dl>  <dl> -	<dt><label for="banlength">{L_BAN_LENGTH}:</label></dt> +	<dt><label for="banlength">{L_BAN_LENGTH}{L_COLON}</label></dt>  	<dd><label for="banlength"><select name="banlength" id="banlength" onchange="if(this.value==-1){document.getElementById('banlengthother').style.display = 'block';}else{document.getElementById('banlengthother').style.display='none';}">{S_BAN_END_OPTIONS}</select></label></dd>  	<dd id="banlengthother" style="display: none;"><label><input type="text" name="banlengthother" class="inputbox" /><br /><span>{L_YEAR_MONTH_DAY}</span></label></dd>  </dl>  <dl> -	<dt><label for="banexclude">{L_BAN_EXCLUDE}:</label><br /><span>{L_BAN_EXCLUDE_EXPLAIN}</span></dt> +	<dt><label for="banexclude">{L_BAN_EXCLUDE}{L_COLON}</label><br /><span>{L_BAN_EXCLUDE_EXPLAIN}</span></dt>  	<dd><label><input type="radio" name="banexclude" value="1" class="radio" /> {L_YES}</label>  		<label><input type="radio" name="banexclude" id="banexclude" value="0" checked="checked" class="radio" /> {L_NO}</label></dd>  </dl>  <dl> -	<dt><label for="banreason">{L_BAN_REASON}:</label></dt> +	<dt><label for="banreason">{L_BAN_REASON}{L_COLON}</label></dt>  	<dd><input name="banreason" type="text" class="text medium" maxlength="255" id="banreason" /></dd>  </dl>  <dl> -	<dt><label for="bangivereason">{L_BAN_GIVE_REASON}:</label></dt> +	<dt><label for="bangivereason">{L_BAN_GIVE_REASON}{L_COLON}</label></dt>  	<dd><input name="bangivereason" type="text" class="text medium" maxlength="255" id="bangivereason" /></dd>  </dl> @@ -88,19 +88,19 @@  <!-- IF S_BANNED_OPTIONS -->  	<dl> -		<dt><label for="unban">{L_BAN_CELL}:</label></dt> +		<dt><label for="unban">{L_BAN_CELL}{L_COLON}</label></dt>  		<dd><select id="unban" name="unban[]" multiple="multiple" size="10" style="width: 50%" onchange="if (this.selectedIndex > -1) display_details(this.options[this.selectedIndex].value); else display_details(-1);">{BANNED_OPTIONS}</select></dd>  	</dl>  	<dl> -		<dt><label for="unbanlength">{L_BAN_LENGTH}:</label></dt> +		<dt><label for="unbanlength">{L_BAN_LENGTH}{L_COLON}</label></dt>  		<dd><input style="border: 0;" type="text" class="text full" readonly="readonly" name="unbanlength" id="unbanlength" /></dd>  	</dl>  	<dl> -		<dt><label for="unbanreason">{L_BAN_REASON}:</label></dt> +		<dt><label for="unbanreason">{L_BAN_REASON}{L_COLON}</label></dt>  		<dd><textarea style="border: 0;" class="text full" readonly="readonly" name="unbanreason" id="unbanreason" rows="5" cols="80"> </textarea></dd>  	</dl>  	<dl> -		<dt><label for="unbangivereason">{L_BAN_GIVE_REASON}:</label></dt> +		<dt><label for="unbangivereason">{L_BAN_GIVE_REASON}{L_COLON}</label></dt>  		<dd><textarea style="border: 0;" class="text full" readonly="readonly" name="unbangivereason" id="unbangivereason" rows="5" cols="80"> </textarea></dd>  	</dl> diff --git a/phpBB/adm/style/acp_board.html b/phpBB/adm/style/acp_board.html index 781f5c6bce..6b8ceb3ef6 100644 --- a/phpBB/adm/style/acp_board.html +++ b/phpBB/adm/style/acp_board.html @@ -25,7 +25,7 @@  	<!-- ELSE -->  		<dl> -			<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt> +			<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>  			<dd>{options.CONTENT}</dd>  		</dl> diff --git a/phpBB/adm/style/acp_bots.html b/phpBB/adm/style/acp_bots.html index 87679fc33a..cdd0fd4a93 100644 --- a/phpBB/adm/style/acp_bots.html +++ b/phpBB/adm/style/acp_bots.html @@ -22,27 +22,27 @@  	<fieldset>  		<legend>{L_TITLE}</legend>  	<dl> -		<dt><label for="bot_name">{L_BOT_NAME}:</label><br /><span>{L_BOT_NAME_EXPLAIN}</span></dt> +		<dt><label for="bot_name">{L_BOT_NAME}{L_COLON}</label><br /><span>{L_BOT_NAME_EXPLAIN}</span></dt>  		<dd><input name="bot_name" type="text" id="bot_name" value="{BOT_NAME}" maxlength="255" /></dd>  	</dl>  	<dl> -		<dt><label for="bot_style">{L_BOT_STYLE}:</label><br /><span>{L_BOT_STYLE_EXPLAIN}</span></dt> +		<dt><label for="bot_style">{L_BOT_STYLE}{L_COLON}</label><br /><span>{L_BOT_STYLE_EXPLAIN}</span></dt>  		<dd><select id="bot_style" name="bot_style">{S_STYLE_OPTIONS}</select></dd>  	</dl>  	<dl> -		<dt><label for="bot_lang">{L_BOT_LANG}:</label><br /><span>{L_BOT_LANG_EXPLAIN}</span></dt> +		<dt><label for="bot_lang">{L_BOT_LANG}{L_COLON}</label><br /><span>{L_BOT_LANG_EXPLAIN}</span></dt>  		<dd><select id="bot_lang" name="bot_lang">{S_LANG_OPTIONS}</select></dd>  	</dl>  	<dl> -		<dt><label for="bot_active">{L_BOT_ACTIVE}:</label></dt> +		<dt><label for="bot_active">{L_BOT_ACTIVE}{L_COLON}</label></dt>  		<dd><select id="bot_active" name="bot_active">{S_ACTIVE_OPTIONS}</select></dd>  	</dl>  	<dl> -		<dt><label for="bot_agent">{L_BOT_AGENT}:</label><br /><span>{L_BOT_AGENT_EXPLAIN}</span></dt> +		<dt><label for="bot_agent">{L_BOT_AGENT}{L_COLON}</label><br /><span>{L_BOT_AGENT_EXPLAIN}</span></dt>  		<dd><input name="bot_agent" type="text" id="bot_agent" value="{BOT_AGENT}" maxlength="255" /></dd>  	</dl>  	<dl> -		<dt><label for="bot_ip">{L_BOT_IP}:</label><br /><span>{L_BOT_IP_EXPLAIN}</span></dt> +		<dt><label for="bot_ip">{L_BOT_IP}{L_COLON}</label><br /><span>{L_BOT_IP_EXPLAIN}</span></dt>  		<dd><input name="bot_ip" type="text" id="bot_ip" value="{BOT_IP}" maxlength="255" /></dd>  	</dl> diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html index 83314ab633..ab5e207e0d 100644 --- a/phpBB/adm/style/acp_captcha.html +++ b/phpBB/adm/style/acp_captcha.html @@ -13,25 +13,25 @@  <legend>{L_GENERAL_OPTIONS}</legend>  <dl> -	<dt><label for="enable_confirm">{L_VISUAL_CONFIRM_REG}:</label><br /><span>{L_VISUAL_CONFIRM_REG_EXPLAIN}</span></dt> +	<dt><label for="enable_confirm">{L_VISUAL_CONFIRM_REG}{L_COLON}</label><br /><span>{L_VISUAL_CONFIRM_REG_EXPLAIN}</span></dt>  	<dd><label><input type="radio" class="radio" id="enable_confirm" name="enable_confirm" value="1"<!-- IF REG_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>  		<label><input type="radio" class="radio" name="enable_confirm" value="0"<!-- IF not REG_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>  </dl>  <dl> -	<dt><label for="max_reg_attempts">{L_REG_LIMIT}:</label><br /><span>{L_REG_LIMIT_EXPLAIN}</span></dt> +	<dt><label for="max_reg_attempts">{L_REG_LIMIT}{L_COLON}</label><br /><span>{L_REG_LIMIT_EXPLAIN}</span></dt>  	<dd><input id="max_reg_attempts" type="text" size="4" maxlength="4" name="max_reg_attempts" value="{REG_LIMIT}" /></dd>  </dl>  <dl> -	<dt><label for="max_login_attempts">{L_MAX_LOGIN_ATTEMPTS}:</label><br /><span>{L_MAX_LOGIN_ATTEMPTS_EXPLAIN}</span></dt> +	<dt><label for="max_login_attempts">{L_MAX_LOGIN_ATTEMPTS}{L_COLON}</label><br /><span>{L_MAX_LOGIN_ATTEMPTS_EXPLAIN}</span></dt>  	<dd><input id="max_login_attempts" type="text" size="4" maxlength="4" name="max_login_attempts" value="{MAX_LOGIN_ATTEMPTS}" /></dd>  </dl>  <dl> -	<dt><label for="enable_post_confirm">{L_VISUAL_CONFIRM_POST}:</label><br /><span>{L_VISUAL_CONFIRM_POST_EXPLAIN}</span></dt> +	<dt><label for="enable_post_confirm">{L_VISUAL_CONFIRM_POST}{L_COLON}</label><br /><span>{L_VISUAL_CONFIRM_POST_EXPLAIN}</span></dt>  	<dd><label><input type="radio" class="radio" id="enable_post_confirm" name="enable_post_confirm" value="1"<!-- IF POST_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>  		<label><input type="radio" class="radio" name="enable_post_confirm" value="0"<!-- IF not POST_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>  </dl>  <dl> -	<dt><label for="confirm_refresh">{L_VISUAL_CONFIRM_REFRESH}:</label><br /><span>{L_VISUAL_CONFIRM_REFRESH_EXPLAIN}</span></dt> +	<dt><label for="confirm_refresh">{L_VISUAL_CONFIRM_REFRESH}{L_COLON}</label><br /><span>{L_VISUAL_CONFIRM_REFRESH_EXPLAIN}</span></dt>  	<dd><label><input type="radio" class="radio" id="confirm_refresh" name="confirm_refresh" value="1"<!-- IF CONFIRM_REFRESH --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>  		<label><input type="radio" class="radio" name="confirm_refresh" value="0"<!-- IF not CONFIRM_REFRESH --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>  </dl> @@ -40,12 +40,12 @@  <fieldset>  <legend>{L_AVAILABLE_CAPTCHAS}</legend>  <dl> -	<dt><label for="captcha_select">{L_CAPTCHA_SELECT}:</label><br /><span>{L_CAPTCHA_SELECT_EXPLAIN}</span></dt> +	<dt><label for="captcha_select">{L_CAPTCHA_SELECT}{L_COLON}</label><br /><span>{L_CAPTCHA_SELECT_EXPLAIN}</span></dt>  	<dd><select id="captcha_select" name="select_captcha" onchange="(document.getElementById('acp_captcha')).submit()" >{CAPTCHA_SELECT}</select></dd>  </dl>   <!-- IF S_CAPTCHA_HAS_CONFIG -->  <dl> -	<dt><label for="configure">{L_CAPTCHA_CONFIGURE}:</label><br /><span>{L_CAPTCHA_CONFIGURE_EXPLAIN}</span></dt> +	<dt><label for="configure">{L_CAPTCHA_CONFIGURE}{L_COLON}</label><br /><span>{L_CAPTCHA_CONFIGURE_EXPLAIN}</span></dt>  	<dd><input class="button2" type="submit" id="configure" name="configure" value="{L_CONFIGURE}" /></dd>  </dl>  <!-- ENDIF --> diff --git a/phpBB/adm/style/acp_database.html b/phpBB/adm/style/acp_database.html index 28ac2db1b9..bf0c80bcd9 100644 --- a/phpBB/adm/style/acp_database.html +++ b/phpBB/adm/style/acp_database.html @@ -13,7 +13,7 @@  	<fieldset>  		<legend>{L_RESTORE_OPTIONS}</legend>  	<dl> -		<dt><label for="file">{L_SELECT_FILE}:</label></dt> +		<dt><label for="file">{L_SELECT_FILE}{L_COLON}</label></dt>  		<dd><select id="file" name="file" size="10"><!-- BEGIN files --><option value="{files.FILE}"<!-- IF files.S_LAST_ROW --> selected="selected"<!-- ENDIF -->>{files.NAME}</option><!-- END files --></select></dd>  	</dl> @@ -57,26 +57,26 @@  	<fieldset>  		<legend>{L_BACKUP_OPTIONS}</legend>  	<dl> -		<dt><label for="type">{L_BACKUP_TYPE}:</label></dt> +		<dt><label for="type">{L_BACKUP_TYPE}{L_COLON}</label></dt>  		<dd><label><input type="radio" class="radio" name="type" value="full" id="type" checked="checked" /> {L_FULL_BACKUP}</label>  			<label><input type="radio" name="type" class="radio" value="structure" /> {L_STRUCTURE_ONLY}</label>  			<label><input type="radio" class="radio" name="type" value="data" /> {L_DATA_ONLY}</label></dd>  	</dl>  	<dl> -		<dt><label for="method">{L_FILE_TYPE}:</label></dt> +		<dt><label for="method">{L_FILE_TYPE}{L_COLON}</label></dt>  		<dd><!-- BEGIN methods -->  		<label><input name="method"<!-- IF methods.S_FIRST_ROW --> id="method" checked="checked"<!-- ENDIF --> type="radio" class="radio" value="{methods.TYPE}" /> {methods.TYPE}</label>  		<!-- END methods --></dd>  	</dl>  	<dl> -		<dt><label for="where">{L_ACTION}:</label></dt> +		<dt><label for="where">{L_ACTION}{L_COLON}</label></dt>  		<dd>  			<label><input id="where" type="radio" class="radio" name="where" value="store" checked="checked" /> {L_STORE_LOCAL}</label>  			<label><input type="radio" class="radio" name="where" value="download" /> {L_DOWNLOAD}</label>  		</dd>  	</dl>  	<dl> -		<dt><label for="table">{L_TABLE_SELECT}:</label></dt> +		<dt><label for="table">{L_TABLE_SELECT}{L_COLON}</label></dt>  		<dd><select id="table" name="table[]" size="10" multiple="multiple">  		<!-- BEGIN tables -->  			<option value="{tables.TABLE}">{tables.TABLE}</option> diff --git a/phpBB/adm/style/acp_disallow.html b/phpBB/adm/style/acp_disallow.html index 776f54d66c..0608f29474 100644 --- a/phpBB/adm/style/acp_disallow.html +++ b/phpBB/adm/style/acp_disallow.html @@ -11,7 +11,7 @@  <fieldset>  	<legend>{L_ADD_DISALLOW_TITLE}</legend>  <dl> -	<dt><label for="user">{L_USERNAME}:</label><br /><span>{L_ADD_DISALLOW_EXPLAIN}</span></dt> +	<dt><label for="user">{L_USERNAME}{L_COLON}</label><br /><span>{L_ADD_DISALLOW_EXPLAIN}</span></dt>  	<dd><input id="user" type="text" class="text medium" maxlength="255" name="disallowed_user" /></dd>  </dl> @@ -28,7 +28,7 @@  	<legend>{L_DELETE_DISALLOW_TITLE}</legend>  <!-- IF S_DISALLOWED_NAMES -->  	<dl> -		<dt><label for="disallowed">{L_USERNAME}:</label></dt> +		<dt><label for="disallowed">{L_USERNAME}{L_COLON}</label></dt>  		<dd><select name="disallowed_id" id="disallowed">{S_DISALLOWED_NAMES}</select></dd>  	</dl> diff --git a/phpBB/adm/style/acp_email.html b/phpBB/adm/style/acp_email.html index 1339ac6529..950ecb40b0 100644 --- a/phpBB/adm/style/acp_email.html +++ b/phpBB/adm/style/acp_email.html @@ -18,32 +18,32 @@  <fieldset>  	<legend>{L_COMPOSE}</legend>  <dl> -	<dt><label for="group">{L_SEND_TO_GROUP}:</label></dt> +	<dt><label for="group">{L_SEND_TO_GROUP}{L_COLON}</label></dt>  	<dd><select id="group" name="g">{S_GROUP_OPTIONS}</select></dd>  </dl>  <dl> -	<dt><label for="usernames">{L_SEND_TO_USERS}:</label><br /><span>{L_SEND_TO_USERS_EXPLAIN}</span></dt> +	<dt><label for="usernames">{L_SEND_TO_USERS}{L_COLON}</label><br /><span>{L_SEND_TO_USERS_EXPLAIN}</span></dt>  	<dd><textarea name="usernames" id="usernames" rows="5" cols="40">{USERNAMES}</textarea></dd>  	<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>  </dl>  <dl> -	<dt><label for="subject">{L_SUBJECT}:</label></dt> +	<dt><label for="subject">{L_SUBJECT}{L_COLON}</label></dt>  	<dd><input name="subject" type="text" id="subject" value="{SUBJECT}" /></dd>  </dl>  <dl> -	<dt><label for="message">{L_MASS_MESSAGE}:</label><br /><span>{L_MASS_MESSAGE_EXPLAIN}</span></dt> +	<dt><label for="message">{L_MASS_MESSAGE}{L_COLON}</label><br /><span>{L_MASS_MESSAGE_EXPLAIN}</span></dt>  	<dd><textarea id="message" name="message" rows="10" cols="60">{MESSAGE}</textarea></dd>  </dl>  <dl> -	<dt><label for="priority">{L_MAIL_PRIORITY}:</label></dt> +	<dt><label for="priority">{L_MAIL_PRIORITY}{L_COLON}</label></dt>  	<dd><select id="priority" name="mail_priority_flag">{S_PRIORITY_OPTIONS}</select></dd>  </dl>  <dl> -	<dt><label for="banned">{L_MAIL_BANNED}:</label><br /><span>{L_MAIL_BANNED_EXPLAIN}</span></dt> +	<dt><label for="banned">{L_MAIL_BANNED}{L_COLON}</label><br /><span>{L_MAIL_BANNED_EXPLAIN}</span></dt>  	<dd><input id="banned" name="mail_banned_flag" type="checkbox" class="radio" /></dd>  </dl>  <dl> -	<dt><label for="send">{L_SEND_IMMEDIATELY}:</label></dt> +	<dt><label for="send">{L_SEND_IMMEDIATELY}{L_COLON}</label></dt>  	<dd><input id="send" type="checkbox" class="radio" name="send_immediately" checked="checked" /></dd>  </dl> diff --git a/phpBB/adm/style/acp_ext_details.html b/phpBB/adm/style/acp_ext_details.html index e7532691ad..18786d80f9 100644 --- a/phpBB/adm/style/acp_ext_details.html +++ b/phpBB/adm/style/acp_ext_details.html @@ -10,38 +10,38 @@  		<legend>{L_EXT_DETAILS}</legend>  		<!-- IF META_DISPLAY_NAME -->  		<dl> -			<dt><label for="meta_display_name">{L_DISPLAY_NAME}:</label></dt> +			<dt><label for="meta_display_name">{L_DISPLAY_NAME}{L_COLON}</label></dt>  			<dd><strong id="meta_display_name">{META_DISPLAY_NAME}</strong></dd>  		</dl>  		<!-- ENDIF -->  		<dl> -			<dt><label for="meta_name">{L_CLEAN_NAME}:</label></dt> +			<dt><label for="meta_name">{L_CLEAN_NAME}{L_COLON}</label></dt>  			<dd><strong id="meta_name">{META_NAME}</strong></dd>  		</dl>  		<!-- IF META_DESCRIPTION -->  		<dl> -			<dt><label for="meta_description">{L_DESCRIPTION}:</label></dt> +			<dt><label for="meta_description">{L_DESCRIPTION}{L_COLON}</label></dt>  			<dd><p id="meta_description">{META_DESCRIPTION}</p></dd>  		</dl>  		<!-- ENDIF -->  		<dl> -			<dt><label for="meta_version">{L_VERSION}:</label></dt> +			<dt><label for="meta_version">{L_VERSION}{L_COLON}</label></dt>  			<dd><p id="meta_version">{META_VERSION}</p></dd>  		</dl>  		<!-- IF META_HOMEPAGE -->  		<dl> -			<dt><label for="meta_homepage">{L_HOMEPAGE}:</label></dt> +			<dt><label for="meta_homepage">{L_HOMEPAGE}{L_COLON}</label></dt>  			<dd><p id="meta_homepage">{META_HOMEPAGE}</p></dd>  		</dl>  		<!-- ENDIF -->  		<!-- IF META_TIME -->  		<dl> -			<dt><label for="meta_time">{L_TIME}:</label></dt> +			<dt><label for="meta_time">{L_TIME}{L_COLON}</label></dt>  			<dd><p id="meta_time">{META_TIME}</p></dd>  		</dl>  		<!-- ENDIF -->  		<dl> -			<dt><label for="meta_license">{L_LICENCE}:</label></dt> +			<dt><label for="meta_license">{L_LICENCE}{L_COLON}</label></dt>  			<dd><p id="meta_license">{META_LICENCE}</p></dd>  		</dl>  	</fieldset> @@ -51,13 +51,13 @@  		<legend>{L_REQUIREMENTS}</legend>  		<!-- IF META_REQUIRE_PHPBB -->  		<dl<!-- IF META_REQUIRE_PHPBB_FAIL --> class="requirements_not_met"<!-- ENDIF -->> -			<dt><label for="require_phpbb">{L_PHPBB_VERSION}:</label></dt> +			<dt><label for="require_phpbb">{L_PHPBB_VERSION}{L_COLON}</label></dt>  			<dd><p id="require_phpbb">{META_REQUIRE_PHPBB}</p></dd>  		</dl>  		<!-- ENDIF -->  		<!-- IF META_REQUIRE_PHP -->  		<dl<!-- IF META_REQUIRE_PHP_FAIL --> class="requirements_not_met"<!-- ENDIF -->> -			<dt><label for="require_php">{L_PHP_VERSION}:</label></dt> +			<dt><label for="require_php">{L_PHP_VERSION}{L_COLON}</label></dt>  			<dd><p id="require_php">{META_REQUIRE_PHP}</p></dd>  		</dl>  		<!-- ENDIF --> @@ -69,24 +69,24 @@  		<!-- BEGIN meta_authors -->  		<fieldset>  			<dl> -				<dt><label for="meta_author_name">{L_AUTHOR_NAME}:</label></dt> +				<dt><label for="meta_author_name">{L_AUTHOR_NAME}{L_COLON}</label></dt>  				<dd><strong id="meta_author_name">{meta_authors.AUTHOR_NAME}</strong></dd>  			</dl>  			<!-- IF meta_authors.AUTHOR_EMAIL -->  			<dl> -				<dt><label for="meta_author_email">{L_AUTHOR_EMAIL}:</label></dt> +				<dt><label for="meta_author_email">{L_AUTHOR_EMAIL}{L_COLON}</label></dt>  				<dd><strong id="meta_author_email"><a href="mailto:{meta_authors.AUTHOR_EMAIL}">{meta_authors.AUTHOR_EMAIL}</a></strong></dd>  			</dl>  			<!-- ENDIF -->  			<!-- IF meta_authors.AUTHOR_HOMEPAGE -->  			<dl> -				<dt><label for="meta_author_url">{L_AUTHOR_HOMEPAGE}:</label></dt> +				<dt><label for="meta_author_url">{L_AUTHOR_HOMEPAGE}{L_COLON}</label></dt>  				<dd><strong id="meta_author_url"><a href="{meta_authors.AUTHOR_HOMEPAGE}">{meta_authors.AUTHOR_HOMEPAGE}</a></strong></dd>  			</dl>  			<!-- ENDIF -->  			<!-- IF meta_authors.AUTHOR_ROLE -->  			<dl> -				<dt><label for="author_role">{L_AUTHOR_ROLE}:</label></dt> +				<dt><label for="author_role">{L_AUTHOR_ROLE}{L_COLON}</label></dt>  				<dd><strong id="meta_author_role">{meta_authors.AUTHOR_ROLE}</strong></dd>  			</dl>  			<!-- ENDIF --> diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index e29cdcf2e9..cb9cae6c0d 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -112,13 +112,13 @@  	<fieldset>  		<legend>{L_FORUM_SETTINGS}</legend>  	<dl> -		<dt><label for="forum_type">{L_FORUM_TYPE}:</label></dt> +		<dt><label for="forum_type">{L_FORUM_TYPE}{L_COLON}</label></dt>  		<dd><select id="forum_type" name="forum_type" onchange="display_options(this.options[this.selectedIndex].value);">{S_FORUM_TYPE_OPTIONS}</select></dd>  	</dl>  	<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_POST -->  	<div id="type_actions">  		<dl> -			<dt><label for="type_action">{L_DECIDE_MOVE_DELETE_CONTENT}:</label></dt> +			<dt><label for="type_action">{L_DECIDE_MOVE_DELETE_CONTENT}{L_COLON}</label></dt>  			<dd><label><input type="radio" class="radio" name="type_action" value="delete"<!-- IF not S_MOVE_FORUM_OPTIONS --> checked="checked" id="type_action"<!-- ENDIF --> /> {L_DELETE_ALL_POSTS}</label></dd>  			<!-- IF S_MOVE_FORUM_OPTIONS --><dd><label><input type="radio" class="radio" name="type_action" id="type_action" value="move" checked="checked" /> {L_MOVE_POSTS_TO}</label> <select name="to_forum_id">{S_MOVE_FORUM_OPTIONS}</select></dd><!-- ENDIF -->  		</dl> @@ -127,7 +127,7 @@  	<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_CAT and S_HAS_SUBFORUMS -->  	<div id="cat_to_link_actions">  		<dl> -			<dt><label for="action_subforums">{L_DECIDE_MOVE_DELETE_SUBFORUMS}:</label></dt> +			<dt><label for="action_subforums">{L_DECIDE_MOVE_DELETE_SUBFORUMS}{L_COLON}</label></dt>  			<!-- IF S_FORUMS_LIST -->  				<dd><label><input type="radio" class="radio" id="action_subforums" name="action_subforums" value="move" checked="checked" /> {L_MOVE_SUBFORUMS_TO}</label> <select name="subforums_to_id">{S_FORUMS_LIST}</select></dd>  			<!-- ELSE --> @@ -137,49 +137,49 @@  	</div>  	<!-- ENDIF -->  	<dl> -		<dt><label for="parent">{L_FORUM_PARENT}:</label></dt> +		<dt><label for="parent">{L_FORUM_PARENT}{L_COLON}</label></dt>  		<dd><select id="parent" name="forum_parent_id"><option value="0"<!-- IF not S_FORUM_PARENT_ID --> selected="selected"<!-- ENDIF -->>{L_NO_PARENT}</option>{S_PARENT_OPTIONS}</select></dd>  	</dl>  	<!-- IF S_CAN_COPY_PERMISSIONS -->  		<dl> -			<dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt> +			<dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}{L_COLON}</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>  			<dd><select id="forum_perm_from" name="forum_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_FORUM_OPTIONS}</select></dd>  		</dl>  	<!-- ENDIF -->  	<dl> -		<dt><label for="forum_name">{L_FORUM_NAME}:</label></dt> +		<dt><label for="forum_name">{L_FORUM_NAME}{L_COLON}</label></dt>  		<dd><input class="text medium" type="text" id="forum_name" name="forum_name" value="{FORUM_NAME}" maxlength="255" /></dd>  	</dl>  	<dl> -		<dt><label for="forum_desc">{L_FORUM_DESC}:</label><br /><span>{L_FORUM_DESC_EXPLAIN}</span></dt> +		<dt><label for="forum_desc">{L_FORUM_DESC}{L_COLON}</label><br /><span>{L_FORUM_DESC_EXPLAIN}</span></dt>  		<dd><textarea id="forum_desc" name="forum_desc" rows="5" cols="45">{FORUM_DESC}</textarea></dd>  		<dd><label><input type="checkbox" class="radio" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>  			<label><input type="checkbox" class="radio" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>  			<label><input type="checkbox" class="radio" name="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd>  	</dl>  	<dl> -		<dt><label for="forum_image">{L_FORUM_IMAGE}:</label><br /><span>{L_FORUM_IMAGE_EXPLAIN}</span></dt> +		<dt><label for="forum_image">{L_FORUM_IMAGE}{L_COLON}</label><br /><span>{L_FORUM_IMAGE_EXPLAIN}</span></dt>  		<dd><input class="text medium" type="text" id="forum_image" name="forum_image" value="{FORUM_IMAGE}" maxlength="255" /></dd>  		<!-- IF FORUM_IMAGE_SRC -->  			<dd><img src="{FORUM_IMAGE_SRC}" alt="{L_FORUM_IMAGE}" /></dd>  		<!-- ENDIF -->  	</dl>  	<dl> -		<dt><label for="forum_password">{L_FORUM_PASSWORD}:</label><br /><span>{L_FORUM_PASSWORD_EXPLAIN}</span></dt> +		<dt><label for="forum_password">{L_FORUM_PASSWORD}{L_COLON}</label><br /><span>{L_FORUM_PASSWORD_EXPLAIN}</span></dt>  		<dd><input type="password" id="forum_password" name="forum_password" value="<!-- IF S_FORUM_PASSWORD_SET -->      <!-- ENDIF -->" autocomplete="off" /></dd>  	</dl>  	<dl> -		<dt><label for="forum_password_confirm">{L_FORUM_PASSWORD_CONFIRM}:</label><br /><span>{L_FORUM_PASSWORD_CONFIRM_EXPLAIN}</span></dt> +		<dt><label for="forum_password_confirm">{L_FORUM_PASSWORD_CONFIRM}{L_COLON}</label><br /><span>{L_FORUM_PASSWORD_CONFIRM_EXPLAIN}</span></dt>  		<dd><input type="password" id="forum_password_confirm" name="forum_password_confirm" value="<!-- IF S_FORUM_PASSWORD_SET -->      <!-- ENDIF -->" autocomplete="off" /></dd>  	</dl>  	<!-- IF S_FORUM_PASSWORD_SET -->  	<dl> -		<dt><label for="forum_password_unset">{L_FORUM_PASSWORD_UNSET}:</label><br /><span>{L_FORUM_PASSWORD_UNSET_EXPLAIN}</span></dt> +		<dt><label for="forum_password_unset">{L_FORUM_PASSWORD_UNSET}{L_COLON}</label><br /><span>{L_FORUM_PASSWORD_UNSET_EXPLAIN}</span></dt>  		<dd><input id="forum_password_unset" name="forum_password_unset" type="checkbox" /></dd>  	</dl>  	<!-- ENDIF -->  	<dl> -		<dt><label for="forum_style">{L_FORUM_STYLE}:</label></dt> +		<dt><label for="forum_style">{L_FORUM_STYLE}{L_COLON}</label></dt>  		<dd><select id="forum_style" name="forum_style"><option value="0">{L_DEFAULT_STYLE}</option>{S_STYLES_OPTIONS}</select></dd>  	</dl>  	</fieldset> @@ -188,7 +188,7 @@  		<fieldset>  			<legend>{L_GENERAL_FORUM_SETTINGS}</legend>  		<dl> -			<dt><label for="display_active">{L_DISPLAY_ACTIVE_TOPICS}:</label><br /><span>{L_DISPLAY_ACTIVE_TOPICS_EXPLAIN}</span></dt> +			<dt><label for="display_active">{L_DISPLAY_ACTIVE_TOPICS}{L_COLON}</label><br /><span>{L_DISPLAY_ACTIVE_TOPICS_EXPLAIN}</span></dt>  			<dd><label><input type="radio" class="radio" name="display_active" value="1"<!-- IF S_ENABLE_ACTIVE_TOPICS --> id="display_active" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  				<label><input type="radio" class="radio" name="display_active" value="0"<!-- IF not S_ENABLE_ACTIVE_TOPICS --> id="display_active" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  		</dl> @@ -199,46 +199,46 @@  		<fieldset>  			<legend>{L_GENERAL_FORUM_SETTINGS}</legend>  		<dl> -			<dt><label for="forum_status">{L_FORUM_STATUS}:</label></dt> +			<dt><label for="forum_status">{L_FORUM_STATUS}{L_COLON}</label></dt>  			<dd><select id="forum_status" name="forum_status">{S_STATUS_OPTIONS}</select></dd>  		</dl>  		<dl> -			<dt><label for="display_subforum_list">{L_LIST_SUBFORUMS}:</label><br /><span>{L_LIST_SUBFORUMS_EXPLAIN}</span></dt> +			<dt><label for="display_subforum_list">{L_LIST_SUBFORUMS}{L_COLON}</label><br /><span>{L_LIST_SUBFORUMS_EXPLAIN}</span></dt>  			<dd><label><input type="radio" class="radio" name="display_subforum_list" value="1"<!-- IF S_DISPLAY_SUBFORUM_LIST --> id="display_subforum_list" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  				<label><input type="radio" class="radio" name="display_subforum_list" value="0"<!-- IF not S_DISPLAY_SUBFORUM_LIST --> id="display_subforum_list" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  		</dl>  		<dl> -			<dt><label for="display_on_index">{L_LIST_INDEX}:</label><br /><span>{L_LIST_INDEX_EXPLAIN}</span></dt> +			<dt><label for="display_on_index">{L_LIST_INDEX}{L_COLON}</label><br /><span>{L_LIST_INDEX_EXPLAIN}</span></dt>  			<dd><label><input type="radio" class="radio" name="display_on_index" value="1"<!-- IF S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  				<label><input type="radio" class="radio" name="display_on_index" value="0"<!-- IF not S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  		</dl>  		<dl> -			<dt><label for="enable_post_review">{L_ENABLE_POST_REVIEW}:</label><br /><span>{L_ENABLE_POST_REVIEW_EXPLAIN}</span></dt> +			<dt><label for="enable_post_review">{L_ENABLE_POST_REVIEW}{L_COLON}</label><br /><span>{L_ENABLE_POST_REVIEW_EXPLAIN}</span></dt>  			<dd><label><input type="radio" class="radio" name="enable_post_review" value="1"<!-- IF S_ENABLE_POST_REVIEW --> id="enable_post_review" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  				<label><input type="radio" class="radio" name="enable_post_review" value="0"<!-- IF not S_ENABLE_POST_REVIEW --> id="enable_post_review" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  		</dl>  		<dl> -			<dt><label for="enable_quick_reply">{L_ENABLE_QUICK_REPLY}:</label><br /><span>{L_ENABLE_QUICK_REPLY_EXPLAIN}</span></dt> +			<dt><label for="enable_quick_reply">{L_ENABLE_QUICK_REPLY}{L_COLON}</label><br /><span>{L_ENABLE_QUICK_REPLY_EXPLAIN}</span></dt>  			<dd><label><input type="radio" class="radio" name="enable_quick_reply" value="1"<!-- IF S_ENABLE_QUICK_REPLY --> id="enable_quick_reply" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  				<label><input type="radio" class="radio" name="enable_quick_reply" value="0"<!-- IF not S_ENABLE_QUICK_REPLY --> id="enable_quick_reply" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  		</dl>  		<dl> -			<dt><label for="enable_indexing">{L_ENABLE_INDEXING}:</label><br /><span>{L_ENABLE_INDEXING_EXPLAIN}</span></dt> +			<dt><label for="enable_indexing">{L_ENABLE_INDEXING}{L_COLON}</label><br /><span>{L_ENABLE_INDEXING_EXPLAIN}</span></dt>  			<dd><label><input type="radio" class="radio" name="enable_indexing" value="1"<!-- IF S_ENABLE_INDEXING --> id="enable_indexing" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  				<label><input type="radio" class="radio" name="enable_indexing" value="0"<!-- IF not S_ENABLE_INDEXING --> id="enable_indexing" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  		</dl>  		<dl> -			<dt><label for="enable_icons">{L_ENABLE_TOPIC_ICONS}:</label></dt> +			<dt><label for="enable_icons">{L_ENABLE_TOPIC_ICONS}{L_COLON}</label></dt>  			<dd><label><input type="radio" class="radio" name="enable_icons" value="1"<!-- IF S_TOPIC_ICONS --> id="enable_icons" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  				<label><input type="radio" class="radio" name="enable_icons" value="0"<!-- IF not S_TOPIC_ICONS --> id="enable_icons" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  		</dl>  		<dl> -			<dt><label for="display_recent">{L_ENABLE_RECENT}:</label><br /><span>{L_ENABLE_RECENT_EXPLAIN}</span></dt> +			<dt><label for="display_recent">{L_ENABLE_RECENT}{L_COLON}</label><br /><span>{L_ENABLE_RECENT_EXPLAIN}</span></dt>  			<dd><label><input type="radio" class="radio" name="display_recent" value="1"<!-- IF S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  				<label><input type="radio" class="radio" name="display_recent" value="0"<!-- IF not S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  		</dl>  		<dl> -			<dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}:</label><br /><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt> +			<dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}{L_COLON}</label><br /><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt>  			<dd><input type="text" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" size="4" maxlength="4" /></dd>  		</dl>  		</fieldset> @@ -246,34 +246,34 @@  		<fieldset>  			<legend>{L_FORUM_PRUNE_SETTINGS}</legend>  		<dl> -			<dt><label for="enable_prune">{L_FORUM_AUTO_PRUNE}:</label><br /><span>{L_FORUM_AUTO_PRUNE_EXPLAIN}</span></dt> +			<dt><label for="enable_prune">{L_FORUM_AUTO_PRUNE}{L_COLON}</label><br /><span>{L_FORUM_AUTO_PRUNE_EXPLAIN}</span></dt>  			<dd><label><input type="radio" class="radio" name="enable_prune" value="1"<!-- IF S_PRUNE_ENABLE --> id="enable_prune" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  				<label><input type="radio" class="radio" name="enable_prune" value="0"<!-- IF not S_PRUNE_ENABLE --> id="enable_prune" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  		</dl>  		<dl> -			<dt><label for="prune_freq">{L_AUTO_PRUNE_FREQ}:</label><br /><span>{L_AUTO_PRUNE_FREQ_EXPLAIN}</span></dt> +			<dt><label for="prune_freq">{L_AUTO_PRUNE_FREQ}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_FREQ_EXPLAIN}</span></dt>  			<dd><input type="text" id="prune_freq" name="prune_freq" value="{PRUNE_FREQ}" maxlength="4" size="4" /> {L_DAYS}</dd>  		</dl>  		<dl> -			<dt><label for="prune_days">{L_AUTO_PRUNE_DAYS}:</label><br /><span>{L_AUTO_PRUNE_DAYS_EXPLAIN}</span></dt> +			<dt><label for="prune_days">{L_AUTO_PRUNE_DAYS}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_DAYS_EXPLAIN}</span></dt>  			<dd><input type="text" id="prune_days" name="prune_days" value="{PRUNE_DAYS}" maxlength="4" size="4" /> {L_DAYS}</dd>  		</dl>  		<dl> -			<dt><label for="prune_viewed">{L_AUTO_PRUNE_VIEWED}:</label><br /><span>{L_AUTO_PRUNE_VIEWED_EXPLAIN}</span></dt> +			<dt><label for="prune_viewed">{L_AUTO_PRUNE_VIEWED}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_VIEWED_EXPLAIN}</span></dt>  			<dd><input type="text" id="prune_viewed" name="prune_viewed" value="{PRUNE_VIEWED}" maxlength="4" size="4" /> {L_DAYS}</dd>  		</dl>  		<dl> -			<dt><label for="prune_old_polls">{L_PRUNE_OLD_POLLS}:</label><br /><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt> +			<dt><label for="prune_old_polls">{L_PRUNE_OLD_POLLS}{L_COLON}</label><br /><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt>  			<dd><label><input type="radio" class="radio" name="prune_old_polls" value="1"<!-- IF S_PRUNE_OLD_POLLS --> id="prune_old_polls" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  				<label><input type="radio" class="radio" name="prune_old_polls" value="0"<!-- IF not S_PRUNE_OLD_POLLS --> id="prune_old_polls" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  		</dl>  		<dl> -			<dt><label for="prune_announce">{L_PRUNE_ANNOUNCEMENTS}:</label></dt> +			<dt><label for="prune_announce">{L_PRUNE_ANNOUNCEMENTS}{L_COLON}</label></dt>  			<dd><label><input type="radio" class="radio" name="prune_announce" value="1"<!-- IF S_PRUNE_ANNOUNCE --> id="prune_announce" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  				<label><input type="radio" class="radio" name="prune_announce" value="0"<!-- IF not S_PRUNE_ANNOUNCE --> id="prune_announce" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  		</dl>  		<dl> -			<dt><label for="prune_sticky">{L_PRUNE_STICKY}:</label></dt> +			<dt><label for="prune_sticky">{L_PRUNE_STICKY}{L_COLON}</label></dt>  			<dd><label><input type="radio" class="radio" name="prune_sticky" value="1"<!-- IF S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  				<label><input type="radio" class="radio" name="prune_sticky" value="0"<!-- IF not S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  		</dl> @@ -284,16 +284,16 @@  		<fieldset>  			<legend>{L_GENERAL_FORUM_SETTINGS}</legend>  		<dl> -			<dt><label for="link_display_on_index">{L_LIST_INDEX}:</label><br /><span>{L_LIST_INDEX_EXPLAIN}</span></dt> +			<dt><label for="link_display_on_index">{L_LIST_INDEX}{L_COLON}</label><br /><span>{L_LIST_INDEX_EXPLAIN}</span></dt>  			<dd><label><input type="radio" class="radio" name="link_display_on_index" value="1"<!-- IF S_DISPLAY_ON_INDEX --> id="link_display_on_index" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  				<label><input type="radio" class="radio" name="link_display_on_index" value="0"<!-- IF not S_DISPLAY_ON_INDEX --> id="link_display_on_index" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  		</dl>  		<dl> -			<dt><label for="forum_link">{L_FORUM_LINK}:</label><br /><span>{L_FORUM_LINK_EXPLAIN}</span></dt> +			<dt><label for="forum_link">{L_FORUM_LINK}{L_COLON}</label><br /><span>{L_FORUM_LINK_EXPLAIN}</span></dt>  			<dd><input class="text medium" type="text" id="forum_link" name="forum_link" value="{FORUM_DATA_LINK}" maxlength="255" /></dd>  		</dl>  		<dl> -			<dt><label for="forum_link_track">{L_FORUM_LINK_TRACK}:</label><br /><span>{L_FORUM_LINK_TRACK_EXPLAIN}</span></dt> +			<dt><label for="forum_link_track">{L_FORUM_LINK_TRACK}{L_COLON}</label><br /><span>{L_FORUM_LINK_TRACK_EXPLAIN}</span></dt>  			<dd><label><input type="radio" class="radio" name="forum_link_track" value="1"<!-- IF S_FORUM_LINK_TRACK --> id="forum_link_track" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  				<label><input type="radio" class="radio" name="forum_link_track" value="0"<!-- IF not S_FORUM_LINK_TRACK --> id="forum_link_track" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  		</dl> @@ -304,17 +304,17 @@  		<fieldset>  			<legend>{L_FORUM_RULES}</legend>  		<dl> -			<dt><label for="forum_rules_link">{L_FORUM_RULES_LINK}:</label><br /><span>{L_FORUM_RULES_LINK_EXPLAIN}</span></dt> +			<dt><label for="forum_rules_link">{L_FORUM_RULES_LINK}{L_COLON}</label><br /><span>{L_FORUM_RULES_LINK_EXPLAIN}</span></dt>  			<dd><input class="text medium" type="text" id="forum_rules_link" name="forum_rules_link" value="{FORUM_RULES_LINK}" maxlength="255" /></dd>  		</dl>  	<!-- IF FORUM_RULES_PREVIEW -->  		<dl> -			<dt><label>{L_FORUM_RULES_PREVIEW}:</label></dt> +			<dt><label>{L_FORUM_RULES_PREVIEW}{L_COLON}</label></dt>  			<dd>{FORUM_RULES_PREVIEW}</dd>  		</dl>  	<!-- ENDIF -->  		<dl> -			<dt><label for="forum_rules">{L_FORUM_RULES}:</label><br /><span>{L_FORUM_RULES_EXPLAIN}</span></dt> +			<dt><label for="forum_rules">{L_FORUM_RULES}{L_COLON}</label><br /><span>{L_FORUM_RULES_EXPLAIN}</span></dt>  			<dd><textarea id="forum_rules" name="forum_rules" rows="4" cols="70">{FORUM_RULES_PLAIN}</textarea></dd>  			<dd><label><input type="checkbox" class="radio" name="rules_parse_bbcode"<!-- IF S_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>  				<label><input type="checkbox" class="radio" name="rules_parse_smilies"<!-- IF S_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label> @@ -351,12 +351,12 @@  	<fieldset>  		<legend>{L_FORUM_DELETE}</legend>  	<dl> -		<dt><label>{L_FORUM_NAME}:</label></dt> +		<dt><label>{L_FORUM_NAME}{L_COLON}</label></dt>  		<dd><strong>{FORUM_NAME}</strong></dd>  	</dl>  	<!-- IF S_FORUM_POST -->  		<dl> -			<dt><label for="delete_action">{L_ACTION}:</label></dt> +			<dt><label for="delete_action">{L_ACTION}{L_COLON}</label></dt>  			<dd><label><input type="radio" class="radio" id="delete_action" name="action_posts" value="delete" checked="checked" /> {L_DELETE_ALL_POSTS}</label></dd>  			<!-- IF S_MOVE_FORUM_OPTIONS -->  				<dd><label><input type="radio" class="radio" name="action_posts" value="move" /> {L_MOVE_POSTS_TO}</label> <select name="posts_to_id">{S_MOVE_FORUM_OPTIONS}</select></dd> @@ -365,7 +365,7 @@  	<!-- ENDIF -->  	<!-- IF S_HAS_SUBFORUMS -->  		<dl> -			<dt><label for="sub_delete_action">{L_ACTION}:</label></dt> +			<dt><label for="sub_delete_action">{L_ACTION}{L_COLON}</label></dt>  			<dd><label><input type="radio" class="radio" id="sub_delete_action" name="action_subforums" value="delete" checked="checked" /> {L_DELETE_SUBFORUMS}</label></dd>  			<!-- IF S_FORUMS_LIST -->  				<dd><label><input type="radio" class="radio" name="action_subforums" value="move" /> {L_MOVE_SUBFORUMS_TO}</label> <select name="subforums_to_id">{S_FORUMS_LIST}</select></dd> @@ -449,7 +449,7 @@  					<!-- IF forums.FORUM_IMAGE --><div style="float: {S_CONTENT_FLOW_BEGIN}; margin-right: 5px;">{forums.FORUM_IMAGE}</div><!-- ENDIF -->  					<strong><!-- IF forums.S_FORUM_LINK -->{forums.FORUM_NAME}<!-- ELSE --><a href="{forums.U_FORUM}">{forums.FORUM_NAME}</a><!-- ENDIF --></strong>  					<!-- IF forums.FORUM_DESCRIPTION --><br /><span>{forums.FORUM_DESCRIPTION}</span><!-- ENDIF --> -					<!-- IF forums.S_FORUM_POST --><br /><br /><span>{L_TOPICS}: <strong>{forums.FORUM_TOPICS}</strong> / {L_POSTS}: <strong>{forums.FORUM_POSTS}</strong></span><!-- ENDIF --> +					<!-- IF forums.S_FORUM_POST --><br /><br /><span>{L_TOPICS}{L_COLON} <strong>{forums.FORUM_TOPICS}</strong> / {L_POSTS}{L_COLON} <strong>{forums.FORUM_POSTS}</strong></span><!-- ENDIF -->  				</td>  				<td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;">  					<!-- IF forums.S_FIRST_ROW && not forums.S_LAST_ROW --> @@ -482,7 +482,7 @@  	<form id="fselect" method="post" action="{U_SEL_ACTION}">  	<fieldset class="quick"> -		{L_SELECT_FORUM}: <select name="parent_id" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{FORUM_BOX}</select> +		{L_SELECT_FORUM}{L_COLON} <select name="parent_id" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{FORUM_BOX}</select>  		<input class="button2" type="submit" value="{L_GO}" />  		{S_FORM_TOKEN} diff --git a/phpBB/adm/style/acp_forums_copy_perm.html b/phpBB/adm/style/acp_forums_copy_perm.html index acec3c1967..1fcf2f62a4 100644 --- a/phpBB/adm/style/acp_forums_copy_perm.html +++ b/phpBB/adm/style/acp_forums_copy_perm.html @@ -9,7 +9,7 @@  <fieldset>  	<dl> -		<dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt> +		<dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}{L_COLON}</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>  		<dd><select id="forum_perm_from" name="forum_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_FORUM_OPTIONS}</select></dd>  	</dl>  	<div style="text-align: center;">{S_FORM_TOKEN}{S_HIDDEN_FIELDS} diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html index 6e52880131..4701bf702f 100644 --- a/phpBB/adm/style/acp_groups.html +++ b/phpBB/adm/style/acp_groups.html @@ -22,11 +22,11 @@  	<fieldset>  		<legend>{L_GROUP_DETAILS}</legend>  	<dl> -		<dt><label<!-- IF not S_SPECIAL_GROUP --> for="group_name"<!-- ENDIF -->>{L_GROUP_NAME}:</label></dt> +		<dt><label<!-- IF not S_SPECIAL_GROUP --> for="group_name"<!-- ENDIF -->>{L_GROUP_NAME}{L_COLON}</label></dt>  		<dd><!-- IF S_SPECIAL_GROUP --><strong>{GROUP_NAME}</strong><!-- ENDIF --><input name="group_name" type="<!-- IF S_SPECIAL_GROUP -->hidden<!-- ELSE -->text<!-- ENDIF -->" id="group_name" value="{GROUP_INTERNAL_NAME}" /></dd>  	</dl>  	<dl> -		<dt><label for="group_desc">{L_GROUP_DESC}:</label></dt> +		<dt><label for="group_desc">{L_GROUP_DESC}{L_COLON}</label></dt>  		<dd><textarea id="group_desc" name="group_desc" rows="5" cols="45">{GROUP_DESC}</textarea></dd>  		<dd><label><input type="checkbox" class="radio" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>  			<label><input type="checkbox" class="radio" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label> @@ -34,7 +34,7 @@  	</dl>  	<!-- IF not S_SPECIAL_GROUP -->  		<dl> -			<dt><label for="group_type">{L_GROUP_TYPE}:</label><br /><span>{L_GROUP_TYPE_EXPLAIN}</span></dt> +			<dt><label for="group_type">{L_GROUP_TYPE}{L_COLON}</label><br /><span>{L_GROUP_TYPE_EXPLAIN}</span></dt>  			<dd>  				<label><input name="group_type" type="radio" class="radio" id="group_type" value="{GROUP_TYPE_FREE}"{GROUP_FREE} /> {L_GROUP_OPEN}</label>  				<label><input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_OPEN}"{GROUP_OPEN} /> {L_GROUP_REQUEST}</label> @@ -48,7 +48,7 @@  	<!-- IF S_ADD_GROUP and S_GROUP_PERM -->  		<dl> -			<dt><label for="group_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt> +			<dt><label for="group_perm_from">{L_COPY_PERMISSIONS}{L_COLON}</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>  			<dd><select id="group_perm_from" name="group_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_GROUP_OPTIONS}</select></dd>  		</dl>  	<!-- ENDIF --> @@ -58,24 +58,24 @@  		<legend>{L_GROUP_OPTIONS_SAVE}</legend>  	<!-- IF S_USER_FOUNDER -->  	<dl> -		<dt><label for="group_founder_manage">{L_GROUP_FOUNDER_MANAGE}:</label><br /><span>{L_GROUP_FOUNDER_MANAGE_EXPLAIN}</span></dt> +		<dt><label for="group_founder_manage">{L_GROUP_FOUNDER_MANAGE}{L_COLON}</label><br /><span>{L_GROUP_FOUNDER_MANAGE_EXPLAIN}</span></dt>  		<dd><input name="group_founder_manage" type="checkbox" value="1" class="radio" id="group_founder_manage"{GROUP_FOUNDER_MANAGE} /></dd>  	</dl>  	<!-- ENDIF -->  	<dl> -		<dt><label for="group_skip_auth">{L_GROUP_SKIP_AUTH}:</label><br /><span>{L_GROUP_SKIP_AUTH_EXPLAIN}</span></dt> +		<dt><label for="group_skip_auth">{L_GROUP_SKIP_AUTH}{L_COLON}</label><br /><span>{L_GROUP_SKIP_AUTH_EXPLAIN}</span></dt>  		<dd><input name="group_skip_auth" type="checkbox" value="1" class="radio" id="group_skip_auth"{GROUP_SKIP_AUTH} /></dd>  	</dl>  	<dl> -		<dt><label for="group_legend">{L_GROUP_LEGEND}:</label></dt> +		<dt><label for="group_legend">{L_GROUP_LEGEND}{L_COLON}</label></dt>  		<dd><input name="group_legend" type="checkbox" value="1" class="radio" id="group_legend"{GROUP_LEGEND} /></dd>  	</dl>  	<dl> -		<dt><label for="group_teampage">{L_GROUP_TEAMPAGE}:</label></dt> +		<dt><label for="group_teampage">{L_GROUP_TEAMPAGE}{L_COLON}</label></dt>  		<dd><input name="group_teampage" type="checkbox" value="1" class="radio" id="group_teampage"{GROUP_TEAMPAGE} /></dd>  	</dl>  	<dl> -		<dt><label for="group_receive_pm">{L_GROUP_RECEIVE_PM}:</label><br /><span>{L_GROUP_RECEIVE_PM_EXPLAIN}</span></dt> +		<dt><label for="group_receive_pm">{L_GROUP_RECEIVE_PM}{L_COLON}</label><br /><span>{L_GROUP_RECEIVE_PM_EXPLAIN}</span></dt>  		<dd><input name="group_receive_pm" type="checkbox" value="1" class="radio" id="group_receive_pm"{GROUP_RECEIVE_PM} /></dd>  	</dl>  	</fieldset> @@ -83,19 +83,19 @@  	<fieldset>  		<legend>{L_GROUP_SETTINGS_SAVE}</legend>  	<dl> -		<dt><label for="group_message_limit">{L_GROUP_MESSAGE_LIMIT}:</label><br /><span>{L_GROUP_MESSAGE_LIMIT_EXPLAIN}</span></dt> +		<dt><label for="group_message_limit">{L_GROUP_MESSAGE_LIMIT}{L_COLON}</label><br /><span>{L_GROUP_MESSAGE_LIMIT_EXPLAIN}</span></dt>  		<dd><input name="group_message_limit" type="text" id="group_message_limit" maxlength="4" size="4" value="{GROUP_MESSAGE_LIMIT}" /></dd>  	</dl>  	<dl> -		<dt><label for="group_max_recipients">{L_GROUP_MAX_RECIPIENTS}:</label><br /><span>{L_GROUP_MAX_RECIPIENTS_EXPLAIN}</span></dt> +		<dt><label for="group_max_recipients">{L_GROUP_MAX_RECIPIENTS}{L_COLON}</label><br /><span>{L_GROUP_MAX_RECIPIENTS_EXPLAIN}</span></dt>  		<dd><input name="group_max_recipients" type="text" id="group_max_recipients" maxlength="10" size="4" value="{GROUP_MAX_RECIPIENTS}" /></dd>  	</dl>  	<dl> -		<dt><label for="group_colour">{L_GROUP_COLOR}:</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt> +		<dt><label for="group_colour">{L_GROUP_COLOR}{L_COLON}</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt>  		<dd><input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" /><!-- IF GROUP_COLOUR --> <span style="background-color: #{GROUP_COLOUR}">   </span><!-- ENDIF -->  <span>[ <a href="{U_SWATCH}" onclick="popup(this.href, 636, 150, '_swatch'); return false">{L_COLOUR_SWATCH}</a> ]</span></dd>  	</dl>  	<dl> -		<dt><label for="group_rank">{L_GROUP_RANK}:</label></dt> +		<dt><label for="group_rank">{L_GROUP_RANK}{L_COLON}</label></dt>  		<dd><select name="group_rank" id="group_rank">{S_RANK_OPTIONS}</select></dd>  	</dl>  	</fieldset> @@ -103,32 +103,32 @@  	<fieldset>  		<legend>{L_GROUP_AVATAR}</legend>  	<dl> -		<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt> +		<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>  		<dd>{AVATAR_IMAGE}</dd>  		<dd><label><input type="checkbox" class="radio" name="delete" /> {L_DELETE_AVATAR}</label></dd>  	</dl>  	<!-- IF not S_IN_AVATAR_GALLERY -->  		<!-- IF S_CAN_UPLOAD -->  			<dl> -				<dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}:</label></dt> +				<dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}{L_COLON}</label></dt>  				<dd><input type="file" id="uploadfile" name="uploadfile" /></dd>  			</dl>  			<dl> -				<dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt> +				<dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}{L_COLON}</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>  				<dd><input name="uploadurl" type="text" id="uploadurl" value="" /></dd>  			</dl>  		<!-- ENDIF -->  		<dl> -			<dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt> +			<dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}{L_COLON}</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>  			<dd><input name="remotelink" type="text" id="remotelink" value="" /></dd>  		</dl>  		<dl> -			<dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt> +			<dt><label for="width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>  			<dd><input name="width" type="text" id="width" size="3" value="{AVATAR_WIDTH}" /> <span>{L_PIXEL} × </span> <input type="text" name="height" size="3" value="{AVATAR_HEIGHT}" /> <span>{L_PIXEL}</span></dd>  		</dl>  		<!-- IF S_DISPLAY_GALLERY -->  			<dl> -				<dt><label>{L_AVATAR_GALLERY}:</label></dt> +				<dt><label>{L_AVATAR_GALLERY}{L_COLON}</label></dt>  				<dd><input class="button2" type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" /></dd>  			</dl>  		<!-- ENDIF --> @@ -138,7 +138,7 @@  		<fieldset>  			<legend>{L_AVATAR_GALLERY}</legend>  		<dl> -			<dt><label for="category">{L_AVATAR_CATEGORY}:</label></dt> +			<dt><label for="category">{L_AVATAR_CATEGORY}{L_COLON}</label></dt>  			<dd><select name="category" id="category">{S_CAT_OPTIONS}</select> <input class="button2" type="submit" value="{L_GO}" name="display_gallery" /></dd>  		</dl>  		<dl> @@ -258,17 +258,17 @@  	<fieldset>  		<legend>{L_ADD_USERS}</legend>  	<dl> -		<dt><label for="leader">{L_USER_GROUP_LEADER}:</label></dt> +		<dt><label for="leader">{L_USER_GROUP_LEADER}{L_COLON}</label></dt>  		<dd><label><input name="leader" type="radio" class="radio" value="1" /> {L_YES}</label>  			<label><input name="leader" type="radio" class="radio" id="leader" value="0" checked="checked" /> {L_NO}</label></dd>  	</dl>  	<dl> -		<dt><label for="default">{L_USER_GROUP_DEFAULT}:</label><br /><span>{L_USER_GROUP_DEFAULT_EXPLAIN}</span></dt> +		<dt><label for="default">{L_USER_GROUP_DEFAULT}{L_COLON}</label><br /><span>{L_USER_GROUP_DEFAULT_EXPLAIN}</span></dt>  		<dd><label><input name="default" type="radio" class="radio" value="1" /> {L_YES}</label>  			<label><input name="default" type="radio" class="radio" id="default" value="0" checked="checked" /> {L_NO}</label></dd>  	</dl>  	<dl> -		<dt><label for="usernames">{L_USERNAME}:</label><br /><span>{L_USERNAMES_EXPLAIN}</span></dt> +		<dt><label for="usernames">{L_USERNAME}{L_COLON}</label><br /><span>{L_USERNAMES_EXPLAIN}</span></dt>  		<dd><textarea id="usernames" name="usernames" cols="40" rows="5"></textarea></dd>  		<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>  	</dl> @@ -322,7 +322,7 @@  	<fieldset class="quick">  		<!-- IF S_GROUP_ADD --> -			{L_CREATE_GROUP}: <input type="text" name="group_name" value="" /> <input class="button2" type="submit" name="submit" value="{L_SUBMIT}" /> +			{L_CREATE_GROUP}{L_COLON} <input type="text" name="group_name" value="" /> <input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />  			<input type="hidden" name="add" value="1" />  		<!-- ENDIF -->  		{S_FORM_TOKEN} diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html index 3a03573756..1e309d4cbc 100644 --- a/phpBB/adm/style/acp_groups_position.html +++ b/phpBB/adm/style/acp_groups_position.html @@ -9,7 +9,7 @@  	<fieldset>  		<legend>{L_LEGEND_SETTINGS}</legend>  		<dl> -			<dt><label for="legend_sort_groupname">{L_LEGEND_SORT_GROUPNAME}:</label><br /><span>{L_LEGEND_SORT_GROUPNAME_EXPLAIN}</span></dt> +			<dt><label for="legend_sort_groupname">{L_LEGEND_SORT_GROUPNAME}{L_COLON}</label><br /><span>{L_LEGEND_SORT_GROUPNAME_EXPLAIN}</span></dt>  			<dd>  				<label><input type="radio" name="legend_sort_groupname" class="radio" value="1"<!-- IF LEGEND_SORT_GROUPNAME --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>  				<label><input type="radio" name="legend_sort_groupname" class="radio" value="0"<!-- IF not LEGEND_SORT_GROUPNAME --> checked="checked"<!-- ENDIF --> /> {L_NO}</label> @@ -82,7 +82,7 @@  	<fieldset>  		<legend>{L_TEAMPAGE_SETTINGS}</legend>  		<dl> -			<dt><label for="teampage_multiple">{L_TEAMPAGE_MEMBERSHIPS}:</label></dt> +			<dt><label for="teampage_multiple">{L_TEAMPAGE_MEMBERSHIPS}{L_COLON}</label></dt>  			<dd>  				<label><input type="radio" name="teampage_memberships" class="radio" value="0"<!-- IF DISPLAY_MEMBERSHIPS == 0 --> checked="checked"<!-- ENDIF --> /> {L_TEAMPAGE_DISP_FIRST}</label><br />  				<label><input type="radio" name="teampage_memberships" class="radio" value="1"<!-- IF DISPLAY_MEMBERSHIPS == 1 --> checked="checked"<!-- ENDIF --> /> {L_TEAMPAGE_DISP_DEFAULT}</label><br /> @@ -90,7 +90,7 @@  			</dd>  		</dl>  		<dl> -			<dt><label for="teampage_forums">{L_TEAMPAGE_FORUMS}:</label><br /><span>{L_TEAMPAGE_FORUMS_EXPLAIN}</span></dt> +			<dt><label for="teampage_forums">{L_TEAMPAGE_FORUMS}{L_COLON}</label><br /><span>{L_TEAMPAGE_FORUMS_EXPLAIN}</span></dt>  			<dd>  				<label><input type="radio" name="teampage_forums" class="radio" value="1"<!-- IF DISPLAY_FORUMS --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>  				<label><input type="radio" name="teampage_forums" class="radio" value="0"<!-- IF not DISPLAY_FORUMS --> checked="checked"<!-- ENDIF --> /> {L_NO}</label> diff --git a/phpBB/adm/style/acp_inactive.html b/phpBB/adm/style/acp_inactive.html index 0b3b1b02d1..726c8c8b32 100644 --- a/phpBB/adm/style/acp_inactive.html +++ b/phpBB/adm/style/acp_inactive.html @@ -33,7 +33,7 @@  		<td style="vertical-align: top;">  			{inactive.USERNAME_FULL} -			<!-- IF inactive.POSTS --><br />{L_POSTS}: <strong>{inactive.POSTS}</strong> [<a href="{inactive.U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a>]<!-- ENDIF --> +			<!-- IF inactive.POSTS --><br />{L_POSTS}{L_COLON} <strong>{inactive.POSTS}</strong> [<a href="{inactive.U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a>]<!-- ENDIF -->  		</td>  		<td style="vertical-align: top;">{inactive.JOINED}</td>  		<td style="vertical-align: top;">{inactive.INACTIVE_DATE}</td> @@ -53,7 +53,7 @@  </table>  <fieldset class="display-options"> -	{L_DISPLAY_LOG}:  {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}<!-- IF .pagination --> Users per page: <input class="inputbox autowidth" type="text" name="users_per_page" id="users_per_page" size="3" value="{USERS_PER_PAGE}" /><!-- ENDIF --> +	{L_DISPLAY_LOG}{L_COLON}  {S_LIMIT_DAYS} {L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR}<!-- IF .pagination --> Users per page{L_COLON} <input class="inputbox autowidth" type="text" name="users_per_page" id="users_per_page" size="3" value="{USERS_PER_PAGE}" /><!-- ENDIF -->  	<input class="button2" type="submit" value="{L_GO}" name="sort" />  </fieldset> diff --git a/phpBB/adm/style/acp_jabber.html b/phpBB/adm/style/acp_jabber.html index 2ba1424bda..639bcd221f 100644 --- a/phpBB/adm/style/acp_jabber.html +++ b/phpBB/adm/style/acp_jabber.html @@ -21,35 +21,35 @@  	<p>{L_JAB_GTALK_NOTE}</p>  <!-- ENDIF -->  <dl> -	<dt><label for="jab_enable">{L_JAB_ENABLE}:</label><br /><span>{L_JAB_ENABLE_EXPLAIN}</span></dt> +	<dt><label for="jab_enable">{L_JAB_ENABLE}{L_COLON}</label><br /><span>{L_JAB_ENABLE_EXPLAIN}</span></dt>  	<dd><label><input type="radio" class="radio" id="jab_enable" name="jab_enable" value="1"<!-- IF JAB_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>  		<label><input type="radio" class="radio" name="jab_enable" value="0"<!-- IF not JAB_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>  </dl>  <dl> -	<dt><label for="jab_host">{L_JAB_SERVER}:</label><br /><span>{L_JAB_SERVER_EXPLAIN}</span></dt> +	<dt><label for="jab_host">{L_JAB_SERVER}{L_COLON}</label><br /><span>{L_JAB_SERVER_EXPLAIN}</span></dt>  	<dd><input type="text" id="jab_host" name="jab_host" value="{JAB_HOST}" /></dd>  </dl>  <dl> -	<dt><label for="jab_port">{L_JAB_PORT}:</label><br /><span>{L_JAB_PORT_EXPLAIN}</span></dt> +	<dt><label for="jab_port">{L_JAB_PORT}{L_COLON}</label><br /><span>{L_JAB_PORT_EXPLAIN}</span></dt>  	<dd><input type="text" id="jab_port" name="jab_port" value="{JAB_PORT}" maxlength="5" size="5" /></dd>  </dl>  <dl> -	<dt><label for="jab_username">{L_JAB_USERNAME}:</label><br /><span>{L_JAB_USERNAME_EXPLAIN}</span></dt> +	<dt><label for="jab_username">{L_JAB_USERNAME}{L_COLON}</label><br /><span>{L_JAB_USERNAME_EXPLAIN}</span></dt>  	<dd><input type="text" id="jab_username" name="jab_username" value="{JAB_USERNAME}" /></dd>  </dl>  <dl> -	<dt><label for="jab_password">{L_JAB_PASSWORD}:</label><br /><span>{L_JAB_PASSWORD_EXPLAIN}</span></dt> +	<dt><label for="jab_password">{L_JAB_PASSWORD}{L_COLON}</label><br /><span>{L_JAB_PASSWORD_EXPLAIN}</span></dt>  	<dd><input type="password" id="jab_password" name="jab_password" value="{JAB_PASSWORD}" /></dd>  </dl>  <!-- IF S_CAN_USE_SSL -->  <dl> -	<dt><label for="jab_use_ssl">{L_JAB_USE_SSL}:</label><br /><span>{L_JAB_USE_SSL_EXPLAIN}</span></dt> +	<dt><label for="jab_use_ssl">{L_JAB_USE_SSL}{L_COLON}</label><br /><span>{L_JAB_USE_SSL_EXPLAIN}</span></dt>  	<dd><label><input type="radio" class="radio" id="jab_use_ssl" name="jab_use_ssl" value="1"<!-- IF JAB_USE_SSL --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>  		<label><input type="radio" class="radio" name="jab_use_ssl" value="0"<!-- IF not JAB_USE_SSL --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  </dl>  <!-- ENDIF -->  <dl> -	<dt><label for="jab_package_size">{L_JAB_PACKAGE_SIZE}:</label><br /><span>{L_JAB_PACKAGE_SIZE_EXPLAIN}</span></dt> +	<dt><label for="jab_package_size">{L_JAB_PACKAGE_SIZE}{L_COLON}</label><br /><span>{L_JAB_PACKAGE_SIZE_EXPLAIN}</span></dt>  	<dd><input type="text" id="jab_package_size" name="jab_package_size" value="{JAB_PACKAGE_SIZE}" maxlength="5" size="5" /></dd>  </dl> diff --git a/phpBB/adm/style/acp_language.html b/phpBB/adm/style/acp_language.html index 81276287c1..c400437049 100644 --- a/phpBB/adm/style/acp_language.html +++ b/phpBB/adm/style/acp_language.html @@ -13,7 +13,7 @@  	<fieldset>  		<legend>{L_DOWNLOAD_AS}</legend>  	<dl> -		<dt><label for="use_method">{L_DOWNLOAD_AS}:</label></dt> +		<dt><label for="use_method">{L_DOWNLOAD_AS}{L_COLON}</label></dt>  		<dd>{RADIO_BUTTONS}</dd>  	</dl> @@ -35,19 +35,19 @@  	<fieldset>  		<legend>{LANG_LOCAL_NAME}</legend>  	<dl> -		<dt><label for="lang_english_name">{L_LANG_ENGLISH_NAME}:</label></dt> +		<dt><label for="lang_english_name">{L_LANG_ENGLISH_NAME}{L_COLON}</label></dt>  		<dd><input type="text" id="lang_english_name" name="lang_english_name" value="{LANG_ENGLISH_NAME}" maxlength="100" /></dd>  	</dl>  	<dl> -		<dt><label for="lang_local_name">{L_LANG_LOCAL_NAME}:</label></dt> +		<dt><label for="lang_local_name">{L_LANG_LOCAL_NAME}{L_COLON}</label></dt>  		<dd><input type="text" id="lang_local_name" name="lang_local_name" value="{LANG_LOCAL_NAME}" maxlength="255" /></dd>  	</dl>  	<dl> -		<dt><label>{L_LANG_ISO_CODE}:</label></dt> +		<dt><label>{L_LANG_ISO_CODE}{L_COLON}</label></dt>  		<dd><strong>{LANG_ISO}</strong></dd>  	</dl>  	<dl> -		<dt><label for="lang_author">{L_LANG_AUTHOR}:</label></dt> +		<dt><label for="lang_author">{L_LANG_AUTHOR}{L_COLON}</label></dt>  		<dd><input type="text" id="lang_author" name="lang_author" value="{LANG_AUTHOR}" maxlength="255" /></dd>  	</dl> @@ -147,7 +147,7 @@  	</tr>  	<tr>  		<td class="row3" style="text-align: right;">	 -		<!-- IF ALLOW_UPLOAD -->  {L_UPLOAD_METHOD}: <!-- BEGIN buttons--><input type="radio" class="radio"<!-- IF buttons.S_FIRST_ROW --> id="method" checked="checked"<!-- ENDIF --> value="{buttons.VALUE}" name="method" /> {buttons.VALUE} <!-- END buttons --><input type="submit" name="upload_file" class="button2" value="{L_SUBMIT_AND_UPLOAD}" /><!-- ENDIF --></td> +		<!-- IF ALLOW_UPLOAD -->  {L_UPLOAD_METHOD}{L_COLON} <!-- BEGIN buttons--><input type="radio" class="radio"<!-- IF buttons.S_FIRST_ROW --> id="method" checked="checked"<!-- ENDIF --> value="{buttons.VALUE}" name="method" /> {buttons.VALUE} <!-- END buttons --><input type="submit" name="upload_file" class="button2" value="{L_SUBMIT_AND_UPLOAD}" /><!-- ENDIF --></td>  	</tr>  	</thead>  	<tbody> @@ -186,12 +186,12 @@  	<fieldset>  		<legend>{L_UPLOAD_SETTINGS}</legend>  	<dl> -		<dt><label>{L_UPLOAD_METHOD}:</label></dt> +		<dt><label>{L_UPLOAD_METHOD}{L_COLON}</label></dt>  		<dd><strong>{NAME}</strong></dd>  	</dl>  	<!-- BEGIN data -->  	<dl> -		<dt><label for="{data.DATA}">{data.NAME}:</label><br /><span>{data.EXPLAIN}</span></dt> +		<dt><label for="{data.DATA}">{data.NAME}{L_COLON}</label><br /><span>{data.EXPLAIN}</span></dt>  		<dd><input type="<!-- IF data.DATA == 'password' -->password<!-- ELSE -->text<!-- ENDIF -->" id="{data.DATA}" name="{data.DATA}" value="{data.DEFAULT}" /></dd>  	</dl>  	<!-- END data --> diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html index 1e54f89afe..e13196f65d 100644 --- a/phpBB/adm/style/acp_logs.html +++ b/phpBB/adm/style/acp_logs.html @@ -9,7 +9,7 @@  <form id="list" method="post" action="{U_ACTION}">  <fieldset class="display-options" style="float: left"> -	{L_SEARCH_KEYWORDS}: <input type="text" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" /> +	{L_SEARCH_KEYWORDS}{L_COLON} <input type="text" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" />  </fieldset>  <!-- IF .pagination --> @@ -67,7 +67,7 @@  <!-- ENDIF -->  <fieldset class="display-options"> -	{L_DISPLAY_LOG}:  {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR} +	{L_DISPLAY_LOG}{L_COLON}  {S_LIMIT_DAYS} {L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR}  	<input class="button2" type="submit" value="{L_GO}" name="sort" />  	{S_FORM_TOKEN}  </fieldset> @@ -75,7 +75,7 @@  <!-- IF S_SHOW_FORUMS -->  	<fieldset class="quick"> -		{L_SELECT_FORUM}: <select name="f" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{S_FORUM_BOX}</select> +		{L_SELECT_FORUM}{L_COLON} <select name="f" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{S_FORUM_BOX}</select>  		<input class="button2" type="submit" value="{L_GO}" />  	</fieldset>  <!-- ENDIF --> diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index d9f833d878..8b591294d4 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -89,56 +89,56 @@  	</thead>  	<tbody>  	<tr> -		<td>{L_NUMBER_POSTS}: </td> +		<td>{L_NUMBER_POSTS}{L_COLON} </td>  		<td><strong>{TOTAL_POSTS}</strong></td> -		<td>{L_POSTS_PER_DAY}: </td> +		<td>{L_POSTS_PER_DAY}{L_COLON} </td>  		<td><strong>{POSTS_PER_DAY}</strong></td>  	</tr>  	<tr> -		<td>{L_NUMBER_TOPICS}: </td> +		<td>{L_NUMBER_TOPICS}{L_COLON} </td>  		<td><strong>{TOTAL_TOPICS}</strong></td> -		<td>{L_TOPICS_PER_DAY}: </td> +		<td>{L_TOPICS_PER_DAY}{L_COLON} </td>  		<td><strong>{TOPICS_PER_DAY}</strong></td>  	</tr>  	<tr> -		<td>{L_NUMBER_USERS}: </td> +		<td>{L_NUMBER_USERS}{L_COLON} </td>  		<td><strong>{TOTAL_USERS}</strong></td> -		<td>{L_USERS_PER_DAY}: </td> +		<td>{L_USERS_PER_DAY}{L_COLON} </td>  		<td><strong>{USERS_PER_DAY}</strong></td>  	</tr>  	<tr> -		<td>{L_NUMBER_FILES}: </td> +		<td>{L_NUMBER_FILES}{L_COLON} </td>  		<td><strong>{TOTAL_FILES}</strong></td> -		<td>{L_FILES_PER_DAY}: </td> +		<td>{L_FILES_PER_DAY}{L_COLON} </td>  		<td><strong>{FILES_PER_DAY}</strong></td>  	</tr>  	<tr> -		<td>{L_BOARD_STARTED}: </td> +		<td>{L_BOARD_STARTED}{L_COLON} </td>  		<td><strong>{START_DATE}</strong></td> -		<td>{L_AVATAR_DIR_SIZE}: </td> +		<td>{L_AVATAR_DIR_SIZE}{L_COLON} </td>  		<td><strong>{AVATAR_DIR_SIZE}</strong></td>  	</tr>  	<tr> -		<td>{L_DATABASE_SIZE}: </td> +		<td>{L_DATABASE_SIZE}{L_COLON} </td>  		<td><strong>{DBSIZE}</strong></td> -		<td>{L_UPLOAD_DIR_SIZE}: </td> +		<td>{L_UPLOAD_DIR_SIZE}{L_COLON} </td>  		<td><strong>{UPLOAD_DIR_SIZE}</strong></td>  	</tr>  	<tr> -		<td>{L_DATABASE_SERVER_INFO}: </td> +		<td>{L_DATABASE_SERVER_INFO}{L_COLON} </td>  		<td><strong>{DATABASE_INFO}</strong></td> -		<td>{L_GZIP_COMPRESSION}: </td> +		<td>{L_GZIP_COMPRESSION}{L_COLON} </td>  		<td><strong>{GZIP_COMPRESSION}</strong></td>  	</tr>  	<tr> -		<td>{L_BOARD_VERSION}: </td> +		<td>{L_BOARD_VERSION}{L_COLON} </td>  		<td>  			<strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF --> title="{L_MORE_INFORMATION}">{BOARD_VERSION}</a></strong> [ <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> ]  		</td>  	<!-- IF S_TOTAL_ORPHAN --> -		<td>{L_NUMBER_ORPHAN}: </td> +		<td>{L_NUMBER_ORPHAN}{L_COLON} </td>  		<td><strong>{TOTAL_ORPHAN}</strong></td>  	<!-- ELSE -->  		<td> </td> @@ -261,7 +261,7 @@  				<td style="vertical-align: top;">  					{inactive.USERNAME_FULL} -					<!-- IF inactive.POSTS --><br />{L_POSTS}: <strong>{inactive.POSTS}</strong> [<a href="{inactive.U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a>]<!-- ENDIF --> +					<!-- IF inactive.POSTS --><br />{L_POSTS}{L_COLON} <strong>{inactive.POSTS}</strong> [<a href="{inactive.U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a>]<!-- ENDIF -->  				</td>  				<td style="vertical-align: top;">{inactive.JOINED}</td>  				<td style="vertical-align: top;">{inactive.INACTIVE_DATE}</td> diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html index 6c4645e80c..1e49198725 100644 --- a/phpBB/adm/style/acp_modules.html +++ b/phpBB/adm/style/acp_modules.html @@ -72,37 +72,37 @@  	<fieldset>  		<legend>{L_GENERAL_OPTIONS}</legend>  	<dl> -		<dt><label for="module_langname">{L_MODULE_LANGNAME}:</label><br /> +		<dt><label for="module_langname">{L_MODULE_LANGNAME}{L_COLON}</label><br />  		<span>{L_MODULE_LANGNAME_EXPLAIN}</span></dt>  		<dd><input name="module_langname" type="text" class="text medium" id="module_langname" value="{MODULE_LANGNAME}" /></dd>  	</dl>  	<dl> -		<dt><label for="module_type">{L_MODULE_TYPE}:</label></dt> +		<dt><label for="module_type">{L_MODULE_TYPE}{L_COLON}</label></dt>  		<dd><select name="module_type" id="module_type" onchange="display_options(this.value);"><option value="category"<!-- IF S_IS_CAT --> selected="selected"<!-- ENDIF -->>{L_CATEGORY}</option><option value="module"<!-- IF not S_IS_CAT --> selected="selected"<!-- ENDIF -->>{L_MODULE}</option></select></dd>  	</dl>  	<dl> -		<dt><label for="parent_id">{L_PARENT}:</label></dt> +		<dt><label for="parent_id">{L_PARENT}{L_COLON}</label></dt>  		<dd><select name="module_parent_id" id="parent_id">{S_CAT_OPTIONS}</select></dd>  	</dl>  	<hr />  	<dl> -		<dt><label for="module_enabled">{L_MODULE_ENABLED}:</label></dt> +		<dt><label for="module_enabled">{L_MODULE_ENABLED}{L_COLON}</label></dt>  		<dd><label><input type="radio" class="radio" name="module_enabled" id="module_enabled" value="1"<!-- IF MODULE_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label><input type="radio" class="radio" name="module_enabled" value="0"<!-- IF not MODULE_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl>  	<div id="modoptions"<!-- IF S_IS_CAT --> style="display: none;"<!-- ENDIF -->>  		<dl> -			<dt><label for="module_display">{L_MODULE_DISPLAYED}:</label><br /><span>{L_MODULE_DISPLAYED_EXPLAIN}</span></dt> +			<dt><label for="module_display">{L_MODULE_DISPLAYED}{L_COLON}</label><br /><span>{L_MODULE_DISPLAYED_EXPLAIN}</span></dt>  			<dd><label><input type="radio" class="radio" name="module_display" id="module_display" value="1"<!-- IF MODULE_DISPLAY --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>  				<label><input type="radio" class="radio" name="module_display" value="0"<!-- IF not MODULE_DISPLAY --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  		</dl>  		<dl> -			<dt><label for="module_basename">{L_CHOOSE_MODULE}:</label><br /> +			<dt><label for="module_basename">{L_CHOOSE_MODULE}{L_COLON}</label><br />  			<span>{L_CHOOSE_MODULE_EXPLAIN}</span></dt>  			<dd><select name="module_basename" id="module_basename" onchange="display_modes(this.value);">{S_MODULE_NAMES}</select></dd>  		</dl>  		<dl> -			<dt><label for="module_mode">{L_CHOOSE_MODE}:</label><br /> +			<dt><label for="module_mode">{L_CHOOSE_MODE}{L_COLON}</label><br />  			<span>{L_CHOOSE_MODE_EXPLAIN}</span></dt>  			<dd><select name="module_mode" id="module_mode">{S_MODULE_MODES}</select></dd>  		</dl> @@ -201,7 +201,7 @@  	<form id="mselect" method="post" action="{U_SEL_ACTION}">  	<fieldset class="quick"> -		{L_SELECT_MODULE}: <select name="parent_id" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{MODULE_BOX}</select>  +		{L_SELECT_MODULE}{L_COLON} <select name="parent_id" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{MODULE_BOX}</select>   		<input class="button2" type="submit" value="{L_GO}" />  	</fieldset> diff --git a/phpBB/adm/style/acp_permission_roles.html b/phpBB/adm/style/acp_permission_roles.html index 2ac77af25d..d654c320ca 100644 --- a/phpBB/adm/style/acp_permission_roles.html +++ b/phpBB/adm/style/acp_permission_roles.html @@ -36,11 +36,11 @@  	<fieldset>  		<legend>{L_ROLE_DETAILS}</legend>  	<dl> -		<dt><label for="role_name">{L_ROLE_NAME}:</label></dt> +		<dt><label for="role_name">{L_ROLE_NAME}{L_COLON}</label></dt>  		<dd><input name="role_name" type="text" id="role_name" value="{ROLE_NAME}" maxlength="255" /></dd>  	</dl>  	<dl> -		<dt><label for="role_description">{L_ROLE_DESCRIPTION}:</label><br /><span>{L_ROLE_DESCRIPTION_EXPLAIN}</span></dt> +		<dt><label for="role_description">{L_ROLE_DESCRIPTION}{L_COLON}</label><br /><span>{L_ROLE_DESCRIPTION_EXPLAIN}</span></dt>  		<dd><textarea id="role_description" name="role_description" rows="3" cols="45">{ROLE_DESCRIPTION}</textarea></dd>  	</dl> @@ -182,7 +182,7 @@  	</table>  	<fieldset class="quick"> -		{L_CREATE_ROLE}: <input type="text" name="role_name" value="" maxlength="255" /><!-- IF S_ROLE_OPTIONS --> <select name="options_from"><option value="0" selected="selected">{L_CREATE_ROLE_FROM}</option>{S_ROLE_OPTIONS}</select><!-- ENDIF --> <input class="button2" type="submit" name="add" value="{L_SUBMIT}" /><br /> +		{L_CREATE_ROLE}{L_COLON} <input type="text" name="role_name" value="" maxlength="255" /><!-- IF S_ROLE_OPTIONS --> <select name="options_from"><option value="0" selected="selected">{L_CREATE_ROLE_FROM}</option>{S_ROLE_OPTIONS}</select><!-- ENDIF --> <input class="button2" type="submit" name="add" value="{L_SUBMIT}" /><br />  		{S_FORM_TOKEN}  	</fieldset>  	</form> diff --git a/phpBB/adm/style/acp_permissions.html b/phpBB/adm/style/acp_permissions.html index b44cca782e..88a82532a1 100644 --- a/phpBB/adm/style/acp_permissions.html +++ b/phpBB/adm/style/acp_permissions.html @@ -19,7 +19,7 @@  	<p>{L_EXPLAIN}</p>  	<!-- IF S_FORUM_NAMES --> -		<p><strong>{L_FORUMS}:</strong> {FORUM_NAMES}</p> +		<p><strong>{L_FORUMS}{L_COLON}</strong> {FORUM_NAMES}</p>  	<!-- ENDIF -->  	<!-- IF S_SELECT_FORUM --> @@ -30,7 +30,7 @@  			<legend>{L_LOOK_UP_FORUM}</legend>  			<!-- IF S_FORUM_MULTIPLE --><p>{L_LOOK_UP_FORUMS_EXPLAIN}</p><!-- ENDIF -->  		<dl> -			<dt><label for="forum">{L_LOOK_UP_FORUM}:</label></dt> +			<dt><label for="forum">{L_LOOK_UP_FORUM}{L_COLON}</label></dt>  			<dd><select id="forum" name="forum_id[]"<!-- IF S_FORUM_MULTIPLE --> multiple="multiple"<!-- ENDIF --> size="10">{S_FORUM_OPTIONS}</select></dd>  			<!-- IF S_FORUM_ALL --><dd><label><input type="checkbox" class="radio" name="all_forums" value="1" /> {L_ALL_FORUMS}</label></dd><!-- ENDIF -->  		</dl> @@ -52,7 +52,7 @@  				<legend>{L_LOOK_UP_FORUM}</legend>  				<p>{L_SELECT_FORUM_SUBFORUM_EXPLAIN}</p>  			<dl> -				<dt><label for="sforum">{L_LOOK_UP_FORUM}:</label></dt> +				<dt><label for="sforum">{L_LOOK_UP_FORUM}{L_COLON}</label></dt>  				<dd><select id="sforum" name="subforum_id">{S_SUBFORUM_OPTIONS}</select></dd>  			</dl> @@ -74,7 +74,7 @@  		<fieldset>  			<legend>{L_LOOK_UP_USER}</legend>  		<dl> -			<dt><label for="username">{L_FIND_USERNAME}:</label></dt> +			<dt><label for="username">{L_FIND_USERNAME}{L_COLON}</label></dt>  			<dd><input class="text medium" type="text" id="username" name="username[]" /></dd>  			<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>  			<dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd> @@ -95,7 +95,7 @@  		<fieldset>  			<legend>{L_LOOK_UP_GROUP}</legend>  		<dl> -			<dt><label for="group">{L_LOOK_UP_GROUP}:</label></dt> +			<dt><label for="group">{L_LOOK_UP_GROUP}{L_COLON}</label></dt>  			<dd><select name="group_id[]" id="group">{S_GROUP_OPTIONS}</select></dd>  		</dl> @@ -225,7 +225,7 @@  			<fieldset>  				<legend>{L_LOOK_UP_USER}</legend>  			<dl> -				<dt><label for="username">{L_FIND_USERNAME}:</label></dt> +				<dt><label for="username">{L_FIND_USERNAME}{L_COLON}</label></dt>  				<dd><input type="text" id="username" name="username[]" /></dd>  				<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>  				<dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd> @@ -266,7 +266,7 @@  			<fieldset>  				<legend>{L_LOOK_UP_GROUP}</legend>  			<dl> -				<dt><label for="group_select">{L_LOOK_UP_GROUP}:</label></dt> +				<dt><label for="group_select">{L_LOOK_UP_GROUP}{L_COLON}</label></dt>  				<dd><select name="group_id[]" id="group_select">{S_ADD_GROUP_OPTIONS}</select></dd>  				<dd> </dd>  			</dl> @@ -317,7 +317,7 @@  		<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">  			{S_HIDDEN_FIELDS}  			{S_FORM_TOKEN} -			{L_SELECT_TYPE}: <select name="type">{S_PERMISSION_DROPDOWN}</select> +			{L_SELECT_TYPE}{L_COLON} <select name="type">{S_PERMISSION_DROPDOWN}</select>  			<input class="button2" type="submit" name="submit" value="{L_GO}" />  		</fieldset> diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html index 5be69aa20b..13be669f70 100644 --- a/phpBB/adm/style/acp_profile.html +++ b/phpBB/adm/style/acp_profile.html @@ -24,22 +24,22 @@  		<fieldset>  			<legend>{L_TITLE}</legend>  		<dl> -			<dt><label>{L_FIELD_TYPE}:</label><br /><span>{L_FIELD_TYPE_EXPLAIN}</span></dt> +			<dt><label>{L_FIELD_TYPE}{L_COLON}</label><br /><span>{L_FIELD_TYPE_EXPLAIN}</span></dt>  			<dd><strong>{FIELD_TYPE}</strong></dd>  		</dl>  		<!-- IF S_EDIT_MODE -->  		<dl> -			<dt><label>{L_FIELD_IDENT}:</label><br /><span>{L_FIELD_IDENT_EXPLAIN}</span></dt> +			<dt><label>{L_FIELD_IDENT}{L_COLON}</label><br /><span>{L_FIELD_IDENT_EXPLAIN}</span></dt>  			<dd><input type="hidden" name="field_ident" value="{FIELD_IDENT}" /><strong>{FIELD_IDENT}</strong></dd>  		</dl>  		<!-- ELSE -->  		<dl> -			<dt><label for="field_ident">{L_FIELD_IDENT}:</label><br /><span>{L_FIELD_IDENT_EXPLAIN}</span></dt> +			<dt><label for="field_ident">{L_FIELD_IDENT}{L_COLON}</label><br /><span>{L_FIELD_IDENT_EXPLAIN}</span></dt>  			<dd><input class="text medium" type="text" id="field_ident" name="field_ident" value="{FIELD_IDENT}" /></dd>  		</dl>  		<!-- ENDIF -->  		<dl> -			<dt><label for="field_no_view">{L_DISPLAY_PROFILE_FIELD}:</label><br /><span>{L_DISPLAY_PROFILE_FIELD_EXPLAIN}</span></dt> +			<dt><label for="field_no_view">{L_DISPLAY_PROFILE_FIELD}{L_COLON}</label><br /><span>{L_DISPLAY_PROFILE_FIELD_EXPLAIN}</span></dt>  			<dd><label><input type="radio" class="radio" id="field_no_view" name="field_no_view" value="0"<!-- IF not S_FIELD_NO_VIEW --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>  				<label><input type="radio" class="radio" name="field_no_view" value="1"<!-- IF S_FIELD_NO_VIEW --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  		</dl> @@ -48,31 +48,31 @@  		<fieldset>  			<legend>{L_VISIBILITY_OPTION}</legend>  		<dl> -			<dt><label for="field_show_profile">{L_DISPLAY_AT_PROFILE}:</label><br /><span>{L_DISPLAY_AT_PROFILE_EXPLAIN}</span></dt> +			<dt><label for="field_show_profile">{L_DISPLAY_AT_PROFILE}{L_COLON}</label><br /><span>{L_DISPLAY_AT_PROFILE_EXPLAIN}</span></dt>  			<dd><input type="checkbox" class="radio" id="field_show_profile" name="field_show_profile" value="1"<!-- IF S_SHOW_PROFILE --> checked="checked"<!-- ENDIF --> /></dd>  		</dl>  		<dl> -			<dt><label for="field_show_on_reg">{L_DISPLAY_AT_REGISTER}:</label><br /><span>{L_DISPLAY_AT_REGISTER_EXPLAIN}</span></dt> +			<dt><label for="field_show_on_reg">{L_DISPLAY_AT_REGISTER}{L_COLON}</label><br /><span>{L_DISPLAY_AT_REGISTER_EXPLAIN}</span></dt>  			<dd><input type="checkbox" class="radio" id="field_show_on_reg" name="field_show_on_reg" value="1"<!-- IF S_SHOW_ON_REG --> checked="checked"<!-- ENDIF --> /></dd>  		</dl>  		<dl> -			<dt><label for="field_show_on_pm">{L_DISPLAY_ON_PM}:</label><br /><span>{L_DISPLAY_ON_PM_EXPLAIN}</span></dt> +			<dt><label for="field_show_on_pm">{L_DISPLAY_ON_PM}{L_COLON}</label><br /><span>{L_DISPLAY_ON_PM_EXPLAIN}</span></dt>  			<dd><input type="checkbox" class="radio" id="field_show_on_pm" name="field_show_on_pm" value="1"<!-- IF S_SHOW_ON_PM --> checked="checked"<!-- ENDIF --> /></dd>  		</dl>  		<dl> -			<dt><label for="field_show_on_vt">{L_DISPLAY_ON_VT}:</label><br /><span>{L_DISPLAY_ON_VT_EXPLAIN}</span></dt> +			<dt><label for="field_show_on_vt">{L_DISPLAY_ON_VT}{L_COLON}</label><br /><span>{L_DISPLAY_ON_VT_EXPLAIN}</span></dt>  			<dd><input type="checkbox" class="radio" id="field_show_on_vt" name="field_show_on_vt" value="1"<!-- IF S_SHOW_ON_VT --> checked="checked"<!-- ENDIF --> /></dd>  		</dl>  		<dl> -			<dt><label for="field_required">{L_REQUIRED_FIELD}:</label><br /><span>{L_REQUIRED_FIELD_EXPLAIN}</span></dt> +			<dt><label for="field_required">{L_REQUIRED_FIELD}{L_COLON}</label><br /><span>{L_REQUIRED_FIELD_EXPLAIN}</span></dt>  			<dd><input type="checkbox" class="radio" id="field_required" name="field_required" value="1"<!-- IF S_FIELD_REQUIRED --> checked="checked"<!-- ENDIF --> /></dd>  		</dl>  		<dl> -			<dt><label for="field_show_novalue">{L_SHOW_NOVALUE_FIELD}:</label><br /><span>{L_SHOW_NOVALUE_FIELD_EXPLAIN}</span></dt> +			<dt><label for="field_show_novalue">{L_SHOW_NOVALUE_FIELD}{L_COLON}</label><br /><span>{L_SHOW_NOVALUE_FIELD_EXPLAIN}</span></dt>  			<dd><input type="checkbox" class="radio" id="field_show_novalue" name="field_show_novalue" value="1"<!-- IF S_FIELD_SHOW_NOVALUE --> checked="checked"<!-- ENDIF --> /></dd>  		</dl>  		<dl> -			<dt><label for="field_hide">{L_HIDE_PROFILE_FIELD}:</label><br /><span>{L_HIDE_PROFILE_FIELD_EXPLAIN}</span></dt> +			<dt><label for="field_hide">{L_HIDE_PROFILE_FIELD}{L_COLON}</label><br /><span>{L_HIDE_PROFILE_FIELD_EXPLAIN}</span></dt>  			<dd><input type="checkbox" class="radio" id="field_hide" name="field_hide" value="1"<!-- IF S_FIELD_HIDE --> checked="checked"<!-- ENDIF --> /></dd>  		</dl>  		</fieldset> @@ -86,22 +86,22 @@  		<fieldset>  			<legend>{L_LANG_SPECIFIC}</legend>  		<dl> -			<dt><label for="lang_name">{L_USER_FIELD_NAME}:</label></dt> +			<dt><label for="lang_name">{L_USER_FIELD_NAME}{L_COLON}</label></dt>  			<dd><input class="text medium" type="text" id="lang_name" name="lang_name" value="{LANG_NAME}" /></dd>  		</dl>  		<dl> -			<dt><label for="lang_explain">{L_FIELD_DESCRIPTION}:</label><br /><span>{L_FIELD_DESCRIPTION_EXPLAIN}</span></dt> +			<dt><label for="lang_explain">{L_FIELD_DESCRIPTION}{L_COLON}</label><br /><span>{L_FIELD_DESCRIPTION_EXPLAIN}</span></dt>  			<dd><textarea id="lang_explain" name="lang_explain" rows="3" cols="80">{LANG_EXPLAIN}</textarea></dd>  		</dl>  		<!-- IF S_TEXT or S_STRING -->  			<dl> -				<dt><label for="lang_default_value">{L_DEFAULT_VALUE}:</label><br /><span>{L_DEFAULT_VALUE_EXPLAIN}</span></dt> +				<dt><label for="lang_default_value">{L_DEFAULT_VALUE}{L_COLON}</label><br /><span>{L_DEFAULT_VALUE_EXPLAIN}</span></dt>  				<dd><!-- IF S_STRING --><input class="text medium" type="text" id="lang_default_value" name="lang_default_value" value="{LANG_DEFAULT_VALUE}" /><!-- ELSE --><textarea id="lang_default_value" name="lang_default_value" rows="5" cols="80">{LANG_DEFAULT_VALUE}</textarea><!-- ENDIF --></dd>  			</dl>  		<!-- ENDIF -->  		<!-- IF S_BOOL or S_DROPDOWN -->  			<dl> -				<dt><label for="lang_options">{L_ENTRIES}:</label> +				<dt><label for="lang_options">{L_ENTRIES}{L_COLON}</label>  					<!-- IF S_EDIT_MODE and S_DROPDOWN -->  						<br /><span>{L_EDIT_DROPDOWN_LANG_EXPLAIN}</span>  					<!-- ELSE --> @@ -130,7 +130,7 @@  			<legend>{L_TITLE}</legend>  		<!-- BEGIN option -->  			<dl> -				<dt><label>{option.TITLE}:</label><!-- IF option.EXPLAIN --><br /><span>{option.EXPLAIN}</span><!-- ENDIF --></dt> +				<dt><label>{option.TITLE}{L_COLON}</label><!-- IF option.EXPLAIN --><br /><span>{option.EXPLAIN}</span><!-- ENDIF --></dt>  				<dd>{option.FIELD}</dd>  			</dl>  		<!-- END option --> @@ -153,7 +153,7 @@  				<legend>{options.LANGUAGE}</legend>  			<!-- BEGIN field -->  				<dl> -					<dt><label>{options.field.L_TITLE}:</label><!-- IF options.field.L_EXPLAIN --><br /><span>{options.field.L_EXPLAIN}</span><!-- ENDIF --></dt> +					<dt><label>{options.field.L_TITLE}{L_COLON}</label><!-- IF options.field.L_EXPLAIN --><br /><span>{options.field.L_EXPLAIN}</span><!-- ENDIF --></dt>  					{options.field.FIELD}  				</dl>  			<!-- END field --> diff --git a/phpBB/adm/style/acp_prune_forums.html b/phpBB/adm/style/acp_prune_forums.html index dfc5827117..aede662bcb 100644 --- a/phpBB/adm/style/acp_prune_forums.html +++ b/phpBB/adm/style/acp_prune_forums.html @@ -43,7 +43,7 @@  		<legend>{L_SELECT_FORUM}</legend>  		<p>{L_LOOK_UP_FORUMS_EXPLAIN}</p>  	<dl> -		<dt><label for="forum">{L_LOOK_UP_FORUM}:</label></dt> +		<dt><label for="forum">{L_LOOK_UP_FORUM}{L_COLON}</label></dt>  		<dd><select id="forum" name="f[]" multiple="multiple" size="10">{S_FORUM_OPTIONS}</select></dd>  		<dd><label><input type="checkbox" class="radio" name="all_forums" value="1" /> {L_ALL_FORUMS}</label></dd>  	</dl> @@ -65,32 +65,32 @@  	<h2>{L_FORUM}</h2> -	<p>{L_SELECTED_FORUMS}: {FORUM_LIST}</p> +	<p>{L_SELECTED_FORUMS}{L_COLON} {FORUM_LIST}</p>  	<form id="acp_prune" method="post" action="{U_ACTION}">  	<fieldset>  		<legend>{L_FORUM_PRUNE}</legend>  	<dl> -		<dt><label for="prune_days">{L_PRUNE_NOT_POSTED}:</label></dt> +		<dt><label for="prune_days">{L_PRUNE_NOT_POSTED}{L_COLON}</label></dt>  		<dd><input type="text" id="prune_days" name="prune_days" /></dd>  	</dl>  	<dl> -		<dt><label for="prune_vieweddays">{L_PRUNE_NOT_VIEWED}:</label></dt> +		<dt><label for="prune_vieweddays">{L_PRUNE_NOT_VIEWED}{L_COLON}</label></dt>  		<dd><input type="text" id="prune_vieweddays" name="prune_vieweddays" /></dd>  	</dl>  	<dl> -		<dt><label for="polls">{L_PRUNE_OLD_POLLS}:</label><br /><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt> +		<dt><label for="polls">{L_PRUNE_OLD_POLLS}{L_COLON}</label><br /><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt>  		<dd><label><input type="radio" class="radio" name="prune_old_polls" value="1" /> {L_YES}</label>  			<label><input type="radio" class="radio" id="polls" name="prune_old_polls" value="0" checked="checked" /> {L_NO}</label></dd>  	</dl>  	<dl> -		<dt><label for="announce">{L_PRUNE_ANNOUNCEMENTS}:</label></dt> +		<dt><label for="announce">{L_PRUNE_ANNOUNCEMENTS}{L_COLON}</label></dt>  		<dd><label><input type="radio" class="radio" name="prune_announce" value="1" /> {L_YES}</label>  			<label><input type="radio" class="radio" id="announce" name="prune_announce" value="0" checked="checked" /> {L_NO}</label></dd>  	</dl>  	<dl> -		<dt><label for="sticky">{L_PRUNE_STICKY}:</label></dt> +		<dt><label for="sticky">{L_PRUNE_STICKY}{L_COLON}</label></dt>  		<dd><label><input type="radio" class="radio" name="prune_sticky" value="1" /> {L_YES}</label>  			<label><input type="radio" class="radio" id="sticky" name="prune_sticky" value="0" checked="checked" /> {L_NO}</label></dd>  	</dl> diff --git a/phpBB/adm/style/acp_prune_users.html b/phpBB/adm/style/acp_prune_users.html index 4ca562fd32..75fa04a157 100644 --- a/phpBB/adm/style/acp_prune_users.html +++ b/phpBB/adm/style/acp_prune_users.html @@ -11,39 +11,39 @@  <fieldset>  	<legend>{L_CRITERIA}</legend>  <dl> -	<dt><label for="username">{L_USERNAME}:</label></dt> +	<dt><label for="username">{L_USERNAME}{L_COLON}</label></dt>  	<dd><input type="text" id="username" name="username" /></dd>  </dl>  <dl> -	<dt><label for="email">{L_EMAIL}:</label></dt> +	<dt><label for="email">{L_EMAIL}{L_COLON}</label></dt>  	<dd><input type="text" id="email" name="email" /></dd>  </dl>  <dl> -	<dt><label for="email">{L_WEBSITE}:</label></dt> +	<dt><label for="email">{L_WEBSITE}{L_COLON}</label></dt>  	<dd><input type="text" id="website" name="website" /></dd>  </dl>  <dl> -	<dt><label for="joined">{L_JOINED}:</label><br /><span>{L_JOINED_EXPLAIN}</span></dt> +	<dt><label for="joined">{L_JOINED}{L_COLON}</label><br /><span>{L_JOINED_EXPLAIN}</span></dt>  	<dd>  		<strong>{L_AFTER}</strong> <input type="text" id="joined_after" name="joined_after" />  		<br /> <br /> <strong>{L_BEFORE}</strong> <input type="text" id="joined_before" name="joined_before" />  	</dd>  </dl>  <dl> -	<dt><label for="active">{L_LAST_ACTIVE}:</label><br /><span>{L_LAST_ACTIVE_EXPLAIN}</span></dt> +	<dt><label for="active">{L_LAST_ACTIVE}{L_COLON}</label><br /><span>{L_LAST_ACTIVE_EXPLAIN}</span></dt>  	<dd><select name="active_select">{S_ACTIVE_OPTIONS}</select> <input type="text" id="active" name="active" /></dd>  </dl>  <dl> -	<dt><label for="count">{L_POSTS}:</label></dt> +	<dt><label for="count">{L_POSTS}{L_COLON}</label></dt>  	<dd><select name="count_select">{S_COUNT_OPTIONS}</select> <input type="text" id="count" name="count" /></dd>  </dl>  <dl> -	<dt><label for="posts_on_queue">{L_POSTS_ON_QUEUE}:</label></dt> +	<dt><label for="posts_on_queue">{L_POSTS_ON_QUEUE}{L_COLON}</label></dt>  	<dd><select name="queue_select">{S_COUNT_OPTIONS}</select> <input type="text" id="posts_on_queue" name="posts_on_queue" /></select>  </dl>  <!-- IF S_GROUP_LIST -->  <dl> -	<dt><label for="group_id">{L_GROUP}:</label><br /><span>{L_PRUNE_USERS_GROUP_EXPLAIN}</dt> +	<dt><label for="group_id">{L_GROUP}{L_COLON}</label><br /><span>{L_PRUNE_USERS_GROUP_EXPLAIN}</dt>  	<dd><select name="group_id">{S_GROUP_LIST}</select></dd>  </dl>  <!-- ENDIF --> @@ -52,7 +52,7 @@  <fieldset>  	<legend>{L_USERNAMES}</legend>  <dl> -	<dt><label for="users">{L_ACP_PRUNE_USERS}:</label><br /><span>{L_SELECT_USERS_EXPLAIN}</span></dt> +	<dt><label for="users">{L_ACP_PRUNE_USERS}{L_COLON}</label><br /><span>{L_SELECT_USERS_EXPLAIN}</span></dt>  	<dd><textarea id="users" name="users" cols="40" rows="5"></textarea></dd>  	<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>  </dl> @@ -61,12 +61,12 @@  <fieldset>  	<legend>{L_OPTIONS}</legend>  <dl> -	<dt><label for="deleteposts">{L_DELETE_USER_POSTS}:</label><br /><span>{L_DELETE_USER_POSTS_EXPLAIN}</span></dt> +	<dt><label for="deleteposts">{L_DELETE_USER_POSTS}{L_COLON}</label><br /><span>{L_DELETE_USER_POSTS_EXPLAIN}</span></dt>  	<dd><label><input type="radio" class="radio" name="deleteposts" value="1" /> {L_YES}</label>  		<label><input type="radio" class="radio" id="deleteposts" name="deleteposts" value="0" checked="checked" /> {L_NO}</label></dd>  </dl>  <dl> -	<dt><label for="deactivate">{L_DEACTIVATE_DELETE}:</label><br /><span>{L_DEACTIVATE_DELETE_EXPLAIN}</span></dt> +	<dt><label for="deactivate">{L_DEACTIVATE_DELETE}{L_COLON}</label><br /><span>{L_DEACTIVATE_DELETE_EXPLAIN}</span></dt>  	<dd><label><input type="radio" class="radio" name="action" value="delete" /> {L_DELETE_USERS}</label>  		<label><input type="radio" class="radio" id="deactivate" name="action" value="deactivate" checked="checked" /> {L_DEACTIVATE}</label></dd>  </dl> diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html index 7fb7da7095..a475370f73 100644 --- a/phpBB/adm/style/acp_ranks.html +++ b/phpBB/adm/style/acp_ranks.html @@ -25,22 +25,22 @@  	<fieldset>  		<legend>{L_ACP_RANKS}</legend>  	<dl> -		<dt><label for="title">{L_RANK_TITLE}:</label></dt> +		<dt><label for="title">{L_RANK_TITLE}{L_COLON}</label></dt>  		<dd><input name="title" type="text" id="title" value="{RANK_TITLE}" maxlength="255" /></dd>  	</dl>  	<dl> -		<dt><label for="rank_image">{L_RANK_IMAGE}:</label></dt> +		<dt><label for="rank_image">{L_RANK_IMAGE}{L_COLON}</label></dt>  		<dd><select name="rank_image" id="rank_image" onchange="update_image(this.options[selectedIndex].value);">{S_FILENAME_LIST}</select></dd>  		<dd><img src="{RANK_IMAGE}" id="image" alt="" /></dd>  	</dl>  	<dl> -		<dt><label for="special_rank">{L_RANK_SPECIAL}:</label></dt> +		<dt><label for="special_rank">{L_RANK_SPECIAL}{L_COLON}</label></dt>  		<dd><label><input onclick="dE('posts', -1)" type="radio" class="radio" name="special_rank" value="1" id="special_rank"<!-- IF S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label><input onclick="dE('posts', 1)" type="radio" class="radio" name="special_rank" value="0"<!-- IF not S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl>  	<!-- IF S_SPECIAL_RANK --><div id="posts" style="display: none;"><!-- ELSE --><div id="posts"><!-- ENDIF -->  	<dl> -		<dt><label for="min_posts">{L_RANK_MINIMUM}:</label></dt> +		<dt><label for="min_posts">{L_RANK_MINIMUM}{L_COLON}</label></dt>  		<dd><input name="min_posts" type="text" id="min_posts" maxlength="10" value="{MIN_POSTS}" /></dd>  	</dl>  	</div> diff --git a/phpBB/adm/style/acp_reasons.html b/phpBB/adm/style/acp_reasons.html index 7cf2cce4c9..2f39f64614 100644 --- a/phpBB/adm/style/acp_reasons.html +++ b/phpBB/adm/style/acp_reasons.html @@ -29,7 +29,7 @@  		<legend>{L_TITLE}</legend>  		<p><!-- IF S_TRANSLATED -->{L_IS_TRANSLATED_EXPLAIN}<!-- ELSE -->{L_IS_NOT_TRANSLATED_EXPLAIN}<!-- ENDIF --></p>  	<dl> -		<dt><label for="reason_title">{L_REASON_TITLE}:</label></dt> +		<dt><label for="reason_title">{L_REASON_TITLE}{L_COLON}</label></dt>  		<dd><input name="reason_title" type="text" id="reason_title" value="{REASON_TITLE}" maxlength="255" /></dd>  	</dl>  	<!-- IF S_TRANSLATED --> @@ -39,7 +39,7 @@  	</dl>  	<!-- ENDIF -->  	<dl> -		<dt><label for="reason_description">{L_REASON_DESCRIPTION}:</label></dt> +		<dt><label for="reason_description">{L_REASON_DESCRIPTION}{L_COLON}</label></dt>  		<dd><textarea name="reason_description" id="reason_description" rows="8" cols="80">{REASON_DESCRIPTION}</textarea></dd>  	</dl>  	<!-- IF S_TRANSLATED --> diff --git a/phpBB/adm/style/acp_search.html b/phpBB/adm/style/acp_search.html index ff83f6b792..3da70bc0c8 100644 --- a/phpBB/adm/style/acp_search.html +++ b/phpBB/adm/style/acp_search.html @@ -12,32 +12,32 @@  	<fieldset>  		<legend>{L_GENERAL_SEARCH_SETTINGS}</legend>  	<dl> -		<dt><label for="load_search">{L_YES_SEARCH}:</label><br /><span>{L_YES_SEARCH_EXPLAIN}</span></dt> +		<dt><label for="load_search">{L_YES_SEARCH}{L_COLON}</label><br /><span>{L_YES_SEARCH_EXPLAIN}</span></dt>  		<dd><label><input type="radio" class="radio" id="load_search" name="config[load_search]" value="1"<!-- IF S_YES_SEARCH --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label><input type="radio" class="radio" name="config[load_search]" value="0"<!-- IF not S_YES_SEARCH --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl>  	<dl> -		<dt><label for="search_interval">{L_SEARCH_INTERVAL}:</label><br /><span>{L_SEARCH_INTERVAL_EXPLAIN}</span></dt> +		<dt><label for="search_interval">{L_SEARCH_INTERVAL}{L_COLON}</label><br /><span>{L_SEARCH_INTERVAL_EXPLAIN}</span></dt>  		<dd><input id="search_interval" type="text" size="4" maxlength="4" name="config[search_interval]" value="{SEARCH_INTERVAL}" /> {L_SECONDS}</dd>  	</dl>  	<dl> -		<dt><label for="search_anonymous_interval">{L_SEARCH_GUEST_INTERVAL}:</label><br /><span>{L_SEARCH_GUEST_INTERVAL_EXPLAIN}</span></dt> +		<dt><label for="search_anonymous_interval">{L_SEARCH_GUEST_INTERVAL}{L_COLON}</label><br /><span>{L_SEARCH_GUEST_INTERVAL_EXPLAIN}</span></dt>  		<dd><input id="search_anonymous_interval" type="text" size="4" maxlength="4" name="config[search_anonymous_interval]" value="{SEARCH_GUEST_INTERVAL}" /> {L_SECONDS}</dd>  	</dl>  	<dl> -		<dt><label for="limit_search_load">{L_LIMIT_SEARCH_LOAD}:</label><br /><span>{L_LIMIT_SEARCH_LOAD_EXPLAIN}</span></dt> +		<dt><label for="limit_search_load">{L_LIMIT_SEARCH_LOAD}{L_COLON}</label><br /><span>{L_LIMIT_SEARCH_LOAD_EXPLAIN}</span></dt>  		<dd><input id="limit_search_load" type="text" size="4" maxlength="4" name="config[limit_search_load]" value="{LIMIT_SEARCH_LOAD}" /></dd>  	</dl>  	<dl> -		<dt><label for="min_search_author_chars">{L_MIN_SEARCH_AUTHOR_CHARS}:</label><br /><span>{L_MIN_SEARCH_AUTHOR_CHARS_EXPLAIN}</span></dt> +		<dt><label for="min_search_author_chars">{L_MIN_SEARCH_AUTHOR_CHARS}{L_COLON}</label><br /><span>{L_MIN_SEARCH_AUTHOR_CHARS_EXPLAIN}</span></dt>  		<dd><input id="min_search_author_chars" type="text" size="4" maxlength="4" name="config[min_search_author_chars]" value="{MIN_SEARCH_AUTHOR_CHARS}" /></dd>  	</dl>  	<dl> -		<dt><label for="max_num_search_keywords">{L_MAX_NUM_SEARCH_KEYWORDS}:</label><br /><span>{L_MAX_NUM_SEARCH_KEYWORDS_EXPLAIN}</span></dt> +		<dt><label for="max_num_search_keywords">{L_MAX_NUM_SEARCH_KEYWORDS}{L_COLON}</label><br /><span>{L_MAX_NUM_SEARCH_KEYWORDS_EXPLAIN}</span></dt>  		<dd><input id="max_num_search_keywords" type="text" size="4" maxlength="4" name="config[max_num_search_keywords]" value="{MAX_NUM_SEARCH_KEYWORDS}" /></dd>  	</dl>  	<dl> -		<dt><label for="search_store_results">{L_SEARCH_STORE_RESULTS}:</label><br /><span>{L_SEARCH_STORE_RESULTS_EXPLAIN}</span></dt> +		<dt><label for="search_store_results">{L_SEARCH_STORE_RESULTS}{L_COLON}</label><br /><span>{L_SEARCH_STORE_RESULTS_EXPLAIN}</span></dt>  		<dd><input id="search_store_results" type="text" size="4" maxlength="6" name="config[search_store_results]" value="{SEARCH_STORE_RESULTS}" /> {L_SECONDS}</dd>  	</dl>  	</fieldset> @@ -45,7 +45,7 @@  	<fieldset>  		<legend>{L_SEARCH_TYPE}</legend>  	<dl> -		<dt><label for="search_type">{L_SEARCH_TYPE}:</label><br /><span>{L_SEARCH_TYPE_EXPLAIN}</span></dt> +		<dt><label for="search_type">{L_SEARCH_TYPE}{L_COLON}</label><br /><span>{L_SEARCH_TYPE_EXPLAIN}</span></dt>  		<dd><select id="search_type" name="config[search_type]">{S_SEARCH_TYPES}</select></dd>  	</dl>  	</fieldset> @@ -110,7 +110,7 @@  				{backend.S_HIDDEN_FIELDS} -				<legend>{L_INDEX_STATS}: {backend.L_NAME} <!-- IF backend.S_ACTIVE -->({L_ACTIVE}) <!-- ENDIF --></legend> +				<legend>{L_INDEX_STATS}{L_COLON} {backend.L_NAME} <!-- IF backend.S_ACTIVE -->({L_ACTIVE}) <!-- ENDIF --></legend>  				<table cellspacing="1">  					<caption>{backend.L_NAME} <!-- IF backend.S_ACTIVE -->({L_ACTIVE}) <!-- ENDIF --></caption> @@ -126,9 +126,9 @@  				<tbody>  				<!-- BEGIN data -->  					<tr> -						<td>{backend.data.STATISTIC_1}:</td> +						<td>{backend.data.STATISTIC_1}{L_COLON}</td>  						<td>{backend.data.VALUE_1}</td> -						<td>{backend.data.STATISTIC_2}<!-- IF backend.data.STATISTIC_2 -->:<!-- ENDIF --></td> +						<td>{backend.data.STATISTIC_2}<!-- IF backend.data.STATISTIC_2 -->{L_COLON}<!-- ENDIF --></td>  						<td>{backend.data.VALUE_2}</td>  					</tr>  				<!-- END data --> diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html index b09cbafc95..3dc4c2d616 100644 --- a/phpBB/adm/style/acp_styles.html +++ b/phpBB/adm/style/acp_styles.html @@ -36,7 +36,7 @@  	<input type="hidden" name="id" value="{STYLE_ID}" />  	<fieldset>  	<dl> -		<dt><label for="name">{L_STYLE_NAME}:</label></dt> +		<dt><label for="name">{L_STYLE_NAME}{L_COLON}</label></dt>  		<dd><input type="text" id="name" name="style_name" value="{STYLE_NAME}" /></dd>  	</dl>  	<dl> @@ -44,11 +44,11 @@  		<dd><strong>{STYLE_PATH}</strong></dd>  	</dl>  	<dl> -		<dt><label for="name">{L_COPYRIGHT}:</label></dt> +		<dt><label for="name">{L_COPYRIGHT}{L_COLON}</label></dt>  		<dd><strong>{STYLE_COPYRIGHT}</strong></dd>  	</dl>  	<dl> -		<dt><label for="style_parent">{L_INHERITING_FROM}:</label></dt> +		<dt><label for="style_parent">{L_INHERITING_FROM}{L_COLON}</label></dt>  		<dd><select id="style_parent" name="style_parent">  			<option value=""<!-- IF STYLE_PARENT == 0 --> selected="selected"<!-- ENDIF -->> - </option>  			<!-- BEGIN parent_styles --> @@ -57,13 +57,13 @@  		</select></dd>  	</dl>  	<dl> -		<dt><label for="style_active">{L_STYLE_ACTIVE}:</label></dt> +		<dt><label for="style_active">{L_STYLE_ACTIVE}{L_COLON}</label></dt>  		<dd><label><input type="radio" class="radio" name="style_active" value="1"<!-- IF S_STYLE_ACTIVE --> id="style_active" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label><input type="radio" class="radio" name="style_active" value="0"<!-- IF not S_STYLE_ACTIVE --> id="style_active" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl>  	<!-- IF not S_STYLE_DEFAULT -->  		<dl> -			<dt><label for="style_default">{L_STYLE_DEFAULT}:</label></dt> +			<dt><label for="style_default">{L_STYLE_DEFAULT}{L_COLON}</label></dt>  			<dd><label><input type="radio" class="radio" name="style_default" value="1" /> {L_YES}</label>  				<label><input type="radio" class="radio" id="style_default" name="style_default" value="0" checked="checked" /> {L_NO}</label></dd>  		</dl> diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html index 837629255b..96c9de6ebb 100644 --- a/phpBB/adm/style/acp_users.html +++ b/phpBB/adm/style/acp_users.html @@ -13,7 +13,7 @@  	<fieldset>  		<legend>{L_SELECT_USER}</legend>  	<dl> -		<dt><label for="username">{L_ENTER_USERNAME}:</label></dt> +		<dt><label for="username">{L_ENTER_USERNAME}{L_COLON}</label></dt>  		<dd><input class="text medium" type="text" id="username" name="username" /></dd>  		<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>  		<dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="u" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd> @@ -68,7 +68,7 @@  	<form id="mode_select" method="post" action="{U_MODE_SELECT}">  	<fieldset class="quick"> -		{L_SELECT_FORM}: <select name="mode" onchange="if (this.options[this.selectedIndex].value != '') this.form.submit();">{S_FORM_OPTIONS}</select> <input class="button2" type="submit" value="{L_GO}" /> +		{L_SELECT_FORM}{L_COLON} <select name="mode" onchange="if (this.options[this.selectedIndex].value != '') this.form.submit();">{S_FORM_OPTIONS}</select> <input class="button2" type="submit" value="{L_GO}" />  		{S_FORM_TOKEN}  	</fieldset>  	</form> @@ -106,7 +106,7 @@  	<fieldset>  		<legend>{L_ACP_USER_RANK}</legend>  	<dl> -		<dt><label for="user_rank">{L_USER_RANK}:</label></dt> +		<dt><label for="user_rank">{L_USER_RANK}{L_COLON}</label></dt>  		<dd><select name="user_rank" id="user_rank">{S_RANK_OPTIONS}</select></dd>  	</dl>  	</fieldset> @@ -146,7 +146,7 @@  	<!-- IF S_GROUP_OPTIONS -->  		<fieldset class="quick"> -			{L_USER_GROUP_ADD}: <select name="g">{S_GROUP_OPTIONS}</select> <input class="button1" type="submit" name="update" value="{L_SUBMIT}" /> +			{L_USER_GROUP_ADD}{L_COLON} <select name="g">{S_GROUP_OPTIONS}</select> <input class="button1" type="submit" name="update" value="{L_SUBMIT}" />  			{S_FORM_TOKEN}  		</fieldset>  	<!-- ENDIF --> @@ -177,7 +177,7 @@  	<tbody>  	<!-- BEGIN attach -->  		<!-- IF attach.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> -		<td><a href="{attach.U_DOWNLOAD}">{attach.REAL_FILENAME}</a><br /><span class="small"><!-- IF attach.S_IN_MESSAGE --><strong>{L_PM}: </strong><!-- ELSE --><strong>{L_POST}: </strong><!-- ENDIF --><a href="{attach.U_VIEW_TOPIC}">{attach.TOPIC_TITLE}</a></span></td> +		<td><a href="{attach.U_DOWNLOAD}">{attach.REAL_FILENAME}</a><br /><span class="small"><!-- IF attach.S_IN_MESSAGE --><strong>{L_PM}{L_COLON} </strong><!-- ELSE --><strong>{L_POST}{L_COLON} </strong><!-- ENDIF --><a href="{attach.U_VIEW_TOPIC}">{attach.TOPIC_TITLE}</a></span></td>  		<td style="text-align: center">{attach.POST_TIME}</td>  		<td style="text-align: center">{attach.SIZE}</td>  		<td style="text-align: center">{attach.DOWNLOAD_COUNT}</td> @@ -192,7 +192,7 @@  	</div>  	<!-- ENDIF -->  	<fieldset class="display-options"> -		{L_SORT_BY}: <select name="sk">{S_SORT_KEY}</select> <select name="sd">{S_SORT_DIR}</select> +		{L_SORT_BY}{L_COLON} <select name="sk">{S_SORT_KEY}</select> <select name="sd">{S_SORT_DIR}</select>  		<input class="button2" type="submit" value="{L_GO}" name="sort" />  	</fieldset>  	<hr /> @@ -219,7 +219,7 @@  	<form id="select_forum" method="post" action="{U_ACTION}">  		<fieldset class="quick" style="text-align: left;"> -			{L_SELECT_FORUM}: <select name="f">{S_FORUM_OPTIONS}</select> +			{L_SELECT_FORUM}{L_COLON} <select name="f">{S_FORUM_OPTIONS}</select>  			<input class="button2" type="submit" value="{L_GO}" name="select" />  			{S_FORM_TOKEN}  		</fieldset> diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html index 35d8374237..2135b52fb9 100644 --- a/phpBB/adm/style/acp_users_avatar.html +++ b/phpBB/adm/style/acp_users_avatar.html @@ -3,36 +3,36 @@  	<fieldset>  		<legend>{L_ACP_USER_AVATAR}</legend>  	<dl> -		<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt> +		<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>  		<dd>{AVATAR_IMAGE}</dd>  		<dd><label><input type="checkbox" class="radio" name="delete" /> {L_DELETE_AVATAR}</label></dd>  	</dl>  	<!-- IF not S_IN_AVATAR_GALLERY -->  		<!-- IF S_UPLOAD_FILE -->  			<dl>  -				<dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}:</label></dt> +				<dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}{L_COLON}</label></dt>  				<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_MAX_FILESIZE}" /><input type="file" id="uploadfile" name="uploadfile" /></dd>  			</dl>  		<!-- ENDIF -->  		<!-- IF S_REMOTE_UPLOAD -->  			<dl> -				<dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt> +				<dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}{L_COLON}</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>  				<dd><input name="uploadurl" type="text" id="uploadurl" value="" /></dd>  			</dl>  		<!-- ENDIF -->  		<!-- IF S_ALLOW_REMOTE -->  			<dl> -				<dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt> +				<dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}{L_COLON}</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>  				<dd><input name="remotelink" type="text" id="remotelink" value="" /></dd>  			</dl>  			<dl> -				<dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt> +				<dt><label for="width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>  				<dd><input name="width" type="text" id="width" size="3" value="{USER_AVATAR_WIDTH}" /> <span>{L_PIXEL} × </span> <input type="text" name="height" size="3" value="{USER_AVATAR_HEIGHT}" /> <span>{L_PIXEL}</span></dd>  			</dl>  		<!-- ENDIF -->  		<!-- IF S_DISPLAY_GALLERY -->  			<dl>  -				<dt><label>{L_AVATAR_GALLERY}:</label></dt> +				<dt><label>{L_AVATAR_GALLERY}{L_COLON}</label></dt>  				<dd><input class="button2" type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" /></dd>  			</dl>  		<!-- ENDIF --> @@ -42,7 +42,7 @@  		<fieldset>  			<legend>{L_AVATAR_GALLERY}</legend>  		<dl> -			<dt><label for="category">{L_AVATAR_CATEGORY}:</label></dt> +			<dt><label for="category">{L_AVATAR_CATEGORY}{L_COLON}</label></dt>  			<dd><select name="category" id="category">{S_CAT_OPTIONS}</select> <input class="button2" type="submit" value="{L_GO}" name="display_gallery" /></dd>  		</dl>  		<dl> diff --git a/phpBB/adm/style/acp_users_feedback.html b/phpBB/adm/style/acp_users_feedback.html index 1dad7f1927..d1a4f59445 100644 --- a/phpBB/adm/style/acp_users_feedback.html +++ b/phpBB/adm/style/acp_users_feedback.html @@ -40,7 +40,7 @@  	<!-- ENDIF -->  	<fieldset class="display-options"> -		{L_DISPLAY_LOG}:  {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR} +		{L_DISPLAY_LOG}{L_COLON}  {S_LIMIT_DAYS} {L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR}  		<input class="button2" type="submit" value="{L_GO}" name="sort" />  	</fieldset>  	<hr /> diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html index 5c5fa010f4..b7e3a9822e 100644 --- a/phpBB/adm/style/acp_users_overview.html +++ b/phpBB/adm/style/acp_users_overview.html @@ -3,54 +3,54 @@  <fieldset>  	<legend>{L_ACP_USER_OVERVIEW}</legend>  <dl> -	<dt><label for="user">{L_USERNAME}:</label><br /><span>{L_NAME_CHARS_EXPLAIN}</span></dt> +	<dt><label for="user">{L_USERNAME}{L_COLON}</label><br /><span>{L_NAME_CHARS_EXPLAIN}</span></dt>  	<dd><input type="text" id="user" name="user" value="{USER}" /></dd>  	<!-- IF U_SWITCH_PERMISSIONS --><dd>[ <a href="{U_SWITCH_PERMISSIONS}">{L_USE_PERMISSIONS}</a> ]</dd><!-- ENDIF -->  </dl>  <!-- IF S_USER_INACTIVE -->  <dl> -	<dt><label>{L_USER_IS_INACTIVE}:</label></dt> +	<dt><label>{L_USER_IS_INACTIVE}{L_COLON}</label></dt>  	<dd><strong>{USER_INACTIVE_REASON}</strong></dd>  </dl>  <!-- ENDIF -->  <dl> -	<dt><label>{L_REGISTERED}:</label></dt> +	<dt><label>{L_REGISTERED}{L_COLON}</label></dt>  	<dd><strong>{USER_REGISTERED}</strong></dd>  </dl>  <!-- IF S_USER_IP -->  <dl> -	<dt><label>{L_REGISTERED_IP}:</label></dt> +	<dt><label>{L_REGISTERED_IP}{L_COLON}</label></dt>  	<dd><a href="{U_SHOW_IP}">{REGISTERED_IP}</a></dd>  	<dd>[ <a href="{U_WHOIS}" onclick="popup(this.href, 700, 500, '_whois'); return false;">{L_WHOIS}</a> ]</dd>  </dl>  <!-- ENDIF -->  <dl> -	<dt><label>{L_LAST_ACTIVE}:</label></dt> +	<dt><label>{L_LAST_ACTIVE}{L_COLON}</label></dt>  	<dd><strong>{USER_LASTACTIVE}</strong></dd>  </dl>  <dl> -	<dt><label>{L_POSTS}:</label></dt> +	<dt><label>{L_POSTS}{L_COLON}</label></dt>  	<dd><strong>{USER_POSTS}</strong><!-- IF POSTS_IN_QUEUE and U_MCP_QUEUE --> (<a href="{U_MCP_QUEUE}">{L_POSTS_IN_QUEUE}</a>)<!-- ELSEIF POSTS_IN_QUEUE --> ({L_POSTS_IN_QUEUE})<!-- ENDIF --></dd>  </dl>  <dl> -	<dt><label>{L_WARNINGS}:</label></dt> +	<dt><label>{L_WARNINGS}{L_COLON}</label></dt>  	<dd><strong>{USER_WARNINGS}</strong></dd>  </dl>  <dl> -	<dt><label for="user_founder">{L_FOUNDER}:</label><br /><span>{L_FOUNDER_EXPLAIN}</span></dt> +	<dt><label for="user_founder">{L_FOUNDER}{L_COLON}</label><br /><span>{L_FOUNDER_EXPLAIN}</span></dt>  	<dd><label><input type="radio" class="radio" name="user_founder" value="1"<!-- IF S_USER_FOUNDER --> id="user_founder" checked="checked"<!-- ENDIF --><!-- IF not S_FOUNDER --> disabled="disabled"<!-- ENDIF --> /> {L_YES}</label>  		<label><input type="radio" class="radio" name="user_founder" value="0"<!-- IF not S_USER_FOUNDER --> id="user_founder" checked="checked"<!-- ENDIF --><!-- IF not S_FOUNDER --> disabled="disabled"<!-- ENDIF --> /> {L_NO}</label></dd>  </dl>  <dl> -	<dt><label for="user_email">{L_EMAIL}:</label></dt> +	<dt><label for="user_email">{L_EMAIL}{L_COLON}</label></dt>  	<dd><input class="text medium" type="text" id="user_email" name="user_email" value="{USER_EMAIL}" autocomplete="off" /></dd>  </dl>  <dl> -	<dt><label for="new_password">{L_NEW_PASSWORD}:</label><br /><span>{L_CHANGE_PASSWORD_EXPLAIN}</span></dt> +	<dt><label for="new_password">{L_NEW_PASSWORD}{L_COLON}</label><br /><span>{L_CHANGE_PASSWORD_EXPLAIN}</span></dt>  	<dd><input type="password" id="new_password" name="new_password" value="" autocomplete="off" /></dd>  </dl>  <dl> -	<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}:</label><br /><span>{L_CONFIRM_PASSWORD_EXPLAIN}</span></dt> +	<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}{L_COLON}</label><br /><span>{L_CONFIRM_PASSWORD_EXPLAIN}</span></dt>  	<dd><input type="password" id="password_confirm" name="password_confirm" value="" autocomplete="off" /></dd>  </dl> @@ -107,16 +107,16 @@  	<fieldset>  		<legend>{L_USER_TOOLS}</legend>  	<dl> -		<dt><label for="quicktools">{L_QUICK_TOOLS}:</label></dt> +		<dt><label for="quicktools">{L_QUICK_TOOLS}{L_COLON}</label></dt>  		<dd><select id="quicktools" name="action" onchange="display_reason(this.options[this.selectedIndex].value);">{S_ACTION_OPTIONS}</select></dd>  	</dl>  	<div style="display: none;" id="reasons">  		<dl> -			<dt><label for="ban_reason">{L_BAN_REASON}:</label></dt> +			<dt><label for="ban_reason">{L_BAN_REASON}{L_COLON}</label></dt>  			<dd><input name="ban_reason" type="text" class="text medium" maxlength="3000" id="ban_reason" /></dd>  		</dl>  		<dl> -			<dt><label for="ban_give_reason">{L_BAN_GIVE_REASON}:</label></dt> +			<dt><label for="ban_give_reason">{L_BAN_GIVE_REASON}{L_COLON}</label></dt>  			<dd><input name="ban_give_reason" type="text" class="text medium" maxlength="3000" id="ban_give_reason" /></dd>  		</dl>  	</div> @@ -135,7 +135,7 @@  			<fieldset>  				<legend>{L_DELETE_USER}</legend>  				<dl> -					<dt><label for="delete_type">{L_DELETE_USER}:</label><br /><span>{L_DELETE_USER_EXPLAIN}</span></dt> +					<dt><label for="delete_type">{L_DELETE_USER}{L_COLON}</label><br /><span>{L_DELETE_USER_EXPLAIN}</span></dt>  					<dd>  					<!-- IF USER_HAS_POSTS -->  						<select id="delete_type" name="delete_type"><option class="sep" value="">{L_SELECT_OPTION}</option><option value="retain">{L_RETAIN_POSTS}</option><option value="remove">{L_DELETE_POSTS}</option></select> diff --git a/phpBB/adm/style/acp_users_prefs.html b/phpBB/adm/style/acp_users_prefs.html index 9439f0cf03..f1b9e28a66 100644 --- a/phpBB/adm/style/acp_users_prefs.html +++ b/phpBB/adm/style/acp_users_prefs.html @@ -9,52 +9,52 @@  	<fieldset>  		<legend>{L_UCP_PREFS_PERSONAL}</legend>  	<dl>  -		<dt><label for="viewemail">{L_SHOW_EMAIL}:</label></dt> +		<dt><label for="viewemail">{L_SHOW_EMAIL}{L_COLON}</label></dt>  		<dd><label><input type="radio" class="radio" name="viewemail" value="1"<!-- IF VIEW_EMAIL --> id="viewemail" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label><input type="radio" class="radio" name="viewemail" value="0"<!-- IF not VIEW_EMAIL --> id="viewemail" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl>  	<dl>  -		<dt><label for="massemail">{L_ADMIN_EMAIL}:</label></dt> +		<dt><label for="massemail">{L_ADMIN_EMAIL}{L_COLON}</label></dt>  		<dd><label><input type="radio" class="radio" name="massemail" value="1"<!-- IF MASS_EMAIL --> id="massemail" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label><input type="radio" class="radio" name="massemail" value="0"<!-- IF not MASS_EMAIL --> id="massemail" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl>  	<dl>  -		<dt><label for="allowpm">{L_ALLOW_PM}:</label><br /><span>{L_ALLOW_PM_EXPLAIN}</span></dt> +		<dt><label for="allowpm">{L_ALLOW_PM}{L_COLON}</label><br /><span>{L_ALLOW_PM_EXPLAIN}</span></dt>  		<dd><label><input type="radio" class="radio" name="allowpm" value="1"<!-- IF ALLOW_PM --> id="allowpm" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label><input type="radio" class="radio" name="allowpm" value="0"<!-- IF not ALLOW_PM --> id="allowpm" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl>  	<dl>  -		<dt><label for="hideonline">{L_HIDE_ONLINE}:</label></dt> +		<dt><label for="hideonline">{L_HIDE_ONLINE}{L_COLON}</label></dt>  		<dd><label><input type="radio" class="radio" name="hideonline" value="1"<!-- IF HIDE_ONLINE --> id="hideonline" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label><input type="radio" class="radio" name="hideonline" value="0"<!-- IF not HIDE_ONLINE --> id="hideonline" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl>  	<dl>  -		<dt><label for="notifymethod">{L_NOTIFY_METHOD}:</label><br /><span>{L_NOTIFY_METHOD_EXPLAIN}</span></dt> +		<dt><label for="notifymethod">{L_NOTIFY_METHOD}{L_COLON}</label><br /><span>{L_NOTIFY_METHOD_EXPLAIN}</span></dt>  		<dd><label><input type="radio" class="radio" name="notifymethod" value="0"<!-- IF NOTIFY_EMAIL --> id="notifymethod" checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_EMAIL}</label>  			<label><input type="radio" class="radio" name="notifymethod" value="1"<!-- IF NOTIFY_IM --> id="notifymethod" checked="checked"<!-- ENDIF --><!-- IF S_JABBER_DISABLED --> disabled="disabled"<!-- ENDIF --> /> {L_NOTIFY_METHOD_IM}</label>  			<label><input type="radio" class="radio" name="notifymethod" value="2"<!-- IF NOTIFY_BOTH --> id="notifymethod" checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_BOTH}</label></dd>  	</dl>  	<dl>  -		<dt><label for="notifypm">{L_NOTIFY_ON_PM}:</label></dt> +		<dt><label for="notifypm">{L_NOTIFY_ON_PM}{L_COLON}</label></dt>  		<dd><label><input type="radio" class="radio" name="notifypm" value="1"<!-- IF NOTIFY_PM --> id="notifypm" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label><input type="radio" class="radio" name="notifypm" value="0"<!-- IF not NOTIFY_PM --> id="notifypm" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl>  	<dl>  -		<dt><label for="popuppm">{L_POPUP_ON_PM}:</label></dt> +		<dt><label for="popuppm">{L_POPUP_ON_PM}{L_COLON}</label></dt>  		<dd><label><input type="radio" class="radio" name="popuppm" value="1"<!-- IF POPUP_PM --> id="popuppm" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label><input type="radio" class="radio" name="popuppm" value="0"<!-- IF not POPUP_PM --> id="popuppm" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl>  	<dl>  -		<dt><label for="lang">{L_BOARD_LANGUAGE}:</label></dt> +		<dt><label for="lang">{L_BOARD_LANGUAGE}{L_COLON}</label></dt>  		<dd><select id="lang" name="lang">{S_LANG_OPTIONS}</select></dd>  	</dl>  	<dl>  -		<dt><label for="style">{L_BOARD_STYLE}:</label></dt> +		<dt><label for="style">{L_BOARD_STYLE}{L_COLON}</label></dt>  		<dd><select id="style" name="style">{S_STYLE_OPTIONS}</select></dd>  	</dl>  	<!-- INCLUDE timezone_option.html -->  	<dl>  -		<dt><label for="dateoptions">{L_BOARD_DATE_FORMAT}:</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt> +		<dt><label for="dateoptions">{L_BOARD_DATE_FORMAT}{L_COLON}</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><div id="custom_date"<!-- IF not S_CUSTOM_DATEFORMAT --> style="display:none;"<!-- ENDIF -->><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="30" /></div></dd>  	</dl> @@ -63,22 +63,22 @@  	<fieldset>  		<legend>{L_UCP_PREFS_POST}</legend>  	<dl>  -		<dt><label for="bbcode">{L_DEFAULT_BBCODE}:</label></dt> +		<dt><label for="bbcode">{L_DEFAULT_BBCODE}{L_COLON}</label></dt>  		<dd><label><input type="radio" class="radio" name="bbcode" value="1"<!-- IF BBCODE --> id="bbcode" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label><input type="radio" class="radio" name="bbcode" value="0"<!-- IF not BBCODE --> id="bbcode" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl>  	<dl>  -		<dt><label for="smilies">{L_DEFAULT_SMILIES}:</label></dt> +		<dt><label for="smilies">{L_DEFAULT_SMILIES}{L_COLON}</label></dt>  		<dd><label><input type="radio" class="radio" name="smilies" value="1"<!-- IF SMILIES --> id="smilies" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label><input type="radio" class="radio" name="smilies" value="0"<!-- IF not SMILIES --> id="smilies" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl>  	<dl>  -		<dt><label for="sig">{L_DEFAULT_ADD_SIG}:</label></dt> +		<dt><label for="sig">{L_DEFAULT_ADD_SIG}{L_COLON}</label></dt>  		<dd><label><input type="radio" class="radio" name="sig" value="1"<!-- IF ATTACH_SIG --> id="sig" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label><input type="radio" class="radio" name="sig" value="0"<!-- IF not ATTACH_SIG --> id="sig" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl>  	<dl>  -		<dt><label for="notify">{L_DEFAULT_NOTIFY}:</label></dt> +		<dt><label for="notify">{L_DEFAULT_NOTIFY}{L_COLON}</label></dt>  		<dd><label><input type="radio" class="radio" name="notify" value="1"<!-- IF NOTIFY --> id="notify" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label><input type="radio" class="radio" name="notify" value="0"<!-- IF not NOTIFY --> id="notify" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl> @@ -87,57 +87,57 @@  	<fieldset>  		<legend>{L_UCP_PREFS_VIEW}</legend>  	<dl>  -		<dt><label for="view_images">{L_VIEW_IMAGES}:</label></dt> +		<dt><label for="view_images">{L_VIEW_IMAGES}{L_COLON}</label></dt>  		<dd><label><input type="radio" class="radio" name="view_images" value="1"<!-- IF VIEW_IMAGES --> id="view_images" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label><input type="radio" class="radio" name="view_images" value="0"<!-- IF not VIEW_IMAGES --> id="view_images" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl>  	<dl>  -		<dt><label for="view_flash">{L_VIEW_FLASH}:</label></dt> +		<dt><label for="view_flash">{L_VIEW_FLASH}{L_COLON}</label></dt>  		<dd><label><input type="radio" class="radio" name="view_flash" value="1"<!-- IF VIEW_FLASH --> id="view_flash" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label><input type="radio" class="radio" name="view_flash" value="0"<!-- IF not VIEW_FLASH --> id="view_flash" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl>  	<dl>  -		<dt><label for="view_smilies">{L_VIEW_SMILIES}:</label></dt> +		<dt><label for="view_smilies">{L_VIEW_SMILIES}{L_COLON}</label></dt>  		<dd><label><input type="radio" class="radio" name="view_smilies" value="1"<!-- IF VIEW_SMILIES --> id="view_smilies" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label><input type="radio" class="radio" name="view_smilies" value="0"<!-- IF not VIEW_SMILIES --> id="view_smilies" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl>  	<dl>  -		<dt><label for="view_sigs">{L_VIEW_SIGS}:</label></dt> +		<dt><label for="view_sigs">{L_VIEW_SIGS}{L_COLON}</label></dt>  		<dd><label><input type="radio" class="radio" name="view_sigs" value="1"<!-- IF VIEW_SIGS --> id="view_sigs" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label><input type="radio" class="radio" name="view_sigs" value="0"<!-- IF not VIEW_SIGS --> id="view_sigss" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl>  	<dl>  -		<dt><label for="view_avatars">{L_VIEW_AVATARS}:</label></dt> +		<dt><label for="view_avatars">{L_VIEW_AVATARS}{L_COLON}</label></dt>  		<dd><label><input type="radio" class="radio" name="view_avatars" value="1"<!-- IF VIEW_AVATARS --> id="view_avatars" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label><input type="radio" class="radio" name="view_avatars" value="0"<!-- IF not VIEW_AVATARS --> id="view_avatars" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl>  	<dl>  -		<dt><label for="view_wordcensor">{L_DISABLE_CENSORS}:</label></dt> +		<dt><label for="view_wordcensor">{L_DISABLE_CENSORS}{L_COLON}</label></dt>  		<dd><label><input type="radio" class="radio" name="view_wordcensor" value="1"<!-- IF VIEW_WORDCENSOR --> id="view_wordcensor" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label><input type="radio" class="radio" name="view_wordcensor" value="0"<!-- IF not VIEW_WORDCENSOR --> id="view_wordcensor" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl>  	<dl>  -		<dt><label>{L_VIEW_TOPICS_DAYS}:</label></dt> +		<dt><label>{L_VIEW_TOPICS_DAYS}{L_COLON}</label></dt>  		<dd>{S_TOPIC_SORT_DAYS}</dd>  	</dl>  	<dl>  -		<dt><label>{L_VIEW_TOPICS_KEY}:</label></dt> +		<dt><label>{L_VIEW_TOPICS_KEY}{L_COLON}</label></dt>  		<dd>{S_TOPIC_SORT_KEY}</dd>  	</dl>  	<dl>  -		<dt><label>{L_VIEW_TOPICS_DIR}:</label></dt> +		<dt><label>{L_VIEW_TOPICS_DIR}{L_COLON}</label></dt>  		<dd>{S_TOPIC_SORT_DIR}</dd>  	</dl>  	<dl>  -		<dt><label>{L_VIEW_POSTS_DAYS}:</label></dt> +		<dt><label>{L_VIEW_POSTS_DAYS}{L_COLON}</label></dt>  		<dd>{S_POST_SORT_DAYS}</dd>  	</dl>  	<dl>  -		<dt><label>{L_VIEW_POSTS_KEY}:</label></dt> +		<dt><label>{L_VIEW_POSTS_KEY}{L_COLON}</label></dt>  		<dd>{S_POST_SORT_KEY}</dd>  	</dl>  	<dl>  -		<dt><label>{L_VIEW_POSTS_DIR}:</label></dt> +		<dt><label>{L_VIEW_POSTS_DIR}{L_COLON}</label></dt>  		<dd>{S_POST_SORT_DIR}</dd>  	</dl>  	</fieldset> diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html index ea7204e2e4..3232e8d1f5 100644 --- a/phpBB/adm/style/acp_users_profile.html +++ b/phpBB/adm/style/acp_users_profile.html @@ -3,44 +3,44 @@  	<fieldset>  		<legend>{L_USER_PROFILE}</legend>  	<dl> -		<dt><label for="icq">{L_UCP_ICQ}:</label></dt> +		<dt><label for="icq">{L_UCP_ICQ}{L_COLON}</label></dt>  		<dd><input type="text" id="icq" name="icq" value="{ICQ}" /></dd>  	</dl>  	<dl> -		<dt><label for="aim">{L_UCP_AIM}:</label></dt> +		<dt><label for="aim">{L_UCP_AIM}{L_COLON}</label></dt>  		<dd><input type="text" id="aim" name="aim" value="{AIM}" /></dd>  	</dl>  	<dl> -		<dt><label for="msn">{L_UCP_MSNM}:</label></dt> +		<dt><label for="msn">{L_UCP_MSNM}{L_COLON}</label></dt>  		<dd><input type="text" id="msn" name="msn" value="{MSN}" /></dd>  	</dl>  	<dl> -		<dt><label for="yim">{L_UCP_YIM}:</label></dt> +		<dt><label for="yim">{L_UCP_YIM}{L_COLON}</label></dt>  		<dd><input type="text" id="yim" name="yim" value="{YIM}" /></dd>  	</dl>  	<dl> -		<dt><label for="jabber">{L_UCP_JABBER}:</label></dt> +		<dt><label for="jabber">{L_UCP_JABBER}{L_COLON}</label></dt>  		<dd><input type="text" id="jabber" name="jabber" value="{JABBER}" /></dd>  	</dl>  	<dl> -		<dt><label for="website">{L_WEBSITE}:</label></dt> +		<dt><label for="website">{L_WEBSITE}{L_COLON}</label></dt>  		<dd><input type="text" id="website" name="website" value="{WEBSITE}" /></dd>  	</dl>  	<dl> -		<dt><label for="location">{L_LOCATION}:</label></dt> +		<dt><label for="location">{L_LOCATION}{L_COLON}</label></dt>  		<dd><input type="text" id="location" name="location" value="{LOCATION}" /></dd>  	</dl>  	<dl> -		<dt><label for="occupation">{L_OCCUPATION}:</label></dt> +		<dt><label for="occupation">{L_OCCUPATION}{L_COLON}</label></dt>  		<dd><textarea id="occupation" name="occupation" rows="3" cols="30">{OCCUPATION}</textarea></dd>  	</dl>  	<dl> -		<dt><label for="interests">{L_INTERESTS}:</label></dt> +		<dt><label for="interests">{L_INTERESTS}{L_COLON}</label></dt>  		<dd><textarea id="interests" name="interests" rows="3" cols="30">{INTERESTS}</textarea></dd>  	</dl>  	<dl>  -		<dt><label for="birthday">{L_BIRTHDAY}:</label><br /><span>{L_BIRTHDAY_EXPLAIN}</span></dt> -		<dd>{L_DAY}: <select id="birthday" name="bday_day">{S_BIRTHDAY_DAY_OPTIONS}</select> {L_MONTH}: <select name="bday_month">{S_BIRTHDAY_MONTH_OPTIONS}</select> {L_YEAR}: <select name="bday_year">{S_BIRTHDAY_YEAR_OPTIONS}</select></dd> +		<dt><label for="birthday">{L_BIRTHDAY}{L_COLON}</label><br /><span>{L_BIRTHDAY_EXPLAIN}</span></dt> +		<dd>{L_DAY}{L_COLON} <select id="birthday" name="bday_day">{S_BIRTHDAY_DAY_OPTIONS}</select> {L_MONTH}{L_COLON} <select name="bday_month">{S_BIRTHDAY_MONTH_OPTIONS}</select> {L_YEAR}{L_COLON} <select name="bday_year">{S_BIRTHDAY_YEAR_OPTIONS}</select></dd>  	</dl>  	</fieldset> @@ -49,7 +49,7 @@  			<legend>{L_USER_CUSTOM_PROFILE_FIELDS}</legend>  		<!-- BEGIN profile_fields -->  		<dl>  -			<dt><label<!-- IF profile_fields.FIELD_ID --> for="{profile_fields.FIELD_ID}"<!-- ENDIF -->>{profile_fields.LANG_NAME}:</label><!-- IF profile_fields.LANG_EXPLAIN --><br /><span>{profile_fields.LANG_EXPLAIN}</span><!-- ENDIF --></dt> +			<dt><label<!-- IF profile_fields.FIELD_ID --> for="{profile_fields.FIELD_ID}"<!-- ENDIF -->>{profile_fields.LANG_NAME}{L_COLON}</label><!-- IF profile_fields.LANG_EXPLAIN --><br /><span>{profile_fields.LANG_EXPLAIN}</span><!-- ENDIF --></dt>  			<dd>{profile_fields.FIELD}</dd>  			<!-- IF profile_fields.ERROR -->  				<dd><span class="small" style="color: red;">{profile_fields.ERROR}</span></dd> diff --git a/phpBB/adm/style/acp_users_signature.html b/phpBB/adm/style/acp_users_signature.html index d55deac808..c9cc053eec 100644 --- a/phpBB/adm/style/acp_users_signature.html +++ b/phpBB/adm/style/acp_users_signature.html @@ -26,7 +26,7 @@  		d: '{LA_BBCODE_D_HELP}',  		tip: '{L_STYLES_TIP}'  		<!-- BEGIN custom_tags --> -			,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}' +			,cb_{custom_tags.BBCODE_ID}{L_COLON} '{custom_tags.A_BBCODE_HELPLINE}'  		<!-- END custom_tags -->  	} @@ -66,7 +66,7 @@  				<input type="button" class="button2" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" onmouseover="helpline('d')" onmouseout="helpline('tip')" />  			<!-- ENDIF --> -			{L_FONT_SIZE}: <select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_FONT_SIZE}" onmouseover="helpline('f')" onmouseout="helpline('tip')"> +			{L_FONT_SIZE}{L_COLON} <select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_FONT_SIZE}" onmouseover="helpline('f')" onmouseout="helpline('tip')">  				<option value="50">{L_FONT_TINY}</option>  				<option value="85">{L_FONT_SMALL}</option>  				<option value="100" selected="selected">{L_FONT_NORMAL}</option> @@ -92,8 +92,8 @@  				// ]]>  				</script>  			</dt> -			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px;"><textarea name="signature" rows="10" cols="60" style="width: 95%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();">{SIGNATURE}</textarea></dd> -			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 5px;"> +			<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 90px;"><textarea name="signature" rows="10" cols="60" style="width: 95%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();">{SIGNATURE}</textarea></dd> +			<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 90px; margin-top: 5px;">  			<!-- IF S_BBCODE_ALLOWED -->  				<label><input type="checkbox" class="radio" name="disable_bbcode"{S_BBCODE_CHECKED} /> {L_DISABLE_BBCODE}</label>  			<!-- ENDIF --> @@ -104,7 +104,7 @@  				<label><input type="checkbox" class="radio" name="disable_magic_url"{S_MAGIC_URL_CHECKED} /> {L_DISABLE_MAGIC_URL}</label>  			<!-- ENDIF -->  			</dd> -			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 10px;"><strong>{L_OPTIONS}: </strong>{BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS}</dd> +			<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 90px; margin-top: 10px;"><strong>{L_OPTIONS}{L_COLON} </strong>{BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS}</dd>  		</dl>  	</fieldset> diff --git a/phpBB/adm/style/captcha_default_acp_demo.html b/phpBB/adm/style/captcha_default_acp_demo.html index 0b1434f7e0..0f137f28df 100644 --- a/phpBB/adm/style/captcha_default_acp_demo.html +++ b/phpBB/adm/style/captcha_default_acp_demo.html @@ -1,4 +1,4 @@  <dl> -	<dt><label for="captcha_preview">{L_PREVIEW}:</label><br /><span>{L_CAPTCHA_PREVIEW_EXPLAIN}</span></dt> +	<dt><label for="captcha_preview">{L_PREVIEW}{L_COLON}</label><br /><span>{L_CAPTCHA_PREVIEW_EXPLAIN}</span></dt>  	<dd><img src="{CONFIRM_IMAGE}" alt="{L_PREVIEW}" width="360" height="96" id="captcha_preview" /></dd>  </dl> diff --git a/phpBB/adm/style/captcha_gd_acp.html b/phpBB/adm/style/captcha_gd_acp.html index e2804bbc7d..b333d9205c 100644 --- a/phpBB/adm/style/captcha_gd_acp.html +++ b/phpBB/adm/style/captcha_gd_acp.html @@ -14,32 +14,32 @@  <legend>{L_GENERAL_OPTIONS}</legend>  <dl> -	<dt><label for="captcha_gd_foreground_noise">{L_CAPTCHA_GD_FOREGROUND_NOISE}:</label><br /><span>{L_CAPTCHA_GD_FOREGROUND_NOISE_EXPLAIN}</span></dt> +	<dt><label for="captcha_gd_foreground_noise">{L_CAPTCHA_GD_FOREGROUND_NOISE}{L_COLON}</label><br /><span>{L_CAPTCHA_GD_FOREGROUND_NOISE_EXPLAIN}</span></dt>  	<dd><label><input id="captcha_gd_foreground_noise" name="captcha_gd_foreground_noise" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_FOREGROUND_NOISE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>  		<label><input name="captcha_gd_foreground_noise" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_FOREGROUND_NOISE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  </dl>  <dl> -	<dt><label for="captcha_gd_x_grid">{L_CAPTCHA_GD_X_GRID}:</label><br /><span>{L_CAPTCHA_GD_X_GRID_EXPLAIN}</span></dt> +	<dt><label for="captcha_gd_x_grid">{L_CAPTCHA_GD_X_GRID}{L_COLON}</label><br /><span>{L_CAPTCHA_GD_X_GRID_EXPLAIN}</span></dt>  	<dd><input id="captcha_gd_x_grid" name="captcha_gd_x_grid" value="{CAPTCHA_GD_X_GRID}" type="text" /></dd>  </dl>  <dl> -	<dt><label for="captcha_gd_y_grid">{L_CAPTCHA_GD_Y_GRID}:</label><br /><span>{L_CAPTCHA_GD_Y_GRID_EXPLAIN}</span></dt> +	<dt><label for="captcha_gd_y_grid">{L_CAPTCHA_GD_Y_GRID}{L_COLON}</label><br /><span>{L_CAPTCHA_GD_Y_GRID_EXPLAIN}</span></dt>  	<dd><input id="captcha_gd_y_grid" name="captcha_gd_y_grid" value="{CAPTCHA_GD_Y_GRID}" type="text" /></dd>  </dl>  <dl> -	<dt><label for="captcha_gd_wave">{L_CAPTCHA_GD_WAVE}:</label><br /><span>{L_CAPTCHA_GD_WAVE_EXPLAIN}</span></dt> +	<dt><label for="captcha_gd_wave">{L_CAPTCHA_GD_WAVE}{L_COLON}</label><br /><span>{L_CAPTCHA_GD_WAVE_EXPLAIN}</span></dt>  	<dd><label><input id="captcha_gd_wave" name="captcha_gd_wave" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_WAVE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>  		<label><input name="captcha_gd_wave" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_WAVE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>  </dd>  </dl>  <dl> -	<dt><label for="captcha_gd_3d_noise">{L_CAPTCHA_GD_3D_NOISE}:</label><br /><span>{L_CAPTCHA_GD_3D_NOISE_EXPLAIN}</span></dt> +	<dt><label for="captcha_gd_3d_noise">{L_CAPTCHA_GD_3D_NOISE}{L_COLON}</label><br /><span>{L_CAPTCHA_GD_3D_NOISE_EXPLAIN}</span></dt>  	<dd><label><input id="captcha_gd_3d_noise" name="captcha_gd_3d_noise" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_3D_NOISE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>  		<label><input name="captcha_gd_3d_noise" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_3D_NOISE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>  </dd>  </dl>  <dl> -	<dt><label for="captcha_gd_fonts">{L_CAPTCHA_GD_FONTS}:</label><br /><span>{L_CAPTCHA_GD_FONTS_EXPLAIN}</span></dt> +	<dt><label for="captcha_gd_fonts">{L_CAPTCHA_GD_FONTS}{L_COLON}</label><br /><span>{L_CAPTCHA_GD_FONTS_EXPLAIN}</span></dt>  	<dd><label><input id="captcha_gd_fonts" name="captcha_gd_fonts" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_FONTS == 1 --> checked="checked"<!-- ENDIF --> /> {L_CAPTCHA_FONT_DEFAULT}</label>  		<label><input name="captcha_gd_fonts" value="2" class="radio" type="radio"<!-- IF CAPTCHA_GD_FONTS == 2 --> checked="checked"<!-- ENDIF --> /> {L_CAPTCHA_FONT_NEW}</label>  		<label><input name="captcha_gd_fonts" value="3" class="radio" type="radio"<!-- IF CAPTCHA_GD_FONTS == 3 --> checked="checked"<!-- ENDIF --> /> {L_CAPTCHA_FONT_LOWER}</label> diff --git a/phpBB/adm/style/captcha_qa_acp.html b/phpBB/adm/style/captcha_qa_acp.html index 4eb46d2d3c..99f3f24f70 100644 --- a/phpBB/adm/style/captcha_qa_acp.html +++ b/phpBB/adm/style/captcha_qa_acp.html @@ -59,7 +59,7 @@  	<fieldset>  		<legend>{L_EDIT_QUESTION}</legend>  	<dl> -		<dt><label for="strict">{L_QUESTION_STRICT}:</label><br /><span>{L_QUESTION_STRICT_EXPLAIN}</span></dt> +		<dt><label for="strict">{L_QUESTION_STRICT}{L_COLON}</label><br /><span>{L_QUESTION_STRICT_EXPLAIN}</span></dt>  		<dd><label><input type="radio" class="radio" name="strict" value="1"<!-- IF STRICT --> id="strict" checked="checked"<!-- ENDIF --> /> {L_YES}</label>  			<label><input type="radio" class="radio" name="strict" value="0"<!-- IF not STRICT --> id="strict" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>  	</dl> diff --git a/phpBB/adm/style/captcha_qa_acp_demo.html b/phpBB/adm/style/captcha_qa_acp_demo.html index 0ea2d6a024..79170e27c6 100644 --- a/phpBB/adm/style/captcha_qa_acp_demo.html +++ b/phpBB/adm/style/captcha_qa_acp_demo.html @@ -1,5 +1,5 @@  <dl> -	<dt><label for="answer"><!-- IF QA_CONFIRM_QUESTION --> {QA_CONFIRM_QUESTION} <!-- ELSE --> {L_CONFIRM_QUESTION} <!-- ENDIF -->:</label><br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt> +	<dt><label for="answer"><!-- IF QA_CONFIRM_QUESTION --> {QA_CONFIRM_QUESTION} <!-- ELSE --> {L_CONFIRM_QUESTION} <!-- ENDIF -->{L_COLON}</label><br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>  	<dd>  		<input type="text" tabindex="10" name="answer" id="answer" size="45" class="inputbox autowidth" title="{L_ANSWER}"  /> diff --git a/phpBB/adm/style/captcha_recaptcha_acp.html b/phpBB/adm/style/captcha_recaptcha_acp.html index 34912c7955..67176ebd07 100644 --- a/phpBB/adm/style/captcha_recaptcha_acp.html +++ b/phpBB/adm/style/captcha_recaptcha_acp.html @@ -13,11 +13,11 @@  <legend>{L_GENERAL_OPTIONS}</legend>  <dl> -	<dt><label for="recaptcha_pubkey">{L_RECAPTCHA_PUBLIC}:</label><br /><span>{L_RECAPTCHA_PUBLIC_EXPLAIN}</span></dt> +	<dt><label for="recaptcha_pubkey">{L_RECAPTCHA_PUBLIC}{L_COLON}</label><br /><span>{L_RECAPTCHA_PUBLIC_EXPLAIN}</span></dt>  	<dd><input id="recaptcha_pubkey" name="recaptcha_pubkey" value="{RECAPTCHA_PUBKEY}" size="50" type="text" /></dd>  </dl>  <dl> -	<dt><label for="recaptcha_privkey">{L_RECAPTCHA_PRIVATE}:</label><br /><span>{L_RECAPTCHA_PRIVATE_EXPLAIN}</span></dt> +	<dt><label for="recaptcha_privkey">{L_RECAPTCHA_PRIVATE}{L_COLON}</label><br /><span>{L_RECAPTCHA_PRIVATE_EXPLAIN}</span></dt>  	<dd><input id="recaptcha_privkey" name="recaptcha_privkey" value="{RECAPTCHA_PRIVKEY}" size="50" type="text" /></dd>  </dl> diff --git a/phpBB/adm/style/custom_profile_fields.html b/phpBB/adm/style/custom_profile_fields.html index 351397d3c7..982356bfa7 100644 --- a/phpBB/adm/style/custom_profile_fields.html +++ b/phpBB/adm/style/custom_profile_fields.html @@ -26,7 +26,7 @@  <!-- END int -->  <!-- BEGIN date --> -	<span>{L_DAY}:</span> <select name="{date.FIELD_IDENT}_day" id="{date.FIELD_IDENT}_day">{date.S_DAY_OPTIONS}</select> -	<span>{L_MONTH}:</span> <select name="{date.FIELD_IDENT}_month" id="{date.FIELD_IDENT}_month">{date.S_MONTH_OPTIONS}</select> -	<span>{L_YEAR}:</span> <select name="{date.FIELD_IDENT}_year" id="{date.FIELD_IDENT}_year">{date.S_YEAR_OPTIONS}</select> +	<span>{L_DAY}{L_COLON}</span> <select name="{date.FIELD_IDENT}_day" id="{date.FIELD_IDENT}_day">{date.S_DAY_OPTIONS}</select> +	<span>{L_MONTH}{L_COLON}</span> <select name="{date.FIELD_IDENT}_month" id="{date.FIELD_IDENT}_month">{date.S_MONTH_OPTIONS}</select> +	<span>{L_YEAR}{L_COLON}</span> <select name="{date.FIELD_IDENT}_year" id="{date.FIELD_IDENT}_year">{date.S_YEAR_OPTIONS}</select>  <!-- END date --> diff --git a/phpBB/adm/style/install_convert.html b/phpBB/adm/style/install_convert.html index cf78f30b50..5fec8c4789 100644 --- a/phpBB/adm/style/install_convert.html +++ b/phpBB/adm/style/install_convert.html @@ -86,7 +86,7 @@  			<!-- ELSE -->  				<dl> -					<dt><label>{checks.TITLE}:</label><!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt> +					<dt><label>{checks.TITLE}{L_COLON}</label><!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>  					<dd>{checks.RESULT}</dd>  				</dl>  			<!-- ENDIF --> @@ -109,7 +109,7 @@  			<!-- ELSE -->  				<dl> -					<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt> +					<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>  					<dd>{options.CONTENT}</dd>  				</dl> diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html index e306d8f6bf..6826654ded 100644 --- a/phpBB/adm/style/install_header.html +++ b/phpBB/adm/style/install_header.html @@ -42,7 +42,7 @@ function dE(n, s, type)  		<!-- IF S_LANG_SELECT -->  		<form method="post" action="">  			<fieldset class="nobg"> -				<label for="language">{L_SELECT_LANG}:</label> +				<label for="language">{L_SELECT_LANG}{L_COLON}</label>  				{S_LANG_SELECT}  				<input class="button1" type="submit" id="change_lang" name="change_lang" value="{L_CHANGE}" />  			</fieldset> diff --git a/phpBB/adm/style/install_install.html b/phpBB/adm/style/install_install.html index 79006fba69..1a809a3588 100644 --- a/phpBB/adm/style/install_install.html +++ b/phpBB/adm/style/install_install.html @@ -20,7 +20,7 @@  		<!-- ELSE -->  			<dl> -				<dt>{checks.TITLE}:<!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt> +				<dt>{checks.TITLE}{L_COLON}<!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>  				<dd>{checks.RESULT}</dd>  			</dl>  		<!-- ENDIF --> @@ -43,7 +43,7 @@  		<!-- ELSE -->  			<dl> -				<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt> +				<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>  				<dd>{options.CONTENT}</dd>  			</dl> diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html index 818889c89b..b5fa46dbf6 100644 --- a/phpBB/adm/style/install_update.html +++ b/phpBB/adm/style/install_update.html @@ -221,13 +221,13 @@  			<!-- BEGIN new -->  				<dl>  					<dt style="width: 60%;"><strong><!-- IF new.DIR_PART -->{new.DIR_PART}<br /><!-- ENDIF -->{new.FILE_PART}</strong> -					<!-- IF new.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{new.CUSTOM_ORIGINAL}</span><!-- ENDIF --> +					<!-- IF new.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{new.CUSTOM_ORIGINAL}</span><!-- ENDIF -->  				</dt> -				<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;"> +				<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">  					<!-- IF not new.S_BINARY -->[<a href="{new.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{new.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->  				</dd>  				<!-- IF new.S_CUSTOM --> -					<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;"><label><input type="checkbox" name="no_update[]" value="{new.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd> +					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{new.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>  				<!-- ENDIF -->  				</dl>  			<!-- END new --> @@ -245,11 +245,11 @@  			<!-- BEGIN not_modified -->  				<dl>  					<dt style="width: 60%;"><strong><!-- IF not_modified.DIR_PART -->{not_modified.DIR_PART}<br /><!-- ENDIF -->{not_modified.FILE_PART}</strong> -						<!-- IF not_modified.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{not_modified.CUSTOM_ORIGINAL}</span><!-- ENDIF --> +						<!-- IF not_modified.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{not_modified.CUSTOM_ORIGINAL}</span><!-- ENDIF -->  					</dt> -					<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;"><!-- IF not not_modified.S_BINARY -->[<a href="{not_modified.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{not_modified.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd> +					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><!-- IF not not_modified.S_BINARY -->[<a href="{not_modified.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{not_modified.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd>  					<!-- IF not_modified.S_CUSTOM --> -						<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;"><label><input type="checkbox" name="no_update[]" value="{not_modified.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd> +						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{not_modified.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>  					<!-- ENDIF -->  				</dl>  			<!-- END not_modified --> @@ -266,24 +266,24 @@  				<legend><img src="{T_IMAGE_PATH}file_modified.gif" alt="{L_STATUS_MODIFIED}" /></legend>  				<dl>  					<dt style="width: 60%;"><strong><!-- IF modified.DIR_PART -->{modified.DIR_PART}<br /><!-- ENDIF -->{modified.FILE_PART}</strong> -					<!-- IF modified.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{modified.CUSTOM_ORIGINAL}</span><!-- ENDIF --> +					<!-- IF modified.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{modified.CUSTOM_ORIGINAL}</span><!-- ENDIF -->  				</dt> -				<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;"> </dd> +				<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"> </dd>  				<!-- IF modified.S_CUSTOM --> -					<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;"><label><input type="checkbox" name="no_update[]" value="{modified.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd> +					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{modified.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>  				<!-- ENDIF -->  				</dl>  				<dl>  					<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="0" checked="checked" /> {L_MERGE_MODIFICATIONS_OPTION}</label></dt> -					<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{modified.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd> +					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{modified.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd>  				</dl>  				<dl>  					<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="1" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt> -					<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE --> <!-- ENDIF --></dd> +					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE --> <!-- ENDIF --></dd>  				</dl>  				<dl>  					<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt> -					<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE --> <!-- ENDIF --></dd> +					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE --> <!-- ENDIF --></dd>  				</dl>  			</fieldset>  			<!-- END modified --> @@ -299,13 +299,13 @@  			<!-- BEGIN new_conflict -->  				<dl>  					<dt style="width: 60%;"><strong><!-- IF new_conflict.DIR_PART -->{new_conflict.DIR_PART}<br /><!-- ENDIF -->{new_conflict.FILE_PART}</strong> -					<!-- IF new_conflict.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{new_conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF --> +					<!-- IF new_conflict.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{new_conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF -->  				</dt> -				<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;"> +				<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">  					<!-- IF not new_conflict.S_BINARY -->[<a href="{new_conflict.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{new_conflict.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->  				</dd>  				<!-- IF new_conflict.S_CUSTOM --> -					<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;"><label><input type="checkbox" name="no_update[]" value="{new_conflict.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd> +					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{new_conflict.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>  				<!-- ENDIF -->  				</dl>  			<!-- END new_conflict --> @@ -322,38 +322,38 @@  				<legend><img src="{T_IMAGE_PATH}file_conflict.gif" alt="{L_STATUS_CONFLICT}" /></legend>  				<dl>  					<dt style="width: 60%;"><strong><!-- IF conflict.DIR_PART -->{conflict.DIR_PART}<br /><!-- ENDIF -->{conflict.FILE_PART}</strong> -						<!-- IF conflict.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF --> -						<!-- IF conflict.NUM_CONFLICTS --><br /><span>{L_NUM_CONFLICTS}: {conflict.NUM_CONFLICTS}</span><!-- ENDIF --> +						<!-- IF conflict.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF --> +						<!-- IF conflict.NUM_CONFLICTS --><br /><span>{L_NUM_CONFLICTS}{L_COLON} {conflict.NUM_CONFLICTS}</span><!-- ENDIF -->  					</dt> -					<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;"> +					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">  						<!-- IF not conflict.S_BINARY -->[<a href="{conflict.U_SHOW_DIFF}">{L_DOWNLOAD_CONFLICTS}</a>]<br />{L_DOWNLOAD_CONFLICTS_EXPLAIN}  						<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->  					</dd>  					<!-- IF conflict.S_CUSTOM --> -						<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;"><label><input type="checkbox" name="no_update[]" value="{conflict.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd> +						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{conflict.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>  					<!-- ENDIF -->  				</dl>  				<!-- IF conflict.S_BINARY -->  					<dl>  						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="1" checked="checked" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt> -						<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;"> </dd> +						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"> </dd>  					</dl>  				<!-- ELSE -->  					<dl>  						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="3" checked="checked" /> {L_MERGE_NEW_FILE_OPTION}</label></dt> -						<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;">[<a href="{conflict.U_VIEW_NEW_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_MODIFIED}</a>]</dd> +						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_NEW_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_MODIFIED}</a>]</dd>  					</dl>  					<dl>  						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="4" /> {L_MERGE_MOD_FILE_OPTION}</label></dt> -						<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;">[<a href="{conflict.U_VIEW_MOD_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_MODIFIED}</a>]</dd> +						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_MOD_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_MODIFIED}</a>]</dd>  					</dl>  					<dl>  						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="1" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt> -						<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;">[<a href="{conflict.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd> +						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>  					</dl>  					<dl>  						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt> -						<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;">[<a href="{conflict.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd> +						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>  					</dl>  				<!-- ENDIF -->  			</fieldset> @@ -392,7 +392,7 @@  	<fieldset>  		<legend>{L_SELECT_DOWNLOAD_FORMAT}</legend>  	<dl> -		<dt><label for="use_method">{L_DOWNLOAD_AS}:</label></dt> +		<dt><label for="use_method">{L_DOWNLOAD_AS}{L_COLON}</label></dt>  		<dd>{RADIO_BUTTONS}</dd>  	</dl>  	</fieldset> @@ -455,12 +455,12 @@  	<fieldset>  		<legend>{L_FTP_SETTINGS}</legend>  	<dl> -		<dt><label>{L_UPLOAD_METHOD}:</label></dt> +		<dt><label>{L_UPLOAD_METHOD}{L_COLON}</label></dt>  		<dd><strong>{UPLOAD_METHOD}</strong></dd>  	</dl>  	<!-- BEGIN data -->  	<dl> -		<dt><label for="{data.DATA}">{data.NAME}:</label><br /><span>{data.EXPLAIN}</span></dt> +		<dt><label for="{data.DATA}">{data.NAME}{L_COLON}</label><br /><span>{data.EXPLAIN}</span></dt>  		<dd><input type="<!-- IF data.DATA == 'password' -->password<!-- ELSE -->text<!-- ENDIF -->" id="{data.DATA}" name="{data.DATA}" value="{data.DEFAULT}" /></dd>  	</dl>  	<!-- END data --> diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html index b5d25e82f2..ecdc40e157 100644 --- a/phpBB/adm/style/install_update_diff.html +++ b/phpBB/adm/style/install_update_diff.html @@ -223,7 +223,7 @@ table.hrdiff caption span {  		<p id="skip"><a href="#acp">{L_SKIP}</a></p>  		<form method="post" action="">  		<fieldset class="quick"> -			<label for="diff_mode">{L_SELECT_DIFF_MODE}:</label> +			<label for="diff_mode">{L_SELECT_DIFF_MODE}{L_COLON}</label>  			<select name="diff_mode" id="diff_mode">{S_DIFF_MODE_OPTIONS}</select>  			<input class="button1" type="submit" id="submit" name="submit" value="{L_CHANGE}" /> @@ -231,7 +231,7 @@ table.hrdiff caption span {  		</form>  <!-- ENDIF -->  <!-- IF S_DIFF_CONFLICT_FILE --> -		<div style="float: {S_CONTENT_FLOW_BEGIN};"><strong>{L_NUM_CONFLICTS}: {NUM_CONFLICTS}</strong></div> +		<div style="float: {S_CONTENT_FLOW_BEGIN};"><strong>{L_NUM_CONFLICTS}{L_COLON} {NUM_CONFLICTS}</strong></div>  		<br style="clear: both;" />  <!-- ENDIF -->  	</div> diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html index f6d0e1025f..f7902e6d2e 100644 --- a/phpBB/adm/style/overall_header.html +++ b/phpBB/adm/style/overall_header.html @@ -9,7 +9,7 @@  <script type="text/javascript">  // <![CDATA[ -var jump_page = '{LA_JUMP_PAGE}:'; +var jump_page = '{LA_JUMP_PAGE}{L_COLON}';  var on_page = '{ON_PAGE}';  var per_page = '{PER_PAGE}';  var base_url = '{A_BASE_URL}'; diff --git a/phpBB/adm/style/permission_forum_copy.html b/phpBB/adm/style/permission_forum_copy.html index a4c00c12ae..1e012a9347 100644 --- a/phpBB/adm/style/permission_forum_copy.html +++ b/phpBB/adm/style/permission_forum_copy.html @@ -12,7 +12,7 @@  		<legend>{L_LOOK_UP_FORUM}</legend>  		<dl> -			<dt><label for="src_forum">{L_COPY_PERMISSIONS_FROM}:</label><br /><span>{L_COPY_PERMISSIONS_FORUM_FROM_EXPLAIN}</span></dt> +			<dt><label for="src_forum">{L_COPY_PERMISSIONS_FROM}{L_COLON}</label><br /><span>{L_COPY_PERMISSIONS_FORUM_FROM_EXPLAIN}</span></dt>  			<dd><select id="src_forum" name="src_forum_id"><option value="0">{L_SELECT_FORUM}</option><option value="-1">------------------</option>{S_FORUM_OPTIONS}</select></dd>  		</dl>  	</fieldset> @@ -22,7 +22,7 @@  		<p>{L_LOOK_UP_FORUMS_EXPLAIN}</p>  		<dl> -			<dt><label for="dest_forums">{L_COPY_PERMISSIONS_TO}:</label><br /><span>{L_COPY_PERMISSIONS_FORUM_TO_EXPLAIN}</span></dt> +			<dt><label for="dest_forums">{L_COPY_PERMISSIONS_TO}{L_COLON}</label><br /><span>{L_COPY_PERMISSIONS_FORUM_TO_EXPLAIN}</span></dt>  			<dd><select id="dest_forums" name="dest_forum_ids[]" multiple="multiple" size="10">{S_FORUM_OPTIONS}</select></dd>  		</dl>  	</fieldset> diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html index e29609b8b6..4d52b901c3 100644 --- a/phpBB/adm/style/permission_mask.html +++ b/phpBB/adm/style/permission_mask.html @@ -38,9 +38,9 @@  			<a href="#" onclick="swap_options('{p_mask.S_ROW_COUNT}', '{p_mask.f_mask.S_ROW_COUNT}', '0', true); return false;">{L_ADVANCED_PERMISSIONS}</a><!-- IF not p_mask.S_VIEW and p_mask.f_mask.S_CUSTOM --> *<!-- ENDIF -->  		</div>  		<dl class="permissions-simple"> -			<dt style="width: 20%"><label for="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">{L_ROLE}:</label></dt> +			<dt style="width: 20%"><label for="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">{L_ROLE}{L_COLON}</label></dt>  			<!-- IF p_mask.f_mask.S_ROLE_OPTIONS --> -				<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 20%"><select id="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" name="role[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" onchange="set_role_settings(this.options[selectedIndex].value, 'advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); init_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')">{p_mask.f_mask.S_ROLE_OPTIONS}</select></dd> +				<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 20%"><select id="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" name="role[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" onchange="set_role_settings(this.options[selectedIndex].value, 'advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); init_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')">{p_mask.f_mask.S_ROLE_OPTIONS}</select></dd>  			<!-- ELSE -->  				<dd>{L_NO_ROLE_AVAILABLE}</dd>  			<!-- ENDIF --> @@ -118,7 +118,7 @@  			</div>  			<!-- IF not p_mask.S_VIEW --> -			<fieldset class="quick" style="margin-{S_CONTENT_FLOW_END}: 11px;"> +			<fieldset class="quick" style="margin-{S_CONTENT_FLOW_END}{L_COLON} 11px;">  				<p class="small">{L_APPLY_PERMISSIONS_EXPLAIN}</p>  				<input class="button1" type="submit" name="psubmit[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" value="{L_APPLY_PERMISSIONS}" />  				<!-- IF .p_mask.f_mask gt 1 or .p_mask gt 1 --> diff --git a/phpBB/adm/style/permission_roles_mask.html b/phpBB/adm/style/permission_roles_mask.html index 485858da74..277310edbf 100644 --- a/phpBB/adm/style/permission_roles_mask.html +++ b/phpBB/adm/style/permission_roles_mask.html @@ -2,7 +2,7 @@  <!-- BEGIN role_mask -->  	<table cellspacing="1"> -		<caption><!-- IF role_mask.FORUM_ID -->{L_FORUM}: <!-- ENDIF -->{role_mask.NAME}</caption> +		<caption><!-- IF role_mask.FORUM_ID -->{L_FORUM}{L_COLON} <!-- ENDIF -->{role_mask.NAME}</caption>  	<tbody>  	<tr>  		<th>{L_USERS}</th> diff --git a/phpBB/adm/style/permission_trace.html b/phpBB/adm/style/permission_trace.html index 186bb28b67..744ad3293e 100644 --- a/phpBB/adm/style/permission_trace.html +++ b/phpBB/adm/style/permission_trace.html @@ -4,7 +4,7 @@  	<!-- IF U_BACK --><a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a><!-- ENDIF --> -	<h3>{L_TRACE_FOR}: {PERMISSION_USERNAME} / <!-- IF FORUM_NAME -->{FORUM_NAME} / <!-- ENDIF -->{PERMISSION} </h3> +	<h3>{L_TRACE_FOR}{L_COLON} {PERMISSION_USERNAME} / <!-- IF FORUM_NAME -->{FORUM_NAME} / <!-- ENDIF -->{PERMISSION} </h3>  	<br /> diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html index d4cbcb6cbe..0ba445ca2a 100644 --- a/phpBB/adm/style/simple_header.html +++ b/phpBB/adm/style/simple_header.html @@ -9,7 +9,7 @@  <script type="text/javascript">  // <![CDATA[ -var jump_page = '{LA_JUMP_PAGE}:'; +var jump_page = '{LA_JUMP_PAGE}{L_COLON}';  var on_page = '{ON_PAGE}';  var per_page = '{PER_PAGE}';  var base_url = '{A_BASE_URL}'; diff --git a/phpBB/adm/style/timezone_option.html b/phpBB/adm/style/timezone_option.html index 23c0ee19e9..7a799b69c6 100644 --- a/phpBB/adm/style/timezone_option.html +++ b/phpBB/adm/style/timezone_option.html @@ -1,5 +1,5 @@  <dl> -	<dt><label for="timezone">{L_BOARD_TIMEZONE}:</label></dt> +	<dt><label for="timezone">{L_BOARD_TIMEZONE}{L_COLON}</label></dt>  	<!-- IF S_TZ_DATE_OPTIONS -->  	<dd id="tz_select_date" style="display: none;">  		<select name="tz_date" id="tz_date" class="autowidth tz_select"> diff --git a/phpBB/includes/auth/auth_ldap.php b/phpBB/includes/auth/auth_ldap.php index 26029efe1e..24823f9ce7 100644 --- a/phpBB/includes/auth/auth_ldap.php +++ b/phpBB/includes/auth/auth_ldap.php @@ -309,35 +309,35 @@ function acp_ldap(&$new)  	$tpl = '  	<dl> -		<dt><label for="ldap_server">' . $user->lang['LDAP_SERVER'] . ':</label><br /><span>' . $user->lang['LDAP_SERVER_EXPLAIN'] . '</span></dt> +		<dt><label for="ldap_server">' . $user->lang['LDAP_SERVER'] . $user->lang['COLON'] . '</label><br /><span>' . $user->lang['LDAP_SERVER_EXPLAIN'] . '</span></dt>  		<dd><input type="text" id="ldap_server" size="40" name="config[ldap_server]" value="' . $new['ldap_server'] . '" /></dd>  	</dl>  	<dl> -		<dt><label for="ldap_port">' . $user->lang['LDAP_PORT'] . ':</label><br /><span>' . $user->lang['LDAP_PORT_EXPLAIN'] . '</span></dt> +		<dt><label for="ldap_port">' . $user->lang['LDAP_PORT'] . $user->lang['COLON'] . '</label><br /><span>' . $user->lang['LDAP_PORT_EXPLAIN'] . '</span></dt>  		<dd><input type="text" id="ldap_port" size="40" name="config[ldap_port]" value="' . $new['ldap_port'] . '" /></dd>  	</dl>  	<dl> -		<dt><label for="ldap_dn">' . $user->lang['LDAP_DN'] . ':</label><br /><span>' . $user->lang['LDAP_DN_EXPLAIN'] . '</span></dt> +		<dt><label for="ldap_dn">' . $user->lang['LDAP_DN'] . $user->lang['COLON'] . '</label><br /><span>' . $user->lang['LDAP_DN_EXPLAIN'] . '</span></dt>  		<dd><input type="text" id="ldap_dn" size="40" name="config[ldap_base_dn]" value="' . $new['ldap_base_dn'] . '" /></dd>  	</dl>  	<dl> -		<dt><label for="ldap_uid">' . $user->lang['LDAP_UID'] . ':</label><br /><span>' . $user->lang['LDAP_UID_EXPLAIN'] . '</span></dt> +		<dt><label for="ldap_uid">' . $user->lang['LDAP_UID'] . $user->lang['COLON'] . '</label><br /><span>' . $user->lang['LDAP_UID_EXPLAIN'] . '</span></dt>  		<dd><input type="text" id="ldap_uid" size="40" name="config[ldap_uid]" value="' . $new['ldap_uid'] . '" /></dd>  	</dl>  	<dl> -		<dt><label for="ldap_user_filter">' . $user->lang['LDAP_USER_FILTER'] . ':</label><br /><span>' . $user->lang['LDAP_USER_FILTER_EXPLAIN'] . '</span></dt> +		<dt><label for="ldap_user_filter">' . $user->lang['LDAP_USER_FILTER'] . $user->lang['COLON'] . '</label><br /><span>' . $user->lang['LDAP_USER_FILTER_EXPLAIN'] . '</span></dt>  		<dd><input type="text" id="ldap_user_filter" size="40" name="config[ldap_user_filter]" value="' . $new['ldap_user_filter'] . '" /></dd>  	</dl>  	<dl> -		<dt><label for="ldap_email">' . $user->lang['LDAP_EMAIL'] . ':</label><br /><span>' . $user->lang['LDAP_EMAIL_EXPLAIN'] . '</span></dt> +		<dt><label for="ldap_email">' . $user->lang['LDAP_EMAIL'] . $user->lang['COLON'] . '</label><br /><span>' . $user->lang['LDAP_EMAIL_EXPLAIN'] . '</span></dt>  		<dd><input type="text" id="ldap_email" size="40" name="config[ldap_email]" value="' . $new['ldap_email'] . '" /></dd>  	</dl>  	<dl> -		<dt><label for="ldap_user">' . $user->lang['LDAP_USER'] . ':</label><br /><span>' . $user->lang['LDAP_USER_EXPLAIN'] . '</span></dt> +		<dt><label for="ldap_user">' . $user->lang['LDAP_USER'] . $user->lang['COLON'] . '</label><br /><span>' . $user->lang['LDAP_USER_EXPLAIN'] . '</span></dt>  		<dd><input type="text" id="ldap_user" size="40" name="config[ldap_user]" value="' . $new['ldap_user'] . '" /></dd>  	</dl>  	<dl> -		<dt><label for="ldap_password">' . $user->lang['LDAP_PASSWORD'] . ':</label><br /><span>' . $user->lang['LDAP_PASSWORD_EXPLAIN'] . '</span></dt> +		<dt><label for="ldap_password">' . $user->lang['LDAP_PASSWORD'] . $user->lang['COLON'] . '</label><br /><span>' . $user->lang['LDAP_PASSWORD_EXPLAIN'] . '</span></dt>  		<dd><input type="password" id="ldap_password" size="40" name="config[ldap_password]" value="' . $new['ldap_password'] . '" autocomplete="off" /></dd>  	</dl>  	'; diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php index 700b8695dc..58a4dd7d6a 100644 --- a/phpBB/includes/search/fulltext_mysql.php +++ b/phpBB/includes/search/fulltext_mysql.php @@ -905,11 +905,11 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base  	{  		$tpl = '  		<dl> -			<dt><label>' . $this->user->lang['MIN_SEARCH_CHARS'] . ':</label><br /><span>' . $this->user->lang['FULLTEXT_MYSQL_MIN_SEARCH_CHARS_EXPLAIN'] . '</span></dt> +			<dt><label>' . $this->user->lang['MIN_SEARCH_CHARS'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_MYSQL_MIN_SEARCH_CHARS_EXPLAIN'] . '</span></dt>  			<dd>' . $this->config['fulltext_mysql_min_word_len'] . '</dd>  		</dl>  		<dl> -			<dt><label>' . $this->user->lang['MAX_SEARCH_CHARS'] . ':</label><br /><span>' . $this->user->lang['FULLTEXT_MYSQL_MAX_SEARCH_CHARS_EXPLAIN'] . '</span></dt> +			<dt><label>' . $this->user->lang['MAX_SEARCH_CHARS'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_MYSQL_MAX_SEARCH_CHARS_EXPLAIN'] . '</span></dt>  			<dd>' . $this->config['fulltext_mysql_max_word_len'] . '</dd>  		</dl>  		'; diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php index e25b1fe11d..4623326fc7 100644 --- a/phpBB/includes/search/fulltext_native.php +++ b/phpBB/includes/search/fulltext_native.php @@ -1791,19 +1791,19 @@ class phpbb_search_fulltext_native extends phpbb_search_base  		$tpl = '  		<dl> -			<dt><label for="fulltext_native_load_upd">' . $this->user->lang['YES_SEARCH_UPDATE'] . ':</label><br /><span>' . $this->user->lang['YES_SEARCH_UPDATE_EXPLAIN'] . '</span></dt> +			<dt><label for="fulltext_native_load_upd">' . $this->user->lang['YES_SEARCH_UPDATE'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['YES_SEARCH_UPDATE_EXPLAIN'] . '</span></dt>  			<dd><label><input type="radio" id="fulltext_native_load_upd" name="config[fulltext_native_load_upd]" value="1"' . (($this->config['fulltext_native_load_upd']) ? ' checked="checked"' : '') . ' class="radio" /> ' . $this->user->lang['YES'] . '</label><label><input type="radio" name="config[fulltext_native_load_upd]" value="0"' . ((!$this->config['fulltext_native_load_upd']) ? ' checked="checked"' : '') . ' class="radio" /> ' . $this->user->lang['NO'] . '</label></dd>  		</dl>  		<dl> -			<dt><label for="fulltext_native_min_chars">' . $this->user->lang['MIN_SEARCH_CHARS'] . ':</label><br /><span>' . $this->user->lang['MIN_SEARCH_CHARS_EXPLAIN'] . '</span></dt> +			<dt><label for="fulltext_native_min_chars">' . $this->user->lang['MIN_SEARCH_CHARS'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['MIN_SEARCH_CHARS_EXPLAIN'] . '</span></dt>  			<dd><input id="fulltext_native_min_chars" type="text" size="3" maxlength="3" name="config[fulltext_native_min_chars]" value="' . (int) $this->config['fulltext_native_min_chars'] . '" /></dd>  		</dl>  		<dl> -			<dt><label for="fulltext_native_max_chars">' . $this->user->lang['MAX_SEARCH_CHARS'] . ':</label><br /><span>' . $this->user->lang['MAX_SEARCH_CHARS_EXPLAIN'] . '</span></dt> +			<dt><label for="fulltext_native_max_chars">' . $this->user->lang['MAX_SEARCH_CHARS'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['MAX_SEARCH_CHARS_EXPLAIN'] . '</span></dt>  			<dd><input id="fulltext_native_max_chars" type="text" size="3" maxlength="3" name="config[fulltext_native_max_chars]" value="' . (int) $this->config['fulltext_native_max_chars'] . '" /></dd>  		</dl>  		<dl> -			<dt><label for="fulltext_native_common_thres">' . $this->user->lang['COMMON_WORD_THRESHOLD'] . ':</label><br /><span>' . $this->user->lang['COMMON_WORD_THRESHOLD_EXPLAIN'] . '</span></dt> +			<dt><label for="fulltext_native_common_thres">' . $this->user->lang['COMMON_WORD_THRESHOLD'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['COMMON_WORD_THRESHOLD_EXPLAIN'] . '</span></dt>  			<dd><input id="fulltext_native_common_thres" type="text" size="3" maxlength="3" name="config[fulltext_native_common_thres]" value="' . (double) $this->config['fulltext_native_common_thres'] . '" /> %</dd>  		</dl>  		'; diff --git a/phpBB/includes/search/fulltext_postgres.php b/phpBB/includes/search/fulltext_postgres.php index 34a27f294c..08f64735b6 100644 --- a/phpBB/includes/search/fulltext_postgres.php +++ b/phpBB/includes/search/fulltext_postgres.php @@ -884,11 +884,11 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base  		$tpl .= '</select></dd>  		</dl>                  <dl> -                        <dt><label for="fulltext_postgres_min_word_len">' . $this->user->lang['FULLTEXT_POSTGRES_MIN_WORD_LEN'] . ':</label><br /><span>' . $this->user->lang['FULLTEXT_POSTGRES_MIN_WORD_LEN_EXPLAIN'] . '</span></dt> +                        <dt><label for="fulltext_postgres_min_word_len">' . $this->user->lang['FULLTEXT_POSTGRES_MIN_WORD_LEN'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_POSTGRES_MIN_WORD_LEN_EXPLAIN'] . '</span></dt>                          <dd><input id="fulltext_postgres_min_word_len" type="text" size="3" maxlength="3" name="config[fulltext_postgres_min_word_len]" value="' . (int) $this->config['fulltext_postgres_min_word_len'] . '" /></dd>                  </dl>                  <dl> -                        <dt><label for="fulltext_postgres_max_word_len">' . $this->user->lang['FULLTEXT_POSTGRES_MAX_WORD_LEN'] . ':</label><br /><span>' . $this->user->lang['FULLTEXT_POSTGRES_MAX_WORD_LEN_EXPLAIN'] . '</span></dt> +                        <dt><label for="fulltext_postgres_max_word_len">' . $this->user->lang['FULLTEXT_POSTGRES_MAX_WORD_LEN'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_POSTGRES_MAX_WORD_LEN_EXPLAIN'] . '</span></dt>                          <dd><input id="fulltext_postgres_max_word_len" type="text" size="3" maxlength="3" name="config[fulltext_postgres_max_word_len]" value="' . (int) $this->config['fulltext_postgres_max_word_len'] . '" /></dd>                  </dl>  		'; diff --git a/phpBB/includes/search/fulltext_sphinx.php b/phpBB/includes/search/fulltext_sphinx.php index 674029fe6c..dd5634b623 100644 --- a/phpBB/includes/search/fulltext_sphinx.php +++ b/phpBB/includes/search/fulltext_sphinx.php @@ -862,23 +862,23 @@ class phpbb_search_fulltext_sphinx  		$tpl = '  		<span class="error">' . $this->user->lang['FULLTEXT_SPHINX_CONFIGURE']. '</span>  		<dl> -			<dt><label for="fulltext_sphinx_data_path">' . $this->user->lang['FULLTEXT_SPHINX_DATA_PATH'] . ':</label><br /><span>' . $this->user->lang['FULLTEXT_SPHINX_DATA_PATH_EXPLAIN'] . '</span></dt> +			<dt><label for="fulltext_sphinx_data_path">' . $this->user->lang['FULLTEXT_SPHINX_DATA_PATH'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_SPHINX_DATA_PATH_EXPLAIN'] . '</span></dt>  			<dd><input id="fulltext_sphinx_data_path" type="text" size="40" maxlength="255" name="config[fulltext_sphinx_data_path]" value="' . $this->config['fulltext_sphinx_data_path'] . '" /></dd>  		</dl>  		<dl> -			<dt><label for="fulltext_sphinx_host">' . $this->user->lang['FULLTEXT_SPHINX_HOST'] . ':</label><br /><span>' . $this->user->lang['FULLTEXT_SPHINX_HOST_EXPLAIN'] . '</span></dt> +			<dt><label for="fulltext_sphinx_host">' . $this->user->lang['FULLTEXT_SPHINX_HOST'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_SPHINX_HOST_EXPLAIN'] . '</span></dt>  			<dd><input id="fulltext_sphinx_host" type="text" size="40" maxlength="255" name="config[fulltext_sphinx_host]" value="' . $this->config['fulltext_sphinx_host'] . '" /></dd>  		</dl>  		<dl> -			<dt><label for="fulltext_sphinx_port">' . $this->user->lang['FULLTEXT_SPHINX_PORT'] . ':</label><br /><span>' . $this->user->lang['FULLTEXT_SPHINX_PORT_EXPLAIN'] . '</span></dt> +			<dt><label for="fulltext_sphinx_port">' . $this->user->lang['FULLTEXT_SPHINX_PORT'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_SPHINX_PORT_EXPLAIN'] . '</span></dt>  			<dd><input id="fulltext_sphinx_port" type="text" size="4" maxlength="10" name="config[fulltext_sphinx_port]" value="' . $this->config['fulltext_sphinx_port'] . '" /></dd>  		</dl>  		<dl> -			<dt><label for="fulltext_sphinx_indexer_mem_limit">' . $this->user->lang['FULLTEXT_SPHINX_INDEXER_MEM_LIMIT'] . ':</label><br /><span>' . $this->user->lang['FULLTEXT_SPHINX_INDEXER_MEM_LIMIT_EXPLAIN'] . '</span></dt> +			<dt><label for="fulltext_sphinx_indexer_mem_limit">' . $this->user->lang['FULLTEXT_SPHINX_INDEXER_MEM_LIMIT'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_SPHINX_INDEXER_MEM_LIMIT_EXPLAIN'] . '</span></dt>  			<dd><input id="fulltext_sphinx_indexer_mem_limit" type="text" size="4" maxlength="10" name="config[fulltext_sphinx_indexer_mem_limit]" value="' . $this->config['fulltext_sphinx_indexer_mem_limit'] . '" />' . $this->user->lang['MIB'] . '</dd>  		</dl>  		<dl> -			<dt><label for="fulltext_sphinx_config_file">' . $this->user->lang['FULLTEXT_SPHINX_CONFIG_FILE'] . ':</label><br /><span>' . $this->user->lang['FULLTEXT_SPHINX_CONFIG_FILE_EXPLAIN'] . '</dt> +			<dt><label for="fulltext_sphinx_config_file">' . $this->user->lang['FULLTEXT_SPHINX_CONFIG_FILE'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_SPHINX_CONFIG_FILE_EXPLAIN'] . '</dt>  			<dd>' . (($this->config_generate()) ? '<textarea readonly="readonly" rows="6">' . $this->config_file_data . '</textarea>' : $this->config_file_data) . '</dd>  		<dl>  		'; diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index 934ff566cc..5577e8dab3 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -838,11 +838,11 @@ function compose_pm($id, $mode, $action, $user_folders = array())  			$post_id = request_var('p', 0);  			if ($config['allow_post_links'])  			{ -				$message_link = "[url=" . generate_board_url() . "/viewtopic.$phpEx?p={$post_id}#p{$post_id}]{$user->lang['SUBJECT']}: {$message_subject}[/url]\n\n"; +				$message_link = "[url=" . generate_board_url() . "/viewtopic.$phpEx?p={$post_id}#p{$post_id}]{$user->lang['SUBJECT']}{$user->lang['COLON']} {$message_subject}[/url]\n\n";  			}  			else  			{ -				$message_link = $user->lang['SUBJECT'] . ': ' . $message_subject . " (" . generate_board_url() . "/viewtopic.$phpEx?p={$post_id}#p{$post_id})\n\n"; +				$message_link = $user->lang['SUBJECT'] . $user->lang['COLON'] . ' ' . $message_subject . " (" . generate_board_url() . "/viewtopic.$phpEx?p={$post_id}#p{$post_id})\n\n";  			}  		}  		else diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index e6022e3b79..4300ef431a 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -134,6 +134,7 @@ $lang = array_merge($lang, array(  	'COLLAPSE_VIEW'			=> 'Collapse view',  	'CLOSE_WINDOW'			=> 'Close window',  	'COLOUR_SWATCH'			=> 'Colour swatch', +	'COLON'					=> ':',  	'COMMA_SEPARATOR'		=> ', ',	// Comma used to join lists into a single string, use localised comma if appropriate, eg: Ideographic or Arabic  	'CONFIRM'				=> 'Confirm',  	'CONFIRM_CODE'			=> 'Confirmation code', diff --git a/phpBB/styles/prosilver/template/bbcode.html b/phpBB/styles/prosilver/template/bbcode.html index dac2929a0f..c0c0a2da46 100644 --- a/phpBB/styles/prosilver/template/bbcode.html +++ b/phpBB/styles/prosilver/template/bbcode.html @@ -8,11 +8,11 @@  <!-- BEGIN listitem --><li><!-- END listitem -->  <!-- BEGIN listitem_close --></li><!-- END listitem_close --> -<!-- BEGIN quote_username_open --><blockquote><div><cite>{USERNAME} {L_WROTE}:</cite><!-- END quote_username_open --> +<!-- BEGIN quote_username_open --><blockquote><div><cite>{USERNAME} {L_WROTE}{L_COLON}</cite><!-- END quote_username_open -->  <!-- BEGIN quote_open --><blockquote class="uncited"><div><!-- END quote_open -->  <!-- BEGIN quote_close --></div></blockquote><!-- END quote_close --> -<!-- BEGIN code_open --><dl class="codebox"><dt>{L_CODE}: <a href="#" onclick="selectCode(this); return false;">{L_SELECT_ALL_CODE}</a></dt><dd><code><!-- END code_open --> +<!-- BEGIN code_open --><dl class="codebox"><dt>{L_CODE}{L_COLON} <a href="#" onclick="selectCode(this); return false;">{L_SELECT_ALL_CODE}</a></dt><dd><code><!-- END code_open -->  <!-- BEGIN code_close --></code></dd></dl><!-- END code_close -->  <!-- BEGIN inline_attachment_open --><div class="inline-attachment"><!-- END inline_attachment_open --> diff --git a/phpBB/styles/prosilver/template/captcha_default.html b/phpBB/styles/prosilver/template/captcha_default.html index 007cff644f..c9c5295d13 100644 --- a/phpBB/styles/prosilver/template/captcha_default.html +++ b/phpBB/styles/prosilver/template/captcha_default.html @@ -9,7 +9,7 @@  <!-- ENDIF -->  	<dl> -		<dt><label for="confirm_code">{L_CONFIRM_CODE}:</label></dt> +		<dt><label for="confirm_code">{L_CONFIRM_CODE}{L_COLON}</label></dt>  		<dd><img src="{CONFIRM_IMAGE_LINK}" alt="{L_CONFIRM_CODE}" /></dd>  		<dd><input type="text" name="confirm_code" id="confirm_code" size="8" maxlength="8" tabindex="{$CAPTCHA_TAB_INDEX}" class="inputbox narrow" title="{L_CONFIRM_CODE}" />  		<!-- IF S_CONFIRM_REFRESH --><input type="submit" name="refresh_vc" id="refresh_vc" class="button2" value="{L_VC_REFRESH}" /><!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/captcha_qa.html b/phpBB/styles/prosilver/template/captcha_qa.html index 7986b1faa2..c179f6dc20 100644 --- a/phpBB/styles/prosilver/template/captcha_qa.html +++ b/phpBB/styles/prosilver/template/captcha_qa.html @@ -7,7 +7,7 @@  <!-- ENDIF -->  	<dl> -	<dt><label>{QA_CONFIRM_QUESTION}:</label><br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt> +	<dt><label>{QA_CONFIRM_QUESTION}{L_COLON}</label><br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>  	<dd>  		<input type="text" tabindex="{$CAPTCHA_TAB_INDEX}" name="qa_answer" id="answer" size="45"  class="inputbox autowidth" title="{L_ANSWER}" />  		<input type="hidden" name="qa_confirm_id" id="qa_confirm_id" value="{QA_CONFIRM_ID}" /> diff --git a/phpBB/styles/prosilver/template/captcha_recaptcha.html b/phpBB/styles/prosilver/template/captcha_recaptcha.html index 087a5b9405..aad1008241 100644 --- a/phpBB/styles/prosilver/template/captcha_recaptcha.html +++ b/phpBB/styles/prosilver/template/captcha_recaptcha.html @@ -10,7 +10,7 @@  <!-- IF S_RECAPTCHA_AVAILABLE -->  	<dl> -	<dt><label>{L_CONFIRM_CODE}</label>:<br /><span>{L_RECAPTCHA_EXPLAIN}</span></dt> +	<dt><label>{L_CONFIRM_CODE}{L_COLON}</label><br /><span>{L_RECAPTCHA_EXPLAIN}</span></dt>  	<dd>  		<script type="text/javascript">  		// <![CDATA[ diff --git a/phpBB/styles/prosilver/template/custom_profile_fields.html b/phpBB/styles/prosilver/template/custom_profile_fields.html index 44c68f532b..9c627a509d 100644 --- a/phpBB/styles/prosilver/template/custom_profile_fields.html +++ b/phpBB/styles/prosilver/template/custom_profile_fields.html @@ -25,7 +25,7 @@  <!-- END int -->  <!-- BEGIN date --> -<label for="{date.FIELD_IDENT}_day">{L_DAY}: <select name="{date.FIELD_IDENT}_day" id="{date.FIELD_IDENT}_day">{date.S_DAY_OPTIONS}</select></label>  -<label for="{date.FIELD_IDENT}_month">{L_MONTH}: <select name="{date.FIELD_IDENT}_month" id="{date.FIELD_IDENT}_month">{date.S_MONTH_OPTIONS}</select></label>  -<label for="{date.FIELD_IDENT}_year">{L_YEAR}: <select name="{date.FIELD_IDENT}_year" id="{date.FIELD_IDENT}_year">{date.S_YEAR_OPTIONS}</select></label> +<label for="{date.FIELD_IDENT}_day">{L_DAY}{L_COLON} <select name="{date.FIELD_IDENT}_day" id="{date.FIELD_IDENT}_day">{date.S_DAY_OPTIONS}</select></label>  +<label for="{date.FIELD_IDENT}_month">{L_MONTH}{L_COLON} <select name="{date.FIELD_IDENT}_month" id="{date.FIELD_IDENT}_month">{date.S_MONTH_OPTIONS}</select></label>  +<label for="{date.FIELD_IDENT}_year">{L_YEAR}{L_COLON} <select name="{date.FIELD_IDENT}_year" id="{date.FIELD_IDENT}_year">{date.S_YEAR_OPTIONS}</select></label>  <!-- END date --> diff --git a/phpBB/styles/prosilver/template/drafts.html b/phpBB/styles/prosilver/template/drafts.html index c3c54876e3..b6e6a7f5b7 100644 --- a/phpBB/styles/prosilver/template/drafts.html +++ b/phpBB/styles/prosilver/template/drafts.html @@ -28,8 +28,8 @@  		<dl>  			<dt>  				<a href="{draftrow.U_INSERT}" title="{L_LOAD_DRAFT}" class="topictitle">{draftrow.DRAFT_SUBJECT}</a><br /> -				<!-- IF not S_PRIVMSGS --><!-- IF draftrow.S_LINK_TOPIC -->{L_TOPIC}: <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a> -				<!-- ELSEIF draftrow.S_LINK_FORUM -->{L_FORUM}: <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a> +				<!-- IF not S_PRIVMSGS --><!-- IF draftrow.S_LINK_TOPIC -->{L_TOPIC}{L_COLON} <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a> +				<!-- ELSEIF draftrow.S_LINK_FORUM -->{L_FORUM}{L_COLON} <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a>  				<!-- ELSE -->{L_NO_TOPIC_FORUM}<!-- ENDIF --><!-- ENDIF -->  			</dt>  			<dd class="posted">{draftrow.DATE}</dd> diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html index 488658d806..8762cb0c2e 100644 --- a/phpBB/styles/prosilver/template/forumlist_body.html +++ b/phpBB/styles/prosilver/template/forumlist_body.html @@ -33,7 +33,7 @@  					<a href="{forumrow.U_VIEWFORUM}" class="forumtitle">{forumrow.FORUM_NAME}</a><br />  					{forumrow.FORUM_DESC}  					<!-- IF forumrow.MODERATORS --> -						<br /><strong>{forumrow.L_MODERATOR_STR}:</strong> {forumrow.MODERATORS} +						<br /><strong>{forumrow.L_MODERATOR_STR}{L_COLON}</strong> {forumrow.MODERATORS}  					<!-- ENDIF -->  					<!-- IF .forumrow.subforum and forumrow.S_LIST_SUBFORUMS -->  						<br /><strong>{forumrow.L_SUBFORUM_STR}</strong> @@ -43,7 +43,7 @@  					<!-- ENDIF -->  				</dt>  				<!-- IF forumrow.CLICKS --> -					<dd class="redirect"><span>{L_REDIRECTS}: {forumrow.CLICKS}</span></dd> +					<dd class="redirect"><span>{L_REDIRECTS}{L_COLON} {forumrow.CLICKS}</span></dd>  				<!-- ELSEIF not forumrow.S_IS_LINK -->  					<dd class="topics">{forumrow.TOPICS} <dfn>{L_TOPICS}</dfn></dd>  					<dd class="posts">{forumrow.POSTS} <dfn>{L_POSTS}</dfn></dd> diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html index 5962166dbc..6babbf5997 100644 --- a/phpBB/styles/prosilver/template/index_body.html +++ b/phpBB/styles/prosilver/template/index_body.html @@ -18,8 +18,8 @@  	<form method="post" action="{S_LOGIN_ACTION}" class="headerspace">  	<h3><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a><!-- IF S_REGISTER_ENABLED -->  •  <a href="{U_REGISTER}">{L_REGISTER}</a><!-- ENDIF --></h3>  		<fieldset class="quick-login"> -			<label for="username">{L_USERNAME}:</label> <input type="text" name="username" id="username" size="10" class="inputbox" title="{L_USERNAME}" /> -			<label for="password">{L_PASSWORD}:</label> <input type="password" name="password" id="password" size="10" class="inputbox" title="{L_PASSWORD}" /> +			<label for="username">{L_USERNAME}{L_COLON}</label> <input type="text" name="username" id="username" size="10" class="inputbox" title="{L_USERNAME}" /> +			<label for="password">{L_PASSWORD}{L_COLON}</label> <input type="password" name="password" id="password" size="10" class="inputbox" title="{L_PASSWORD}" />  			<!-- IF S_AUTOLOGIN_ENABLED -->  				| <label for="autologin">{L_LOG_ME_IN} <input type="checkbox" name="autologin" id="autologin" /></label>  			<!-- ENDIF --> @@ -32,12 +32,12 @@  <!-- IF S_DISPLAY_ONLINE_LIST -->  	<!-- IF U_VIEWONLINE --><h3><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h3><!-- ELSE --><h3>{L_WHO_IS_ONLINE}</h3><!-- ENDIF -->  	<p>{TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})<br />{RECORD_USERS}<br /> <br />{LOGGED_IN_USER_LIST} -	<!-- IF LEGEND --><br /><em>{L_LEGEND}: {LEGEND}</em><!-- ENDIF --></p> +	<!-- IF LEGEND --><br /><em>{L_LEGEND}{L_COLON} {LEGEND}</em><!-- ENDIF --></p>  <!-- ENDIF -->  <!-- IF S_DISPLAY_BIRTHDAY_LIST -->  	<h3>{L_BIRTHDAYS}</h3> -	<p><!-- IF .birthdays -->{L_CONGRATULATIONS}: <strong><!-- BEGIN birthdays -->{birthdays.USERNAME}<!-- IF birthdays.AGE !== '' --> ({birthdays.AGE})<!-- ENDIF --><!-- IF not birthdays.S_LAST_ROW -->, <!-- ENDIF --><!-- END birthdays --></strong><!-- ELSE -->{L_NO_BIRTHDAYS}<!-- ENDIF --></p> +	<p><!-- IF .birthdays -->{L_CONGRATULATIONS}{L_COLON} <strong><!-- BEGIN birthdays -->{birthdays.USERNAME}<!-- IF birthdays.AGE !== '' --> ({birthdays.AGE})<!-- ENDIF --><!-- IF not birthdays.S_LAST_ROW -->, <!-- ENDIF --><!-- END birthdays --></strong><!-- ELSE -->{L_NO_BIRTHDAYS}<!-- ENDIF --></p>  <!-- ENDIF -->  <!-- IF NEWEST_USER --> diff --git a/phpBB/styles/prosilver/template/jumpbox.html b/phpBB/styles/prosilver/template/jumpbox.html index 1029627561..0060e83b15 100644 --- a/phpBB/styles/prosilver/template/jumpbox.html +++ b/phpBB/styles/prosilver/template/jumpbox.html @@ -4,7 +4,7 @@  <!-- ELSEIF S_VIEWFORUM -->  	<p></p><p><a href="{U_INDEX}" class="left-box {S_CONTENT_FLOW_BEGIN}" accesskey="r">{L_RETURN_TO} {L_INDEX}</a></p>  <!-- ELSEIF SEARCH_TOPIC --> -	<p></p><p><a class="left-box {S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH_TOPIC}" accesskey="r">{L_RETURN_TO}: {SEARCH_TOPIC}</a></p> +	<p></p><p><a class="left-box {S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH_TOPIC}" accesskey="r">{L_RETURN_TO}{L_COLON} {SEARCH_TOPIC}</a></p>  <!-- ELSEIF S_SEARCH_ACTION -->  	<p></p><p><a class="left-box {S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH}" title="{L_SEARCH_ADV}" accesskey="r">{L_RETURN_TO_SEARCH_ADV}</a></p>  <!-- ENDIF --> @@ -17,7 +17,7 @@  	<!-- ELSE -->  		<fieldset class="jumpbox">  	<!-- ENDIF --> -			<label for="f" accesskey="j"><!-- IF S_IN_MCP and S_MERGE_SELECT -->{L_SELECT_TOPICS_FROM}<!-- ELSEIF S_IN_MCP -->{L_MODERATE_FORUM}<!-- ELSE -->{L_JUMP_TO}<!-- ENDIF -->:</label> +			<label for="f" accesskey="j"><!-- IF S_IN_MCP and S_MERGE_SELECT -->{L_SELECT_TOPICS_FROM}<!-- ELSEIF S_IN_MCP -->{L_MODERATE_FORUM}<!-- ELSE -->{L_JUMP_TO}<!-- ENDIF -->{L_COLON}</label>  			<select name="f" id="f" onchange="if(this.options[this.selectedIndex].value != -1){ document.forms['jumpbox'].submit() }">  			<!-- BEGIN jumpbox_forums -->  				<!-- IF jumpbox_forums.S_FORUM_COUNT == 1 --><option value="-1">------------------</option><!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/login_body.html b/phpBB/styles/prosilver/template/login_body.html index 90d8191676..89ef8acd6f 100644 --- a/phpBB/styles/prosilver/template/login_body.html +++ b/phpBB/styles/prosilver/template/login_body.html @@ -18,11 +18,11 @@  		<fieldset <!-- IF not S_CONFIRM_CODE -->class="fields1"<!-- ELSE -->class="fields2"<!-- ENDIF -->>  		<!-- IF LOGIN_ERROR --><div class="error">{LOGIN_ERROR}</div><!-- ENDIF -->  		<dl> -			<dt><label for="{USERNAME_CREDENTIAL}">{L_USERNAME}:</label></dt> +			<dt><label for="{USERNAME_CREDENTIAL}">{L_USERNAME}{L_COLON}</label></dt>  			<dd><input type="text" tabindex="1" name="{USERNAME_CREDENTIAL}" id="{USERNAME_CREDENTIAL}" size="25" value="{USERNAME}" class="inputbox autowidth" /></dd>  		</dl>  		<dl> -			<dt><label for="{PASSWORD_CREDENTIAL}">{L_PASSWORD}:</label></dt> +			<dt><label for="{PASSWORD_CREDENTIAL}">{L_PASSWORD}{L_COLON}</label></dt>  			<dd><input type="password" tabindex="2" id="{PASSWORD_CREDENTIAL}" name="{PASSWORD_CREDENTIAL}" size="25" class="inputbox autowidth" /></dd>  			<!-- IF S_DISPLAY_FULL_LOGIN and (U_SEND_PASSWORD or U_RESEND_ACTIVATION) -->  				<!-- IF U_SEND_PASSWORD --><dd><a href="{U_SEND_PASSWORD}">{L_FORGOT_PASS}</a></dd><!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/login_forum.html b/phpBB/styles/prosilver/template/login_forum.html index 13669a78bb..63f0b2e0f7 100644 --- a/phpBB/styles/prosilver/template/login_forum.html +++ b/phpBB/styles/prosilver/template/login_forum.html @@ -17,7 +17,7 @@  		</dl>  	<!-- ENDIF -->  	<dl> -		<dt><label for="password">{L_PASSWORD}:</label></dt> +		<dt><label for="password">{L_PASSWORD}{L_COLON}</label></dt>  		<dd><input class="inputbox narrow" type="password" name="password" id="password" size="25" tabindex="1" /></dd>  	</dl>  	<dl class="fields2"> diff --git a/phpBB/styles/prosilver/template/mcp_approve.html b/phpBB/styles/prosilver/template/mcp_approve.html index 8b7f7c8c6d..faa88aefc7 100644 --- a/phpBB/styles/prosilver/template/mcp_approve.html +++ b/phpBB/styles/prosilver/template/mcp_approve.html @@ -20,14 +20,14 @@  		<!-- IF not S_APPROVE -->  			<dl class="fields2 nobg"> -				<dt><label>{L_DISAPPROVE_REASON}:</label></dt> +				<dt><label>{L_DISAPPROVE_REASON}{L_COLON}</label></dt>  				<dd><select name="reason_id">  					<!-- BEGIN reason --><option value="{reason.ID}"<!-- IF reason.S_SELECTED --> selected="selected"<!-- ENDIF -->>{reason.DESCRIPTION}</option><!-- END reason -->  					</select>  				</dd>  			</dl>  			<dl class="fields2 nobg"> -				<dt><label for="reason">{L_MORE_INFO}:</label><br /><span>{L_CAN_LEAVE_BLANK}</span></dt> +				<dt><label for="reason">{L_MORE_INFO}{L_COLON}</label><br /><span>{L_CAN_LEAVE_BLANK}</span></dt>  				<dd><textarea class="inputbox" name="reason" id="reason" rows="4" cols="40">{REASON}</textarea></dd>  			</dl>  		<!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/mcp_ban.html b/phpBB/styles/prosilver/template/mcp_ban.html index adcd86d057..591dbf8076 100644 --- a/phpBB/styles/prosilver/template/mcp_ban.html +++ b/phpBB/styles/prosilver/template/mcp_ban.html @@ -43,28 +43,28 @@  	<fieldset>  	<dl> -		<dt><label for="ban">{L_BAN_CELL}:</label></dt> +		<dt><label for="ban">{L_BAN_CELL}{L_COLON}</label></dt>  		<dd><label for="ban"><textarea name="ban" id="ban" class="inputbox" cols="40" rows="3">{BAN_QUANTIFIER}</textarea></label></dd>  		<!-- IF S_USERNAME_BAN --><dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></strong></dd><!-- ENDIF -->  	</dl>  	<dl> -		<dt><label for="banlength">{L_BAN_LENGTH}:</label></dt> +		<dt><label for="banlength">{L_BAN_LENGTH}{L_COLON}</label></dt>  		<dd><label for="banlength"><select name="banlength" id="banlength" onchange="if(this.value==-1){document.getElementById('banlengthother').style.display = 'block';}else{document.getElementById('banlengthother').style.display='none';}">{S_BAN_END_OPTIONS}</select></label></dd>  		<dd id="banlengthother" style="display: none;"><label><input type="text" name="banlengthother" class="inputbox" /><br /><span>{L_YEAR_MONTH_DAY}</span></label></dd>  	</dl>  	<dl> -		<dt><label for="banreason">{L_BAN_REASON}:</label></dt> +		<dt><label for="banreason">{L_BAN_REASON}{L_COLON}</label></dt>  		<dd><input name="banreason" id="banreason" type="text" class="inputbox" maxlength="255" /></dd>  	</dl>  	<dl> -		<dt><label for="bangivereason">{L_BAN_GIVE_REASON}:</label></dt> +		<dt><label for="bangivereason">{L_BAN_GIVE_REASON}{L_COLON}</label></dt>  		<dd><input name="bangivereason" id="bangivereason" type="text" class="inputbox" maxlength="255" /></dd>  	</dl>  	<hr />  	<dl> -		<dt><label for="banexclude0">{L_BAN_EXCLUDE}:</label><br /><span>{L_BAN_EXCLUDE_EXPLAIN}</span></dt> +		<dt><label for="banexclude0">{L_BAN_EXCLUDE}{L_COLON}</label><br /><span>{L_BAN_EXCLUDE_EXPLAIN}</span></dt>  		<dd>  			<label for="banexclude1"><input type="radio" name="banexclude" id="banexclude1" value="1" /> {L_YES}</label>   			<label for="banexclude0"><input type="radio" name="banexclude" id="banexclude0" value="0" checked="checked" /> {L_NO}</label> @@ -90,19 +90,19 @@  	<!-- IF S_BANNED_OPTIONS -->  		<fieldset>  		<dl> -			<dt><label for="unban">{L_BAN_CELL}:</label></dt> +			<dt><label for="unban">{L_BAN_CELL}{L_COLON}</label></dt>  			<dd><select name="unban[]" id="unban" multiple="multiple" size="5" onchange="if (this.selectedIndex != -1) {display_details(this.options[this.selectedIndex].value);}">{BANNED_OPTIONS}</select></dd>  		</dl>  		<dl> -			<dt>{L_BAN_LENGTH}:</dt> +			<dt>{L_BAN_LENGTH}{L_COLON}</dt>  			<dd><strong id="unbanlength"></strong></dd>  		</dl>  		<dl> -			<dt>{L_BAN_REASON}:</dt> +			<dt>{L_BAN_REASON}{L_COLON}</dt>  			<dd><strong id="unbanreason"></strong></dd>  		</dl>  		<dl> -			<dt>{L_BAN_GIVE_REASON}:</dt> +			<dt>{L_BAN_GIVE_REASON}{L_COLON}</dt>  			<dd><strong id="unbangivereason"></strong></dd>  		</dl>  		</fieldset> diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html index 811aace154..cd4ae69fe7 100644 --- a/phpBB/styles/prosilver/template/mcp_forum.html +++ b/phpBB/styles/prosilver/template/mcp_forum.html @@ -3,7 +3,7 @@  <!-- DEFINE $CUSTOM_FIELDSET_CLASS = 'forum-selection2' -->  <!-- INCLUDE jumpbox.html --> -<h2><a href="{U_VIEW_FORUM}">{L_FORUM}: {FORUM_NAME}</a></h2> +<h2><a href="{U_VIEW_FORUM}">{L_FORUM}{L_COLON} {FORUM_NAME}</a></h2>  <form method="post" id="mcp" action="{S_MCP_ACTION}"> @@ -82,7 +82,7 @@  	<fieldset class="display-options">  		<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->  		<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF --> -		<label>{L_DISPLAY_TOPICS}: {S_SELECT_SORT_DAYS}</label> +		<label>{L_DISPLAY_TOPICS}{L_COLON} {S_SELECT_SORT_DAYS}</label>  		<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label>  		<label>{S_SELECT_SORT_DIR} <input type="submit" name="sort" value="{L_GO}" class="button2" /></label>  	</fieldset> diff --git a/phpBB/styles/prosilver/template/mcp_front.html b/phpBB/styles/prosilver/template/mcp_front.html index 69e0b02a4e..57e57d8254 100644 --- a/phpBB/styles/prosilver/template/mcp_front.html +++ b/phpBB/styles/prosilver/template/mcp_front.html @@ -31,8 +31,8 @@  						{L_POSTED} {L_POST_BY_AUTHOR} {unapproved.AUTHOR_FULL} » {unapproved.POST_TIME}  					</dt>  					<dd class="moderation"><span> -						{L_TOPIC}: <a href="{unapproved.U_TOPIC}">{unapproved.TOPIC_TITLE}</a> [<a href="{unapproved.U_MCP_TOPIC}">{L_MODERATE}</a>]<br /> -						{L_FORUM}: <!-- IF unapproved.U_FORUM --><a href="{unapproved.U_FORUM}">{unapproved.FORUM_NAME}</a><!-- ELSE -->{unapproved.FORUM_NAME}<!-- ENDIF --><!-- IF unapproved.U_MCP_FORUM --> [<a href="{unapproved.U_MCP_FORUM}">{L_MODERATE}</a>]<!-- ENDIF --></span> +						{L_TOPIC}{L_COLON} <a href="{unapproved.U_TOPIC}">{unapproved.TOPIC_TITLE}</a> [<a href="{unapproved.U_MCP_TOPIC}">{L_MODERATE}</a>]<br /> +						{L_FORUM}{L_COLON} <!-- IF unapproved.U_FORUM --><a href="{unapproved.U_FORUM}">{unapproved.FORUM_NAME}</a><!-- ELSE -->{unapproved.FORUM_NAME}<!-- ENDIF --><!-- IF unapproved.U_MCP_FORUM --> [<a href="{unapproved.U_MCP_FORUM}">{L_MODERATE}</a>]<!-- ENDIF --></span>  					</dd>  			 		<dd class="mark"><input type="checkbox" name="post_id_list[]" value="{unapproved.POST_ID}" /></dd> @@ -84,7 +84,7 @@  					</dt>  					<dd class="moderation">  						<span>{L_REPORTED} {L_POST_BY_AUTHOR} {report.REPORTER_FULL} {L_REPORTED_ON_DATE} {report.REPORT_TIME}<br /> -						{L_FORUM}: <a href="{report.U_FORUM}">{report.FORUM_NAME}</a></span> +						{L_FORUM}{L_COLON} <a href="{report.U_FORUM}">{report.FORUM_NAME}</a></span>  					</dd>  				</dl>  			</li> diff --git a/phpBB/styles/prosilver/template/mcp_logs.html b/phpBB/styles/prosilver/template/mcp_logs.html index 0d7f357d5b..15974802bc 100644 --- a/phpBB/styles/prosilver/template/mcp_logs.html +++ b/phpBB/styles/prosilver/template/mcp_logs.html @@ -9,7 +9,7 @@  	<ul class="linklist">  		<li class="leftside"> -			{L_SEARCH_KEYWORDS}: <input type="text" class="inputbox autowidth" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" /> +			{L_SEARCH_KEYWORDS}{L_COLON} <input type="text" class="inputbox autowidth" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" />  		</li>  		<li class="rightside pagination">  			<!-- IF TOTAL -->{TOTAL} • <!-- ENDIF --> @@ -56,7 +56,7 @@  		<fieldset class="display-options">  			<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->  			<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF --> -			<label>{L_DISPLAY_POSTS}: {S_SELECT_SORT_DAYS}</label> +			<label>{L_DISPLAY_POSTS}{L_COLON} {S_SELECT_SORT_DAYS}</label>  			<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label>  			<label>{S_SELECT_SORT_DIR}</label>  			<input type="submit" name="sort" value="{L_GO}" class="button2" /> diff --git a/phpBB/styles/prosilver/template/mcp_move.html b/phpBB/styles/prosilver/template/mcp_move.html index 4611412a9e..d7a4f3d798 100644 --- a/phpBB/styles/prosilver/template/mcp_move.html +++ b/phpBB/styles/prosilver/template/mcp_move.html @@ -11,7 +11,7 @@  		<fieldset>  		<dl class="fields2"> -			<dt><label>{L_SELECT_DESTINATION_FORUM}:</label></dt> +			<dt><label>{L_SELECT_DESTINATION_FORUM}{L_COLON}</label></dt>  			<dd><select name="to_forum_id">{S_FORUM_SELECT}</select></dd>  			<!-- IF S_CAN_LEAVE_SHADOW --><dd><label for="move_leave_shadow"><input type="checkbox" name="move_leave_shadow" id="move_leave_shadow" />{L_LEAVE_SHADOW}</label></dd><!-- ENDIF -->  			<!-- IF S_CAN_LOCK_TOPIC --><dd><label for="move_lock_topics"><input type="checkbox" name="move_lock_topics" id="move_lock_topics" />{L_LOCK_TOPIC}</label></dd><!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/mcp_notes_front.html b/phpBB/styles/prosilver/template/mcp_notes_front.html index 3da66ccb2e..db10284bce 100644 --- a/phpBB/styles/prosilver/template/mcp_notes_front.html +++ b/phpBB/styles/prosilver/template/mcp_notes_front.html @@ -9,7 +9,7 @@  	<fieldset>  	<dl> -		<dt><label for="username">{L_SELECT_USER}:</label></dt> +		<dt><label for="username">{L_SELECT_USER}{L_COLON}</label></dt>  		<dd><input name="username" id="username" type="text" class="inputbox" /></dd>  		<dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></strong></dd>  	</dl> diff --git a/phpBB/styles/prosilver/template/mcp_notes_user.html b/phpBB/styles/prosilver/template/mcp_notes_user.html index d0d79f4664..c7c568657c 100644 --- a/phpBB/styles/prosilver/template/mcp_notes_user.html +++ b/phpBB/styles/prosilver/template/mcp_notes_user.html @@ -16,11 +16,11 @@  		<div class="column2">  			<dl class="details"> -				<!-- IF RANK_TITLE --><dt>{L_RANK}:</dt><dd>{RANK_TITLE}</dd><!-- ENDIF --> -				<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE --> <!-- ELSE -->{L_RANK}:<!-- ENDIF --></dt><dd>{RANK_IMG}</dd><!-- ENDIF --> -				<dt>{L_JOINED}:</dt><dd>{JOINED}</dd> -				<dt>{L_TOTAL_POSTS}:</dt><dd>{POSTS}</dd> -				<dt>{L_WARNINGS}: </dt><dd>{WARNINGS}</dd> +				<!-- IF RANK_TITLE --><dt>{L_RANK}{L_COLON}</dt><dd>{RANK_TITLE}</dd><!-- ENDIF --> +				<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE --> <!-- ELSE -->{L_RANK}{L_COLON}<!-- ENDIF --></dt><dd>{RANK_IMG}</dd><!-- ENDIF --> +				<dt>{L_JOINED}{L_COLON}</dt><dd>{JOINED}</dd> +				<dt>{L_TOTAL_POSTS}{L_COLON}</dt><dd>{POSTS}</dd> +				<dt>{L_WARNINGS}{L_COLON} </dt><dd>{WARNINGS}</dd>  			</dl>  		</div>  	</div> @@ -52,7 +52,7 @@  	<ul class="linklist">  		<li class="leftside"> -			{L_SEARCH_KEYWORDS}: <input type="text" class="inputbox autowidth" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" /> +			{L_SEARCH_KEYWORDS}{L_COLON} <input type="text" class="inputbox autowidth" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" />  		</li>  		<li class="rightside pagination">  			<!-- IF TOTAL_REPORTS -->{TOTAL_REPORTS} • <!-- ENDIF --> @@ -97,7 +97,7 @@  	<fieldset class="display-options">  		<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->  		<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF --> -		<label>{L_DISPLAY_LOG}: {S_SELECT_SORT_DAYS}</label> +		<label>{L_DISPLAY_LOG}{L_COLON} {S_SELECT_SORT_DAYS}</label>  		<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label>  		<input type="submit" name="sort" value="{L_GO}" class="button2" />  	</fieldset> diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html index 752fbdd078..756a6eb114 100644 --- a/phpBB/styles/prosilver/template/mcp_post.html +++ b/phpBB/styles/prosilver/template/mcp_post.html @@ -11,7 +11,7 @@  		<div class="inner">  		<div class="postbody"> -			<h3>{L_REPORT_REASON}: {REPORT_REASON_TITLE}</h3> +			<h3>{L_REPORT_REASON}{L_COLON} {REPORT_REASON_TITLE}</h3>  			<p class="author">{L_REPORTED} {L_POST_BY_AUTHOR} {REPORTER_FULL} « {REPORT_DATE}</p>  		<!-- IF not S_POST_REPORTED -->  			<p class="rules">{L_REPORT_CLOSED}</p> @@ -59,10 +59,10 @@  		<h3><a href="{U_VIEW_POST}">{POST_SUBJECT}</a></h3>  		<!-- IF S_PM -->  		<p class="author"> -			<strong>{L_SENT_AT}:</strong> {POST_DATE} -			<br /><strong>{L_PM_FROM}:</strong> {POST_AUTHOR_FULL} -			<!-- IF S_TO_RECIPIENT --><br /><strong>{L_TO}:</strong> <!-- BEGIN to_recipient --><!-- IF to_recipient.NAME_FULL -->{to_recipient.NAME_FULL}<!-- ELSE --><a href="{to_recipient.U_VIEW}" style="color:<!-- IF to_recipient.COLOUR -->{to_recipient.COLOUR}<!-- ELSEIF to_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{to_recipient.NAME}</a><!-- ENDIF --> <!-- END to_recipient --><!-- ENDIF --> -			<!-- IF S_BCC_RECIPIENT --><br /><strong>{L_BCC}:</strong> <!-- BEGIN bcc_recipient --><!-- IF bcc_recipient.NAME_FULL -->{bcc_recipient.NAME_FULL}<!-- ELSE --><a href="{bcc_recipient.U_VIEW}" style="color:<!-- IF bcc_recipient.COLOUR -->{bcc_recipient.COLOUR}<!-- ELSEIF bcc_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{bcc_recipient.NAME}</a><!-- ENDIF --> <!-- END bcc_recipient --><!-- ENDIF --> +			<strong>{L_SENT_AT}{L_COLON}</strong> {POST_DATE} +			<br /><strong>{L_PM_FROM}{L_COLON}</strong> {POST_AUTHOR_FULL} +			<!-- IF S_TO_RECIPIENT --><br /><strong>{L_TO}{L_COLON}</strong> <!-- BEGIN to_recipient --><!-- IF to_recipient.NAME_FULL -->{to_recipient.NAME_FULL}<!-- ELSE --><a href="{to_recipient.U_VIEW}" style="color:<!-- IF to_recipient.COLOUR -->{to_recipient.COLOUR}<!-- ELSEIF to_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{to_recipient.NAME}</a><!-- ENDIF --> <!-- END to_recipient --><!-- ENDIF --> +			<!-- IF S_BCC_RECIPIENT --><br /><strong>{L_BCC}{L_COLON}</strong> <!-- BEGIN bcc_recipient --><!-- IF bcc_recipient.NAME_FULL -->{bcc_recipient.NAME_FULL}<!-- ELSE --><a href="{bcc_recipient.U_VIEW}" style="color:<!-- IF bcc_recipient.COLOUR -->{bcc_recipient.COLOUR}<!-- ELSEIF bcc_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{bcc_recipient.NAME}</a><!-- ENDIF --> <!-- END bcc_recipient --><!-- ENDIF -->  		</p>  		<!-- ELSE -->  		<p class="author">{MINI_POST_IMG} {L_POSTED} {L_POST_BY_AUTHOR} {POST_AUTHOR_FULL} » {POST_DATE}</p> @@ -106,7 +106,7 @@  		<!-- IF S_MCP_REPORT and S_CAN_VIEWIP -->  			<hr /> -			<div><!-- IF S_PM -->{L_THIS_PM_IP}<!-- ELSE -->{L_THIS_POST_IP}<!-- ENDIF -->: <!-- IF U_WHOIS --> +			<div><!-- IF S_PM -->{L_THIS_PM_IP}<!-- ELSE -->{L_THIS_POST_IP}<!-- ENDIF -->{L_COLON} <!-- IF U_WHOIS -->  				<a href="{U_WHOIS}"><!-- IF POST_IPADDR -->{POST_IPADDR}<!-- ELSE -->{POST_IP}<!-- ENDIF --></a> (<!-- IF POST_IPADDR -->{POST_IP}<!-- ELSE --><a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a><!-- ENDIF -->)  			<!-- ELSE -->  				<!-- IF POST_IPADDR -->{POST_IPADDR} ({POST_IP})<!-- ELSE -->{POST_IP}<!-- IF U_LOOKUP_IP --> (<a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a>)<!-- ENDIF --><!-- ENDIF --> @@ -128,7 +128,7 @@  			<fieldset>  			<dl> -				<dt><label>{L_CHANGE_POSTER}:</label></dt> +				<dt><label>{L_CHANGE_POSTER}{L_COLON}</label></dt>  				<!-- IF S_USER_SELECT --><dd><select name="u">{S_USER_SELECT}</select> <input type="submit" class="button2" name="action[chgposter_ip]" value="{L_CONFIRM}" /></dd><!-- ENDIF -->  				<dd style="margin-top:3px;">  					<input class="inputbox autowidth" type="text" name="username" value="" /> @@ -147,7 +147,7 @@  			<fieldset>  			<dl> -				<dt><label>{L_MOD_OPTIONS}:</label></dt> +				<dt><label>{L_MOD_OPTIONS}{L_COLON}</label></dt>  				<dd><select name="action">  					<!-- IF S_CAN_LOCK_POST --><!-- IF S_POST_LOCKED --><option value="unlock_post">{L_UNLOCK_POST} [{L_UNLOCK_POST_EXPLAIN}]</option><!-- ELSE --><option value="lock_post">{L_LOCK_POST} [{L_LOCK_POST_EXPLAIN}]</option><!-- ENDIF --><!-- ENDIF -->  					<!-- IF S_CAN_DELETE_POST --><option value="delete_post">{L_DELETE_POST}</option><!-- ENDIF --> @@ -187,7 +187,7 @@  				<h3>{L_FEEDBACK}</h3>  				<!-- BEGIN usernotes --> -					<span class="small"><strong>{L_REPORTED_BY}: {usernotes.REPORT_BY} « {usernotes.REPORT_AT}</strong></span> +					<span class="small"><strong>{L_REPORTED_BY}{L_COLON} {usernotes.REPORT_BY} « {usernotes.REPORT_AT}</strong></span>  					<!-- IF S_CLEAR_ALLOWED --><div class="right-box"><input type="checkbox" name="marknote[]" value="{usernotes.ID}" /></div><!-- ENDIF -->  					<div class="postbody">{usernotes.ACTION}</div> @@ -227,8 +227,8 @@  			<h3>{L_MCP_POST_REPORTS}</h3>  			<!-- BEGIN reports --> -				<span class="small"><strong>{L_REPORTED_BY}: <!-- IF reports.U_REPORTER --><a href="{reports.U_REPORTER}">{reports.REPORTER}</a><!-- ELSE -->{reports.REPORTER}<!-- ENDIF --> « {reports.REPORT_TIME}</strong></span> -				<p><em>{reports.REASON_TITLE}: {reports.REASON_DESC}</em><!-- IF reports.REPORT_TEXT --><br />{reports.REPORT_TEXT}<!-- ENDIF --></p> +				<span class="small"><strong>{L_REPORTED_BY}{L_COLON} <!-- IF reports.U_REPORTER --><a href="{reports.U_REPORTER}">{reports.REPORTER}</a><!-- ELSE -->{reports.REPORTER}<!-- ENDIF --> « {reports.REPORT_TIME}</strong></span> +				<p><em>{reports.REASON_TITLE}{L_COLON} {reports.REASON_DESC}</em><!-- IF reports.REPORT_TEXT --><br />{reports.REPORT_TEXT}<!-- ENDIF --></p>  			<!-- END reports -->  			</div> @@ -239,7 +239,7 @@  		<div class="panel" id="ip">  			<div class="inner"> -			<p>{L_THIS_POST_IP}: <!-- IF U_WHOIS --> +			<p>{L_THIS_POST_IP}{L_COLON} <!-- IF U_WHOIS -->  				<a href="{U_WHOIS}"><!-- IF POST_IPADDR -->{POST_IPADDR}<!-- ELSE -->{POST_IP}<!-- ENDIF --></a> (<!-- IF POST_IPADDR -->{POST_IP}<!-- ELSE --><a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a><!-- ENDIF -->)  			<!-- ELSE -->  				<!-- IF POST_IPADDR -->{POST_IPADDR} ({POST_IP})<!-- ELSE -->{POST_IP}<!-- IF U_LOOKUP_IP --> (<a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a>)<!-- ENDIF --><!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/mcp_queue.html b/phpBB/styles/prosilver/template/mcp_queue.html index 93483ae02a..dc8869713d 100644 --- a/phpBB/styles/prosilver/template/mcp_queue.html +++ b/phpBB/styles/prosilver/template/mcp_queue.html @@ -3,7 +3,7 @@  <form id="mcp" method="post" action="{S_MCP_ACTION}">  <fieldset class="forum-selection"> -	<label for="fo">{L_FORUM}: <select name="f" id="fo">{S_FORUM_OPTIONS}</select></label> +	<label for="fo">{L_FORUM}{L_COLON} <select name="f" id="fo">{S_FORUM_OPTIONS}</select></label>  	<input type="submit" name="sort" value="{L_GO}" class="button2" />  	{S_FORM_TOKEN}  </fieldset> @@ -51,8 +51,8 @@  				</dt>  				<dd class="moderation">  					<span> -						<!-- IF S_TOPICS --><br /><!-- ELSE -->{L_TOPIC}: <a href="{postrow.U_TOPIC}">{postrow.TOPIC_TITLE}</a> <br /><!-- ENDIF --> -						{L_FORUM}: <a href="{postrow.U_VIEWFORUM}">{postrow.FORUM_NAME}</a> +						<!-- IF S_TOPICS --><br /><!-- ELSE -->{L_TOPIC}{L_COLON} <a href="{postrow.U_TOPIC}">{postrow.TOPIC_TITLE}</a> <br /><!-- ENDIF --> +						{L_FORUM}{L_COLON} <a href="{postrow.U_VIEWFORUM}">{postrow.FORUM_NAME}</a>  					</span>  				</dd> @@ -67,7 +67,7 @@  		<fieldset class="display-options">  			<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->  			<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF --> -			<label>{L_DISPLAY_POSTS}: {S_SELECT_SORT_DAYS}</label> +			<label>{L_DISPLAY_POSTS}{L_COLON} {S_SELECT_SORT_DAYS}</label>  			<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label>  			<!-- IF TOPIC_ID --><label><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" />  <strong>{L_ONLY_TOPIC}</strong></label><!-- ENDIF -->  			<input type="submit" name="sort" value="{L_GO}" class="button2" /> diff --git a/phpBB/styles/prosilver/template/mcp_reports.html b/phpBB/styles/prosilver/template/mcp_reports.html index aa67414713..f9a0ec4bd6 100644 --- a/phpBB/styles/prosilver/template/mcp_reports.html +++ b/phpBB/styles/prosilver/template/mcp_reports.html @@ -4,7 +4,7 @@  <!-- IF not S_PM -->  <fieldset class="forum-selection"> -	<label for="fo">{L_FORUM}: <select name="f" id="fo">{S_FORUM_OPTIONS}</select></label> +	<label for="fo">{L_FORUM}{L_COLON} <select name="f" id="fo">{S_FORUM_OPTIONS}</select></label>  	<input type="submit" name="sort" value="{L_GO}" class="button2" />  	{S_FORM_TOKEN}  </fieldset> @@ -58,7 +58,7 @@  					</dt>  					<dd class="moderation">  						<span>{postrow.REPORTER_FULL} « {postrow.REPORT_TIME}<br /> -						<!-- IF postrow.U_VIEWFORUM -->{L_FORUM}: <a href="{postrow.U_VIEWFORUM}">{postrow.FORUM_NAME}</a><!-- ELSE -->{postrow.FORUM_NAME}<!-- ENDIF --></span> +						<!-- IF postrow.U_VIEWFORUM -->{L_FORUM}{L_COLON} <a href="{postrow.U_VIEWFORUM}">{postrow.FORUM_NAME}</a><!-- ELSE -->{postrow.FORUM_NAME}<!-- ENDIF --></span>  					</dd>  					<!-- ENDIF -->  					<dd class="mark"><input type="checkbox" name="report_id_list[]" value="{postrow.REPORT_ID}" /></dd> @@ -70,7 +70,7 @@  		<fieldset class="display-options">  			<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->  			<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF --> -			<label>{L_DISPLAY_POSTS}: {S_SELECT_SORT_DAYS}</label> +			<label>{L_DISPLAY_POSTS}{L_COLON} {S_SELECT_SORT_DAYS}</label>  			<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label>  			<!-- IF TOPIC_ID --><label><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" />  <strong>{L_ONLY_TOPIC}</strong></label><!-- ENDIF -->  			<input type="submit" name="sort" value="{L_GO}" class="button2" /> diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html index ed9307b11c..a89fd8a171 100644 --- a/phpBB/styles/prosilver/template/mcp_topic.html +++ b/phpBB/styles/prosilver/template/mcp_topic.html @@ -1,7 +1,7 @@  <!-- INCLUDE mcp_header.html -->  <div class="tabs-container"> -<h2><a href="{U_VIEW_TOPIC}">{L_TOPIC}: {TOPIC_TITLE}</a></h2> +<h2><a href="{U_VIEW_TOPIC}">{L_TOPIC}{L_COLON} {TOPIC_TITLE}</a></h2>  <script type="text/javascript">  // <![CDATA[ @@ -42,11 +42,11 @@ onload_functions.push('subPanels()');  	<fieldset id="display-panel" class="fields2">  	<dl> -		<dt><label for="posts_per_page">{L_POSTS_PER_PAGE}:</label><br /><span>{L_POSTS_PER_PAGE_EXPLAIN}</span></dt> +		<dt><label for="posts_per_page">{L_POSTS_PER_PAGE}{L_COLON}</label><br /><span>{L_POSTS_PER_PAGE_EXPLAIN}</span></dt>  		<dd><input class="inputbox autowidth" type="text" name="posts_per_page" id="posts_per_page" size="6" value="{POSTS_PER_PAGE}" /></dd>  	</dl>  	<dl> -		<dt><label>{L_DISPLAY_POSTS}:</label></dt> +		<dt><label>{L_DISPLAY_POSTS}{L_COLON}</label></dt>  		<dd>{S_SELECT_SORT_DAYS}  <label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label> <input type="submit" name="sort" value="{L_GO}" class="button2" /></dd>  	</dl>  	</fieldset> @@ -57,18 +57,18 @@ onload_functions.push('subPanels()');  	<!-- IF S_SHOW_TOPIC_ICONS -->  		<dl> -			<dt><label for="icon">{L_TOPIC_ICON}:</label></dt> +			<dt><label for="icon">{L_TOPIC_ICON}{L_COLON}</label></dt>  			<dd><label for="icon"><input type="radio" name="icon" id="icon" value="0" checked="checked" /> {L_NO_TOPIC_ICON}</label>  			<!-- BEGIN topic_icon --><label for="icon-{topic_icon.ICON_ID}"><input type="radio" name="icon" id="icon-{topic_icon.ICON_ID}" value="{topic_icon.ICON_ID}" {topic_icon.S_ICON_CHECKED} /><img src="{topic_icon.ICON_IMG}" width="{topic_icon.ICON_WIDTH}" height="{topic_icon.ICON_HEIGHT}" alt="" title="" /></label> <!-- END topic_icon --></dd>  		</dl>  	<!-- ENDIF -->  	<dl> -		<dt><label for="subject">{L_SPLIT_SUBJECT}:</label></dt> +		<dt><label for="subject">{L_SPLIT_SUBJECT}{L_COLON}</label></dt>  		<dd><input type="text" name="subject" id="subject" size="45" maxlength="124" tabindex="2" value="{SPLIT_SUBJECT}" title="{L_SPLIT_SUBJECT}" class="inputbox" /></dd>  	</dl>  	<dl> -		<dt><label>{L_SPLIT_FORUM}:</label></dt> +		<dt><label>{L_SPLIT_FORUM}{L_COLON}</label></dt>  		<dd><select name="to_forum_id">{S_FORUM_SELECT}</select></dd>  	</dl>  	</fieldset> @@ -78,7 +78,7 @@ onload_functions.push('subPanels()');  	<fieldset id="merge-panel" class="fields2">  		<p>{L_MERGE_TOPIC_EXPLAIN}</p>  	<dl> -		<dt><label for="to_topic_id">{L_MERGE_TOPIC_ID}:</label></dt> +		<dt><label for="to_topic_id">{L_MERGE_TOPIC_ID}{L_COLON}</label></dt>  		<dd>  			<input class="inputbox autowidth" type="text" size="6" name="to_topic_id" id="to_topic_id" value="{TO_TOPIC_ID}" />  			<a href="{U_SELECT_TOPIC}" >{L_SELECT_TOPIC}</a> @@ -96,7 +96,7 @@ onload_functions.push('subPanels()');  	<h3 id="review">  		<span class="right-box"><a href="#review" onclick="viewableArea(getElementById('topicreview'), true); var rev_text = getElementById('review').getElementsByTagName('a').item(0).firstChild; if (rev_text.data == '{LA_EXPAND_VIEW}'){rev_text.data = '{LA_COLLAPSE_VIEW}'; } else if (rev_text.data == '{LA_COLLAPSE_VIEW}'){rev_text.data = '{LA_EXPAND_VIEW}'};">{L_EXPAND_VIEW}</a></span> -		{L_TOPIC_REVIEW}: {TOPIC_TITLE} +		{L_TOPIC_REVIEW}{L_COLON} {TOPIC_TITLE}  	</h3>  	<div id="topicreview"> @@ -105,7 +105,7 @@ onload_functions.push('subPanels()');  			<div class="inner">  			<div class="postbody" id="pr{postrow.POST_ID}"> -				<ul class="profile-icons"><li class="info-icon"><a href="{postrow.U_POST_DETAILS}" title="{L_POST_DETAILS}"><span>{L_POST_DETAILS}</span></a></li><li><label for="post_id_list_select_{postrow.POST_ID}">{L_SELECT}: <input type="checkbox" id="post_id_list_select_{postrow.POST_ID}" name="post_id_list[]" value="{postrow.POST_ID}"<!-- IF postrow.S_CHECKED --> checked="checked"<!-- ENDIF --> /></label></li></ul> +				<ul class="profile-icons"><li class="info-icon"><a href="{postrow.U_POST_DETAILS}" title="{L_POST_DETAILS}"><span>{L_POST_DETAILS}</span></a></li><li><label for="post_id_list_select_{postrow.POST_ID}">{L_SELECT}{L_COLON} <input type="checkbox" id="post_id_list_select_{postrow.POST_ID}" name="post_id_list[]" value="{postrow.POST_ID}"<!-- IF postrow.S_CHECKED --> checked="checked"<!-- ENDIF --> /></label></li></ul>  				<h3><a href="{postrow.U_POST_DETAILS}">{postrow.POST_SUBJECT}</a></h3>  				<p class="author"><a href="#pr{postrow.POST_ID}">{postrow.MINI_POST_IMG}</a> {L_POSTED} {postrow.POST_DATE} {L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR_FULL}</strong><!-- IF postrow.U_MCP_DETAILS --> [ <a href="{postrow.U_MCP_DETAILS}">{L_POST_DETAILS}</a> ]<!-- ENDIF --></p> diff --git a/phpBB/styles/prosilver/template/mcp_warn_front.html b/phpBB/styles/prosilver/template/mcp_warn_front.html index df3497eb25..5a332cf202 100644 --- a/phpBB/styles/prosilver/template/mcp_warn_front.html +++ b/phpBB/styles/prosilver/template/mcp_warn_front.html @@ -11,7 +11,7 @@  	<fieldset>  	<dl> -		<dt><label for="username">{L_SELECT_USER}:</label></dt> +		<dt><label for="username">{L_SELECT_USER}{L_COLON}</label></dt>  		<dd><input name="username" id="username" type="text" class="inputbox" /></dd>  		<dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></strong></dd>  	</dl> diff --git a/phpBB/styles/prosilver/template/mcp_warn_list.html b/phpBB/styles/prosilver/template/mcp_warn_list.html index fca377a823..69aa185391 100644 --- a/phpBB/styles/prosilver/template/mcp_warn_list.html +++ b/phpBB/styles/prosilver/template/mcp_warn_list.html @@ -57,7 +57,7 @@  		</table>  		<fieldset class="display-options"> -			<label>{L_DISPLAY_POSTS}: {S_SELECT_SORT_DAYS}</label> +			<label>{L_DISPLAY_POSTS}{L_COLON} {S_SELECT_SORT_DAYS}</label>  			<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label>  			<input type="submit" name="sort" value="{L_GO}" class="button2" />  		</fieldset> diff --git a/phpBB/styles/prosilver/template/mcp_warn_post.html b/phpBB/styles/prosilver/template/mcp_warn_post.html index 540abb9473..0dd2e14d92 100644 --- a/phpBB/styles/prosilver/template/mcp_warn_post.html +++ b/phpBB/styles/prosilver/template/mcp_warn_post.html @@ -16,11 +16,11 @@  		<div class="column2">  			<dl class="details"> -				<!-- IF RANK_TITLE --><dt>{L_RANK}:</dt><dd>{RANK_TITLE}</dd><!-- ENDIF --> -				<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE --> <!-- ELSE -->{L_RANK}:<!-- ENDIF --></dt><dd>{RANK_IMG}</dd><!-- ENDIF --> -				<dt>{L_JOINED}:</dt><dd>{JOINED}</dd> -				<dt>{L_TOTAL_POSTS}:</dt><dd>{POSTS}</dd> -				<dt>{L_WARNINGS}: </dt><dd>{WARNINGS}</dd> +				<!-- IF RANK_TITLE --><dt>{L_RANK}{L_COLON}</dt><dd>{RANK_TITLE}</dd><!-- ENDIF --> +				<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE --> <!-- ELSE -->{L_RANK}{L_COLON}<!-- ENDIF --></dt><dd>{RANK_IMG}</dd><!-- ENDIF --> +				<dt>{L_JOINED}{L_COLON}</dt><dd>{JOINED}</dd> +				<dt>{L_TOTAL_POSTS}{L_COLON}</dt><dd>{POSTS}</dd> +				<dt>{L_WARNINGS}{L_COLON} </dt><dd>{WARNINGS}</dd>  			</dl>  		</div>  	</div> diff --git a/phpBB/styles/prosilver/template/mcp_warn_user.html b/phpBB/styles/prosilver/template/mcp_warn_user.html index 5e99c8d7e1..1541f2e5f6 100644 --- a/phpBB/styles/prosilver/template/mcp_warn_user.html +++ b/phpBB/styles/prosilver/template/mcp_warn_user.html @@ -16,11 +16,11 @@  		<div class="column2">  			<dl class="details"> -				<!-- IF RANK_TITLE --><dt>{L_RANK}:</dt><dd>{RANK_TITLE}</dd><!-- ENDIF --> -				<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE --> <!-- ELSE -->{L_RANK}:<!-- ENDIF --></dt><dd>{RANK_IMG}</dd><!-- ENDIF --> -				<dt>{L_JOINED}:</dt><dd>{JOINED}</dd> -				<dt>{L_TOTAL_POSTS}:</dt><dd>{POSTS}</dd> -				<dt>{L_WARNINGS}: </dt><dd>{WARNINGS}</dd> +				<!-- IF RANK_TITLE --><dt>{L_RANK}{L_COLON}</dt><dd>{RANK_TITLE}</dd><!-- ENDIF --> +				<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE --> <!-- ELSE -->{L_RANK}{L_COLON}<!-- ENDIF --></dt><dd>{RANK_IMG}</dd><!-- ENDIF --> +				<dt>{L_JOINED}{L_COLON}</dt><dd>{JOINED}</dd> +				<dt>{L_TOTAL_POSTS}{L_COLON}</dt><dd>{POSTS}</dd> +				<dt>{L_WARNINGS}{L_COLON} </dt><dd>{WARNINGS}</dd>  			</dl>  		</div>  	</div> diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html index 545d5000c4..273182ec3f 100644 --- a/phpBB/styles/prosilver/template/memberlist_body.html +++ b/phpBB/styles/prosilver/template/memberlist_body.html @@ -4,7 +4,7 @@  	<form method="post" id="results" action="{S_MODE_ACTION}" onsubmit="insert_marked(this.user); return false">  <!-- ELSEIF S_SEARCH_USER --> -	<!-- INCLUDE overall_header.html -->	 +	<!-- INCLUDE overall_header.html -->  	<!-- INCLUDE memberlist_search.html -->  	<form method="post" action="{S_MODE_ACTION}"> @@ -25,7 +25,7 @@  		</p>  	<!-- ELSE --> -		<h2 class="solo">{PAGE_TITLE}<!-- IF SEARCH_WORDS -->: <a href="{U_SEARCH_WORDS}">{SEARCH_WORDS}</a><!-- ENDIF --></h2> +		<h2 class="solo">{PAGE_TITLE}<!-- IF SEARCH_WORDS -->{L_COLON} <a href="{U_SEARCH_WORDS}">{SEARCH_WORDS}</a><!-- ENDIF --></h2>  		<div class="panel">  			<div class="inner"> @@ -36,16 +36,16 @@  				<!-- IF U_FIND_MEMBER and not S_SEARCH_USER --><a href="{U_FIND_MEMBER}">{L_FIND_USERNAME}</a> • <!-- ELSEIF S_SEARCH_USER and U_HIDE_FIND_MEMBER and not S_IN_SEARCH_POPUP --><a href="{U_HIDE_FIND_MEMBER}">{L_HIDE_MEMBER_SEARCH}</a> • <!-- ENDIF -->  				<strong style="font-size: 0.95em;">  				<!-- BEGIN first_char --> -					<a href="{first_char.U_SORT}">{first_char.DESC}</a>   +					<a href="{first_char.U_SORT}">{first_char.DESC}</a>   				<!-- END first_char -->  				</strong>  				</li>  				<li class="rightside pagination"> -					{TOTAL_USERS}  -					<!-- IF .pagination -->  -						•  +					{TOTAL_USERS} +					<!-- IF .pagination --> +						•  						<!-- INCLUDE pagination.html --> -					<!-- ELSE -->  +					<!-- ELSE -->  						{PAGE_NUMBER}  					<!-- ENDIF -->  				</li> @@ -114,7 +114,7 @@  	<tr class="<!-- IF memberrow.S_ROW_COUNT is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">  		<td><!-- IF memberrow.RANK_IMG --><span class="rank-img">{memberrow.RANK_IMG}</span><!-- ELSE --><span class="rank-img">{memberrow.RANK_TITLE}</span><!-- ENDIF --><!-- IF S_IN_SEARCH_POPUP and not S_SELECT_SINGLE --><input type="checkbox" name="user" value="{memberrow.USERNAME}" /> <!-- ENDIF -->{memberrow.USERNAME_FULL}<!-- IF S_SELECT_SINGLE --><br />[ <a href="#" onclick="insert_single('{memberrow.A_USERNAME}'); return false;">{L_SELECT}</a> ]<!-- ENDIF --></td>  		<td class="posts"><!-- IF memberrow.POSTS and S_DISPLAY_SEARCH --><a href="{memberrow.U_SEARCH_USER}" title="{L_SEARCH_USER_POSTS}">{memberrow.POSTS}</a><!-- ELSE -->{memberrow.POSTS}<!-- ENDIF --></td> -		<td class="info"><!-- IF memberrow.U_WWW or memberrow.LOCATION --><!-- IF memberrow.U_WWW --><div><a href="{memberrow.U_WWW}" title="{L_VISIT_WEBSITE}: {memberrow.U_WWW}">{memberrow.U_SHORT_WWW}</a></div><!-- ENDIF --><!-- IF memberrow.LOCATION --><div>{memberrow.LOCATION}</div><!-- ENDIF --><!-- ELSE --> <!-- ENDIF --></td> +		<td class="info"><!-- IF memberrow.U_WWW or memberrow.LOCATION --><!-- IF memberrow.U_WWW --><div><a href="{memberrow.U_WWW}" title="{L_VISIT_WEBSITE}{L_COLON} {memberrow.U_WWW}">{memberrow.U_SHORT_WWW}</a></div><!-- ENDIF --><!-- IF memberrow.LOCATION --><div>{memberrow.LOCATION}</div><!-- ENDIF --><!-- ELSE --> <!-- ENDIF --></td>  		<td>{memberrow.JOINED}</td>  		<!-- IF S_VIEWONLINE --><td>{memberrow.VISITED} </td><!-- ENDIF -->  	</tr> @@ -145,7 +145,7 @@  <fieldset class="display-options">  	<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->  	<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF --> -	<label for="sk">{L_SELECT_SORT_METHOD}: <select name="sk" id="sk">{S_MODE_SELECT}</select></label>  +	<label for="sk">{L_SELECT_SORT_METHOD}{L_COLON} <select name="sk" id="sk">{S_MODE_SELECT}</select></label>  	<label for="sd">{L_ORDER} <select name="sd" id="sd">{S_ORDER_SELECT}</select> <input type="submit" name="sort" value="{L_SUBMIT}" class="button2" /></label>  </fieldset>  <!-- ENDIF --> @@ -155,11 +155,11 @@  <hr />  <ul class="linklist"> -	<li class="rightside pagination">{TOTAL_USERS}  -		<!-- IF .pagination -->  -			•  +	<li class="rightside pagination">{TOTAL_USERS} +		<!-- IF .pagination --> +			•  			<!-- INCLUDE pagination.html --> -		<!-- ELSE -->  +		<!-- ELSE -->  			{PAGE_NUMBER}  		<!-- ENDIF -->  	</li> diff --git a/phpBB/styles/prosilver/template/memberlist_email.html b/phpBB/styles/prosilver/template/memberlist_email.html index 97bea144e8..c40a5f1a8b 100644 --- a/phpBB/styles/prosilver/template/memberlist_email.html +++ b/phpBB/styles/prosilver/template/memberlist_email.html @@ -12,30 +12,30 @@  		<fieldset class="fields2">  		<!-- IF S_SEND_USER -->  			<dl> -				<dt><label>{L_RECIPIENT}:</label></dt> +				<dt><label>{L_RECIPIENT}{L_COLON}</label></dt>  				<dd><strong>{USERNAME}</strong></dd>  			</dl>  			<dl> -				<dt><label for="subject">{L_SUBJECT}:</label></dt> +				<dt><label for="subject">{L_SUBJECT}{L_COLON}</label></dt>  				<dd><input class="inputbox autowidth" type="text" name="subject" id="subject" size="50" tabindex="1" value="{SUBJECT}" /></dd>  			</dl>  		<!-- ELSE -->  			<dl> -				<dt><label for="email">{L_EMAIL_ADDRESS}:</label></dt> +				<dt><label for="email">{L_EMAIL_ADDRESS}{L_COLON}</label></dt>  				<dd><input class="inputbox autowidth" type="text" name="email" id="email" size="50" maxlength="100" tabindex="2" value="{EMAIL}" /></dd>  			</dl>  			<dl> -				<dt><label for="name">{L_REAL_NAME}:</label></dt> +				<dt><label for="name">{L_REAL_NAME}{L_COLON}</label></dt>  				<dd><input class="inputbox autowidth" type="text" name="name" id="name" size="50" tabindex="3" value="{NAME}" /></dd>  			</dl>  			<dl> -				<dt><label for="lang">{L_DEST_LANG}:</label><br /> +				<dt><label for="lang">{L_DEST_LANG}{L_COLON}</label><br />  					<span>{L_DEST_LANG_EXPLAIN}</span></dt>  				<dd><select name="lang">{S_LANG_OPTIONS}</select></dd>  			</dl>  		<!-- ENDIF -->  		<dl> -			<dt><label for="message">{L_MESSAGE_BODY}:</label><br /> +			<dt><label for="message">{L_MESSAGE_BODY}{L_COLON}</label><br />  			<span>{L_EMAIL_BODY_EXPLAIN}</span></dt>  			<dd><textarea class="inputbox" name="message" id="message" rows="15" cols="76" tabindex="4">{MESSAGE}</textarea></dd>  		</dl> diff --git a/phpBB/styles/prosilver/template/memberlist_im.html b/phpBB/styles/prosilver/template/memberlist_im.html index ccef778ebb..68aed0b3dd 100644 --- a/phpBB/styles/prosilver/template/memberlist_im.html +++ b/phpBB/styles/prosilver/template/memberlist_im.html @@ -12,17 +12,17 @@  	<fieldset>  	<dl class="fields2"> -		<dt><label>{L_IM_RECIPIENT}:</label></dt> +		<dt><label>{L_IM_RECIPIENT}{L_COLON}</label></dt>  		<dd><strong>{USERNAME}</strong><!-- IF S_SEND_ICQ or S_SEND_AIM or S_SEND_MSNM or S_NO_SEND_JABBER --> [ {IM_CONTACT} ]<!-- ENDIF --><!-- IF PRESENCE_IMG --> {PRESENCE_IMG}<!-- ENDIF --></dd>  	</dl>  	<!-- IF S_SEND_ICQ -->  		<dl class="fields2"> -			<dt><label for="from">{L_IM_NAME}:</label></dt> +			<dt><label for="from">{L_IM_NAME}{L_COLON}</label></dt>  			<dd><input class="inputbox autowidth" type="text" name="from" id="from" size="20" /></dd>  		</dl>  		<dl class="fields2"> -			<dt><label for="body">{L_IM_MESSAGE}:</label></dt> +			<dt><label for="body">{L_IM_MESSAGE}{L_COLON}</label></dt>  			<dd><textarea class="inputbox autowidth" name="body" id="body" rows="5" cols="45"></textarea></dd>  		</dl>  		<dl class="fields2"> @@ -54,7 +54,7 @@  	<!-- IF S_SEND_JABBER -->  		<dl class="fields2"> -			<dt><label for="message">{L_IM_MESSAGE}:</label></dt> +			<dt><label for="message">{L_IM_MESSAGE}{L_COLON}</label></dt>  			<dd><textarea class="inputbox autowidth" name="message" id="message" rows="5" cols="45"></textarea></dd>  		</dl>  		<dl class="fields2"> diff --git a/phpBB/styles/prosilver/template/memberlist_search.html b/phpBB/styles/prosilver/template/memberlist_search.html index 2ea32fc774..6fed528cea 100644 --- a/phpBB/styles/prosilver/template/memberlist_search.html +++ b/phpBB/styles/prosilver/template/memberlist_search.html @@ -50,60 +50,60 @@ function insert_single(user)  	<fieldset class="fields1 column1">  	<dl> -		<dt><label for="username">{L_USERNAME}:</label></dt> +		<dt><label for="username">{L_USERNAME}{L_COLON}</label></dt>  		<dd><input type="text" name="username" id="username" value="{USERNAME}" class="inputbox" /></dd>  	</dl>  <!-- IF S_EMAIL_SEARCH_ALLOWED -->  	<dl> -		<dt><label for="email">{L_EMAIL}:</label></dt> +		<dt><label for="email">{L_EMAIL}{L_COLON}</label></dt>  		<dd><input type="text" name="email" id="email" value="{EMAIL}" class="inputbox" /></dd>  	</dl>  <!-- ENDIF -->  	<dl> -		<dt><label for="icq">{L_ICQ}:</label></dt> +		<dt><label for="icq">{L_ICQ}{L_COLON}</label></dt>  		<dd><input type="text" name="icq" id="icq" value="{ICQ}" class="inputbox" /></dd>  	</dl>  	<dl> -		<dt><label for="aim">{L_AIM}:</label></dt> +		<dt><label for="aim">{L_AIM}{L_COLON}</label></dt>  		<dd><input type="text" name="aim" id="aim" value="{AIM}" class="inputbox" /></dd>  	</dl>  	<dl> -		<dt><label for="yahoo">{L_YIM}:</label></dt> +		<dt><label for="yahoo">{L_YIM}{L_COLON}</label></dt>  		<dd><input type="text" name="yahoo" id="yahoo" value="{YAHOO}" class="inputbox" /></dd>  	</dl>  	<dl> -		<dt><label for="msn">{L_MSNM}:</label></dt> +		<dt><label for="msn">{L_MSNM}{L_COLON}</label></dt>  		<dd><input type="text" name="msn" id="msn" value="{MSNM}" class="inputbox" /></dd>  	</dl>  	</fieldset>  	<fieldset class="fields1 column2">  	<dl> -		<dt><label for="joined">{L_JOINED}:</label></dt> +		<dt><label for="joined">{L_JOINED}{L_COLON}</label></dt>  		<dd><select name="joined_select">{S_JOINED_TIME_OPTIONS}</select> <input class="inputbox medium" type="text" name="joined" id="joined" value="{JOINED}" /></dd>  	</dl>  <!-- IF S_VIEWONLINE -->  	<dl> -		<dt><label for="active">{L_LAST_ACTIVE}:</label></dt> +		<dt><label for="active">{L_LAST_ACTIVE}{L_COLON}</label></dt>  		<dd><select name="active_select">{S_ACTIVE_TIME_OPTIONS}</select> <input class="inputbox medium" type="text" name="active" id="active" value="{ACTIVE}" /></dd>  	</dl>  <!-- ENDIF -->  	<dl> -		<dt><label for="count">{L_POSTS}:</label></dt> +		<dt><label for="count">{L_POSTS}{L_COLON}</label></dt>  		<dd><select name="count_select">{S_COUNT_OPTIONS}</select> <input class="inputbox medium" type="text" name="count" id="count" value="{COUNT}" /></dd>  	</dl>  <!-- IF S_IP_SEARCH_ALLOWED -->  	<dl> -		<dt><label for="ip">{L_POST_IP}:</label></dt> +		<dt><label for="ip">{L_POST_IP}{L_COLON}</label></dt>  		<dd><input class="inputbox medium" type="text" name="ip" id="ip" value="{IP}" /></dd>  	</dl>  <!-- ENDIF -->  	<dl> -		<dt><label for="search_group_id">{L_GROUP}:</label></dt> +		<dt><label for="search_group_id">{L_GROUP}{L_COLON}</label></dt>  		<dd><select name="search_group_id" id="search_group_id">{S_GROUP_SELECT}</select></dd>  	</dl>  	<dl> -		<dt><label for="sk" class="label3">{L_SORT_BY}:</label></dt> +		<dt><label for="sk" class="label3">{L_SORT_BY}{L_COLON}</label></dt>  		<dd><select name="sk" id="sk">{S_SORT_OPTIONS}</select> <select name="sd">{S_ORDER_SELECT}</select></dd>  	</dl>  	</fieldset> diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html index b50e3a84ad..57cfcb86d9 100644 --- a/phpBB/styles/prosilver/template/memberlist_view.html +++ b/phpBB/styles/prosilver/template/memberlist_view.html @@ -15,7 +15,7 @@  	<!-- ENDIF -->  	<dl class="left-box details" style="width: 80%;"> -		<dt>{L_USERNAME}:</dt> +		<dt>{L_USERNAME}{L_COLON}</dt>  		<dd>  			<!-- IF USER_COLOR --><span style="color: {USER_COLOR}; font-weight: bold;"><!-- ELSE --><span><!-- ENDIF -->{USERNAME}</span>  			<!-- IF U_USER_ADMIN --> [ <a href="{U_USER_ADMIN}">{L_USER_ADMIN}</a> ]<!-- ENDIF --> @@ -23,16 +23,16 @@  			<!-- IF U_SWITCH_PERMISSIONS --> [ <a href="{U_SWITCH_PERMISSIONS}">{L_USE_PERMISSIONS}</a> ]<!-- ENDIF -->  		</dd>  		<!-- IF not AVATAR_IMG --> -			<!-- IF RANK_TITLE --><dt>{L_RANK}:</dt> <dd>{RANK_TITLE}</dd><!-- ENDIF --> -			<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE --> <!-- ELSE -->{L_RANK}:<!-- ENDIF --></dt> <dd>{RANK_IMG}</dd><!-- ENDIF --> +			<!-- IF RANK_TITLE --><dt>{L_RANK}{L_COLON}</dt> <dd>{RANK_TITLE}</dd><!-- ENDIF --> +			<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE --> <!-- ELSE -->{L_RANK}{L_COLON}<!-- ENDIF --></dt> <dd>{RANK_IMG}</dd><!-- ENDIF -->  		<!-- ENDIF --> -		<!-- IF S_USER_INACTIVE --><dt>{L_USER_IS_INACTIVE}:</dt> <dd>{USER_INACTIVE_REASON}</dd><!-- ENDIF --> -		<!-- IF LOCATION --><dt>{L_LOCATION}:</dt> <dd>{LOCATION}</dd><!-- ENDIF --> -		<!-- IF AGE !== '' --><dt>{L_AGE}:</dt> <dd>{AGE}</dd><!-- ENDIF --> -		<!-- IF OCCUPATION --><dt>{L_OCCUPATION}:</dt> <dd>{OCCUPATION}</dd><!-- ENDIF --> -		<!-- IF INTERESTS --><dt>{L_INTERESTS}:</dt> <dd>{INTERESTS}</dd><!-- ENDIF --> -		<!-- IF S_GROUP_OPTIONS --><dt>{L_USERGROUPS}:</dt> <dd><select name="g">{S_GROUP_OPTIONS}</select> <input type="submit" name="submit" value="{L_GO}" class="button2" /></dd><!-- ENDIF --> -		<!-- BEGIN custom_fields --><dt>{custom_fields.PROFILE_FIELD_NAME}:</dt> <dd>{custom_fields.PROFILE_FIELD_VALUE}</dd><!-- END custom_fields --> +		<!-- IF S_USER_INACTIVE --><dt>{L_USER_IS_INACTIVE}{L_COLON}</dt> <dd>{USER_INACTIVE_REASON}</dd><!-- ENDIF --> +		<!-- IF LOCATION --><dt>{L_LOCATION}{L_COLON}</dt> <dd>{LOCATION}</dd><!-- ENDIF --> +		<!-- IF AGE !== '' --><dt>{L_AGE}{L_COLON}</dt> <dd>{AGE}</dd><!-- ENDIF --> +		<!-- IF OCCUPATION --><dt>{L_OCCUPATION}{L_COLON}</dt> <dd>{OCCUPATION}</dd><!-- ENDIF --> +		<!-- IF INTERESTS --><dt>{L_INTERESTS}{L_COLON}</dt> <dd>{INTERESTS}</dd><!-- ENDIF --> +		<!-- IF S_GROUP_OPTIONS --><dt>{L_USERGROUPS}{L_COLON}</dt> <dd><select name="g">{S_GROUP_OPTIONS}</select> <input type="submit" name="submit" value="{L_GO}" class="button2" /></dd><!-- ENDIF --> +		<!-- BEGIN custom_fields --><dt>{custom_fields.PROFILE_FIELD_NAME}{L_COLON}</dt> <dd>{custom_fields.PROFILE_FIELD_VALUE}</dd><!-- END custom_fields -->  		<!-- IF S_USER_LOGGED_IN and S_ZEBRA -->  			<!-- IF U_REMOVE_FRIEND -->  				<dt> </dt> <dd class="zebra"><a href="{U_REMOVE_FRIEND}" data-ajax="zebra"><strong>{L_REMOVE_FRIEND}</strong></a></dd> @@ -59,17 +59,17 @@  		<h3>{L_CONTACT_USER} {USERNAME}</h3>  		<dl class="details"> -		<!-- IF U_EMAIL --><dt>{L_EMAIL_ADDRESS}:</dt> <dd><a href="{U_EMAIL}">{L_SEND_EMAIL_USER} {USERNAME}</a></dd><!-- ENDIF --> -		<!-- IF U_WWW --><dt>{L_WEBSITE}:</dt> <dd><a href="{U_WWW}" title="{L_VISIT_WEBSITE}: {U_WWW}">{U_WWW}</a></dd><!-- ENDIF --> -		<!-- IF U_PM --><dt>{L_PM}:</dt> <dd><a href="{U_PM}">{L_SEND_PRIVATE_MESSAGE}</a></dd><!-- ENDIF --> -		<!-- IF U_MSN or USER_MSN --><dt>{L_MSNM}:</dt> <dd><!-- IF U_MSN --><a href="{U_MSN}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_MSNM_MESSAGE}</a><!-- ELSE -->{USER_MSN}<!-- ENDIF --></dd><!-- ENDIF --> -		<!-- IF U_YIM or USER_YIM --><dt>{L_YIM}:</dt> <dd><!-- IF U_YIM --><a href="{U_YIM}" onclick="popup(this.href, 780, 550); return false;">{L_SEND_YIM_MESSAGE}</a><!-- ELSE -->{USER_YIM}<!-- ENDIF --></dd><!-- ENDIF --> -		<!-- IF U_AIM or USER_AIM --><dt>{L_AIM}:</dt> <dd><!-- IF U_AIM --><a href="{U_AIM}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_AIM_MESSAGE}</a><!-- ELSE -->{USER_AIM}<!-- ENDIF --></dd><!-- ENDIF --> -		<!-- IF U_ICQ or USER_ICQ --><dt>{L_ICQ}:</dt> <dd><!-- IF U_ICQ --><a href="{U_ICQ}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_ICQ_MESSAGE}</a><!-- ELSE -->{USER_ICQ}<!-- ENDIF --></dd><!-- ENDIF --> -		<!-- IF U_JABBER and S_JABBER_ENABLED --><dt>{L_JABBER}:</dt> <dd><a href="{U_JABBER}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_JABBER_MESSAGE}</a></dd><!-- ELSEIF USER_JABBER --><dt>{L_JABBER}:</dt> <dd>{USER_JABBER}</dd><!-- ENDIF --> +		<!-- IF U_EMAIL --><dt>{L_EMAIL_ADDRESS}{L_COLON}</dt> <dd><a href="{U_EMAIL}">{L_SEND_EMAIL_USER} {USERNAME}</a></dd><!-- ENDIF --> +		<!-- IF U_WWW --><dt>{L_WEBSITE}{L_COLON}</dt> <dd><a href="{U_WWW}" title="{L_VISIT_WEBSITE}{L_COLON} {U_WWW}">{U_WWW}</a></dd><!-- ENDIF --> +		<!-- IF U_PM --><dt>{L_PM}{L_COLON}</dt> <dd><a href="{U_PM}">{L_SEND_PRIVATE_MESSAGE}</a></dd><!-- ENDIF --> +		<!-- IF U_MSN or USER_MSN --><dt>{L_MSNM}{L_COLON}</dt> <dd><!-- IF U_MSN --><a href="{U_MSN}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_MSNM_MESSAGE}</a><!-- ELSE -->{USER_MSN}<!-- ENDIF --></dd><!-- ENDIF --> +		<!-- IF U_YIM or USER_YIM --><dt>{L_YIM}{L_COLON}</dt> <dd><!-- IF U_YIM --><a href="{U_YIM}" onclick="popup(this.href, 780, 550); return false;">{L_SEND_YIM_MESSAGE}</a><!-- ELSE -->{USER_YIM}<!-- ENDIF --></dd><!-- ENDIF --> +		<!-- IF U_AIM or USER_AIM --><dt>{L_AIM}{L_COLON}</dt> <dd><!-- IF U_AIM --><a href="{U_AIM}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_AIM_MESSAGE}</a><!-- ELSE -->{USER_AIM}<!-- ENDIF --></dd><!-- ENDIF --> +		<!-- IF U_ICQ or USER_ICQ --><dt>{L_ICQ}{L_COLON}</dt> <dd><!-- IF U_ICQ --><a href="{U_ICQ}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_ICQ_MESSAGE}</a><!-- ELSE -->{USER_ICQ}<!-- ENDIF --></dd><!-- ENDIF --> +		<!-- IF U_JABBER and S_JABBER_ENABLED --><dt>{L_JABBER}{L_COLON}</dt> <dd><a href="{U_JABBER}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_JABBER_MESSAGE}</a></dd><!-- ELSEIF USER_JABBER --><dt>{L_JABBER}{L_COLON}</dt> <dd>{USER_JABBER}</dd><!-- ENDIF -->  		<!-- IF S_PROFILE_FIELD1 -->  			<!-- NOTE: Use a construct like this to include admin defined profile fields. Replace FIELD1 with the name of your field. --> -			<dt>{PROFILE_FIELD1_NAME}:</dt> <dd>{PROFILE_FIELD1_VALUE}</dd> +			<dt>{PROFILE_FIELD1_NAME}{L_COLON}</dt> <dd>{PROFILE_FIELD1_VALUE}</dd>  		<!-- ENDIF -->  		</dl>  	</div> @@ -77,20 +77,20 @@  	<div class="column2">  		<h3>{L_USER_FORUM}</h3>  		<dl class="details"> -			<dt>{L_JOINED}:</dt> <dd>{JOINED}</dd> -			<dt>{L_VISITED}:</dt> <dd>{VISITED}</dd> +			<dt>{L_JOINED}{L_COLON}</dt> <dd>{JOINED}</dd> +			<dt>{L_VISITED}{L_COLON}</dt> <dd>{VISITED}</dd>  			<!-- IF S_WARNINGS --> -			<dt>{L_WARNINGS}: </dt> +			<dt>{L_WARNINGS}{L_COLON} </dt>  			<dd><strong>{WARNINGS}</strong><!-- IF U_NOTES or U_WARN --> [ <!-- IF U_NOTES --><a href="{U_NOTES}">{L_VIEW_NOTES}</a><!-- ENDIF --> <!-- IF U_WARN --><!-- IF U_NOTES --> | <!-- ENDIF --><a href="{U_WARN}">{L_WARN_USER}</a><!-- ENDIF --> ]<!-- ENDIF --></dd>  			<!-- ENDIF --> -			<dt>{L_TOTAL_POSTS}:</dt> +			<dt>{L_TOTAL_POSTS}{L_COLON}</dt>  				<dd>{POSTS} <!-- IF S_DISPLAY_SEARCH -->| <strong><a href="{U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a></strong><!-- ENDIF -->  					<!-- IF POSTS_PCT --><br />({POSTS_PCT} / {POSTS_DAY})<!-- ENDIF -->  					<!-- IF POSTS_IN_QUEUE and U_MCP_QUEUE --><br />(<a href="{U_MCP_QUEUE}">{L_POSTS_IN_QUEUE}</a>)<!-- ELSEIF POSTS_IN_QUEUE --><br />({L_POSTS_IN_QUEUE})<!-- ENDIF -->  				</dd>  			<!-- IF S_SHOW_ACTIVITY and POSTS --> -				<dt>{L_ACTIVE_IN_FORUM}:</dt> <dd><!-- IF ACTIVE_FORUM != '' --><strong><a href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></strong><br />({ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT})<!-- ELSE --> - <!-- ENDIF --></dd> -				<dt>{L_ACTIVE_IN_TOPIC}:</dt> <dd><!-- IF ACTIVE_TOPIC != '' --><strong><a href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></strong><br />({ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT})<!-- ELSE --> - <!-- ENDIF --></dd> +				<dt>{L_ACTIVE_IN_FORUM}{L_COLON}</dt> <dd><!-- IF ACTIVE_FORUM != '' --><strong><a href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></strong><br />({ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT})<!-- ELSE --> - <!-- ENDIF --></dd> +				<dt>{L_ACTIVE_IN_TOPIC}{L_COLON}</dt> <dd><!-- IF ACTIVE_TOPIC != '' --><strong><a href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></strong><br />({ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT})<!-- ELSE --> - <!-- ENDIF --></dd>  			<!-- ENDIF -->  		</dl>  	</div> diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 0900222d09..79a8b07971 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -26,7 +26,7 @@  <script type="text/javascript">  // <![CDATA[ -	var jump_page = '{LA_JUMP_PAGE}:'; +	var jump_page = '{LA_JUMP_PAGE}{L_COLON}';  	var on_page = '{ON_PAGE}';  	var per_page = '{PER_PAGE}';  	var base_url = '{A_BASE_URL}'; @@ -162,7 +162,7 @@  		<!-- IF S_BOARD_DISABLED and S_USER_LOGGED_IN and (U_MCP or U_ACP) -->  		<div id="information" class="rules">  			<div class="inner"> -				<strong>{L_INFORMATION}:</strong> {L_BOARD_DISABLED} +				<strong>{L_INFORMATION}{L_COLON}</strong> {L_BOARD_DISABLED}  			</div>  		</div>  		<!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/posting_attach_body.html b/phpBB/styles/prosilver/template/posting_attach_body.html index 162b0b5d4e..fa9dd19c09 100644 --- a/phpBB/styles/prosilver/template/posting_attach_body.html +++ b/phpBB/styles/prosilver/template/posting_attach_body.html @@ -5,14 +5,14 @@  	<fieldset class="fields2">  	<dl> -		<dt><label for="fileupload">{L_FILENAME}:</label></dt> +		<dt><label for="fileupload">{L_FILENAME}{L_COLON}</label></dt>  		<dd>  			<input type="file" name="fileupload" id="fileupload" maxlength="{FILESIZE}" value="" class="inputbox autowidth" />   			<input type="submit" name="add_file" value="{L_ADD_FILE}" class="button2" onclick="upload = true;" />  		</dd>  	</dl>  	<dl> -		<dt><label for="filecomment">{L_FILE_COMMENT}:</label></dt> +		<dt><label for="filecomment">{L_FILE_COMMENT}{L_COLON}</label></dt>  		<dd><textarea name="filecomment" id="filecomment" rows="1" cols="40" class="inputbox autowidth">{FILE_COMMENT}</textarea></dd>  	</dl>  	</fieldset> diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html index 78c2a0d9f2..8e87407757 100644 --- a/phpBB/styles/prosilver/template/posting_buttons.html +++ b/phpBB/styles/prosilver/template/posting_buttons.html @@ -28,7 +28,7 @@  		y: '{LA_BBCODE_Y_HELP}',  		d: '{LA_BBCODE_D_HELP}'  		<!-- BEGIN custom_tags --> -			,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}' +			,cb_{custom_tags.BBCODE_ID}{L_COLON} '{custom_tags.A_BBCODE_HELPLINE}'  		<!-- END custom_tags -->  	} @@ -43,7 +43,7 @@  <!-- IF S_BBCODE_ALLOWED -->  <div id="colour_palette" style="display: none;">  	<dl style="clear: left;"> -		<dt><label>{L_FONT_COLOR}:</label></dt> +		<dt><label>{L_FONT_COLOR}{L_COLON}</label></dt>  		<dd>  		<script type="text/javascript">  		// <![CDATA[ diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html index 2b554f2c1f..c206cc3181 100644 --- a/phpBB/styles/prosilver/template/posting_editor.html +++ b/phpBB/styles/prosilver/template/posting_editor.html @@ -13,7 +13,7 @@  		<!-- IF S_ALLOW_MASS_PM -->  			<!-- IF .to_recipient -->  				<dl> -					<dt><label>{L_TO}:</label></dt> +					<dt><label>{L_TO}{L_COLON}</label></dt>  					<dd>  						<!-- BEGIN to_recipient -->  							<!-- IF not to_recipient.S_FIRST_ROW and to_recipient.S_ROW_COUNT mod 2 eq 0 --></dd><dd><!-- ENDIF --> @@ -25,7 +25,7 @@  			<!-- ENDIF -->  			<!-- IF .bcc_recipient -->  				<dl> -					<dt><label>{L_BCC}:</label></dt> +					<dt><label>{L_BCC}{L_COLON}</label></dt>  					<dd>  						<!-- BEGIN bcc_recipient -->  							<!-- IF not bcc_recipient.S_FIRST_ROW and bcc_recipient.S_ROW_COUNT mod 2 eq 0 --></dd><dd><!-- ENDIF --> @@ -45,7 +45,7 @@  			<!-- ENDIF -->  		<!-- ELSE -->  			<dl> -				<dt><label for="username_list">{L_TO}:</label><!-- IF not S_EDIT_POST --><br /><span><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false">{L_FIND_USERNAME}</a></span><!-- ENDIF --></dt> +				<dt><label for="username_list">{L_TO}{L_COLON}</label><!-- IF not S_EDIT_POST --><br /><span><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false">{L_FIND_USERNAME}</a></span><!-- ENDIF --></dt>  				<!-- IF .to_recipient -->  					<dd>  						<!-- BEGIN to_recipient --> @@ -67,7 +67,7 @@  		<!-- IF S_GROUP_OPTIONS -->  			<div class="column2">  				<dl> -					<dd><label for="group_list">{L_USERGROUPS}:</label> <select name="group_list[]" id="group_list" multiple="multiple" size="4" class="inputbox">{S_GROUP_OPTIONS}</select></dd> +					<dd><label for="group_list">{L_USERGROUPS}{L_COLON}</label> <select name="group_list[]" id="group_list" multiple="multiple" size="4" class="inputbox">{S_GROUP_OPTIONS}</select></dd>  				</dl>  			</div>  		<!-- ENDIF --> @@ -78,14 +78,14 @@  	<!-- IF S_DELETE_ALLOWED -->  	<dl> -		<dt><label for="delete">{L_DELETE_POST}:</label></dt> +		<dt><label for="delete">{L_DELETE_POST}{L_COLON}</label></dt>  		<dd><label for="delete"><input type="checkbox" name="delete" id="delete" /> {L_DELETE_POST_WARN}</label></dd>  	</dl>  	<!-- ENDIF -->  	<!-- IF S_SHOW_TOPIC_ICONS or S_SHOW_PM_ICONS -->  	<dl> -		<dt><label for="icon">{L_ICON}:</label></dt> +		<dt><label for="icon">{L_ICON}{L_COLON}</label></dt>  		<dd>  			<label for="icon"><input type="radio" name="icon" id="icon" value="0" checked="checked" tabindex="1" /> <!-- IF S_SHOW_TOPIC_ICONS -->{L_NO_TOPIC_ICON}<!-- ELSE -->{L_NO_PM_ICON}<!-- ENDIF --></label>  			<!-- BEGIN topic_icon --><label for="icon-{topic_icon.ICON_ID}"><input type="radio" name="icon" id="icon-{topic_icon.ICON_ID}" value="{topic_icon.ICON_ID}" {topic_icon.S_ICON_CHECKED} tabindex="1" /><img src="{topic_icon.ICON_IMG}" width="{topic_icon.ICON_WIDTH}" height="{topic_icon.ICON_HEIGHT}" alt="" title="" /></label> <!-- END topic_icon --> @@ -95,14 +95,14 @@  	<!-- IF not S_PRIVMSGS and S_DISPLAY_USERNAME -->  	<dl style="clear: left;"> -		<dt><label for="username">{L_USERNAME}:</label></dt> +		<dt><label for="username">{L_USERNAME}{L_COLON}</label></dt>  		<dd><input type="text" tabindex="1" name="username" id="username" size="25" value="{USERNAME}" class="inputbox autowidth" /></dd>  	</dl>  	<!-- ENDIF -->  	<!-- IF S_POST_ACTION or S_PRIVMSGS or S_EDIT_DRAFT -->  	<dl style="clear: left;"> -		<dt><label for="subject">{L_SUBJECT}:</label></dt> +		<dt><label for="subject">{L_SUBJECT}{L_COLON}</label></dt>  		<dd><input type="text" name="subject" id="subject" size="45" maxlength="<!-- IF S_NEW_MESSAGE -->120<!-- ELSE -->124<!-- ENDIF -->" tabindex="2" value="{SUBJECT}{DRAFT_SUBJECT}" class="inputbox autowidth" /></dd>  	</dl>  	<!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_CODE --> @@ -163,7 +163,7 @@  			<!-- BEGIN attach_row -->  			<dl> -				<dt><label for="comment_list_{attach_row.ASSOC_INDEX}">{L_FILE_COMMENT}:</label></dt> +				<dt><label for="comment_list_{attach_row.ASSOC_INDEX}">{L_FILE_COMMENT}{L_COLON}</label></dt>  				<dd><textarea name="comment_list[{attach_row.ASSOC_INDEX}]" id="comment_list_{attach_row.ASSOC_INDEX}" rows="1" cols="35" class="inputbox">{attach_row.FILE_COMMENT}</textarea></dd>  				<dd><a href="{attach_row.U_VIEW_ATTACHMENT}" class="{S_CONTENT_FLOW_END}">{attach_row.FILENAME}</a></dd>  				<dd style="margin-top: 5px;"> @@ -241,14 +241,14 @@  			<!-- IF S_TYPE_TOGGLE -->  			<dl> -				<dt><label for="topic_type-0"><!-- IF S_EDIT_POST -->{L_CHANGE_TOPIC_TO}<!-- ELSE -->{L_POST_TOPIC_AS}<!-- ENDIF -->:</label></dt> +				<dt><label for="topic_type-0"><!-- IF S_EDIT_POST -->{L_CHANGE_TOPIC_TO}<!-- ELSE -->{L_POST_TOPIC_AS}<!-- ENDIF -->{L_COLON}</label></dt>  				<dd><!-- BEGIN topic_type --><label for="topic_type-{topic_type.VALUE}"><input type="radio" name="topic_type" id="topic_type-{topic_type.VALUE}" value="{topic_type.VALUE}"{topic_type.S_CHECKED} />{topic_type.L_TOPIC_TYPE}</label> <!-- END topic_type --></dd>  			</dl>  			<!-- ENDIF -->  			<!-- IF S_TOPIC_TYPE_ANNOUNCE or S_TOPIC_TYPE_STICKY -->  			<dl> -				<dt><label for="topic_time_limit">{L_STICK_TOPIC_FOR}:</label></dt> +				<dt><label for="topic_time_limit">{L_STICK_TOPIC_FOR}{L_COLON}</label></dt>  				<dd><label for="topic_time_limit"><input type="text" name="topic_time_limit" id="topic_time_limit" size="3" maxlength="3" value="{TOPIC_TIME_LIMIT}" class="inputbox autowidth" /> {L_DAYS}</label></dd>  				<dd>{L_STICK_TOPIC_FOR_EXPLAIN}</dd>  			</dl> @@ -256,7 +256,7 @@  			<!-- IF S_EDIT_REASON -->  			<dl> -				<dt><label for="edit_reason">{L_EDIT_REASON}:</label></dt> +				<dt><label for="edit_reason">{L_EDIT_REASON}{L_COLON}</label></dt>  				<dd><input type="text" name="edit_reason" id="edit_reason" value="{EDIT_REASON}" class="inputbox" /></dd>  			</dl>  			<!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/posting_layout.html b/phpBB/styles/prosilver/template/posting_layout.html index a5cb3fc154..4e9954ef81 100644 --- a/phpBB/styles/prosilver/template/posting_layout.html +++ b/phpBB/styles/prosilver/template/posting_layout.html @@ -45,7 +45,7 @@  			<h2>{L_SELECT_DESTINATION_FORUM}</h2>  			<p>{L_UNGLOBALISE_EXPLAIN}</p>  			<dl> -				<dt><label for="to_forum_id">{L_MOVE}:</label></dt> +				<dt><label for="to_forum_id">{L_MOVE}{L_COLON}</label></dt>  				<dd><select id="to_forum_id" name="to_forum_id">{S_FORUM_SELECT}</select></dd>  			</dl> diff --git a/phpBB/styles/prosilver/template/posting_poll_body.html b/phpBB/styles/prosilver/template/posting_poll_body.html index 3f64c5d5b5..5d6e01e997 100644 --- a/phpBB/styles/prosilver/template/posting_poll_body.html +++ b/phpBB/styles/prosilver/template/posting_poll_body.html @@ -9,28 +9,28 @@  	<!-- IF S_SHOW_POLL_BOX -->  		<!-- IF S_POLL_DELETE -->  			<dl> -				<dt><label for="poll_delete">{L_POLL_DELETE}:</label></dt> +				<dt><label for="poll_delete">{L_POLL_DELETE}{L_COLON}</label></dt>  				<dd><label for="poll_delete"><input type="checkbox" name="poll_delete" id="poll_delete"<!-- IF S_POLL_DELETE_CHECKED --> checked="checked"<!-- ENDIF --> /> </label></dd>  			</dl>  		<!-- ENDIF -->  		<dl> -			<dt><label for="poll_title">{L_POLL_QUESTION}:</label></dt> +			<dt><label for="poll_title">{L_POLL_QUESTION}{L_COLON}</label></dt>  			<dd><input type="text" name="poll_title" id="poll_title" maxlength="255" value="{POLL_TITLE}" class="inputbox" /></dd>  		</dl>  		<dl> -			<dt><label for="poll_option_text">{L_POLL_OPTIONS}:</label><br /><span>{L_POLL_OPTIONS_EXPLAIN}</span></dt> +			<dt><label for="poll_option_text">{L_POLL_OPTIONS}{L_COLON}</label><br /><span>{L_POLL_OPTIONS_EXPLAIN}</span></dt>  			<dd><textarea name="poll_option_text" id="poll_option_text" rows="5" cols="35" class="inputbox">{POLL_OPTIONS}</textarea></dd>  		</dl>  		<hr class="dashed" />  		<dl> -			<dt><label for="poll_max_options">{L_POLL_MAX_OPTIONS}:</label></dt> +			<dt><label for="poll_max_options">{L_POLL_MAX_OPTIONS}{L_COLON}</label></dt>  			<dd><input type="text" name="poll_max_options" id="poll_max_options" size="3" maxlength="3" value="{POLL_MAX_OPTIONS}" class="inputbox autowidth" /></dd>  			<dd>{L_POLL_MAX_OPTIONS_EXPLAIN}</dd>  		</dl>  		<dl> -			<dt><label for="poll_length">{L_POLL_FOR}:</label></dt> +			<dt><label for="poll_length">{L_POLL_FOR}{L_COLON}</label></dt>  			<dd><label for="poll_length"><input type="text" name="poll_length" id="poll_length" size="3" maxlength="3" value="{POLL_LENGTH}" class="inputbox autowidth" /> {L_DAYS}</label></dd>  			<dd>{L_POLL_FOR_EXPLAIN}</dd>  		</dl> @@ -39,14 +39,14 @@  			<hr class="dashed" />  			<dl> -				<dt><label for="poll_vote_change">{L_POLL_VOTE_CHANGE}:</label></dt> +				<dt><label for="poll_vote_change">{L_POLL_VOTE_CHANGE}{L_COLON}</label></dt>  				<dd><label for="poll_vote_change"><input type="checkbox" id="poll_vote_change" name="poll_vote_change"{VOTE_CHANGE_CHECKED} /> {L_POLL_VOTE_CHANGE_EXPLAIN}</label></dd>  			</dl>  		<!-- ENDIF -->  	<!-- ELSEIF S_POLL_DELETE -->  		<dl class="fields1"> -			<dt><label for="poll_delete">{L_POLL_DELETE}:</label></dt> +			<dt><label for="poll_delete">{L_POLL_DELETE}{L_COLON}</label></dt>  			<dd><label for="poll_delete"><input type="checkbox" name="poll_delete" id="poll_delete"<!-- IF S_POLL_DELETE_CHECKED --> checked="checked"<!-- ENDIF --> /> </label></dd>  		</dl>  	<!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/posting_preview.html b/phpBB/styles/prosilver/template/posting_preview.html index 16fc4ba233..a5aae8c436 100644 --- a/phpBB/styles/prosilver/template/posting_preview.html +++ b/phpBB/styles/prosilver/template/posting_preview.html @@ -3,7 +3,7 @@  <!-- IF S_HAS_POLL_OPTIONS -->  	<div class="content"> -		<h2>{L_PREVIEW}: {POLL_QUESTION}</h2> +		<h2>{L_PREVIEW}{L_COLON} {POLL_QUESTION}</h2>  		<p class="author"><!-- IF L_POLL_LENGTH -->{L_POLL_LENGTH}<br /><!-- ENDIF -->{L_MAX_VOTES}</p>  		<fieldset class="polls"> @@ -25,7 +25,7 @@  <!-- ENDIF -->  	<div class="postbody"> -		<h3>{L_PREVIEW}: {PREVIEW_SUBJECT}</h3> +		<h3>{L_PREVIEW}{L_COLON} {PREVIEW_SUBJECT}</h3>  		<div class="content">{PREVIEW_MESSAGE}</div> diff --git a/phpBB/styles/prosilver/template/posting_topic_review.html b/phpBB/styles/prosilver/template/posting_topic_review.html index 5e7b36c526..1fcc9facd0 100644 --- a/phpBB/styles/prosilver/template/posting_topic_review.html +++ b/phpBB/styles/prosilver/template/posting_topic_review.html @@ -1,7 +1,7 @@  <h3 id="review">  	<span class="right-box"><a href="#review" onclick="viewableArea(getElementById('topicreview'), true); var rev_text = getElementById('review').getElementsByTagName('a').item(0).firstChild; if (rev_text.data == '{LA_EXPAND_VIEW}'){rev_text.data = '{LA_COLLAPSE_VIEW}'; } else if (rev_text.data == '{LA_COLLAPSE_VIEW}'){rev_text.data = '{LA_EXPAND_VIEW}'};">{L_EXPAND_VIEW}</a></span> -	{L_TOPIC_REVIEW}: {TOPIC_TITLE} +	{L_TOPIC_REVIEW}{L_COLON} {TOPIC_TITLE}  </h3>  <div id="topicreview"> diff --git a/phpBB/styles/prosilver/template/quickreply_editor.html b/phpBB/styles/prosilver/template/quickreply_editor.html index 5fcdf0f5d4..9164cb1919 100644 --- a/phpBB/styles/prosilver/template/quickreply_editor.html +++ b/phpBB/styles/prosilver/template/quickreply_editor.html @@ -4,7 +4,7 @@  				<h2>{L_QUICKREPLY}</h2>  				<fieldset class="fields1">  					<dl style="clear: left;"> -						<dt><label for="subject">{L_SUBJECT}:</label></dt> +						<dt><label for="subject">{L_SUBJECT}{L_COLON}</label></dt>  						<dd><input type="text" name="subject" id="subject" size="45" maxlength="124" tabindex="2" value="{SUBJECT}" class="inputbox autowidth" /></dd>  					</dl>  				<div id="message-box"> diff --git a/phpBB/styles/prosilver/template/report_body.html b/phpBB/styles/prosilver/template/report_body.html index 3e876afe85..4cb03dc51c 100644 --- a/phpBB/styles/prosilver/template/report_body.html +++ b/phpBB/styles/prosilver/template/report_body.html @@ -11,12 +11,12 @@  		<fieldset>  		<dl class="fields2"> -			<dt><label for="reason_id">{L_REASON}:</label></dt> +			<dt><label for="reason_id">{L_REASON}{L_COLON}</label></dt>  			<dd><select name="reason_id" id="reason_id" class="full"><!-- BEGIN reason --><option value="{reason.ID}"<!-- IF reason.S_SELECTED --> selected="selected"<!-- ENDIF -->>{reason.DESCRIPTION}</option><!-- END reason --></select></dd>  		</dl>  		<!-- IF S_CAN_NOTIFY -->  			<dl class="fields2"> -				<dt><label for="notify1">{L_REPORT_NOTIFY}:</label><br /><span>{L_REPORT_NOTIFY_EXPLAIN}</span></dt> +				<dt><label for="notify1">{L_REPORT_NOTIFY}{L_COLON}</label><br /><span>{L_REPORT_NOTIFY_EXPLAIN}</span></dt>  				<dd>  					<label for="notify1"><input type="radio" name="notify" id="notify1" value="1" <!-- IF not S_NOTIFY -->checked="checked"<!-- ENDIF --> /> {L_YES}</label>   					<label for="notify0"><input type="radio" name="notify" id="notify0" value="0" <!-- IF S_NOTIFY -->checked="checked"<!-- ENDIF --> /> {L_NO}</label> @@ -24,7 +24,7 @@  			</dl>  		<!-- ENDIF -->  		<dl class="fields2"> -			<dt><label for="report_text">{L_MORE_INFO}:</label><br /><span>{L_CAN_LEAVE_BLANK}</span></dt> +			<dt><label for="report_text">{L_MORE_INFO}{L_COLON}</label><br /><span>{L_CAN_LEAVE_BLANK}</span></dt>  			<dd><textarea name="report_text" id="report_text" rows="10" cols="76" class="inputbox">{REPORT_TEXT}</textarea></dd>  		</dl>  		</fieldset> diff --git a/phpBB/styles/prosilver/template/search_body.html b/phpBB/styles/prosilver/template/search_body.html index 0d8797b2ff..dee080def5 100644 --- a/phpBB/styles/prosilver/template/search_body.html +++ b/phpBB/styles/prosilver/template/search_body.html @@ -18,13 +18,13 @@  	<fieldset>  	<dl> -		<dt><label for="keywords">{L_SEARCH_KEYWORDS}:</label><br /><span>{L_SEARCH_KEYWORDS_EXPLAIN}</span></dt> +		<dt><label for="keywords">{L_SEARCH_KEYWORDS}{L_COLON}</label><br /><span>{L_SEARCH_KEYWORDS_EXPLAIN}</span></dt>  		<dd><input type="text" class="inputbox" name="keywords" id="keywords" size="40" title="{L_SEARCH_KEYWORDS}" /></dd>  		<dd><label for="terms1"><input type="radio" name="terms" id="terms1" value="all" checked="checked" /> {L_SEARCH_ALL_TERMS}</label></dd>  		<dd><label for="terms2"><input type="radio" name="terms" id="terms2" value="any" /> {L_SEARCH_ANY_TERMS}</label></dd>  	</dl>  	<dl> -		<dt><label for="author">{L_SEARCH_AUTHOR}:</label><br /><span>{L_SEARCH_AUTHOR_EXPLAIN}</span></dt> +		<dt><label for="author">{L_SEARCH_AUTHOR}{L_COLON}</label><br /><span>{L_SEARCH_AUTHOR_EXPLAIN}</span></dt>  		<dd><input type="text" class="inputbox" name="author" id="author" size="40" title="{L_SEARCH_AUTHOR}" /></dd>  	</dl>  	</fieldset> @@ -39,18 +39,18 @@  	<fieldset>  	<dl> -		<dt><label for="search_forum">{L_SEARCH_FORUMS}:</label><br /><span>{L_SEARCH_FORUMS_EXPLAIN}</span></dt> +		<dt><label for="search_forum">{L_SEARCH_FORUMS}{L_COLON}</label><br /><span>{L_SEARCH_FORUMS_EXPLAIN}</span></dt>  		<dd><select name="fid[]" id="search_forum" multiple="multiple" size="8" title="{L_SEARCH_FORUMS}">{S_FORUM_OPTIONS}</select></dd>  	</dl>  	<dl> -		<dt><label for="search_child1">{L_SEARCH_SUBFORUMS}:</label></dt> +		<dt><label for="search_child1">{L_SEARCH_SUBFORUMS}{L_COLON}</label></dt>  		<dd>  			<label for="search_child1"><input type="radio" name="sc" id="search_child1" value="1" checked="checked" /> {L_YES}</label>  			<label for="search_child2"><input type="radio" name="sc" id="search_child2" value="0" /> {L_NO}</label>  		</dd>  	</dl>  	<dl> -		<dt><label for="sf1">{L_SEARCH_WITHIN}:</label></dt> +		<dt><label for="sf1">{L_SEARCH_WITHIN}{L_COLON}</label></dt>  		<dd><label for="sf1"><input type="radio" name="sf" id="sf1" value="all" checked="checked" /> {L_SEARCH_TITLE_MSG}</label></dd>  		<dd><label for="sf2"><input type="radio" name="sf" id="sf2" value="msgonly" /> {L_SEARCH_MSG_ONLY}</label></dd>  		<dd><label for="sf3"><input type="radio" name="sf" id="sf3" value="titleonly" /> {L_SEARCH_TITLE_ONLY}</label></dd> @@ -60,25 +60,25 @@  	<hr class="dashed" />  	<dl> -		<dt><label for="show_results1">{L_DISPLAY_RESULTS}:</label></dt> +		<dt><label for="show_results1">{L_DISPLAY_RESULTS}{L_COLON}</label></dt>  		<dd>  			<label for="show_results1"><input type="radio" name="sr" id="show_results1" value="posts" checked="checked" /> {L_POSTS}</label>  			<label for="show_results2"><input type="radio" name="sr" id="show_results2" value="topics" /> {L_TOPICS}</label>  		</dd>  	</dl>  	<dl> -		<dt><label for="sd">{L_RESULT_SORT}:</label></dt> +		<dt><label for="sd">{L_RESULT_SORT}{L_COLON}</label></dt>  		<dd>{S_SELECT_SORT_KEY}   			<label for="sa"><input type="radio" name="sd" id="sa" value="a" /> {L_SORT_ASCENDING}</label>  			<label for="sd"><input type="radio" name="sd" id="sd" value="d" checked="checked" /> {L_SORT_DESCENDING}</label>  		</dd>  	</dl>  	<dl> -		<dt><label>{L_RESULT_DAYS}:</label></dt> +		<dt><label>{L_RESULT_DAYS}{L_COLON}</label></dt>  		<dd>{S_SELECT_SORT_DAYS}</dd>  	</dl>  	<dl> -		<dt><label>{L_RETURN_FIRST}:</label></dt> +		<dt><label>{L_RETURN_FIRST}{L_COLON}</label></dt>  		<dd><select name="ch" title="{L_RETURN_FIRST}">{S_CHARACTER_OPTIONS}</select> {L_POST_CHARACTERS}</dd>  	</dl>  	</fieldset> diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html index 063cc8c8ea..136ca991b1 100644 --- a/phpBB/styles/prosilver/template/search_results.html +++ b/phpBB/styles/prosilver/template/search_results.html @@ -1,12 +1,12 @@  <!-- INCLUDE overall_header.html --> -<h2><!-- IF SEARCH_TITLE -->{SEARCH_TITLE}<!-- ELSE -->{SEARCH_MATCHES}<!-- ENDIF --><!-- IF SEARCH_WORDS -->: <a href="{U_SEARCH_WORDS}">{SEARCH_WORDS}</a><!-- ENDIF --></h2> -<!-- IF SEARCHED_QUERY --> <p>{L_SEARCHED_QUERY}: <strong>{SEARCHED_QUERY}</strong></p><!-- ENDIF --> -<!-- IF IGNORED_WORDS --> <p>{L_IGNORED_TERMS}: <strong>{IGNORED_WORDS}</strong></p><!-- ENDIF --> +<h2><!-- IF SEARCH_TITLE -->{SEARCH_TITLE}<!-- ELSE -->{SEARCH_MATCHES}<!-- ENDIF --><!-- IF SEARCH_WORDS -->{L_COLON} <a href="{U_SEARCH_WORDS}">{SEARCH_WORDS}</a><!-- ENDIF --></h2> +<!-- IF SEARCHED_QUERY --> <p>{L_SEARCHED_QUERY}{L_COLON} <strong>{SEARCHED_QUERY}</strong></p><!-- ENDIF --> +<!-- IF IGNORED_WORDS --> <p>{L_IGNORED_TERMS}{L_COLON} <strong>{IGNORED_WORDS}</strong></p><!-- ENDIF -->  <!-- IF PHRASE_SEARCH_DISABLED --> <p><strong>{L_PHRASE_SEARCH_DISABLED}</strong></p><!-- ENDIF -->  <!-- IF SEARCH_TOPIC --> -	<p><a class="{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH_TOPIC}">{L_RETURN_TO}: {SEARCH_TOPIC}</a></p> +	<p><a class="{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH_TOPIC}">{L_RETURN_TO}{L_COLON} {SEARCH_TOPIC}</a></p>  <!-- ELSE -->  	<p><a class="{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH}" title="{L_SEARCH_ADV}">{L_RETURN_TO_SEARCH_ADV}</a></p>  <!-- ENDIF --> @@ -19,7 +19,7 @@  	<!-- IF SEARCH_MATCHES -->  		<div class="search-box">  			<!-- IF SEARCH_IN_RESULTS --> -				<label for="add_keywords">{L_SEARCH_IN_RESULTS}: <input type="text" name="add_keywords" id="add_keywords" value="" class="inputbox narrow" /></label> +				<label for="add_keywords">{L_SEARCH_IN_RESULTS}{L_COLON} <input type="text" name="add_keywords" id="add_keywords" value="" class="inputbox narrow" /></label>  				<input class="button2" type="submit" name="submit" value="{L_SEARCH}" />  			<!-- ENDIF -->  		</div> @@ -27,10 +27,10 @@  		<div class="rightside pagination">  			{SEARCH_MATCHES} -			<!-- IF .pagination -->  -				•  +			<!-- IF .pagination --> +				•  				<!-- INCLUDE pagination.html --> -			<!-- ELSE -->  +			<!-- ELSE -->  				{PAGE_NUMBER}  			<!-- ENDIF -->  		</div> @@ -122,10 +122,10 @@  			<dt class="author">{L_POST_BY_AUTHOR} {searchresults.POST_AUTHOR_FULL}</dt>  			<dd>{searchresults.POST_DATE}</dd>  			<dd> </dd> -			<dd>{L_FORUM}: <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a></dd> -			<dd>{L_TOPIC}: <a href="{searchresults.U_VIEW_TOPIC}">{searchresults.TOPIC_TITLE}</a></dd> -			<dd>{L_REPLIES}: <strong>{searchresults.TOPIC_REPLIES}</strong></dd> -			<dd>{L_VIEWS}: <strong>{searchresults.TOPIC_VIEWS}</strong></dd> +			<dd>{L_FORUM}{L_COLON} <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a></dd> +			<dd>{L_TOPIC}{L_COLON} <a href="{searchresults.U_VIEW_TOPIC}">{searchresults.TOPIC_TITLE}</a></dd> +			<dd>{L_REPLIES}{L_COLON} <strong>{searchresults.TOPIC_REPLIES}</strong></dd> +			<dd>{L_VIEWS}{L_COLON} <strong>{searchresults.TOPIC_VIEWS}</strong></dd>  		</dl>  	<!-- ENDIF --> @@ -167,8 +167,8 @@  	<ul class="linklist">  		<li class="rightside pagination">  			{SEARCH_MATCHES} -			<!-- IF .pagination -->  -				•  +			<!-- IF .pagination --> +				•  				<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> •  				<ul>  				<!-- BEGIN pagination --> @@ -183,7 +183,7 @@  					<!-- ENDIF -->  				<!-- END pagination -->  				</ul> -			<!-- ELSE -->  +			<!-- ELSE -->  				{PAGE_NUMBER}  			<!-- ENDIF -->  		</li> diff --git a/phpBB/styles/prosilver/template/simple_header.html b/phpBB/styles/prosilver/template/simple_header.html index 6026dfd329..88b2c0c025 100644 --- a/phpBB/styles/prosilver/template/simple_header.html +++ b/phpBB/styles/prosilver/template/simple_header.html @@ -10,7 +10,7 @@  <script type="text/javascript">  // <![CDATA[ -	var jump_page = '{LA_JUMP_PAGE}:'; +	var jump_page = '{LA_JUMP_PAGE}{L_COLON}';  	var on_page = '{ON_PAGE}';  	var per_page = '{PER_PAGE}';  	var base_url = '{A_BASE_URL}'; diff --git a/phpBB/styles/prosilver/template/timezone_option.html b/phpBB/styles/prosilver/template/timezone_option.html index 24d6aa677f..320b9b7121 100644 --- a/phpBB/styles/prosilver/template/timezone_option.html +++ b/phpBB/styles/prosilver/template/timezone_option.html @@ -1,5 +1,5 @@  <dl> -	<dt><label for="timezone">{L_BOARD_TIMEZONE}:</label></dt> +	<dt><label for="timezone">{L_BOARD_TIMEZONE}{L_COLON}</label></dt>  	<!-- IF S_TZ_DATE_OPTIONS -->  	<dd id="tz_select_date" style="display: none;">  		<select name="tz_date" id="tz_date" class="autowidth tz_select"> diff --git a/phpBB/styles/prosilver/template/ucp_agreement.html b/phpBB/styles/prosilver/template/ucp_agreement.html index 4109b6ef34..6c96be864a 100644 --- a/phpBB/styles/prosilver/template/ucp_agreement.html +++ b/phpBB/styles/prosilver/template/ucp_agreement.html @@ -19,7 +19,7 @@  	<form method="post" action="{S_UCP_ACTION}" id="register">  		<p class="rightside"> -			<label for="lang">{L_LANGUAGE}:</label><select name="lang" id="lang" onchange="change_language(this.value); return false;" title="{L_LANGUAGE}">{S_LANG_OPTIONS}</select> +			<label for="lang">{L_LANGUAGE}{L_COLON}</label><select name="lang" id="lang" onchange="change_language(this.value); return false;" title="{L_LANGUAGE}">{S_LANG_OPTIONS}</select>  			{S_HIDDEN_FIELDS}  		</p>  	</form> diff --git a/phpBB/styles/prosilver/template/ucp_attachments.html b/phpBB/styles/prosilver/template/ucp_attachments.html index 2160d8fcf7..8c93547388 100644 --- a/phpBB/styles/prosilver/template/ucp_attachments.html +++ b/phpBB/styles/prosilver/template/ucp_attachments.html @@ -37,7 +37,7 @@  		<li class="row<!-- IF attachrow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">  			<dl>  				<dt style="width: 40%"><a href="{attachrow.U_VIEW_ATTACHMENT}" class="topictitle">{attachrow.FILENAME}</a> ({attachrow.SIZE})<br /> -					<!-- IF attachrow.S_IN_MESSAGE -->{L_PM}: <!-- ELSE -->{L_TOPIC}: <!-- ENDIF --><a href="{attachrow.U_VIEW_TOPIC}">{attachrow.TOPIC_TITLE}</a></dt> +					<!-- IF attachrow.S_IN_MESSAGE -->{L_PM}{L_COLON} <!-- ELSE -->{L_TOPIC}{L_COLON} <!-- ENDIF --><a href="{attachrow.U_VIEW_TOPIC}">{attachrow.TOPIC_TITLE}</a></dt>  				<dd class="extra">{attachrow.DOWNLOAD_COUNT}</dd>  				<dd class="time"><span>{attachrow.POST_TIME}</span></dd>  				<dd class="mark"><input type="checkbox" name="attachment[{attachrow.ATTACH_ID}]" value="1" /></dd> @@ -49,7 +49,7 @@  		<fieldset class="display-options">  			<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->  			<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF --> -			<label for="sk">{L_SORT_BY}: <select name="sk" id="sk">{S_SORT_OPTIONS}</select></label>  +			<label for="sk">{L_SORT_BY}{L_COLON} <select name="sk" id="sk">{S_SORT_OPTIONS}</select></label>   			<label><select name="sd" id="sd">{S_ORDER_SELECT}</select></label>  			<input class="button2" type="submit" name="sort" value="{L_SORT}" />  			{S_FORM_TOKEN} diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options.html b/phpBB/styles/prosilver/template/ucp_avatar_options.html index 9801e065a5..850a1412a0 100644 --- a/phpBB/styles/prosilver/template/ucp_avatar_options.html +++ b/phpBB/styles/prosilver/template/ucp_avatar_options.html @@ -8,32 +8,32 @@  	<fieldset>  	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->  	<dl> -		<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt> +		<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>  		<dd><!-- IF AVATAR -->{AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --></dd>  		<dd><label for="delete"><input type="checkbox" name="delete" id="delete" /> {L_DELETE_AVATAR}</label></dd>  	</dl>  	<!-- IF S_UPLOAD_AVATAR_FILE -->  		<dl> -			<dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}:</label></dt> +			<dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}{L_COLON}</label></dt>  			<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_SIZE}" /><input type="file" name="uploadfile" id="uploadfile" class="inputbox autowidth" /></dd>  		</dl>  	<!-- ENDIF -->  	<!-- IF S_UPLOAD_AVATAR_URL -->  		<dl> -			<dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt> +			<dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}{L_COLON}</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>  			<dd><input type="text" name="uploadurl" id="uploadurl" value="{AVATAR_URL}" class="inputbox" /></dd>  		</dl>  	<!-- ENDIF -->  	<!-- IF S_LINK_AVATAR -->  		<dl> -			<dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt> +			<dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}{L_COLON}</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>  			<dd><input type="text" name="remotelink" id="remotelink" value="{AVATAR_REMOTE}" class="inputbox" /></dd>  		</dl>  		<dl> -			<dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt> +			<dt><label for="width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>  			<dd>  				<label for="width"><input type="text" name="width" id="width" size="3" value="{AVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> ×    				<label for="height"><input type="text" name="height" id="height" size="3" value="{AVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label> @@ -52,7 +52,7 @@  		<h3>{L_AVATAR_GALLERY}</h3>  		<fieldset> -			<label for="category">{L_AVATAR_CATEGORY}: <select name="category" id="category">{S_CAT_OPTIONS}</select></label> +			<label for="category">{L_AVATAR_CATEGORY}{L_COLON} <select name="category" id="category">{S_CAT_OPTIONS}</select></label>  			<input type="submit" value="{L_GO}" name="display_gallery" class="button2" />  			<input type="submit" name="cancel" value="{L_CANCEL}" class="button2" />  		</fieldset> diff --git a/phpBB/styles/prosilver/template/ucp_groups_manage.html b/phpBB/styles/prosilver/template/ucp_groups_manage.html index 892a5d12b4..6b017ea3fa 100644 --- a/phpBB/styles/prosilver/template/ucp_groups_manage.html +++ b/phpBB/styles/prosilver/template/ucp_groups_manage.html @@ -21,18 +21,18 @@  		<fieldset>  		<dl> -			<dt><label for="group_name">{L_GROUP_NAME}:</label></dt> +			<dt><label for="group_name">{L_GROUP_NAME}{L_COLON}</label></dt>  			<dd><!-- IF S_SPECIAL_GROUP --><strong<!-- IF GROUP_COLOUR --> style="color: #{GROUP_COLOUR};"<!-- ENDIF -->>{GROUP_NAME}</strong> <input name="group_name" type="hidden" value="{GROUP_INTERNAL_NAME}" />  				<!-- ELSE --><input name="group_name" type="text" id="group_name" value="{GROUP_INTERNAL_NAME}" class="inputbox" /><!-- ENDIF --></dd>  		</dl>  		<dl> -			<dt><label for="group_desc">{L_GROUP_DESC}:</label></dt> +			<dt><label for="group_desc">{L_GROUP_DESC}{L_COLON}</label></dt>  			<dd><textarea id="group_desc" name="group_desc" rows="5" cols="45" class="inputbox">{GROUP_DESC}</textarea></dd>  			<dd><label for="desc_parse_bbcode"><input type="checkbox" class="radio" name="desc_parse_bbcode" id="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label> <label for="desc_parse_smilies"><input type="checkbox" class="radio" name="desc_parse_smilies" id="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label> <label for="desc_parse_urls"><input type="checkbox" class="radio" name="desc_parse_urls" id="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd>  		</dl>  		<!-- IF not S_SPECIAL_GROUP -->  		<dl> -			<dt><label for="group_type1">{L_GROUP_TYPE}:</label><br /><span>{L_GROUP_TYPE_EXPLAIN}</span></dt> +			<dt><label for="group_type1">{L_GROUP_TYPE}{L_COLON}</label><br /><span>{L_GROUP_TYPE_EXPLAIN}</span></dt>  			<dd>  				<label for="group_type1"><input type="radio" class="radio" name="group_type" id="group_type1" value="{GROUP_TYPE_FREE}"{GROUP_FREE} /> {L_GROUP_OPEN}</label>   				<label for="group_type2"><input type="radio" class="radio" name="group_type" id="group_type2" value="{GROUP_TYPE_OPEN}"{GROUP_OPEN} /> {L_GROUP_REQUEST}</label>  @@ -54,11 +54,11 @@  	<fieldset>  	<dl> -		<dt><label for="group_colour">{L_GROUP_COLOR}:</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt> +		<dt><label for="group_colour">{L_GROUP_COLOR}{L_COLON}</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt>  		<dd><input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="7" maxlength="7" class="inputbox narrow" /> <span style="background-color: {GROUP_COLOUR};">   </span> [ <a href="{U_SWATCH}" onclick="popup(this.href, 636, 150, '_swatch'); return false;">{L_COLOUR_SWATCH}</a> ]</dd>  	</dl>  	<dl> -		<dt><label for="group_rank">{L_GROUP_RANK}:</label></dt> +		<dt><label for="group_rank">{L_GROUP_RANK}{L_COLON}</label></dt>  		<dd><select name="group_rank" id="group_rank">{S_RANK_OPTIONS}</select></dd>  	</dl>  	</fieldset> @@ -185,14 +185,14 @@  	<fieldset>  	<dl> -		<dt><label for="default0">{L_USER_GROUP_DEFAULT}:</label><br /><span>{L_USER_GROUP_DEFAULT_EXPLAIN}</span></dt> +		<dt><label for="default0">{L_USER_GROUP_DEFAULT}{L_COLON}</label><br /><span>{L_USER_GROUP_DEFAULT_EXPLAIN}</span></dt>  		<dd>  			<label for="default1"><input type="radio" name="default" id="default1" value="1" /> {L_YES}</label>   			<label for="default0"><input type="radio" name="default" id="default0" value="0" checked="checked" /> {L_NO}</label>  		</dd>  	</dl>  	<dl> -		<dt><label for="usernames">{L_USERNAME}:</label><br /><span>{L_USERNAMES_EXPLAIN}</span></dt> +		<dt><label for="usernames">{L_USERNAME}{L_COLON}</label><br /><span>{L_USERNAMES_EXPLAIN}</span></dt>  		<dd><textarea name="usernames" id="usernames" rows="3" cols="30" class="inputbox"></textarea></dd>  		<dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></strong></dd>  	</dl> diff --git a/phpBB/styles/prosilver/template/ucp_groups_membership.html b/phpBB/styles/prosilver/template/ucp_groups_membership.html index 5cb238082a..bf266208f2 100644 --- a/phpBB/styles/prosilver/template/ucp_groups_membership.html +++ b/phpBB/styles/prosilver/template/ucp_groups_membership.html @@ -146,7 +146,7 @@  		<!-- IF $SHOW_BUTTONS eq 1 -->  		<div class="right-box"> -			<label for="action">{L_SELECT}:</label>  +			<label for="action">{L_SELECT}{L_COLON}</label>   			<select name="action" id="action">  				<option value="join">{L_JOIN_SELECTED}</option>  				<option value="resign">{L_RESIGN_SELECTED}</option> diff --git a/phpBB/styles/prosilver/template/ucp_main_drafts.html b/phpBB/styles/prosilver/template/ucp_main_drafts.html index 2155abeda3..a99c52cbfc 100644 --- a/phpBB/styles/prosilver/template/ucp_main_drafts.html +++ b/phpBB/styles/prosilver/template/ucp_main_drafts.html @@ -40,8 +40,8 @@  				<dl>  					<dt>  						<a class="topictitle" href="{draftrow.U_VIEW_EDIT}">{draftrow.DRAFT_SUBJECT}</a><br /> -						<!-- IF draftrow.S_LINK_TOPIC -->{L_TOPIC}: <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a> -						<!-- ELSEIF draftrow.S_LINK_FORUM -->{L_FORUM}: <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a> +						<!-- IF draftrow.S_LINK_TOPIC -->{L_TOPIC}{L_COLON} <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a> +						<!-- ELSEIF draftrow.S_LINK_FORUM -->{L_FORUM}{L_COLON} <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a>  						<!-- ELSEIF S_PRIVMSGS -->  						<!-- ELSE -->{L_NO_TOPIC_FORUM}<!-- ENDIF -->  					</dt> diff --git a/phpBB/styles/prosilver/template/ucp_main_front.html b/phpBB/styles/prosilver/template/ucp_main_front.html index 04767b6c01..b92ca7c8e2 100644 --- a/phpBB/styles/prosilver/template/ucp_main_front.html +++ b/phpBB/styles/prosilver/template/ucp_main_front.html @@ -44,12 +44,12 @@  	<h3>{L_YOUR_DETAILS}</h3>  	<dl class="details"> -		<dt>{L_JOINED}:</dt> <dd>{JOINED}</dd> -		<dt>{L_VISITED}:</dt> <dd>{LAST_VISIT_YOU}</dd> -		<dt>{L_TOTAL_POSTS}:</dt> <dd><!-- IF POSTS_PCT -->{POSTS}<!-- IF S_DISPLAY_SEARCH --> | <strong><a href="{U_SEARCH_USER}">{L_SEARCH_YOUR_POSTS}</a></strong><!-- ENDIF --><br />({POSTS_DAY} / {POSTS_PCT})<!-- ELSE -->{POSTS}<!-- ENDIF --></dd> -		<!-- IF ACTIVE_FORUM != '' --><dt>{L_ACTIVE_IN_FORUM}:</dt> <dd><strong><a href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></strong><br />({ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT})</dd><!-- ENDIF --> -		<!-- IF ACTIVE_TOPIC != '' --><dt>{L_ACTIVE_IN_TOPIC}:</dt> <dd><strong><a href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></strong><br />({ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT})</dd><!-- ENDIF --> -		<!-- IF WARNINGS --><dt>{L_YOUR_WARNINGS}:</dt> <dd class="error">{WARNING_IMG} [{WARNINGS}]</dd><!-- ENDIF --> +		<dt>{L_JOINED}{L_COLON}</dt> <dd>{JOINED}</dd> +		<dt>{L_VISITED}{L_COLON}</dt> <dd>{LAST_VISIT_YOU}</dd> +		<dt>{L_TOTAL_POSTS}{L_COLON}</dt> <dd><!-- IF POSTS_PCT -->{POSTS}<!-- IF S_DISPLAY_SEARCH --> | <strong><a href="{U_SEARCH_USER}">{L_SEARCH_YOUR_POSTS}</a></strong><!-- ENDIF --><br />({POSTS_DAY} / {POSTS_PCT})<!-- ELSE -->{POSTS}<!-- ENDIF --></dd> +		<!-- IF ACTIVE_FORUM != '' --><dt>{L_ACTIVE_IN_FORUM}{L_COLON}</dt> <dd><strong><a href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></strong><br />({ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT})</dd><!-- ENDIF --> +		<!-- IF ACTIVE_TOPIC != '' --><dt>{L_ACTIVE_IN_TOPIC}{L_COLON}</dt> <dd><strong><a href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></strong><br />({ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT})</dd><!-- ENDIF --> +		<!-- IF WARNINGS --><dt>{L_YOUR_WARNINGS}{L_COLON}</dt> <dd class="error">{WARNING_IMG} [{WARNINGS}]</dd><!-- ENDIF -->  	</dl>  	</div> diff --git a/phpBB/styles/prosilver/template/ucp_pm_history.html b/phpBB/styles/prosilver/template/ucp_pm_history.html index d7fcbb9e54..6abc9b1402 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_history.html +++ b/phpBB/styles/prosilver/template/ucp_pm_history.html @@ -1,7 +1,7 @@  <h3 id="review">  	<span class="right-box"><a href="#review" onclick="viewableArea(getElementById('topicreview'), true); var rev_text = getElementById('review').getElementsByTagName('a').item(0).firstChild; if (rev_text.data == '{LA_EXPAND_VIEW}'){rev_text.data = '{LA_COLLAPSE_VIEW}'; } else if (rev_text.data == '{LA_COLLAPSE_VIEW}'){rev_text.data = '{LA_EXPAND_VIEW}'};">{L_EXPAND_VIEW}</a></span> -	{L_MESSAGE_HISTORY}: +	{L_MESSAGE_HISTORY}{L_COLON}  </h3>  <div id="topicreview"> @@ -22,7 +22,7 @@  			<!-- ENDIF -->  			<h3><a href="{history_row.U_VIEW_MESSAGE}" <!-- IF history_row.S_CURRENT_MSG -->class="current"<!-- ENDIF -->>{history_row.SUBJECT}</a></h3> -			<p class="author">{history_row.MINI_POST_IMG} {L_SENT_AT}: <strong>{history_row.SENT_DATE}</strong><br /> +			<p class="author">{history_row.MINI_POST_IMG} {L_SENT_AT}{L_COLON} <strong>{history_row.SENT_DATE}</strong><br />  				{L_MESSAGE_BY_AUTHOR} {history_row.MESSAGE_AUTHOR_FULL}</p>  			<div class="content">{history_row.MESSAGE}</div>  			<div id="message_{history_row.MSG_ID}" style="display: none;">{history_row.DECODED_MESSAGE}</div> diff --git a/phpBB/styles/prosilver/template/ucp_pm_message_header.html b/phpBB/styles/prosilver/template/ucp_pm_message_header.html index c02a34f83d..29e6a5a46b 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_message_header.html +++ b/phpBB/styles/prosilver/template/ucp_pm_message_header.html @@ -1,4 +1,4 @@ -<h2>{L_TITLE}<!-- IF CUR_FOLDER_NAME -->: {CUR_FOLDER_NAME}<!-- ENDIF --></h2> +<h2>{L_TITLE}<!-- IF CUR_FOLDER_NAME -->{L_COLON} {CUR_FOLDER_NAME}<!-- ENDIF --></h2>  <form id="viewfolder" method="post" action="{S_PM_ACTION}"> @@ -11,7 +11,7 @@  			<!-- IF U_POST_REPLY_PM --><div class="pmreply-icon"><a title="{L_POST_REPLY_PM}" href="{U_POST_REPLY_PM}"><span></span>{L_POST_REPLY_PM}</a></div>  			<!-- ELSEIF U_POST_NEW_TOPIC --><div class="newpm-icon"><a href="{U_POST_NEW_TOPIC}" accesskey="n" title="{L_UCP_PM_COMPOSE}"><span></span>{L_UCP_PM_COMPOSE}</a></div><!-- ENDIF -->  			<!-- IF U_FORWARD_PM --><div class="forwardpm-icon"><a title="{L_POST_FORWARD_PM}" href="{U_FORWARD_PM}"><span></span>{L_FORWARD_PM}</a></div><!-- ENDIF --> -			<!-- IF U_POST_REPLY_PM and S_PM_RECIPIENTS gt 1 --><div class="reply-all"><a class="left" title="{L_REPLY_TO_ALL}" href="{U_POST_REPLY_ALL}">{L_REPLY_TO_ALL}</a></div><!-- ENDIF -->			 +			<!-- IF U_POST_REPLY_PM and S_PM_RECIPIENTS gt 1 --><div class="reply-all"><a class="left" title="{L_REPLY_TO_ALL}" href="{U_POST_REPLY_ALL}">{L_REPLY_TO_ALL}</a></div><!-- ENDIF -->  		</div>  	<!-- ENDIF --> @@ -21,9 +21,9 @@  			<!-- IF S_VIEW_MESSAGE --><a class="{S_CONTENT_FLOW_BEGIN}" href="{U_CURRENT_FOLDER}">{L_RETURN_TO} {CUR_FOLDER_NAME}</a><!-- ENDIF -->  			<!-- IF FOLDER_CUR_MESSAGES neq 0 -->  				<!-- IF TOTAL_MESSAGES -->{TOTAL_MESSAGES} • <!-- ENDIF --> -				<!-- IF .pagination -->  +				<!-- IF .pagination -->  					<!-- INCLUDE pagination.html --> -				<!-- ELSE -->  +				<!-- ELSE -->  					{PAGE_NUMBER}  				<!-- ENDIF -->  			<!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/ucp_pm_options.html b/phpBB/styles/prosilver/template/ucp_pm_options.html index dde8ee639b..247be8b6fd 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_options.html +++ b/phpBB/styles/prosilver/template/ucp_pm_options.html @@ -9,12 +9,12 @@  	<!-- IF ERROR_MESSAGE --><p class="error">{ERROR_MESSAGE}</p><!-- ENDIF -->  	<!-- IF NOTIFICATION_MESSAGE --><p class="error">{NOTIFICATION_MESSAGE}</p><!-- ENDIF --> -	 +  	<h3>{L_DEFINED_RULES}</h3>  	<ol class="def-rules">  	<!-- BEGIN rule --> -		<li><div class="right-box"><input type="submit" name="delete_rule[{rule.RULE_ID}]" value="{L_DELETE_RULE}" class="button2" /></div><strong>{L_IF}</strong> {rule.CHECK} <em>{rule.RULE}</em> <!-- IF rule.STRING --><strong>{rule.STRING}</strong> | <!-- ENDIF -->{rule.ACTION}<!-- IF rule.FOLDER -->: {rule.FOLDER}<!-- ENDIF --><div style="clear: both;"></div></li> +		<li><div class="right-box"><input type="submit" name="delete_rule[{rule.RULE_ID}]" value="{L_DELETE_RULE}" class="button2" /></div><strong>{L_IF}</strong> {rule.CHECK} <em>{rule.RULE}</em> <!-- IF rule.STRING --><strong>{rule.STRING}</strong> | <!-- ENDIF -->{rule.ACTION}<!-- IF rule.FOLDER -->{L_COLON} {rule.FOLDER}<!-- ENDIF --><div style="clear: both;"></div></li>  	<!-- BEGINELSE -->  		<li><strong>{L_NO_RULES_DEFINED}</strong></li>  	<!-- END rule --> @@ -26,7 +26,7 @@  	<!-- IF S_CHECK_DEFINED -->  		<dl> -			<dt><label<!-- IF S_CHECK_SELECT --> for="check_option"<!-- ENDIF -->>{L_IF}:</label></dt> +			<dt><label<!-- IF S_CHECK_SELECT --> for="check_option"<!-- ENDIF -->>{L_IF}{L_COLON}</label></dt>  			<dd>  				<!-- IF S_CHECK_SELECT --><select name="check_option" id="check_option">{S_CHECK_OPTIONS}</select> <input type="submit" name="next" value="{L_NEXT_STEP}" class="button2" /><!-- ELSE -->{CHECK_CURRENT}<input type="hidden" name="check_option" value="{CHECK_OPTION}" /><!-- ENDIF -->  			</dd> @@ -81,26 +81,26 @@  	<!-- IF not S_MAX_FOLDER_ZERO -->  	<dl> -		<dt><label for="foldername">{L_ADD_FOLDER}:</label></dt> +		<dt><label for="foldername">{L_ADD_FOLDER}{L_COLON}</label></dt>  		<dd><!-- IF S_MAX_FOLDER_REACHED -->{L_MAX_FOLDER_REACHED}<!-- ELSE --><input type="text" class="inputbox medium" name="foldername" id="foldername" size="30" maxlength="30" /> <input class="button2" type="submit" name="addfolder" value="{L_ADD}" /><!-- ENDIF --></dd>  	</dl>  	<!-- IF S_FOLDER_OPTIONS --><hr class="dashed" /><!-- ENDIF -->  	<!-- ENDIF --> -	 +  	<!-- IF S_FOLDER_OPTIONS -->  		<dl> -			<dt><label for="rename_folder_id">{L_RENAME_FOLDER}:</label></dt> +			<dt><label for="rename_folder_id">{L_RENAME_FOLDER}{L_COLON}</label></dt>  			<dd><select name="rename_folder_id" id="rename_folder_id">{S_FOLDER_OPTIONS}</select></dd> -			<dt><label for="new_folder_name">{L_NEW_FOLDER_NAME}:</label></dt> +			<dt><label for="new_folder_name">{L_NEW_FOLDER_NAME}{L_COLON}</label></dt>  			<dd><input type="text" class="inputbox tiny" name="new_folder_name" id="new_folder_name" maxlength="30" /> <input class="button2" type="submit" name="rename_folder" value="{L_RENAME}" /></dd>  		</dl>  		<hr class="dashed" />  		<dl> -			<dt><label for="remove_folder_id">{L_REMOVE_FOLDER}:</label></dt> +			<dt><label for="remove_folder_id">{L_REMOVE_FOLDER}{L_COLON}</label></dt>  			<dd><select name="remove_folder_id" id="remove_folder_id">{S_FOLDER_OPTIONS}</select></dd> -			<dd style="margin-top: 3px;"><label for="remove_action1"><input type="radio" name="remove_action" id="remove_action1" value="1" checked="checked" /> {L_MOVE_DELETED_MESSAGES_TO}:</label> <select name="move_to">{S_TO_FOLDER_OPTIONS}</select></dd> +			<dd style="margin-top: 3px;"><label for="remove_action1"><input type="radio" name="remove_action" id="remove_action1" value="1" checked="checked" /> {L_MOVE_DELETED_MESSAGES_TO}{L_COLON}</label> <select name="move_to">{S_TO_FOLDER_OPTIONS}</select></dd>  			<dd style="margin-top: 3px;"><label for="remove_action2"><input type="radio" name="remove_action" id="remove_action2" value="2" /> {L_DELETE_MESSAGES_IN_FOLDER}</label></dd>  			<dd style="margin-top: 3px;"><input class="button2" type="submit" name="remove_folder" value="{L_REMOVE}" /></dd>  		</dl> @@ -109,15 +109,15 @@  	<hr class="dashed" />  	<dl> -		<dt><label for="full_action1">{L_IF_FOLDER_FULL}:</label></dt> +		<dt><label for="full_action1">{L_IF_FOLDER_FULL}{L_COLON}</label></dt>  		<dd style="margin-top: 3px;"><label for="full_action1"><input type="radio" name="full_action" id="full_action1" value="1"{S_DELETE_CHECKED} /> {L_DELETE_OLDEST_MESSAGES}</label></dd> -		<dd style="margin-top: 3px;"><label for="full_action2"><input type="radio" name="full_action" id="full_action2" value="2"{S_MOVE_CHECKED} /> {L_MOVE_TO_FOLDER}:</label> <select name="full_move_to">{S_FULL_FOLDER_OPTIONS}</select></dd> +		<dd style="margin-top: 3px;"><label for="full_action2"><input type="radio" name="full_action" id="full_action2" value="2"{S_MOVE_CHECKED} /> {L_MOVE_TO_FOLDER}{L_COLON}</label> <select name="full_move_to">{S_FULL_FOLDER_OPTIONS}</select></dd>  		<dd style="margin-top: 3px;"><label for="full_action3" style="white-space:normal;"><input type="radio" name="full_action" id="full_action3" value="3"{S_HOLD_CHECKED} /> {L_HOLD_NEW_MESSAGES}</label></dd>  	</dl>  	<dl> -		<dt><label>{L_DEFAULT_ACTION}:</label><br /><span>{L_DEFAULT_ACTION_EXPLAIN}</span></dt> +		<dt><label>{L_DEFAULT_ACTION}{L_COLON}</label><br /><span>{L_DEFAULT_ACTION_EXPLAIN}</span></dt>  		<dd>{DEFAULT_ACTION}</dd>  		<dd><input class="button2" type="submit" name="fullfolder" value="{L_CHANGE}" /></dd>  	</dl> diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html index 68df22c68e..cb373dc5b6 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html @@ -12,11 +12,11 @@  		<h3>{L_OPTIONS}</h3>  		<fieldset>  			<dl> -				<dt><label for="delimiter">{L_DELIMITER}:</label></dt> +				<dt><label for="delimiter">{L_DELIMITER}{L_COLON}</label></dt>  				<dd><input class="inputbox" type="text" id="delimiter" name="delimiter" value="," /></dd>  			</dl>  			<dl> -				<dt><label for="enclosure">{L_ENCLOSURE}:</label></dt> +				<dt><label for="enclosure">{L_ENCLOSURE}{L_COLON}</label></dt>  				<dd><input class="inputbox" type="text" id="enclosure" name="enclosure" value=""" /></dd>  			</dl>  		</fieldset> @@ -73,7 +73,7 @@  						<!-- IF messagerow.S_PM_REPORTED --><a href="{messagerow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --> {messagerow.ATTACH_ICON_IMG}<br />  						<!-- IF S_SHOW_RECIPIENTS -->{L_MESSAGE_TO} {messagerow.RECIPIENTS}<!-- ELSE -->{L_MESSAGE_BY_AUTHOR} {messagerow.MESSAGE_AUTHOR_FULL} » {messagerow.SENT_TIME}<!-- ENDIF -->  					</dt> -					<!-- IF S_SHOW_RECIPIENTS --><dd class="info"><span>{L_SENT_AT}: {messagerow.SENT_TIME}</span></dd><!-- ENDIF --> +					<!-- IF S_SHOW_RECIPIENTS --><dd class="info"><span>{L_SENT_AT}{L_COLON} {messagerow.SENT_TIME}</span></dd><!-- ENDIF -->  					<!-- IF S_UNREAD --><dd class="info"><!-- IF messagerow.FOLDER --><a href="{messagerow.U_FOLDER}">{messagerow.FOLDER}</a><!-- ELSE -->{L_UNKNOWN_FOLDER}<!-- ENDIF --></dd><!-- ENDIF -->  					<dd class="mark"><input type="checkbox" name="marked_msg_id[]" value="{messagerow.MESSAGE_ID}" /></dd>  				</dl> @@ -93,7 +93,7 @@  	<!-- IF FOLDER_CUR_MESSAGES neq 0 -->  	<fieldset class="display-actions"> -		<div class="left-box"><label for="export_option">{L_EXPORT_FOLDER}: <select name="export_option" id="export_option"><option value="CSV">{L_EXPORT_AS_CSV}</option><option value="CSV_EXCEL">{L_EXPORT_AS_CSV_EXCEL}</option><option value="XML">{L_EXPORT_AS_XML}</option></select></label> <input class="button2" type="submit" name="submit_export" value="{L_GO}" /><br /></div> +		<div class="left-box"><label for="export_option">{L_EXPORT_FOLDER}{L_COLON} <select name="export_option" id="export_option"><option value="CSV">{L_EXPORT_AS_CSV}</option><option value="CSV_EXCEL">{L_EXPORT_AS_CSV_EXCEL}</option><option value="XML">{L_EXPORT_AS_XML}</option></select></label> <input class="button2" type="submit" name="submit_export" value="{L_GO}" /><br /></div>  		<select name="mark_option">{S_MARK_OPTIONS}{S_MOVE_MARKED_OPTIONS}</select> <input class="button2" type="submit" name="submit_mark" value="{L_GO}" />  		<div><a href="#" onclick="marklist('viewfolder', 'marked_msg', true); return false;">{L_MARK_ALL}</a> • <a href="#" onclick="marklist('viewfolder', 'marked_msg', false); return false;">{L_UNMARK_ALL}</a></div>  	</fieldset> @@ -121,7 +121,7 @@  	<fieldset class="display-options">  		<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->  		<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF --> -		<label>{L_DISPLAY}: {S_SELECT_SORT_DAYS}</label> +		<label>{L_DISPLAY}{L_COLON} {S_SELECT_SORT_DAYS}</label>  		<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label>  		<label>{S_SELECT_SORT_DIR} <input type="submit" name="sort" value="{L_GO}" class="button2" /></label>  		<input type="hidden" name="cur_folder_id" value="{CUR_FOLDER_ID}" /> diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html index b022bcd979..c456be1090 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html @@ -31,10 +31,10 @@  		<h3 class="first">{SUBJECT}</h3>  		<p class="author"> -			<strong>{L_SENT_AT}:</strong> {SENT_DATE} -			<br /><strong>{L_PM_FROM}:</strong> {MESSAGE_AUTHOR_FULL} -			<!-- IF S_TO_RECIPIENT --><br /><strong>{L_TO}:</strong> <!-- BEGIN to_recipient --><!-- IF to_recipient.NAME_FULL -->{to_recipient.NAME_FULL}<!-- ELSE --><a href="{to_recipient.U_VIEW}" style="color:<!-- IF to_recipient.COLOUR -->{to_recipient.COLOUR}<!-- ELSEIF to_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{to_recipient.NAME}</a><!-- ENDIF --> <!-- END to_recipient --><!-- ENDIF --> -			<!-- IF S_BCC_RECIPIENT --><br /><strong>{L_BCC}:</strong> <!-- BEGIN bcc_recipient --><!-- IF bcc_recipient.NAME_FULL -->{bcc_recipient.NAME_FULL}<!-- ELSE --><a href="{bcc_recipient.U_VIEW}" style="color:<!-- IF bcc_recipient.COLOUR -->{bcc_recipient.COLOUR}<!-- ELSEIF bcc_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{bcc_recipient.NAME}</a><!-- ENDIF --> <!-- END bcc_recipient --><!-- ENDIF --> +			<strong>{L_SENT_AT}{L_COLON}</strong> {SENT_DATE} +			<br /><strong>{L_PM_FROM}{L_COLON}</strong> {MESSAGE_AUTHOR_FULL} +			<!-- IF S_TO_RECIPIENT --><br /><strong>{L_TO}{L_COLON}</strong> <!-- BEGIN to_recipient --><!-- IF to_recipient.NAME_FULL -->{to_recipient.NAME_FULL}<!-- ELSE --><a href="{to_recipient.U_VIEW}" style="color:<!-- IF to_recipient.COLOUR -->{to_recipient.COLOUR}<!-- ELSEIF to_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{to_recipient.NAME}</a><!-- ENDIF --> <!-- END to_recipient --><!-- ENDIF --> +			<!-- IF S_BCC_RECIPIENT --><br /><strong>{L_BCC}{L_COLON}</strong> <!-- BEGIN bcc_recipient --><!-- IF bcc_recipient.NAME_FULL -->{bcc_recipient.NAME_FULL}<!-- ELSE --><a href="{bcc_recipient.U_VIEW}" style="color:<!-- IF bcc_recipient.COLOUR -->{bcc_recipient.COLOUR}<!-- ELSEIF bcc_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{bcc_recipient.NAME}</a><!-- ENDIF --> <!-- END bcc_recipient --><!-- ENDIF -->  		</p> @@ -46,7 +46,7 @@  					{L_ATTACHMENTS}  					<!-- IF S_HAS_MULTIPLE_ATTACHMENTS -->  						<div class="dl_links"> -							<strong>{L_DOWNLOAD_ALL}:</strong> +							<strong>{L_DOWNLOAD_ALL}{L_COLON}</strong>  							<ul>  							<!-- BEGIN dl_method -->  								<li>[ <a href="{dl_method.LINK}">{dl_method.TYPE}</a> ]</li> @@ -67,7 +67,7 @@  		<!-- IF EDITED_MESSAGE or EDIT_REASON -->  		<div class="notice">{EDITED_MESSAGE} -			<!-- IF EDIT_REASON --><br /><strong>{L_REASON}:</strong> <em>{EDIT_REASON}</em><!-- ENDIF --> +			<!-- IF EDIT_REASON --><br /><strong>{L_REASON}{L_COLON}</strong> <em>{EDIT_REASON}</em><!-- ENDIF -->  		</div>  		<!-- ENDIF --> @@ -81,12 +81,12 @@  		<!-- IF RANK_TITLE --><dd>{RANK_TITLE}</dd><!-- ENDIF -->  		<!-- IF RANK_IMG --><dd>{RANK_IMG}</dd><!-- ENDIF -->  		<dd> </dd> -		<dd><strong>{L_POSTS}:</strong> {AUTHOR_POSTS}</dd> -		<!-- IF AUTHOR_JOINED --><dd><strong>{L_JOINED}:</strong> {AUTHOR_JOINED}</dd><!-- ENDIF --> -		<!-- IF AUTHOR_FROM --><dd><strong>{L_LOCATION}:</strong> {AUTHOR_FROM}</dd><!-- ENDIF --> +		<dd><strong>{L_POSTS}{L_COLON}</strong> {AUTHOR_POSTS}</dd> +		<!-- IF AUTHOR_JOINED --><dd><strong>{L_JOINED}{L_COLON}</strong> {AUTHOR_JOINED}</dd><!-- ENDIF --> +		<!-- IF AUTHOR_FROM --><dd><strong>{L_LOCATION}{L_COLON}</strong> {AUTHOR_FROM}</dd><!-- ENDIF -->  		<!-- BEGIN custom_fields --> -			<dd><strong>{custom_fields.PROFILE_FIELD_NAME}:</strong> {custom_fields.PROFILE_FIELD_VALUE}</dd> +			<dd><strong>{custom_fields.PROFILE_FIELD_NAME}{L_COLON}</strong> {custom_fields.PROFILE_FIELD_VALUE}</dd>  		<!-- END custom_fields --> @@ -95,7 +95,7 @@  			<ul class="profile-icons">  			<!-- IF U_PM --><li class="pm-icon"><a href="{U_PM}" title="{L_PRIVATE_MESSAGE}"><span>{L_PRIVATE_MESSAGE}</span></a></li><!-- ENDIF -->  			<!-- IF U_EMAIL --><li class="email-icon"><a href="{U_EMAIL}" title="{L_SEND_EMAIL_USER} {MESSAGE_AUTHOR}"><span>{L_SEND_EMAIL_USER} {MESSAGE_AUTHOR}</span></a></li><!-- ENDIF --> -			<!-- IF U_WWW --><li class="web-icon"><a href="{U_WWW}" title="{L_VISIT_WEBSITE}: {U_WWW}"><span>{L_WEBSITE}</span></a></li><!-- ENDIF --> +			<!-- IF U_WWW --><li class="web-icon"><a href="{U_WWW}" title="{L_VISIT_WEBSITE}{L_COLON} {U_WWW}"><span>{L_WEBSITE}</span></a></li><!-- ENDIF -->  			<!-- IF U_MSN --><li class="msnm-icon"><a href="{U_MSN}" onclick="popup(this.href, 550, 320); return false;" title="{L_MSNM}"><span>{L_MSNM}</span></a></li><!-- ENDIF -->  			<!-- IF U_ICQ --><li class="icq-icon"><a href="{U_ICQ}" onclick="popup(this.href, 550, 320); return false;" title="{L_ICQ}"><span>{L_ICQ}</span></a></li><!-- ENDIF -->  			<!-- IF U_YIM --><li class="yahoo-icon"><a href="{U_YIM}" onclick="popup(this.href, 780, 550); return false;" title="{L_YIM}"><span>{L_YIM}</span></a></li><!-- ENDIF --> @@ -117,7 +117,7 @@  	<!-- IF U_NEXT_PM --><a href="{U_NEXT_PM}" class="right-box {S_CONTENT_FLOW_END}">{L_VIEW_NEXT_PM}</a><!-- ENDIF -->  	<!-- IF S_MARK_OPTIONS --><label for="mark_option"><select name="mark_option" id="mark_option">{S_MARK_OPTIONS}</select></label> <input class="button2" type="submit" name="submit_mark" value="{L_GO}" /><!-- ENDIF --> -	<!-- IF not S_UNREAD and not S_SPECIAL_FOLDER --><label for="dest_folder"><!-- IF S_VIEW_MESSAGE -->{L_MOVE_TO_FOLDER}: <!-- ELSE -->{L_MOVE_MARKED_TO_FOLDER}<!-- ENDIF --> <select name="dest_folder" id="dest_folder">{S_TO_FOLDER_OPTIONS}</select></label> <input class="button2" type="submit" name="move_pm" value="{L_GO}" /><!-- ENDIF --> +	<!-- IF not S_UNREAD and not S_SPECIAL_FOLDER --><label for="dest_folder"><!-- IF S_VIEW_MESSAGE -->{L_MOVE_TO_FOLDER}{L_COLON} <!-- ELSE -->{L_MOVE_MARKED_TO_FOLDER}<!-- ENDIF --> <select name="dest_folder" id="dest_folder">{S_TO_FOLDER_OPTIONS}</select></label> <input class="button2" type="submit" name="move_pm" value="{L_GO}" /><!-- ENDIF -->  	<input type="hidden" name="marked_msg_id[]" value="{MSG_ID}" />  	<input type="hidden" name="cur_folder_id" value="{CUR_FOLDER_ID}" />  	<input type="hidden" name="p" value="{MSG_ID}" /> diff --git a/phpBB/styles/prosilver/template/ucp_prefs_personal.html b/phpBB/styles/prosilver/template/ucp_prefs_personal.html index 29c01e03b9..4382e891fd 100644 --- a/phpBB/styles/prosilver/template/ucp_prefs_personal.html +++ b/phpBB/styles/prosilver/template/ucp_prefs_personal.html @@ -10,21 +10,21 @@  	<fieldset>  	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->  	<dl> -		<dt><label for="viewemail0">{L_SHOW_EMAIL}:</label></dt> +		<dt><label for="viewemail0">{L_SHOW_EMAIL}{L_COLON}</label></dt>  		<dd>  			<label for="viewemail1"><input type="radio" name="viewemail" id="viewemail1" value="1"<!-- IF S_VIEW_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>   			<label for="viewemail0"><input type="radio" name="viewemail" id="viewemail0" value="0"<!-- IF not S_VIEW_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>  		</dd>  	</dl>  	<dl> -		<dt><label for="massemail1">{L_ADMIN_EMAIL}:</label></dt> +		<dt><label for="massemail1">{L_ADMIN_EMAIL}{L_COLON}</label></dt>  		<dd>  			<label for="massemail1"><input type="radio" name="massemail" id="massemail1" value="1"<!-- IF S_MASS_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>   			<label for="massemail0"><input type="radio" name="massemail" id="massemail0" value="0"<!-- IF not S_MASS_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>  		</dd>  	</dl>  	<dl> -		<dt><label for="allowpm1">{L_ALLOW_PM}:</label><br /><span>{L_ALLOW_PM_EXPLAIN}</span></dt> +		<dt><label for="allowpm1">{L_ALLOW_PM}{L_COLON}</label><br /><span>{L_ALLOW_PM_EXPLAIN}</span></dt>  		<dd>  			<label for="allowpm1"><input type="radio" name="allowpm" id="allowpm1" value="1"<!-- IF S_ALLOW_PM --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>   			<label for="allowpm0"><input type="radio" name="allowpm" id="allowpm0" value="0"<!-- IF not S_ALLOW_PM --> checked="checked"<!-- ENDIF --> /> {L_NO}</label> @@ -32,7 +32,7 @@  	</dl>  	<!-- IF S_CAN_HIDE_ONLINE -->  		<dl> -			<dt><label for="hideonline0">{L_HIDE_ONLINE}:</label><br /><span>{L_HIDE_ONLINE_EXPLAIN}</span></dt> +			<dt><label for="hideonline0">{L_HIDE_ONLINE}{L_COLON}</label><br /><span>{L_HIDE_ONLINE_EXPLAIN}</span></dt>  			<dd>  				<label for="hideonline1"><input type="radio" name="hideonline" id="hideonline1" value="1"<!-- IF S_HIDE_ONLINE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>   				<label for="hideonline0"><input type="radio" name="hideonline" id="hideonline0" value="0"<!-- IF not S_HIDE_ONLINE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label> @@ -41,7 +41,7 @@  	<!-- ENDIF -->		  	<!-- IF S_SELECT_NOTIFY -->  		<dl> -			<dt><label for="notifymethod0">{L_NOTIFY_METHOD}:</label></dt> +			<dt><label for="notifymethod0">{L_NOTIFY_METHOD}{L_COLON}</label></dt>  			<dd>  				<label for="notifymethod0"><input type="radio" name="notifymethod" id="notifymethod0" value="0"<!-- IF S_NOTIFY_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_EMAIL}</label>   				<label for="notifymethod1"><input type="radio" name="notifymethod" id="notifymethod1" value="1"<!-- IF S_NOTIFY_IM --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_IM}</label>  @@ -50,32 +50,32 @@  		</dl>  	<!-- ENDIF -->  	<dl> -		<dt><label for="notifypm1">{L_NOTIFY_ON_PM}:</label></dt> +		<dt><label for="notifypm1">{L_NOTIFY_ON_PM}{L_COLON}</label></dt>  		<dd>  			<label for="notifypm1"><input type="radio" name="notifypm" id="notifypm1" value="1"<!-- IF S_NOTIFY_PM --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>   			<label for="notifypm0"><input type="radio" name="notifypm" id="notifypm0" value="0"<!-- IF not S_NOTIFY_PM --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>  		</dd>  	</dl>  	<dl> -		<dt><label for="popuppm0">{L_POPUP_ON_PM}:</label></dt> +		<dt><label for="popuppm0">{L_POPUP_ON_PM}{L_COLON}</label></dt>  		<dd>  			<label for="popuppm1"><input type="radio" name="popuppm" id="popuppm1" value="1"<!-- IF S_POPUP_PM --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>   			<label for="popuppm0"><input type="radio" name="popuppm" id="popuppm0" value="0"<!-- IF not S_POPUP_PM --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>  		</dd>  	</dl>  	<dl> -		<dt><label for="lang">{L_BOARD_LANGUAGE}:</label></dt> +		<dt><label for="lang">{L_BOARD_LANGUAGE}{L_COLON}</label></dt>  		<dd><select name="lang" id="lang">{S_LANG_OPTIONS}</select></dd>  	</dl>  	<!-- IF S_STYLE_OPTIONS -->  		<dl> -			<dt><label for="style">{L_BOARD_STYLE}:</label></dt> +			<dt><label for="style">{L_BOARD_STYLE}{L_COLON}</label></dt>  			<dd><select name="style" id="style">{S_STYLE_OPTIONS}</select></dd>  		</dl>  	<!-- ENDIF -->  	<!-- INCLUDE timezone_option.html -->  	<dl> -		<dt><label for="dateformat">{L_BOARD_DATE_FORMAT}:</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt> +		<dt><label for="dateformat">{L_BOARD_DATE_FORMAT}{L_COLON}</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} diff --git a/phpBB/styles/prosilver/template/ucp_prefs_post.html b/phpBB/styles/prosilver/template/ucp_prefs_post.html index 0ca51ed7d6..6c68b2bccc 100644 --- a/phpBB/styles/prosilver/template/ucp_prefs_post.html +++ b/phpBB/styles/prosilver/template/ucp_prefs_post.html @@ -9,28 +9,28 @@  	<fieldset>  	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->  	<dl> -		<dt><label for="bbcode1">{L_DEFAULT_BBCODE}:</label></dt> +		<dt><label for="bbcode1">{L_DEFAULT_BBCODE}{L_COLON}</label></dt>  		<dd>  			<label for="bbcode1"><input type="radio" name="bbcode" id="bbcode1" value="1"<!-- IF S_BBCODE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>   			<label for="bbcode0"><input type="radio" name="bbcode" id="bbcode0" value="0"<!-- IF not S_BBCODE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>  		</dd>  	</dl>  	<dl> -		<dt><label for="smilies1">{L_DEFAULT_SMILIES}:</label></dt> +		<dt><label for="smilies1">{L_DEFAULT_SMILIES}{L_COLON}</label></dt>  		<dd>  			<label for="smilies1"><input type="radio" name="smilies" id="smilies1" value="1"<!-- IF S_SMILIES --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>   			<label for="smilies0"><input type="radio" name="smilies" id="smilies0" value="0"<!-- IF not S_SMILIES --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>  		</dd>  	</dl>  	<dl> -		<dt><label for="sig1">{L_DEFAULT_ADD_SIG}:</label></dt> +		<dt><label for="sig1">{L_DEFAULT_ADD_SIG}{L_COLON}</label></dt>  		<dd>  			<label for="sig1"><input type="radio" name="sig" id="sig1" value="1"<!-- IF S_SIG --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>   			<label for="sig0"><input type="radio" name="sig" id="sig0" value="0"<!-- IF not S_SIG --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>  		</dd>  	</dl>  	<dl> -		<dt><label for="notify1">{L_DEFAULT_NOTIFY}:</label></dt> +		<dt><label for="notify1">{L_DEFAULT_NOTIFY}{L_COLON}</label></dt>  		<dd>  			<label for="notify1"><input type="radio" name="notify" id="notify1" value="1"<!-- IF S_NOTIFY --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>   			<label for="notify0"><input type="radio" name="notify" id="notify0" value="0"<!-- IF not S_NOTIFY --> checked="checked"<!-- ENDIF --> /> {L_NO}</label> diff --git a/phpBB/styles/prosilver/template/ucp_prefs_view.html b/phpBB/styles/prosilver/template/ucp_prefs_view.html index 2e47c2e054..51561349c3 100644 --- a/phpBB/styles/prosilver/template/ucp_prefs_view.html +++ b/phpBB/styles/prosilver/template/ucp_prefs_view.html @@ -10,35 +10,35 @@  		<fieldset>  		<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->  		<dl> -			<dt><label for="images1">{L_VIEW_IMAGES}:</label></dt> +			<dt><label for="images1">{L_VIEW_IMAGES}{L_COLON}</label></dt>  			<dd>  				<label for="images1"><input type="radio" name="images" id="images1" value="1"<!-- IF S_IMAGES --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>   				<label for="images0"><input type="radio" name="images" id="images0" value="0"<!-- IF not S_IMAGES --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>  			</dd>  		</dl>  		<dl> -			<dt><label for="flash0">{L_VIEW_FLASH}:</label></dt> +			<dt><label for="flash0">{L_VIEW_FLASH}{L_COLON}</label></dt>  			<dd>  				<label for="flash1"><input type="radio" name="flash" id="flash1" value="1"<!-- IF S_FLASH --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>   				<label for="flash0"><input type="radio" name="flash" id="flash0" value="0"<!-- IF not S_FLASH --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>  			</dd>  		</dl>  		<dl> -			<dt><label for="smilies1">{L_VIEW_SMILIES}:</label></dt> +			<dt><label for="smilies1">{L_VIEW_SMILIES}{L_COLON}</label></dt>  			<dd>  				<label for="smilies1"><input type="radio" name="smilies" id="smilies1" value="1"<!-- IF S_SMILIES --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>   				<label for="smilies0"><input type="radio" name="smilies" id="smilies0" value="0"<!-- IF not S_SMILIES --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>  			</dd>  		</dl>  		<dl> -			<dt><label for="sigs1">{L_VIEW_SIGS}:</label></dt> +			<dt><label for="sigs1">{L_VIEW_SIGS}{L_COLON}</label></dt>  			<dd>  				<label for="sigs1"><input type="radio" name="sigs" id="sigs1" value="1"<!-- IF S_SIGS --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>   				<label for="sigs0"><input type="radio" name="sigs" id="sigs0" value="0"<!-- IF not S_SIGS --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>  			</dd>  		</dl>  		<dl> -			<dt><label for="avatars1">{L_VIEW_AVATARS}:</label></dt> +			<dt><label for="avatars1">{L_VIEW_AVATARS}{L_COLON}</label></dt>  			<dd>  				<label for="avatars1"><input type="radio" name="avatars" id="avatars1" value="1"<!-- IF S_AVATARS --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>   				<label for="avatars0"><input type="radio" name="avatars" id="avatars0" value="0"<!-- IF not S_AVATARS --> checked="checked"<!-- ENDIF --> /> {L_NO}</label> @@ -46,7 +46,7 @@  		</dl>  		<!-- IF S_CHANGE_CENSORS -->  			<dl> -				<dt><label for="wordcensor1">{L_DISABLE_CENSORS}:</label></dt> +				<dt><label for="wordcensor1">{L_DISABLE_CENSORS}{L_COLON}</label></dt>  				<dd>  					<label for="wordcensor1"><input type="radio" name="wordcensor" id="wordcensor1" value="1"<!-- IF S_DISABLE_CENSORS --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>   					<label for="wordcensor0"><input type="radio" name="wordcensor" id="wordcensor0" value="0"<!-- IF not S_DISABLE_CENSORS --> checked="checked"<!-- ENDIF --> /> {L_NO}</label> @@ -55,28 +55,28 @@  		<!-- ENDIF -->  		<hr />  		<dl> -			<dt><label>{L_VIEW_TOPICS_DAYS}:</label></dt> +			<dt><label>{L_VIEW_TOPICS_DAYS}{L_COLON}</label></dt>  			<dd>{S_TOPIC_SORT_DAYS}</dd>  		</dl>  		<dl> -			<dt><label>{L_VIEW_TOPICS_KEY}:</label></dt> +			<dt><label>{L_VIEW_TOPICS_KEY}{L_COLON}</label></dt>  			<dd>{S_TOPIC_SORT_KEY}</dd>  		</dl>  		<dl> -			<dt><label>{L_VIEW_TOPICS_DIR}:</label></dt> +			<dt><label>{L_VIEW_TOPICS_DIR}{L_COLON}</label></dt>  			<dd>{S_TOPIC_SORT_DIR}</dd>  		</dl>  		<hr />  		<dl> -			<dt><label>{L_VIEW_POSTS_DAYS}:</label></dt> +			<dt><label>{L_VIEW_POSTS_DAYS}{L_COLON}</label></dt>  			<dd>{S_POST_SORT_DAYS}</dd>  		</dl>  		<dl> -			<dt><label>{L_VIEW_POSTS_KEY}:</label></dt> +			<dt><label>{L_VIEW_POSTS_KEY}{L_COLON}</label></dt>  			<dd>{S_POST_SORT_KEY}</dd>  		</dl>  		<dl> -			<dt><label>{L_VIEW_POSTS_DIR}:</label></dt> +			<dt><label>{L_VIEW_POSTS_DIR}{L_COLON}</label></dt>  			<dd>{S_POST_SORT_DIR}</dd>  		</dl>  		</fieldset> diff --git a/phpBB/styles/prosilver/template/ucp_profile_profile_info.html b/phpBB/styles/prosilver/template/ucp_profile_profile_info.html index b6f6a8988d..03d89e8590 100644 --- a/phpBB/styles/prosilver/template/ucp_profile_profile_info.html +++ b/phpBB/styles/prosilver/template/ucp_profile_profile_info.html @@ -11,54 +11,54 @@  	<fieldset>  	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->  	<dl> -		<dt><label for="icq">{L_UCP_ICQ}:</label></dt> +		<dt><label for="icq">{L_UCP_ICQ}{L_COLON}</label></dt>  		<dd><input type="text" name="icq" id="icq" maxlength="15" value="{ICQ}" class="inputbox" /></dd>  	</dl>  	<dl> -		<dt><label for="aim">{L_UCP_AIM}:</label></dt> +		<dt><label for="aim">{L_UCP_AIM}{L_COLON}</label></dt>  		<dd><input type="text" name="aim" id="aim" maxlength="255" value="{AIM}" class="inputbox" /></dd>  	</dl>  	<dl> -		<dt><label for="msn">{L_UCP_MSNM}:</label></dt> +		<dt><label for="msn">{L_UCP_MSNM}{L_COLON}</label></dt>  		<dd><input type="text" name="msn" id="msn" maxlength="255" value="{MSN}" class="inputbox" /></dd>  	</dl>  	<dl> -		<dt><label for="yim">{L_UCP_YIM}:</label></dt> +		<dt><label for="yim">{L_UCP_YIM}{L_COLON}</label></dt>  		<dd><input type="text" name="yim" id="yim" maxlength="255" value="{YIM}" class="inputbox" /></dd>  	</dl>  	<dl> -		<dt><label for="jabber">{L_UCP_JABBER}:</label></dt> +		<dt><label for="jabber">{L_UCP_JABBER}{L_COLON}</label></dt>  		<dd><input type="text" name="jabber" id="jabber" maxlength="255" value="{JABBER}" class="inputbox" /></dd>  	</dl>  	<dl> -		<dt><label for="website">{L_WEBSITE}:</label></dt> +		<dt><label for="website">{L_WEBSITE}{L_COLON}</label></dt>  		<dd><input type="text" name="website" id="website" maxlength="255" value="{WEBSITE}" class="inputbox" /></dd>  	</dl>  	<dl> -		<dt><label for="location">{L_LOCATION}:</label></dt> +		<dt><label for="location">{L_LOCATION}{L_COLON}</label></dt>  		<dd><input type="text" name="location" id="location" maxlength="255" value="{LOCATION}" class="inputbox" /></dd>  	</dl>  	<dl> -		<dt><label for="occupation">{L_OCCUPATION}:</label></dt> +		<dt><label for="occupation">{L_OCCUPATION}{L_COLON}</label></dt>  		<dd><textarea name="occupation" id="occupation" class="inputbox" rows="3" cols="30">{OCCUPATION}</textarea></dd>  	</dl>  	<dl> -		<dt><label for="interests">{L_INTERESTS}:</label></dt> +		<dt><label for="interests">{L_INTERESTS}{L_COLON}</label></dt>  		<dd><textarea name="interests" id="interests" class="inputbox" rows="3" cols="30">{INTERESTS}</textarea></dd>  	</dl>  	<!-- IF S_BIRTHDAYS_ENABLED -->  		<dl> -			<dt><label for="bday_day">{L_BIRTHDAY}:</label><br /><span>{L_BIRTHDAY_EXPLAIN}</span></dt> +			<dt><label for="bday_day">{L_BIRTHDAY}{L_COLON}</label><br /><span>{L_BIRTHDAY_EXPLAIN}</span></dt>  			<dd> -				<label for="bday_day">{L_DAY}: <select name="bday_day" id="bday_day" style="width: 4em;">{S_BIRTHDAY_DAY_OPTIONS}</select></label>  -				<label for="bday_month">{L_MONTH}: <select name="bday_month" id="bday_month" style="width: 4em;">{S_BIRTHDAY_MONTH_OPTIONS}</select></label>  -				<label for="bday_year">{L_YEAR}: <select name="bday_year" id="bday_year" style="width: 6em;">{S_BIRTHDAY_YEAR_OPTIONS}</select></label> +				<label for="bday_day">{L_DAY}{L_COLON} <select name="bday_day" id="bday_day" style="width: 4em;">{S_BIRTHDAY_DAY_OPTIONS}</select></label>  +				<label for="bday_month">{L_MONTH}{L_COLON} <select name="bday_month" id="bday_month" style="width: 4em;">{S_BIRTHDAY_MONTH_OPTIONS}</select></label>  +				<label for="bday_year">{L_YEAR}{L_COLON} <select name="bday_year" id="bday_year" style="width: 6em;">{S_BIRTHDAY_YEAR_OPTIONS}</select></label>  			</dd>  		</dl>  	<!-- ENDIF -->  	<!-- BEGIN profile_fields -->  		<dl> -			<dt><label<!-- IF profile_fields.FIELD_ID --> for="{profile_fields.FIELD_ID}"<!-- ENDIF -->>{profile_fields.LANG_NAME}:<!-- IF profile_fields.S_REQUIRED --> *<!-- ENDIF --></label> +			<dt><label<!-- IF profile_fields.FIELD_ID --> for="{profile_fields.FIELD_ID}"<!-- ENDIF -->>{profile_fields.LANG_NAME}{L_COLON}<!-- IF profile_fields.S_REQUIRED --> *<!-- ENDIF --></label>  			<!-- IF profile_fields.LANG_EXPLAIN --><br /><span>{profile_fields.LANG_EXPLAIN}</span><!-- ENDIF --></dt>  			<!-- IF profile_fields.ERROR --><dd class="error">{profile_fields.ERROR}</dd><!-- ENDIF -->  			<dd>{profile_fields.FIELD}</dd> diff --git a/phpBB/styles/prosilver/template/ucp_profile_reg_details.html b/phpBB/styles/prosilver/template/ucp_profile_reg_details.html index 5c0639fce7..c014e54250 100644 --- a/phpBB/styles/prosilver/template/ucp_profile_reg_details.html +++ b/phpBB/styles/prosilver/template/ucp_profile_reg_details.html @@ -13,20 +13,20 @@  	<fieldset>  	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->  	<dl> -		<dt><label <!-- IF S_CHANGE_USERNAME -->for="username"<!-- ENDIF -->>{L_USERNAME}:</label><br /><span>{L_USERNAME_EXPLAIN}</span></dt> +		<dt><label <!-- IF S_CHANGE_USERNAME -->for="username"<!-- ENDIF -->>{L_USERNAME}{L_COLON}</label><br /><span>{L_USERNAME_EXPLAIN}</span></dt>  		<dd><!-- IF S_CHANGE_USERNAME --><input type="text" name="username" id="username" value="{USERNAME}" class="inputbox" title="{L_USERNAME}" /><!-- ELSE --><strong>{USERNAME}</strong><!-- ENDIF --></dd>  	</dl>  	<dl> -		<dt><label for="email">{L_EMAIL_ADDRESS}:</label></dt> +		<dt><label for="email">{L_EMAIL_ADDRESS}{L_COLON}</label></dt>  		<dd><!-- IF S_CHANGE_EMAIL --><input type="text" name="email" id="email" maxlength="100" value="{EMAIL}" class="inputbox" title="{L_EMAIL_ADDRESS}" /><!-- ELSE --><strong>{EMAIL}</strong><!-- ENDIF --></dd>  	</dl>  	<!-- IF S_CHANGE_PASSWORD -->  		<dl> -			<dt><label for="new_password">{L_NEW_PASSWORD}:</label><br /><span>{L_CHANGE_PASSWORD_EXPLAIN}</span></dt> +			<dt><label for="new_password">{L_NEW_PASSWORD}{L_COLON}</label><br /><span>{L_CHANGE_PASSWORD_EXPLAIN}</span></dt>  			<dd><input type="password" name="new_password" id="new_password" maxlength="255" value="{NEW_PASSWORD}" class="inputbox" title="{L_CHANGE_PASSWORD}" /></dd>  		</dl>  		<dl> -			<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}:</label><br /><span>{L_CONFIRM_PASSWORD_EXPLAIN}</span></dt> +			<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}{L_COLON}</label><br /><span>{L_CONFIRM_PASSWORD_EXPLAIN}</span></dt>  			<dd><input type="password" name="password_confirm" id="password_confirm" maxlength="255" value="{PASSWORD_CONFIRM}" class="inputbox" title="{L_CONFIRM_PASSWORD}" /></dd>  		</dl>  	<!-- ENDIF --> @@ -39,7 +39,7 @@  	<fieldset>  	<dl> -		<dt><label for="cur_password">{L_CURRENT_PASSWORD}:</label><br /><span><!-- IF S_CHANGE_PASSWORD -->{L_CURRENT_CHANGE_PASSWORD_EXPLAIN}<!-- ELSE -->{L_CURRENT_PASSWORD_EXPLAIN}<!-- ENDIF --></span></dt> +		<dt><label for="cur_password">{L_CURRENT_PASSWORD}{L_COLON}</label><br /><span><!-- IF S_CHANGE_PASSWORD -->{L_CURRENT_CHANGE_PASSWORD_EXPLAIN}<!-- ELSE -->{L_CURRENT_PASSWORD_EXPLAIN}<!-- ENDIF --></span></dt>  		<dd><input type="password" name="cur_password" id="cur_password" maxlength="255" value="{CUR_PASSWORD}" class="inputbox" title="{L_CURRENT_PASSWORD}" /></dd>  	</dl>  	</fieldset> diff --git a/phpBB/styles/prosilver/template/ucp_register.html b/phpBB/styles/prosilver/template/ucp_register.html index e14ca6493d..47537e9d8b 100644 --- a/phpBB/styles/prosilver/template/ucp_register.html +++ b/phpBB/styles/prosilver/template/ucp_register.html @@ -31,26 +31,26 @@  		<dl><dd><strong>{L_REG_COND}</strong></dd></dl>  	<!-- ENDIF -->  	<dl> -		<dt><label for="username">{L_USERNAME}:</label><br /><span>{L_USERNAME_EXPLAIN}</span></dt> +		<dt><label for="username">{L_USERNAME}{L_COLON}</label><br /><span>{L_USERNAME_EXPLAIN}</span></dt>  		<dd><input type="text" tabindex="1" name="username" id="username" size="25" value="{USERNAME}" class="inputbox autowidth" title="{L_USERNAME}" /></dd>  	</dl>  	<dl> -		<dt><label for="email">{L_EMAIL_ADDRESS}:</label></dt> +		<dt><label for="email">{L_EMAIL_ADDRESS}{L_COLON}</label></dt>  		<dd><input type="text" tabindex="2" name="email" id="email" size="25" maxlength="100" value="{EMAIL}" class="inputbox autowidth" title="{L_EMAIL_ADDRESS}" /></dd>  	</dl>  	<dl> -		<dt><label for="new_password">{L_PASSWORD}:</label><br /><span>{L_PASSWORD_EXPLAIN}</span></dt> +		<dt><label for="new_password">{L_PASSWORD}{L_COLON}</label><br /><span>{L_PASSWORD_EXPLAIN}</span></dt>  		<dd><input type="password" tabindex="4" name="new_password" id="new_password" size="25" value="{PASSWORD}" class="inputbox autowidth" title="{L_NEW_PASSWORD}" /></dd>  	</dl>  	<dl> -		<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}:</label></dt> +		<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}{L_COLON}</label></dt>  		<dd><input type="password"  tabindex="5" name="password_confirm" id="password_confirm" size="25" value="{PASSWORD_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_PASSWORD}" /></dd>  	</dl>  	<hr />  	<dl> -		<dt><label for="lang">{L_LANGUAGE}:</label></dt> +		<dt><label for="lang">{L_LANGUAGE}{L_COLON}</label></dt>  		<dd><select name="lang" id="lang" onchange="change_language(this.value); return false;" tabindex="6" title="{L_LANGUAGE}">{S_LANG_OPTIONS}</select></dd>  	</dl> @@ -61,7 +61,7 @@  	<!-- BEGIN profile_fields -->  		<dl> -			<dt><label<!-- IF profile_fields.FIELD_ID --> for="{profile_fields.FIELD_ID}"<!-- ENDIF -->>{profile_fields.LANG_NAME}:<!-- IF profile_fields.S_REQUIRED --> *<!-- ENDIF --></label> +			<dt><label<!-- IF profile_fields.FIELD_ID --> for="{profile_fields.FIELD_ID}"<!-- ENDIF -->>{profile_fields.LANG_NAME}{L_COLON}<!-- IF profile_fields.S_REQUIRED --> *<!-- ENDIF --></label>  			<!-- IF profile_fields.LANG_EXPLAIN --><br /><span>{profile_fields.LANG_EXPLAIN}</span><!-- ENDIF -->  			<!-- IF profile_fields.ERROR --><br /><span class="error">{profile_fields.ERROR}</span><!-- ENDIF --></dt>  			<dd>{profile_fields.FIELD}</dd> diff --git a/phpBB/styles/prosilver/template/ucp_remind.html b/phpBB/styles/prosilver/template/ucp_remind.html index d480258209..b957bd4fe4 100644 --- a/phpBB/styles/prosilver/template/ucp_remind.html +++ b/phpBB/styles/prosilver/template/ucp_remind.html @@ -10,11 +10,11 @@  		<fieldset>  		<dl> -			<dt><label for="username">{L_USERNAME}:</label></dt> +			<dt><label for="username">{L_USERNAME}{L_COLON}</label></dt>  			<dd><input class="inputbox narrow" type="text" name="username" id="username" size="25" /></dd>  		</dl>  		<dl> -			<dt><label for="email">{L_EMAIL_ADDRESS}:</label><br /><span>{L_EMAIL_REMIND}</span></dt> +			<dt><label for="email">{L_EMAIL_ADDRESS}{L_COLON}</label><br /><span>{L_EMAIL_REMIND}</span></dt>  			<dd><input class="inputbox narrow" type="text" name="email" id="email" size="25" maxlength="100" /></dd>  		</dl>  		<dl> diff --git a/phpBB/styles/prosilver/template/ucp_resend.html b/phpBB/styles/prosilver/template/ucp_resend.html index 36e112863c..6b1b2d84e2 100644 --- a/phpBB/styles/prosilver/template/ucp_resend.html +++ b/phpBB/styles/prosilver/template/ucp_resend.html @@ -11,11 +11,11 @@  		<fieldset>  		<dl> -			<dt><label for="username">{L_USERNAME}:</label></dt> +			<dt><label for="username">{L_USERNAME}{L_COLON}</label></dt>  			<dd><input class="inputbox narrow" type="text" name="username" id="username" size="25" /></dd>  		</dl>  		<dl> -			<dt><label for="email">{L_EMAIL_ADDRESS}:</label><br /><span>{L_EMAIL_REMIND}</span></dt> +			<dt><label for="email">{L_EMAIL_ADDRESS}{L_COLON}</label><br /><span>{L_EMAIL_REMIND}</span></dt>  			<dd><input class="inputbox narrow" type="text" name="email" id="email" size="25" maxlength="100" /></dd>  		</dl>  		<dl> diff --git a/phpBB/styles/prosilver/template/ucp_zebra_foes.html b/phpBB/styles/prosilver/template/ucp_zebra_foes.html index 7aceac74c3..712479dc18 100644 --- a/phpBB/styles/prosilver/template/ucp_zebra_foes.html +++ b/phpBB/styles/prosilver/template/ucp_zebra_foes.html @@ -12,7 +12,7 @@  	<fieldset class="fields2">  	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->  	<dl> -		<dt><label <!-- IF S_USERNAME_OPTIONS -->for="usernames"<!-- ENDIF -->>{L_YOUR_FOES}:</label><br /><span>{L_YOUR_FOES_EXPLAIN}</span></dt> +		<dt><label <!-- IF S_USERNAME_OPTIONS -->for="usernames"<!-- ENDIF -->>{L_YOUR_FOES}{L_COLON}</label><br /><span>{L_YOUR_FOES_EXPLAIN}</span></dt>  		<dd>  			<!-- IF S_USERNAME_OPTIONS -->  				<select name="usernames[]" id="usernames" multiple="multiple" size="5">{S_USERNAME_OPTIONS}</select> @@ -22,7 +22,7 @@  		</dd>  	</dl>  	<dl> -		<dt><label for="add">{L_ADD_FOES}:</label><br /><span>{L_ADD_FOES_EXPLAIN}</span></dt> +		<dt><label for="add">{L_ADD_FOES}{L_COLON}</label><br /><span>{L_ADD_FOES_EXPLAIN}</span></dt>  		<dd><textarea name="add" id="add" rows="3" cols="30" class="inputbox">{USERNAMES}</textarea></dd>  		<dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></strong></dd>  	</dl> diff --git a/phpBB/styles/prosilver/template/ucp_zebra_friends.html b/phpBB/styles/prosilver/template/ucp_zebra_friends.html index 8908e4ba69..583b911284 100644 --- a/phpBB/styles/prosilver/template/ucp_zebra_friends.html +++ b/phpBB/styles/prosilver/template/ucp_zebra_friends.html @@ -12,7 +12,7 @@  	<fieldset class="fields2">  	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->  	<dl> -		<dt><label <!-- IF S_USERNAME_OPTIONS -->for="usernames"<!-- ENDIF -->>{L_YOUR_FRIENDS}:</label><br /><span>{L_YOUR_FRIENDS_EXPLAIN}</span></dt> +		<dt><label <!-- IF S_USERNAME_OPTIONS -->for="usernames"<!-- ENDIF -->>{L_YOUR_FRIENDS}{L_COLON}</label><br /><span>{L_YOUR_FRIENDS_EXPLAIN}</span></dt>  		<dd>  			<!-- IF S_USERNAME_OPTIONS -->  				<select name="usernames[]" id="usernames" multiple="multiple" size="5">{S_USERNAME_OPTIONS}</select> @@ -22,7 +22,7 @@  		</dd>  	</dl>  	<dl> -		<dt><label for="add">{L_ADD_FRIENDS}:</label><br /><span>{L_ADD_FRIENDS_EXPLAIN}</span></dt> +		<dt><label for="add">{L_ADD_FRIENDS}{L_COLON}</label><br /><span>{L_ADD_FRIENDS_EXPLAIN}</span></dt>  		<dd><textarea name="add" id="add" rows="3" cols="30" class="inputbox">{USERNAMES}</textarea></dd>  		<dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></strong></dd>  	</dl> diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html index 373a172918..0a818e725b 100644 --- a/phpBB/styles/prosilver/template/viewforum_body.html +++ b/phpBB/styles/prosilver/template/viewforum_body.html @@ -6,7 +6,7 @@  <div>  	<!-- NOTE: remove the style="display: none" when you want to have the forum description on the forum body -->  	<!-- IF FORUM_DESC --><div style="display: none !important;">{FORUM_DESC}<br /></div><!-- ENDIF --> -	<!-- IF MODERATORS --><p><strong><!-- IF S_SINGLE_MODERATOR -->{L_MODERATOR}<!-- ELSE -->{L_MODERATORS}<!-- ENDIF -->:</strong> {MODERATORS}</p><!-- ENDIF --> +	<!-- IF MODERATORS --><p><strong><!-- IF S_SINGLE_MODERATOR -->{L_MODERATOR}<!-- ELSE -->{L_MODERATORS}<!-- ENDIF -->{L_COLON}</strong> {MODERATORS}</p><!-- ENDIF -->  </div>  <!-- ENDIF --> @@ -59,9 +59,9 @@  		<div class="pagination">  			<!-- IF not S_IS_BOT and U_MARK_TOPICS --><a href="{U_MARK_TOPICS}" accesskey="m" data-ajax="true">{L_MARK_TOPICS_READ}</a> • <!-- ENDIF -->  			<!-- IF TOTAL_TOPICS -->{TOTAL_TOPICS} • <!-- ENDIF --> -			<!-- IF .pagination -->  +			<!-- IF .pagination -->  				<!-- INCLUDE pagination.html --> -			<!-- ELSE -->  +			<!-- ELSE -->  				{PAGE_NUMBER}  			<!-- ENDIF -->  		</div> @@ -90,11 +90,11 @@  				<fieldset class="fields1">  				<dl> -					<dt><label for="username">{L_USERNAME}:</label></dt> +					<dt><label for="username">{L_USERNAME}{L_COLON}</label></dt>  					<dd><input type="text" tabindex="1" name="username" id="username" size="25" value="{USERNAME}" class="inputbox autowidth" /></dd>  				</dl>  				<dl> -					<dt><label for="password">{L_PASSWORD}:</label></dt> +					<dt><label for="password">{L_PASSWORD}{L_COLON}</label></dt>  					<dd><input type="password" tabindex="2" id="password" name="password" size="25" class="inputbox autowidth" /></dd>  					<!-- IF S_AUTOLOGIN_ENABLED --><dd><label for="autologin"><input type="checkbox" name="autologin" id="autologin" tabindex="3" /> {L_LOG_ME_IN}</label></dd><!-- ENDIF -->  					<dd><label for="viewonline"><input type="checkbox" name="viewonline" id="viewonline" tabindex="4" /> {L_HIDE_ME}</label></dd> @@ -192,7 +192,7 @@  			<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->  			<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->  	<!-- IF not S_IS_BOT --> -			<label>{L_DISPLAY_TOPICS}: {S_SELECT_SORT_DAYS}</label> +			<label>{L_DISPLAY_TOPICS}{L_COLON} {S_SELECT_SORT_DAYS}</label>  			<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label>  			<label>{S_SELECT_SORT_DIR} <input type="submit" name="sort" value="{L_GO}" class="button2" /></label>  	<!-- ENDIF --> @@ -214,9 +214,9 @@  			<!-- IF TOTAL_TOPICS and not S_IS_BOT and U_MARK_TOPICS --><a href="{U_MARK_TOPICS}">{L_MARK_TOPICS_READ}</a> •  <!-- ENDIF -->  			<!-- IF TOTAL_POSTS and not NEWEST_USER --> {TOTAL_POSTS}<!-- ELSEIF TOTAL_TOPICS and not NEWEST_USER --> {TOTAL_TOPICS} • <!-- ENDIF -->  			<!-- IF TOTAL_USERS -->{TOTAL_USERS} • <!-- ENDIF --> -			<!-- IF .pagination -->  +			<!-- IF .pagination -->  				<!-- INCLUDE pagination.html --> -			<!-- ELSE -->  +			<!-- ELSE -->  				{PAGE_NUMBER}  			<!-- ENDIF -->  		</div> diff --git a/phpBB/styles/prosilver/template/viewonline_body.html b/phpBB/styles/prosilver/template/viewonline_body.html index 9156090407..7ae1b6bc58 100644 --- a/phpBB/styles/prosilver/template/viewonline_body.html +++ b/phpBB/styles/prosilver/template/viewonline_body.html @@ -29,7 +29,7 @@  		<tbody>  		<!-- BEGIN user_row -->  		<tr class="<!-- IF user_row.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->"> -			<td>{user_row.USERNAME_FULL}<!-- IF user_row.USER_IP --> <span style="margin-left: 30px;">{L_IP}: <a href="{user_row.U_USER_IP}">{user_row.USER_IP}</a> » <a href="{user_row.U_WHOIS}" onclick="popup(this.href, 750, 500); return false;">{L_WHOIS}</a></span><!-- ENDIF --> +			<td>{user_row.USERNAME_FULL}<!-- IF user_row.USER_IP --> <span style="margin-left: 30px;">{L_IP}{L_COLON} <a href="{user_row.U_USER_IP}">{user_row.USER_IP}</a> » <a href="{user_row.U_WHOIS}" onclick="popup(this.href, 750, 500); return false;">{L_WHOIS}</a></span><!-- ENDIF -->  				<!-- IF user_row.USER_BROWSER --><br />{user_row.USER_BROWSER}<!-- ENDIF --></td>  			<td class="info"><a href="{user_row.U_FORUM_LOCATION}">{user_row.FORUM_LOCATION}</a></td>  			<td class="active">{user_row.LASTUPDATE}</td> @@ -53,7 +53,7 @@  </fieldset>  <!-- ENDIF --> -<!-- IF LEGEND --><p><em>{L_LEGEND}: {LEGEND}</em></p><!-- ENDIF --> +<!-- IF LEGEND --><p><em>{L_LEGEND}{L_COLON} {LEGEND}</em></p><!-- ENDIF -->  <ul class="linklist">  	<li class="rightside pagination"> diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index 01b6a504a2..9455d10f72 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -6,7 +6,7 @@  <!-- IF MODERATORS -->  <p> -	<strong><!-- IF S_SINGLE_MODERATOR -->{L_MODERATOR}<!-- ELSE -->{L_MODERATORS}<!-- ENDIF -->:</strong> {MODERATORS} +	<strong><!-- IF S_SINGLE_MODERATOR -->{L_MODERATOR}<!-- ELSE -->{L_MODERATORS}<!-- ENDIF -->{L_COLON}</strong> {MODERATORS}  </p>  <!-- ENDIF --> @@ -47,10 +47,10 @@  	<!-- IF .pagination or TOTAL_POSTS -->  		<div class="pagination"> -			<!-- IF U_VIEW_UNREAD_POST and not S_IS_BOT --><a href="{U_VIEW_UNREAD_POST}">{L_VIEW_UNREAD_POST}</a> • <!-- ENDIF -->{TOTAL_POSTS} •  -			<!-- IF .pagination -->  +			<!-- IF U_VIEW_UNREAD_POST and not S_IS_BOT --><a href="{U_VIEW_UNREAD_POST}">{L_VIEW_UNREAD_POST}</a> • <!-- ENDIF -->{TOTAL_POSTS} • +			<!-- IF .pagination -->  				<!-- INCLUDE pagination.html --> -			<!-- ELSE -->  +			<!-- ELSE -->  				{PAGE_NUMBER}  			<!-- ENDIF -->  		</div> @@ -82,7 +82,7 @@  			<!-- IF S_DISPLAY_RESULTS -->  				<dl>  					<dt> </dt> -					<dd class="resultbar">{L_TOTAL_VOTES} : {TOTAL_VOTES}</dd> +					<dd class="resultbar">{L_TOTAL_VOTES}{L_COLON} {TOTAL_VOTES}</dd>  				</dl>  			<!-- ENDIF --> @@ -161,7 +161,7 @@  						{L_ATTACHMENTS}  						<!-- IF postrow.S_MULTIPLE_ATTACHMENTS -->  							<div class="dl_links"> -								<strong>{L_DOWNLOAD_ALL}:</strong> +								<strong>{L_DOWNLOAD_ALL}{L_COLON}</strong>  								<ul>  								<!-- BEGIN dl_method -->  									<li>[ <a href="{postrow.dl_method.LINK}">{postrow.dl_method.TYPE}</a> ]</li> @@ -179,7 +179,7 @@  			<!-- IF postrow.S_DISPLAY_NOTICE --><div class="rules">{L_DOWNLOAD_NOTICE}</div><!-- ENDIF -->  			<!-- IF postrow.EDITED_MESSAGE or postrow.EDIT_REASON -->  				<div class="notice">{postrow.EDITED_MESSAGE} -					<!-- IF postrow.EDIT_REASON --><br /><strong>{L_REASON}:</strong> <em>{postrow.EDIT_REASON}</em><!-- ENDIF --> +					<!-- IF postrow.EDIT_REASON --><br /><strong>{L_REASON}{L_COLON}</strong> <em>{postrow.EDIT_REASON}</em><!-- ENDIF -->  				</div>  			<!-- ENDIF --> @@ -202,17 +202,17 @@  		<dd> </dd> -		<!-- IF postrow.POSTER_POSTS != '' --><dd><strong>{L_POSTS}:</strong> {postrow.POSTER_POSTS}</dd><!-- ENDIF --> -		<!-- IF postrow.POSTER_JOINED --><dd><strong>{L_JOINED}:</strong> {postrow.POSTER_JOINED}</dd><!-- ENDIF --> -		<!-- IF postrow.POSTER_FROM --><dd><strong>{L_LOCATION}:</strong> {postrow.POSTER_FROM}</dd><!-- ENDIF --> +		<!-- IF postrow.POSTER_POSTS != '' --><dd><strong>{L_POSTS}{L_COLON}</strong> {postrow.POSTER_POSTS}</dd><!-- ENDIF --> +		<!-- IF postrow.POSTER_JOINED --><dd><strong>{L_JOINED}{L_COLON}</strong> {postrow.POSTER_JOINED}</dd><!-- ENDIF --> +		<!-- IF postrow.POSTER_FROM --><dd><strong>{L_LOCATION}{L_COLON}</strong> {postrow.POSTER_FROM}</dd><!-- ENDIF -->  		<!-- IF postrow.S_PROFILE_FIELD1 -->  			<!-- Use a construct like this to include admin defined profile fields. Replace FIELD1 with the name of your field. --> -			<dd><strong>{postrow.PROFILE_FIELD1_NAME}:</strong> {postrow.PROFILE_FIELD1_VALUE}</dd> +			<dd><strong>{postrow.PROFILE_FIELD1_NAME}{L_COLON}</strong> {postrow.PROFILE_FIELD1_VALUE}</dd>  		<!-- ENDIF -->  		<!-- BEGIN custom_fields --> -			<dd><strong>{postrow.custom_fields.PROFILE_FIELD_NAME}:</strong> {postrow.custom_fields.PROFILE_FIELD_VALUE}</dd> +			<dd><strong>{postrow.custom_fields.PROFILE_FIELD_NAME}{L_COLON}</strong> {postrow.custom_fields.PROFILE_FIELD_VALUE}</dd>  		<!-- END custom_fields -->  		<!-- IF not S_IS_BOT --> @@ -221,7 +221,7 @@  				<ul class="profile-icons">  					<!-- IF postrow.U_PM --><li class="pm-icon"><a href="{postrow.U_PM}" title="{L_PRIVATE_MESSAGE}"><span>{L_PRIVATE_MESSAGE}</span></a></li><!-- ENDIF -->  					<!-- IF postrow.U_EMAIL --><li class="email-icon"><a href="{postrow.U_EMAIL}" title="{L_SEND_EMAIL_USER} {postrow.POST_AUTHOR}"><span>{L_SEND_EMAIL_USER} {postrow.POST_AUTHOR}</span></a></li><!-- ENDIF --> -					<!-- IF postrow.U_WWW --><li class="web-icon"><a href="{postrow.U_WWW}" title="{L_VISIT_WEBSITE}: {postrow.U_WWW}"><span>{L_WEBSITE}</span></a></li><!-- ENDIF --> +					<!-- IF postrow.U_WWW --><li class="web-icon"><a href="{postrow.U_WWW}" title="{L_VISIT_WEBSITE}{L_COLON} {postrow.U_WWW}"><span>{L_WEBSITE}</span></a></li><!-- ENDIF -->  					<!-- IF postrow.U_MSN --><li class="msnm-icon"><a href="{postrow.U_MSN}" onclick="popup(this.href, 550, 320); return false;" title="{L_MSNM}"><span>{L_MSNM}</span></a></li><!-- ENDIF -->  					<!-- IF postrow.U_ICQ --><li class="icq-icon"><a href="{postrow.U_ICQ}" onclick="popup(this.href, 550, 320); return false;" title="{L_ICQ}"><span>{L_ICQ}</span></a></li><!-- ENDIF -->  					<!-- IF postrow.U_YIM --><li class="yahoo-icon"><a href="{postrow.U_YIM}" onclick="popup(this.href, 780, 550); return false;" title="{L_YIM}"><span>{L_YIM}</span></a></li><!-- ENDIF --> @@ -252,7 +252,7 @@  		<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->  		<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->  		<!-- IF not S_IS_BOT --> -		<label>{L_DISPLAY_POSTS}: {S_SELECT_SORT_DAYS}</label> +		<label>{L_DISPLAY_POSTS}{L_COLON} {S_SELECT_SORT_DAYS}</label>  		<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label> <label>{S_SELECT_SORT_DIR} <input type="submit" name="sort" value="{L_GO}" class="button2" /></label>  		<!-- ENDIF -->  	</fieldset> @@ -270,7 +270,7 @@  	<!-- IF S_HAS_ATTACHMENTS -->  		<div class="dl_links"> -			<strong>{L_DOWNLOAD_ALL_ATTACHMENTS}:</strong> +			<strong>{L_DOWNLOAD_ALL_ATTACHMENTS}{L_COLON}</strong>  			<ul>  			<!-- BEGIN dl_method -->  				<li>[ <a href="{dl_method.LINK}">{dl_method.TYPE}</a> ]</li> @@ -281,8 +281,8 @@  	<!-- IF .pagination or TOTAL_POSTS -->  		<div class="pagination"> -			{TOTAL_POSTS} •  -			<!-- IF .pagination -->  +			{TOTAL_POSTS} • +			<!-- IF .pagination -->  				<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> •  				<ul>  				<!-- BEGIN pagination --> @@ -294,7 +294,7 @@  					<!-- ENDIF -->  				<!-- END pagination -->  				</ul> -			<!-- ELSE -->  +			<!-- ELSE -->  				{PAGE_NUMBER}  			<!-- ENDIF -->  		</div> @@ -306,7 +306,7 @@  <!-- IF .quickmod -->  	<form method="post" action="{S_MOD_ACTION}" id="quickmodform">  	<fieldset class="quickmod"> -		<label for="quick-mod-select">{L_QUICK_MOD}:</label> +		<label for="quick-mod-select">{L_QUICK_MOD}{L_COLON}</label>  		<select name="action" id="quick-mod-select">  			<!-- BEGIN quickmod -->  			<option value="{quickmod.VALUE}">{quickmod.TITLE}</option> diff --git a/phpBB/styles/prosilver/template/viewtopic_print.html b/phpBB/styles/prosilver/template/viewtopic_print.html index 88d65ea407..54676279d2 100644 --- a/phpBB/styles/prosilver/template/viewtopic_print.html +++ b/phpBB/styles/prosilver/template/viewtopic_print.html @@ -28,7 +28,7 @@  		<!-- BEGIN postrow -->  			<div class="post">  				<h3>{postrow.POST_SUBJECT}</h3> -				<div class="date">{postrow.MINI_POST_IMG}{L_POSTED}: <strong>{postrow.POST_DATE}</strong></div> +				<div class="date">{postrow.MINI_POST_IMG}{L_POSTED}{L_COLON} <strong>{postrow.POST_DATE}</strong></div>  				<div class="author">{L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR}</strong></div>  				<div class="content">{postrow.MESSAGE}</div>  			</div> diff --git a/phpBB/styles/subsilver2/template/attachment.html b/phpBB/styles/subsilver2/template/attachment.html index fca620b481..eb5dd91634 100644 --- a/phpBB/styles/subsilver2/template/attachment.html +++ b/phpBB/styles/subsilver2/template/attachment.html @@ -6,7 +6,7 @@  	<!-- ELSE -->  		<!-- IF _file.COMMENT --> -			<span class="gensmall"><b>{L_FILE_COMMENT}:</b> {_file.COMMENT}</span><br /> +			<span class="gensmall"><b>{L_FILE_COMMENT}{L_COLON}</b> {_file.COMMENT}</span><br />  		<!-- ENDIF -->  		<!-- IF _file.S_THUMBNAIL --> diff --git a/phpBB/styles/subsilver2/template/bbcode.html b/phpBB/styles/subsilver2/template/bbcode.html index 50162740d0..efcf5e1acb 100644 --- a/phpBB/styles/subsilver2/template/bbcode.html +++ b/phpBB/styles/subsilver2/template/bbcode.html @@ -9,11 +9,11 @@  <!-- BEGIN listitem_close --></li><!-- END listitem_close -->  <!-- BEGIN quote_username_open --> -<div class="quotetitle">{USERNAME} {L_WROTE}:</div><div class="quotecontent"> +<div class="quotetitle">{USERNAME} {L_WROTE}{L_COLON}</div><div class="quotecontent">  <!-- END quote_username_open -->  <!-- BEGIN quote_open --> -<div class="quotetitle"><b>{L_QUOTE}:</b></div><div class="quotecontent"> +<div class="quotetitle"><b>{L_QUOTE}{L_COLON}</b></div><div class="quotecontent">  <!-- END quote_open -->  <!-- BEGIN quote_close --> @@ -21,7 +21,7 @@  <!-- END quote_close -->  <!-- BEGIN code_open --> -<div class="codetitle"><b>{L_CODE}:</b></div><div class="codecontent"> +<div class="codetitle"><b>{L_CODE}{L_COLON}</b></div><div class="codecontent">  <!-- END code_open -->  <!-- BEGIN code_close --> @@ -29,7 +29,7 @@  <!-- END code_close -->  <!-- BEGIN inline_attachment_open --> -<div class="attachtitle">{L_ATTACHMENT}:</div><div class="attachcontent"> +<div class="attachtitle">{L_ATTACHMENT}{L_COLON}</div><div class="attachcontent">  <!-- END inline_attachment_open -->  <!-- BEGIN inline_attachment_close --> diff --git a/phpBB/styles/subsilver2/template/captcha_default.html b/phpBB/styles/subsilver2/template/captcha_default.html index e2edf0b810..1be25403ce 100644 --- a/phpBB/styles/subsilver2/template/captcha_default.html +++ b/phpBB/styles/subsilver2/template/captcha_default.html @@ -11,7 +11,7 @@  		<input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" /></td>  	</tr>  	<tr> -		<td class="row1"><b class="genmed">{L_CONFIRM_CODE}:</b><br /><span class="gensmall">{L_CONFIRM_CODE_EXPLAIN}</span></td> +		<td class="row1"><b class="genmed">{L_CONFIRM_CODE}{L_COLON}</b><br /><span class="gensmall">{L_CONFIRM_CODE_EXPLAIN}</span></td>  		<td class="row2"><input class="post" type="text" name="confirm_code" size="8" maxlength="8"<!-- IF $CAPTCHA_TAB_INDEX --> tabindex="{$CAPTCHA_TAB_INDEX}"<!-- ENDIF --> />  		<!-- IF S_CONFIRM_REFRESH --><input type="submit" name="refresh_vc" id="refresh_vc" class="btnlite" value="{L_VC_REFRESH}" /><!-- ENDIF --></td>  	</tr> diff --git a/phpBB/styles/subsilver2/template/captcha_qa.html b/phpBB/styles/subsilver2/template/captcha_qa.html index 3a5778b33e..90a6492400 100644 --- a/phpBB/styles/subsilver2/template/captcha_qa.html +++ b/phpBB/styles/subsilver2/template/captcha_qa.html @@ -2,7 +2,7 @@  		<th colspan="2" valign="middle">{L_CONFIRM_QUESTION}</th>  	</tr>  	<tr> -		<td class="row1"><b class="genmed">{QA_CONFIRM_QUESTION}:</b><br /><span class="gensmall">{L_CONFIRM_QUESTION_EXPLAIN}</span></td> +		<td class="row1"><b class="genmed">{QA_CONFIRM_QUESTION}{L_COLON}</b><br /><span class="gensmall">{L_CONFIRM_QUESTION_EXPLAIN}</span></td>  		<td class="row2"><input class="post" type="text" name="qa_answer" size="80"<!-- IF $CAPTCHA_TAB_INDEX --> tabindex="{$CAPTCHA_TAB_INDEX}"<!-- ENDIF --> />  		<input type="hidden" name="qa_confirm_id" id="confirm_id" value="{QA_CONFIRM_ID}" /></td>  	</tr> diff --git a/phpBB/styles/subsilver2/template/captcha_recaptcha.html b/phpBB/styles/subsilver2/template/captcha_recaptcha.html index ec09b28ef5..0d116b361f 100644 --- a/phpBB/styles/subsilver2/template/captcha_recaptcha.html +++ b/phpBB/styles/subsilver2/template/captcha_recaptcha.html @@ -3,7 +3,7 @@  		<th colspan="2" valign="middle">{L_CONFIRM_CODE}</th>  	</tr>  	<tr> -		<td class="row1"><b class="genmed">{L_CONFIRM_CODE}:</b><br /><span class="gensmall">{L_RECAPTCHA_EXPLAIN}</span></td> +		<td class="row1"><b class="genmed">{L_CONFIRM_CODE}{L_COLON}</b><br /><span class="gensmall">{L_RECAPTCHA_EXPLAIN}</span></td>  		<td class="row2">  		<script type="text/javascript">  		// <![CDATA[ diff --git a/phpBB/styles/subsilver2/template/custom_profile_fields.html b/phpBB/styles/subsilver2/template/custom_profile_fields.html index c8f287ddb4..2853722064 100644 --- a/phpBB/styles/subsilver2/template/custom_profile_fields.html +++ b/phpBB/styles/subsilver2/template/custom_profile_fields.html @@ -25,7 +25,7 @@  <!-- END int -->  <!-- BEGIN date --> -	<span class="genmed">{L_DAY}:</span> <select name="{date.FIELD_IDENT}_day">{date.S_DAY_OPTIONS}</select> -	<span class="genmed">{L_MONTH}:</span> <select name="{date.FIELD_IDENT}_month">{date.S_MONTH_OPTIONS}</select> -	<span class="genmed">{L_YEAR}:</span> <select name="{date.FIELD_IDENT}_year">{date.S_YEAR_OPTIONS}</select> +	<span class="genmed">{L_DAY}{L_COLON}</span> <select name="{date.FIELD_IDENT}_day">{date.S_DAY_OPTIONS}</select> +	<span class="genmed">{L_MONTH}{L_COLON}</span> <select name="{date.FIELD_IDENT}_month">{date.S_MONTH_OPTIONS}</select> +	<span class="genmed">{L_YEAR}{L_COLON}</span> <select name="{date.FIELD_IDENT}_year">{date.S_YEAR_OPTIONS}</select>  <!-- END date --> diff --git a/phpBB/styles/subsilver2/template/forumlist_body.html b/phpBB/styles/subsilver2/template/forumlist_body.html index 521eaf3c16..ad505885f6 100644 --- a/phpBB/styles/subsilver2/template/forumlist_body.html +++ b/phpBB/styles/subsilver2/template/forumlist_body.html @@ -19,13 +19,13 @@  			<td class="row1" width="50" align="center">{forumrow.FORUM_FOLDER_IMG}</td>  			<td class="row1">  				<!-- IF forumrow.FORUM_IMAGE --> -					<div style="float: {S_CONTENT_FLOW_BEGIN}; margin-{S_CONTENT_FLOW_END}: 5px;">{forumrow.FORUM_IMAGE}</div> +					<div style="float: {S_CONTENT_FLOW_BEGIN}; margin-{S_CONTENT_FLOW_END}{L_COLON} 5px;">{forumrow.FORUM_IMAGE}</div>  				<!-- ENDIF -->  				<a class="forumlink" href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a>  				<p class="forumdesc">{forumrow.FORUM_DESC}</p>  			</td>  			<!-- IF forumrow.CLICKS --> -				<td class="row2" colspan="3" align="center"><span class="genmed">{L_REDIRECTS}: {forumrow.CLICKS}</span></td> +				<td class="row2" colspan="3" align="center"><span class="genmed">{L_REDIRECTS}{L_COLON} {forumrow.CLICKS}</span></td>  			<!-- ELSE -->  				<td class="row2" colspan="3" align="center"> </td>  			<!-- ENDIF --> @@ -41,12 +41,12 @@  			<td class="row1" width="50" align="center">{forumrow.FORUM_FOLDER_IMG}</td>  			<td class="row1" width="100%">  				<!-- IF forumrow.FORUM_IMAGE --> -					<div style="float: {S_CONTENT_FLOW_BEGIN}; margin-{S_CONTENT_FLOW_END}: 5px;">{forumrow.FORUM_IMAGE}</div> +					<div style="float: {S_CONTENT_FLOW_BEGIN}; margin-{S_CONTENT_FLOW_END}{L_COLON} 5px;">{forumrow.FORUM_IMAGE}</div>  				<!-- ENDIF -->  				<a class="forumlink" href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a>  				<p class="forumdesc">{forumrow.FORUM_DESC}</p>  				<!-- IF forumrow.MODERATORS --> -					<p class="forumdesc"><strong>{forumrow.L_MODERATOR_STR}:</strong> {forumrow.MODERATORS}</p> +					<p class="forumdesc"><strong>{forumrow.L_MODERATOR_STR}{L_COLON}</strong> {forumrow.MODERATORS}</p>  				<!-- ENDIF -->  				<!-- IF .forumrow.subforum and forumrow.S_LIST_SUBFORUMS -->  					<p class="forumdesc"><strong>{forumrow.L_SUBFORUM_STR}</strong> diff --git a/phpBB/styles/subsilver2/template/index_body.html b/phpBB/styles/subsilver2/template/index_body.html index 100199c209..af2cefef7a 100644 --- a/phpBB/styles/subsilver2/template/index_body.html +++ b/phpBB/styles/subsilver2/template/index_body.html @@ -50,7 +50,7 @@  	</tr>  	<tr>  		<td class="row1" align="center" valign="middle"><img src="{T_THEME_PATH}/images/whosonline.gif" alt="{L_BIRTHDAYS}" /></td> -		<td class="row1" width="100%"><p class="genmed"><!-- IF .birthdays -->{L_CONGRATULATIONS}: <b><!-- BEGIN birthdays -->{birthdays.USERNAME}<!-- IF birthdays.AGE !== '' --> ({birthdays.AGE})<!-- ENDIF --><!-- IF not birthdays.S_LAST_ROW -->, <!-- ENDIF --><!-- END birthdays --></b><!-- ELSE -->{L_NO_BIRTHDAYS}<!-- ENDIF --></p></td> +		<td class="row1" width="100%"><p class="genmed"><!-- IF .birthdays -->{L_CONGRATULATIONS}{L_COLON} <b><!-- BEGIN birthdays -->{birthdays.USERNAME}<!-- IF birthdays.AGE !== '' --> ({birthdays.AGE})<!-- ENDIF --><!-- IF not birthdays.S_LAST_ROW -->, <!-- ENDIF --><!-- END birthdays --></b><!-- ELSE -->{L_NO_BIRTHDAYS}<!-- ENDIF --></p></td>  	</tr>  	</table>  <!-- ENDIF --> @@ -77,7 +77,7 @@  		<td class="cat"><h4><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a></h4></td>  	</tr>  	<tr> -		<td class="row1" align="center"><span class="genmed">{L_USERNAME}:</span> <input class="post" type="text" name="username" size="10" />  <span class="genmed">{L_PASSWORD}:</span> <input class="post" type="password" name="password" size="10" />  <!-- IF S_AUTOLOGIN_ENABLED --> <span class="gensmall">{L_LOG_ME_IN}</span> <input type="checkbox" class="radio" name="autologin" /><!-- ENDIF -->  <input type="submit" class="btnmain" name="login" value="{L_LOGIN}" /></td> +		<td class="row1" align="center"><span class="genmed">{L_USERNAME}{L_COLON}</span> <input class="post" type="text" name="username" size="10" />  <span class="genmed">{L_PASSWORD}{L_COLON}</span> <input class="post" type="password" name="password" size="10" />  <!-- IF S_AUTOLOGIN_ENABLED --> <span class="gensmall">{L_LOG_ME_IN}</span> <input type="checkbox" class="radio" name="autologin" /><!-- ENDIF -->  <input type="submit" class="btnmain" name="login" value="{L_LOGIN}" /></td>  	</tr>  	</table>  	{S_LOGIN_REDIRECT} diff --git a/phpBB/styles/subsilver2/template/jumpbox.html b/phpBB/styles/subsilver2/template/jumpbox.html index a7c157f02b..f4153d7692 100644 --- a/phpBB/styles/subsilver2/template/jumpbox.html +++ b/phpBB/styles/subsilver2/template/jumpbox.html @@ -4,7 +4,7 @@  	<table cellspacing="0" cellpadding="0" border="0">  	<tr> -		<td nowrap="nowrap"><span class="gensmall"><!-- IF S_IN_MCP and S_MERGE_SELECT -->{L_SELECT_TOPICS_FROM}<!-- ELSEIF S_IN_MCP -->{L_MODERATE_FORUM}<!-- ELSE -->{L_JUMP_TO}<!-- ENDIF -->:</span> <select name="f" onchange="if(this.options[this.selectedIndex].value != -1){ document.forms['jumpbox'].submit() }"> +		<td nowrap="nowrap"><span class="gensmall"><!-- IF S_IN_MCP and S_MERGE_SELECT -->{L_SELECT_TOPICS_FROM}<!-- ELSEIF S_IN_MCP -->{L_MODERATE_FORUM}<!-- ELSE -->{L_JUMP_TO}<!-- ENDIF -->{L_COLON}</span> <select name="f" onchange="if(this.options[this.selectedIndex].value != -1){ document.forms['jumpbox'].submit() }">  		<!-- BEGIN jumpbox_forums -->  			<!-- IF jumpbox_forums.S_FORUM_COUNT eq 1 --><option value="-1">------------------</option><!-- ENDIF --> diff --git a/phpBB/styles/subsilver2/template/login_body.html b/phpBB/styles/subsilver2/template/login_body.html index ba316517a9..2b895dda89 100644 --- a/phpBB/styles/subsilver2/template/login_body.html +++ b/phpBB/styles/subsilver2/template/login_body.html @@ -34,7 +34,7 @@  		<!-- ENDIF -->  		<tr> -			<td valign="top" <!-- IF S_ADMIN_AUTH -->style="width: 50%; text-align: {S_CONTENT_FLOW_END};"<!-- ENDIF -->><b class="gensmall">{L_USERNAME}:</b></td> +			<td valign="top" <!-- IF S_ADMIN_AUTH -->style="width: 50%; text-align: {S_CONTENT_FLOW_END};"<!-- ENDIF -->><b class="gensmall">{L_USERNAME}{L_COLON}</b></td>  			<td><input class="post" type="text" name="{USERNAME_CREDENTIAL}" size="25" value="{USERNAME}" tabindex="1" />  				<!-- IF not S_ADMIN_AUTH and S_REGISTER_ENABLED -->  					<br /><a class="gensmall" href="{U_REGISTER}">{L_REGISTER}</a> @@ -42,7 +42,7 @@  			</td>  		</tr>  		<tr> -			<td valign="top" <!-- IF S_ADMIN_AUTH -->style="width: 50%; text-align: {S_CONTENT_FLOW_END};"<!-- ENDIF -->><b class="gensmall">{L_PASSWORD}:</b></td> +			<td valign="top" <!-- IF S_ADMIN_AUTH -->style="width: 50%; text-align: {S_CONTENT_FLOW_END};"<!-- ENDIF -->><b class="gensmall">{L_PASSWORD}{L_COLON}</b></td>  			<td>  				<input class="post" type="password" name="{PASSWORD_CREDENTIAL}" size="25" tabindex="2" />  				<!-- IF U_SEND_PASSWORD --><br /><a class="gensmall" href="{U_SEND_PASSWORD}">{L_FORGOT_PASS}</a><!-- ENDIF --> diff --git a/phpBB/styles/subsilver2/template/login_forum.html b/phpBB/styles/subsilver2/template/login_forum.html index d31a7d2109..c9b2c7277e 100644 --- a/phpBB/styles/subsilver2/template/login_forum.html +++ b/phpBB/styles/subsilver2/template/login_forum.html @@ -21,7 +21,7 @@  				</tr>  			<!-- ENDIF -->  			<tr>  -				<td class="gensmall"><b>{L_PASSWORD}:</b></td> +				<td class="gensmall"><b>{L_PASSWORD}{L_COLON}</b></td>  				<td><input class="post" type="password" name="password" size="25" tabindex="2" /></td>  			</tr>  			</table> diff --git a/phpBB/styles/subsilver2/template/mcp_approve.html b/phpBB/styles/subsilver2/template/mcp_approve.html index 2d2013f05c..5ad7d2f9b5 100644 --- a/phpBB/styles/subsilver2/template/mcp_approve.html +++ b/phpBB/styles/subsilver2/template/mcp_approve.html @@ -20,11 +20,11 @@  				<br />  				<table border="0" width="90%" cellspacing="2" cellpadding="1">  				<tr> -					<td class="row1" width="22%"><b class="gen">{L_DISAPPROVE_REASON}:</b></td> +					<td class="row1" width="22%"><b class="gen">{L_DISAPPROVE_REASON}{L_COLON}</b></td>  					<td class="row1" width="78%"><select name="reason_id"><!-- BEGIN reason --><option value="{reason.ID}"<!-- IF reason.S_SELECTED --> selected="selected"<!-- ENDIF -->>{reason.DESCRIPTION}</option><!-- END reason --></select></td>  				</tr>  				<tr> -					<td class="row1" valign="top"><span class="gen"><b>{L_MORE_INFO}:</b></span><br /><span class="gensmall">{L_CAN_LEAVE_BLANK}</span></td> +					<td class="row1" valign="top"><span class="gen"><b>{L_MORE_INFO}{L_COLON}</b></span><br /><span class="gensmall">{L_CAN_LEAVE_BLANK}</span></td>  					<td class="row1"><textarea class="post" style="width:500px" name="reason" rows="10" cols="40">{REASON}</textarea></td>  				</tr>  				</table> diff --git a/phpBB/styles/subsilver2/template/mcp_ban.html b/phpBB/styles/subsilver2/template/mcp_ban.html index 67de81c60c..edf81c6d76 100644 --- a/phpBB/styles/subsilver2/template/mcp_ban.html +++ b/phpBB/styles/subsilver2/template/mcp_ban.html @@ -41,26 +41,26 @@  	<td class="row3" colspan="2">{L_EXPLAIN}</td>  </tr>  <tr> -	<td class="row1" width="45%" valign="top"><b>{L_BAN_CELL}:</b></td> +	<td class="row1" width="45%" valign="top"><b>{L_BAN_CELL}{L_COLON}</b></td>  	<td class="row2">  		<textarea name="ban" id="ban" cols="40" rows="3" class="post">{USERNAMES}</textarea>  		<!-- IF S_USERNAME_BAN --><br />[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]<!-- ENDIF -->  	</td>  </tr>  <tr> -	<td class="row1" valign="top"><b>{L_BAN_LENGTH}:</b></td> +	<td class="row1" valign="top"><b>{L_BAN_LENGTH}{L_COLON}</b></td>  	<td class="row2"><select name="banlength">{S_BAN_END_OPTIONS}</select><br /><input type="text" name="banlengthother" class="post" /> {L_YEAR_MONTH_DAY}</td>  </tr>  <tr> -	<td class="row1" valign="top"><b>{L_BAN_EXCLUDE}:</b><br /><span class="gensmall">{L_BAN_EXCLUDE_EXPLAIN}</span></td> +	<td class="row1" valign="top"><b>{L_BAN_EXCLUDE}{L_COLON}</b><br /><span class="gensmall">{L_BAN_EXCLUDE_EXPLAIN}</span></td>  	<td class="row2"><input type="radio" class="radio" name="banexclude" value="1" /> {L_YES}   <input type="radio" class="radio" name="banexclude" value="0" checked="checked" /> {L_NO}</td>  </tr>  <tr> -	<td class="row1" valign="top"><b>{L_BAN_REASON}:</b></td> +	<td class="row1" valign="top"><b>{L_BAN_REASON}{L_COLON}</b></td>  	<td class="row2"><input name="banreason" type="text" class="post" maxlength="255" /></td>  </tr>  <tr> -	<td class="row1" valign="top"><b>{L_BAN_GIVE_REASON}:</b></td> +	<td class="row1" valign="top"><b>{L_BAN_GIVE_REASON}{L_COLON}</b></td>  	<td class="row2"><input name="bangivereason" type="text" class="post" maxlength="255" /></td>  </tr>  <tr> @@ -79,19 +79,19 @@  </tr>  <!-- IF S_BANNED_OPTIONS -->  	<tr> -		<td class="row1" valign="top" width="45%"><b>{L_BAN_CELL}:</b></td> +		<td class="row1" valign="top" width="45%"><b>{L_BAN_CELL}{L_COLON}</b></td>  		<td class="row2"><select name="unban[]" multiple="multiple" size="10" style="width: 50%" onchange="if (this.selectedIndex > -1) display_details(this.options[this.selectedIndex].value); else display_details(-1);">{BANNED_OPTIONS}</select></td>  	</tr>  	<tr> -		<td class="row1" valign="top"><b>{L_BAN_LENGTH}:</b></td> +		<td class="row1" valign="top"><b>{L_BAN_LENGTH}{L_COLON}</b></td>  		<td class="row2"><input style="border: 0; width: 100%" type="text" name="unbanlength" readonly="readonly" /></td>  	</tr>  	<tr> -		<td class="row1" valign="top"><b>{L_BAN_REASON}:</b></td> +		<td class="row1" valign="top"><b>{L_BAN_REASON}{L_COLON}</b></td>  		<td class="row2"><textarea style="border: 0; width: 100%" name="unbanreason" readonly="readonly" rows="5" cols="80"> </textarea></td>  	</tr>  	<tr> -		<td class="row1" valign="top"><b>{L_BAN_GIVE_REASON}:</b></td> +		<td class="row1" valign="top"><b>{L_BAN_GIVE_REASON}{L_COLON}</b></td>  		<td class="row2"><textarea style="border: 0; width: 100%" name="unbangivereason" readonly="readonly" rows="5" cols="80"> </textarea></td>  	</tr>  	<tr> diff --git a/phpBB/styles/subsilver2/template/mcp_forum.html b/phpBB/styles/subsilver2/template/mcp_forum.html index 5d69e85391..6972f14b79 100644 --- a/phpBB/styles/subsilver2/template/mcp_forum.html +++ b/phpBB/styles/subsilver2/template/mcp_forum.html @@ -10,7 +10,7 @@  <table class="tablebg" width="100%" cellspacing="1">  <tr> -	<td class="cat" colspan="6" align="center"><span class="gensmall">{L_DISPLAY_TOPICS}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" name="sort" value="{L_GO}" /></td> +	<td class="cat" colspan="6" align="center"><span class="gensmall">{L_DISPLAY_TOPICS}{L_COLON}</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" name="sort" value="{L_GO}" /></td>  </tr>  <tr>  	<th width="4%" nowrap="nowrap"> </th> diff --git a/phpBB/styles/subsilver2/template/mcp_jumpbox.html b/phpBB/styles/subsilver2/template/mcp_jumpbox.html index 14856596f0..734222bc77 100644 --- a/phpBB/styles/subsilver2/template/mcp_jumpbox.html +++ b/phpBB/styles/subsilver2/template/mcp_jumpbox.html @@ -2,7 +2,7 @@  <form name="jumpbox" method="post" action="{S_JUMPBOX_ACTION}"> -	<span class="gensmall">{L_JUMP_TO}:</span> <select name="f" onChange="if(this.options[this.selectedIndex].value != -1 && this.options[this.selectedIndex].value != document.jumpbox.current_f.value){ document.forms['jumpbox'].submit() }"> +	<span class="gensmall">{L_JUMP_TO}{L_COLON}</span> <select name="f" onChange="if(this.options[this.selectedIndex].value != -1 && this.options[this.selectedIndex].value != document.jumpbox.current_f.value){ document.forms['jumpbox'].submit() }">  <!-- IF S_ENABLE_SELECT_ALL -->  	<option value="0">{L_ALL_FORUMS}</option> diff --git a/phpBB/styles/subsilver2/template/mcp_logs.html b/phpBB/styles/subsilver2/template/mcp_logs.html index 03c6a2f139..64f2a6a64d 100644 --- a/phpBB/styles/subsilver2/template/mcp_logs.html +++ b/phpBB/styles/subsilver2/template/mcp_logs.html @@ -22,10 +22,10 @@  		</tr>  	<!-- END log -->  	<tr align="center"> -		<td class="row3" colspan="<!-- IF S_CLEAR_ALLOWED -->5<!-- ELSE -->4<!-- ENDIF -->"><span class="gensmall">{L_SEARCH_KEYWORDS}:</span> <input type="text" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="btnlite" name="filter" value="{L_SEARCH}" /></td> +		<td class="row3" colspan="<!-- IF S_CLEAR_ALLOWED -->5<!-- ELSE -->4<!-- ENDIF -->"><span class="gensmall">{L_SEARCH_KEYWORDS}{L_COLON}</span> <input type="text" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="btnlite" name="filter" value="{L_SEARCH}" /></td>  	</tr>  	<tr align="center"> -		<td class="row3" colspan="<!-- IF S_CLEAR_ALLOWED -->5<!-- ELSE -->4<!-- ENDIF -->"><span class="gensmall">{L_DISPLAY_LOG}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" value="{L_GO}" name="sort" /></td> +		<td class="row3" colspan="<!-- IF S_CLEAR_ALLOWED -->5<!-- ELSE -->4<!-- ENDIF -->"><span class="gensmall">{L_DISPLAY_LOG}{L_COLON}</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" value="{L_GO}" name="sort" /></td>  	</tr>  	<!-- IF S_CLEAR_ALLOWED -->  		<tr> diff --git a/phpBB/styles/subsilver2/template/mcp_notes_front.html b/phpBB/styles/subsilver2/template/mcp_notes_front.html index 6f5972889f..e2e14e0150 100644 --- a/phpBB/styles/subsilver2/template/mcp_notes_front.html +++ b/phpBB/styles/subsilver2/template/mcp_notes_front.html @@ -7,7 +7,7 @@  	<th colspan="2"align="center">{L_SELECT_USER}</th>  </tr>  <tr> -	<td class="row1" width="40%"><b class="gen">{L_FIND_USERNAME}: </b><br /><span class="gensmall">[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</span></td> +	<td class="row1" width="40%"><b class="gen">{L_FIND_USERNAME}{L_COLON} </b><br /><span class="gensmall">[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</span></td>  	<td class="row2"><input type="text" class="post" name="username" size="20" /></td>  </tr>  <tr> diff --git a/phpBB/styles/subsilver2/template/mcp_notes_user.html b/phpBB/styles/subsilver2/template/mcp_notes_user.html index b7ce1d3fce..4bd8de6862 100644 --- a/phpBB/styles/subsilver2/template/mcp_notes_user.html +++ b/phpBB/styles/subsilver2/template/mcp_notes_user.html @@ -30,15 +30,15 @@  	<td class="row1">  		<table width="100%" cellspacing="1" cellpadding="2" border="0">  		<tr>  -			<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_JOINED}: </td> +			<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_JOINED}{L_COLON} </td>  			<td width="100%"><b class="gen">{JOINED}</b></td>  		</tr>  		<tr>  -			<td class="gen" align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap">{L_TOTAL_POSTS}: </td> +			<td class="gen" align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap">{L_TOTAL_POSTS}{L_COLON} </td>  			<td><b class="gen">{POSTS}</b></td>  		</tr>  		<tr>  -			<td class="gen" align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap">{L_WARNINGS}: </td> +			<td class="gen" align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap">{L_WARNINGS}{L_COLON} </td>  			<td><b class="gen">{WARNINGS}</b></td>  		</tr>  		</table> @@ -55,10 +55,10 @@  <!-- IF S_USER_NOTES -->  	<tr align="center"> -		<td colspan="5" class="row3"><span class="gensmall">{L_SEARCH_KEYWORDS}:</span> <input type="text" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="btnlite" name="filter" value="{L_SEARCH}" /></td> +		<td colspan="5" class="row3"><span class="gensmall">{L_SEARCH_KEYWORDS}{L_COLON}</span> <input type="text" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="btnlite" name="filter" value="{L_SEARCH}" /></td>  	</tr>  	<tr align="center"> -		<td colspan="5" class="row3"><span class="gensmall">{L_DISPLAY_LOG}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}:</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" value="{L_GO}" name="sort" /></td> +		<td colspan="5" class="row3"><span class="gensmall">{L_DISPLAY_LOG}{L_COLON}</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}{L_COLON}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" value="{L_GO}" name="sort" /></td>  	</tr>  	<tr>  		<th>{L_REPORT_BY}</th> diff --git a/phpBB/styles/subsilver2/template/mcp_post.html b/phpBB/styles/subsilver2/template/mcp_post.html index 24d8682876..910accd09f 100644 --- a/phpBB/styles/subsilver2/template/mcp_post.html +++ b/phpBB/styles/subsilver2/template/mcp_post.html @@ -8,15 +8,15 @@  		<th colspan="2" align="center"><!-- IF S_PM -->{L_PM_REPORT_DETAILS}<!-- ELSE -->{L_REPORT_DETAILS}<!-- ENDIF --></th>  	</tr>  	<tr> -		<td class="row1"><b class="gen">{L_REPORT_REASON}: </b></td> +		<td class="row1"><b class="gen">{L_REPORT_REASON}{L_COLON} </b></td>  		<td class="row2"><span class="gen">{REPORT_REASON_TITLE} » {REPORT_REASON_DESCRIPTION}</span></td>  	</tr>  	<tr> -		<td class="row1" width="20%"><b class="gen">{L_REPORTER}: </b></td> +		<td class="row1" width="20%"><b class="gen">{L_REPORTER}{L_COLON} </b></td>  		<td class="row2" width="80%"><span class="gen"<!-- IF REPORTER_COLOUR --> style="font-weight: bold; color: {REPORTER_COLOUR};"<!-- ENDIF -->>{REPORTER_NAME}</span>   <span class="gen">[ <!-- IF U_VIEW_REPORTER_PROFILE --><a href="{U_VIEW_REPORTER_PROFILE}">{L_READ_PROFILE}</a><!-- ENDIF --><!-- IF S_USER_NOTES --><!-- IF U_VIEW_REPORTER_PROFILE --> | <!-- ENDIF --><a href="{U_MCP_REPORTER_NOTES}">{L_VIEW_NOTES}</a> | <a href="{U_MCP_WARN_REPORTER}">{L_WARN_USER}</a><!-- ENDIF --> ]</span></td>  	</tr>  	<tr> -		<td class="row1"><b class="gen">{L_REPORTED}: </b></td> +		<td class="row1"><b class="gen">{L_REPORTED}{L_COLON} </b></td>  		<td class="row2"><span class="postdetails">{REPORT_DATE}</span></td>  	</tr>  	<!-- IF REPORT_TEXT --> @@ -49,16 +49,16 @@  	<td class="row3" colspan="2" align="center"><span class="gensmall"><!-- IF S_MCP_QUEUE -->{RETURN_QUEUE} | {RETURN_TOPIC_SIMPLE} | {RETURN_POST}<!-- ELSEIF S_MCP_REPORT -->{RETURN_REPORTS}<!-- IF not S_PM --> | <a href="{U_VIEW_POST}">{L_VIEW_POST}</a> | <a href="{U_VIEW_TOPIC}">{L_VIEW_TOPIC}</a> | <a href="{U_VIEW_FORUM}">{L_VIEW_FORUM}</a><!-- ENDIF --><!-- ELSE -->{RETURN_TOPIC}<!-- ENDIF --></span></td>  </tr>  <tr> -	<td class="row1"><b class="gen"><!-- IF S_PM -->{L_PM_SUBJECT}<!-- ELSE -->{L_POST_SUBJECT}<!-- ENDIF -->: </b></td> +	<td class="row1"><b class="gen"><!-- IF S_PM -->{L_PM_SUBJECT}<!-- ELSE -->{L_POST_SUBJECT}<!-- ENDIF -->{L_COLON} </b></td>  	<td class="row2"><span class="gen">{POST_SUBJECT}</span> <!-- IF S_POST_UNAPPROVED --><span class="postapprove">{UNAPPROVED_IMG} <a href="{U_MCP_APPROVE}">{L_POST_UNAPPROVED}</a></span> <!-- ENDIF --> <!-- IF S_POST_REPORTED and not S_MCP_REPORT --><span class="postreported">{REPORTED_IMG} <a href="{U_MCP_REPORT}">{L_POST_REPORTED}</a></span><!-- ENDIF --></td>  </tr>  <tr> -	<td class="row1" width="20%"><b class="gen"><!-- IF S_PM -->{L_PM_FROM}<!-- ELSE -->{L_POSTER}<!-- ENDIF -->: </b></td> +	<td class="row1" width="20%"><b class="gen"><!-- IF S_PM -->{L_PM_FROM}<!-- ELSE -->{L_POSTER}<!-- ENDIF -->{L_COLON} </b></td>  	<td class="row2" width="80%"><span class="gen"<!-- IF POST_AUTHOR_COLOUR --> style="font-weight: bold; color: {POST_AUTHOR_COLOUR}"<!-- ENDIF -->>{POST_AUTHOR}</span><span class="gen">   [ <!-- IF U_POST_AUTHOR --><a href="{U_POST_AUTHOR}">{L_READ_PROFILE}</a><!-- ENDIF --><!-- IF S_USER_NOTES --><!-- IF U_POST_AUTHOR --> | <!-- ENDIF --><a href="{U_MCP_USER_NOTES}">{L_VIEW_NOTES}</a> <!-- IF U_MCP_WARN_USER -->| <a href="{U_MCP_WARN_USER}">{L_WARN_USER}</a><!-- ENDIF --><!-- ENDIF --> ]</span></td>  </tr>  <!-- IF S_CAN_VIEWIP -->  	<tr> -		<td class="row1"><b class="gen"><!-- IF S_PM -->{L_THIS_PM_IP}<!-- ELSE -->{L_THIS_POST_IP}<!-- ENDIF -->: </b></td> +		<td class="row1"><b class="gen"><!-- IF S_PM -->{L_THIS_PM_IP}<!-- ELSE -->{L_THIS_POST_IP}<!-- ENDIF -->{L_COLON} </b></td>  		<td class="row2"><span class="gen">  			<!-- IF U_WHOIS -->  				<a href="{U_WHOIS}"><!-- IF POST_IPADDR -->{POST_IPADDR}<!-- ELSE -->{POST_IP}<!-- ENDIF --></a> (<!-- IF POST_IPADDR -->{POST_IP}<!-- ELSE --><a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a><!-- ENDIF -->) @@ -69,12 +69,12 @@  	</tr>  <!-- ENDIF -->  <tr> -	<td class="row1"><b class="gen"><!-- IF S_PM -->{L_SENT_AT}<!-- ELSE -->{L_POSTED}<!-- ENDIF -->: </b></td> +	<td class="row1"><b class="gen"><!-- IF S_PM -->{L_SENT_AT}<!-- ELSE -->{L_POSTED}<!-- ENDIF -->{L_COLON} </b></td>  	<td class="row2"><span class="postdetails">{POST_DATE}</span></td>  </tr>  <!-- IF S_TO_RECIPIENT -->  	<tr> -		<td class="row1" nowrap="nowrap" width="150"><b class="gen">{L_TO}:</b></td> +		<td class="row1" nowrap="nowrap" width="150"><b class="gen">{L_TO}{L_COLON}</b></td>  		<td class="row2 gen">  		<!-- BEGIN to_recipient -->  			<!-- IF to_recipient.IS_GROUP --><span class="sep"><a href="{to_recipient.U_VIEW}">{to_recipient.NAME}</a></span><!-- ELSE -->{to_recipient.NAME_FULL} <!-- ENDIF --> @@ -85,7 +85,7 @@  <!-- IF S_BCC_RECIPIENT -->  	<tr> -		<td class="row1" nowrap="nowrap" width="150"><b class="gen">{L_BCC}:</b></td> +		<td class="row1" nowrap="nowrap" width="150"><b class="gen">{L_BCC}{L_COLON}</b></td>  		<td class="row2 gen">  		<!-- BEGIN bcc_recipient -->  			<!-- IF bcc_recipient.IS_GROUP --><span class="sep"><a href="{bcc_recipient.U_VIEW}">{bcc_recipient.NAME}</a></span><!-- ELSE -->{bcc_recipient.NAME_FULL} <!-- ENDIF --> @@ -107,7 +107,7 @@  		<table class="tablebg" width="100%" cellspacing="1">  		<tr> -			<td class="row3"><b class="genmed">{L_ATTACHMENTS}: </b></td> +			<td class="row3"><b class="genmed">{L_ATTACHMENTS}{L_COLON} </b></td>  		</tr>  		<!-- BEGIN attachment -->  			<tr> diff --git a/phpBB/styles/subsilver2/template/mcp_queue.html b/phpBB/styles/subsilver2/template/mcp_queue.html index d13af91888..febde7e59c 100644 --- a/phpBB/styles/subsilver2/template/mcp_queue.html +++ b/phpBB/styles/subsilver2/template/mcp_queue.html @@ -7,7 +7,7 @@  	<th colspan="4" nowrap="nowrap">{L_DISPLAY_OPTIONS}</th>  </tr>  <tr> -	<td colspan="4" class="cat" align="center"><span class="gensmall">{L_DISPLAY_ITEMS}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <span class="gensmall">{L_FORUM}</span> <select name="f">{S_FORUM_OPTIONS}</select>   <!-- IF TOPIC_ID --><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" />  <b>{L_ONLY_TOPIC}</b>   <!-- ENDIF --><input class="btnlite" type="submit" name="sort" value="{L_GO}" /></td> +	<td colspan="4" class="cat" align="center"><span class="gensmall">{L_DISPLAY_ITEMS}{L_COLON}</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <span class="gensmall">{L_FORUM}</span> <select name="f">{S_FORUM_OPTIONS}</select>   <!-- IF TOPIC_ID --><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" />  <b>{L_ONLY_TOPIC}</b>   <!-- ENDIF --><input class="btnlite" type="submit" name="sort" value="{L_GO}" /></td>  </tr>  <tr>   	<th> <!-- IF S_TOPICS -->{L_TOPIC}<!-- ELSE -->{L_POST}<!-- ENDIF --> </th> @@ -19,7 +19,7 @@  	<!-- IF postrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->  		<td style="padding: 4px;"><p class="topictitle">{postrow.ATTACH_ICON_IMG} <a href="{postrow.U_VIEWPOST}">{postrow.POST_SUBJECT}</a></p> -			<span class="gensmall"><!-- IF postrow.U_VIEWFORUM -->{L_FORUM}: <a href="{postrow.U_VIEWFORUM}">{postrow.FORUM_NAME}</a><!-- ELSE -->{postrow.FORUM_NAME}<!-- ENDIF --></span></td> +			<span class="gensmall"><!-- IF postrow.U_VIEWFORUM -->{L_FORUM}{L_COLON} <a href="{postrow.U_VIEWFORUM}">{postrow.FORUM_NAME}</a><!-- ELSE -->{postrow.FORUM_NAME}<!-- ENDIF --></span></td>  		<td style="padding: 4px;" align="{S_CONTENT_FLOW_BEGIN}" valign="top" nowrap="nowrap"><span class="gen">{postrow.POST_AUTHOR_FULL}</span><br />  			<span class="gensmall">[ <a href="{postrow.U_VIEW_DETAILS}">{L_VIEW_DETAILS}</a> ]</span></td>  		<td class="postdetails" style="padding: 4px;" align="{S_CONTENT_FLOW_BEGIN}" valign="top" nowrap="nowrap">{postrow.POST_TIME}</td> diff --git a/phpBB/styles/subsilver2/template/mcp_reports.html b/phpBB/styles/subsilver2/template/mcp_reports.html index cfbd713321..158f9c2603 100644 --- a/phpBB/styles/subsilver2/template/mcp_reports.html +++ b/phpBB/styles/subsilver2/template/mcp_reports.html @@ -7,7 +7,7 @@  	<th colspan="5" nowrap="nowrap">{L_DISPLAY_OPTIONS}</th>  </tr>  <tr> -	<td colspan="5" class="cat" align="center"><span class="gensmall">{L_DISPLAY_POSTS}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}<!-- IF not S_PM --> <span class="gensmall">{L_FORUM}</span> <select name="f">{S_FORUM_OPTIONS}</select>   <!-- IF TOPIC_ID --><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" />  <b>{L_ONLY_TOPIC}</b>   <!-- ENDIF --><!-- ENDIF --><input class="btnlite" type="submit" name="sort" value="{L_GO}" /></td> +	<td colspan="5" class="cat" align="center"><span class="gensmall">{L_DISPLAY_POSTS}{L_COLON}</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}<!-- IF not S_PM --> <span class="gensmall">{L_FORUM}</span> <select name="f">{S_FORUM_OPTIONS}</select>   <!-- IF TOPIC_ID --><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" />  <b>{L_ONLY_TOPIC}</b>   <!-- ENDIF --><!-- ENDIF --><input class="btnlite" type="submit" name="sort" value="{L_GO}" /></td>  </tr>  <tr>   	<!-- IF S_PM --> @@ -26,12 +26,12 @@  	<!-- IF postrow.S_ROW_ is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->  		<!-- IF S_PM -->  		<td style="padding: 4px;"><p class="topictitle">{postrow.ATTACH_ICON_IMG} <a href="{postrow.U_VIEW_DETAILS}">{postrow.PM_SUBJECT}</a></p> -			<span class="gensmall">{L_PM_FROM}: {postrow.PM_AUTHOR_FULL}</span></td> +			<span class="gensmall">{L_PM_FROM}{L_COLON} {postrow.PM_AUTHOR_FULL}</span></td>  		<td style="padding: 4px;" align="{S_CONTENT_FLOW_BEGIN}" valign="top"><span class="gen">{postrow.RECIPIENTS}</span><br /> -			<span class="gensmall">{L_SENT_AT}: {postrow.PM_TIME}</span></td> +			<span class="gensmall">{L_SENT_AT}{L_COLON} {postrow.PM_TIME}</span></td>  		<!-- ELSE -->  		<td style="padding: 4px;"><p class="topictitle">{postrow.ATTACH_ICON_IMG} <a href="{postrow.U_VIEWPOST}">{postrow.POST_SUBJECT}</a></p> -			<span class="gensmall"><!-- IF postrow.U_VIEWFORUM -->{L_FORUM}: <a href="{postrow.U_VIEWFORUM}">{postrow.FORUM_NAME}</a><!-- ELSE -->{postrow.FORUM_NAME}<!-- ENDIF --></span></td> +			<span class="gensmall"><!-- IF postrow.U_VIEWFORUM -->{L_FORUM}{L_COLON} <a href="{postrow.U_VIEWFORUM}">{postrow.FORUM_NAME}</a><!-- ELSE -->{postrow.FORUM_NAME}<!-- ENDIF --></span></td>  		<td style="padding: 4px;" align="{S_CONTENT_FLOW_BEGIN}" valign="top" nowrap="nowrap"><span class="gen">{postrow.POST_AUTHOR_FULL}</span><br />  			<span class="gensmall">{postrow.POST_TIME}</span></td>  		<!-- ENDIF --> diff --git a/phpBB/styles/subsilver2/template/mcp_topic.html b/phpBB/styles/subsilver2/template/mcp_topic.html index 6bbf13e12c..431d8d0e6c 100644 --- a/phpBB/styles/subsilver2/template/mcp_topic.html +++ b/phpBB/styles/subsilver2/template/mcp_topic.html @@ -58,10 +58,10 @@  	<td class="row2" colspan="2"><input class="post" type="text" name="posts_per_page" size="6" value="{POSTS_PER_PAGE}" /></td>  </tr>  <tr> -	<td class="cat" colspan="3" align="center"><span class="gensmall">{L_DISPLAY_POSTS}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" name="sort" value="{L_GO}" /></td> +	<td class="cat" colspan="3" align="center"><span class="gensmall">{L_DISPLAY_POSTS}{L_COLON}</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" name="sort" value="{L_GO}" /></td>  </tr>  <tr> -	<th nowrap="nowrap" colspan="3">{L_TOPIC_REVIEW}: {TOPIC_TITLE}</th> +	<th nowrap="nowrap" colspan="3">{L_TOPIC_REVIEW}{L_COLON} {TOPIC_TITLE}</th>  </tr>  <tr>  	<td class="row3" colspan="3" align="center"><span class="gensmall">{RETURN_TOPIC}</span></td> @@ -74,7 +74,7 @@  		<td width="100%">  			<table width="100%" cellspacing="0" cellpadding="0" border="0">  			<tr valign="top"> -				<td class="gensmall" nowrap="nowrap"> <b>{L_POST_SUBJECT}:</b> </td> +				<td class="gensmall" nowrap="nowrap"> <b>{L_POST_SUBJECT}{L_COLON}</b> </td>  				<td class="gensmall" width="100%">{postrow.POST_SUBJECT}</td>  			</tr>  			</table> @@ -94,7 +94,7 @@  						<table class="tablebg" width="100%" cellspacing="1">  						<tr> -							<td class="row3"><b class="genmed">{L_ATTACHMENTS}: </b></td> +							<td class="row3"><b class="genmed">{L_ATTACHMENTS}{L_COLON} </b></td>  						</tr>  						<!-- BEGIN attachment -->  							<tr> @@ -115,7 +115,7 @@  							<!-- IF postrow.S_POST_REPORTED and postrow.U_MCP_REPORT --><span class="postreported">{REPORTED_IMG} <a href="{postrow.U_MCP_REPORT}">{L_POST_REPORTED}</a></span><!-- ENDIF -->  						</td>  						<td width="10" nowrap="nowrap">{postrow.MINI_POST_IMG}</td> -						<td class="gensmall" nowrap="nowrap"><b>{L_POSTED}:</b> {postrow.POST_DATE}</td> +						<td class="gensmall" nowrap="nowrap"><b>{L_POSTED}{L_COLON}</b> {postrow.POST_DATE}</td>  					</tr>  					</table>  				</td> diff --git a/phpBB/styles/subsilver2/template/mcp_warn_front.html b/phpBB/styles/subsilver2/template/mcp_warn_front.html index 020a79f419..f6daec9cc5 100644 --- a/phpBB/styles/subsilver2/template/mcp_warn_front.html +++ b/phpBB/styles/subsilver2/template/mcp_warn_front.html @@ -7,7 +7,7 @@  	<th colspan="2"align="center">{L_SELECT_USER}</th>  </tr>  <tr> -	<td class="row1" width="40%"><b class="gen">{L_FIND_USERNAME}: </b><br /><span class="gensmall">[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</span></td> +	<td class="row1" width="40%"><b class="gen">{L_FIND_USERNAME}{L_COLON} </b><br /><span class="gensmall">[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</span></td>  	<td class="row2"><input type="text" class="post" name="username" size="20" /></td>  </tr>  <tr> diff --git a/phpBB/styles/subsilver2/template/mcp_warn_list.html b/phpBB/styles/subsilver2/template/mcp_warn_list.html index 0b0cfa8a45..6e263b6403 100644 --- a/phpBB/styles/subsilver2/template/mcp_warn_list.html +++ b/phpBB/styles/subsilver2/template/mcp_warn_list.html @@ -25,7 +25,7 @@  	</tr>  <!-- END user -->  <tr align="center"> -	<td class="row3" colspan="4"><span class="gensmall">{L_DISPLAY_POSTS}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" value="{L_GO}" name="sort" /></td> +	<td class="row3" colspan="4"><span class="gensmall">{L_DISPLAY_POSTS}{L_COLON}</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" value="{L_GO}" name="sort" /></td>  </tr>  </table> diff --git a/phpBB/styles/subsilver2/template/mcp_warn_user.html b/phpBB/styles/subsilver2/template/mcp_warn_user.html index c8856045b5..6b78c71557 100644 --- a/phpBB/styles/subsilver2/template/mcp_warn_user.html +++ b/phpBB/styles/subsilver2/template/mcp_warn_user.html @@ -28,15 +28,15 @@  	<td class="row1">  		<table width="100%" cellspacing="1" cellpadding="2" border="0">  		<tr>  -			<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_JOINED}: </td> +			<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_JOINED}{L_COLON} </td>  			<td width="100%"><b class="gen">{JOINED}</b></td>  		</tr>  		<tr>  -			<td class="gen" align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap">{L_TOTAL_POSTS}: </td> +			<td class="gen" align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap">{L_TOTAL_POSTS}{L_COLON} </td>  			<td><b class="gen">{POSTS}</b></td>  		</tr>  		<tr>  -			<td class="gen" align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap">{L_WARNINGS}: </td> +			<td class="gen" align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap">{L_WARNINGS}{L_COLON} </td>  			<td><b class="gen">{WARNINGS}</b></td>  		</tr>  		</table> diff --git a/phpBB/styles/subsilver2/template/memberlist_body.html b/phpBB/styles/subsilver2/template/memberlist_body.html index 4c7af75ae5..09336fb8a3 100644 --- a/phpBB/styles/subsilver2/template/memberlist_body.html +++ b/phpBB/styles/subsilver2/template/memberlist_body.html @@ -14,7 +14,7 @@  	<form method="post" name="charsearch" action="{S_MODE_ACTION}">  		<table width="100%" cellspacing="1">  		<tr> -			<td align="{S_CONTENT_FLOW_BEGIN}"><span class="genmed">{L_USERNAME_BEGINS_WITH}: </span> +			<td align="{S_CONTENT_FLOW_BEGIN}"><span class="genmed">{L_USERNAME_BEGINS_WITH}{L_COLON} </span>  				<select name="first_char" onchange="this.form.submit();">  					<!-- BEGIN first_char -->  						<option value="{first_char.VALUE}"<!-- IF first_char.S_SELECTED --> selected="selected"<!-- ENDIF -->>{first_char.DESC}</option> @@ -91,7 +91,7 @@  <!-- END memberrow -->  <tr> -	<td class="cat" colspan="<!-- IF S_IN_SEARCH_POPUP -->9<!-- ELSE -->8<!-- ENDIF -->" align="center"><!-- IF S_IN_SEARCH_POPUP and not S_SELECT_SINGLE --><input class="btnlite" type="submit" value="{L_SELECT_MARKED}" /><!-- ELSE --><span class="gensmall">{L_SELECT_SORT_METHOD}:</span> <select name="sk">{S_MODE_SELECT}</select>  <span class="gensmall">{L_ORDER}</span> <select name="sd">{S_ORDER_SELECT}</select>  <input type="submit" name="submit" value="{L_SUBMIT}" class="btnlite" /><!-- ENDIF --></td> +	<td class="cat" colspan="<!-- IF S_IN_SEARCH_POPUP -->9<!-- ELSE -->8<!-- ENDIF -->" align="center"><!-- IF S_IN_SEARCH_POPUP and not S_SELECT_SINGLE --><input class="btnlite" type="submit" value="{L_SELECT_MARKED}" /><!-- ELSE --><span class="gensmall">{L_SELECT_SORT_METHOD}{L_COLON}</span> <select name="sk">{S_MODE_SELECT}</select>  <span class="gensmall">{L_ORDER}</span> <select name="sd">{S_ORDER_SELECT}</select>  <input type="submit" name="submit" value="{L_SUBMIT}" class="btnlite" /><!-- ENDIF --></td>  </tr>  </table>  {S_FORM_TOKEN} diff --git a/phpBB/styles/subsilver2/template/memberlist_group.html b/phpBB/styles/subsilver2/template/memberlist_group.html index f48b9811f0..4140c8cdbf 100644 --- a/phpBB/styles/subsilver2/template/memberlist_group.html +++ b/phpBB/styles/subsilver2/template/memberlist_group.html @@ -4,14 +4,14 @@  	<th colspan="3">{L_GROUP_INFORMATION}</th>  </tr>  <tr>  -	<td class="row1" width="20%"><b class="genmed">{L_GROUP_NAME}:</b></td> +	<td class="row1" width="20%"><b class="genmed">{L_GROUP_NAME}{L_COLON}</b></td>  	<td class="row2"><b class="gen"<!-- IF GROUP_COLOR --> style="color:#{GROUP_COLOR}"<!-- ENDIF -->>{GROUP_NAME}</b></td>  <!-- IF AVATAR_IMG or RANK_IMG or GROUP_RANK or U_PM -->  	<td class="row1" width="33%" rowspan="2" align="center"><!-- IF AVATAR_IMG -->{AVATAR_IMG}<br /><!-- ENDIF --><!-- IF RANK_IMG -->{RANK_IMG}<!-- ENDIF --><!-- IF GROUP_RANK --><span class="gensmall">{GROUP_RANK}</span><br /><br /><!-- ENDIF --><!-- IF U_PM --><a href="{U_PM}" class="imageset">{PM_IMG}</a><!-- ENDIF --></td>  <!-- ENDIF -->  </tr>  <tr>  -	<td class="row1" width="20%"><b class="genmed">{L_GROUP_DESC}:</b></td> +	<td class="row1" width="20%"><b class="genmed">{L_GROUP_DESC}{L_COLON}</b></td>  	<td class="row2"><span class="gen">{GROUP_DESC}</span><p class="forumdesc">{GROUP_TYPE}</p></td>  </tr>  </table> diff --git a/phpBB/styles/subsilver2/template/memberlist_im.html b/phpBB/styles/subsilver2/template/memberlist_im.html index 329c323ffa..da1ad661c3 100644 --- a/phpBB/styles/subsilver2/template/memberlist_im.html +++ b/phpBB/styles/subsilver2/template/memberlist_im.html @@ -13,7 +13,7 @@  		<td class="row3" colspan="2"><span class="gensmall">{L_SEND_IM_EXPLAIN}</span></td>  	</tr>  	<tr> -		<td class="row1"><b class="genmed">{L_IM_RECIPIENT}: </b></td> +		<td class="row1"><b class="genmed">{L_IM_RECIPIENT}{L_COLON} </b></td>  		<td class="row2"><span class="gen"><b>{USERNAME}</b><!-- IF S_SEND_ICQ or S_SEND_AIM or S_SEND_MSNM or S_NO_SEND_JABBER --> [ {IM_CONTACT} ]<!-- ENDIF --></span> <!-- IF PRESENCE_IMG -->{PRESENCE_IMG}<!-- ENDIF --></td>  	</tr> @@ -107,7 +107,7 @@  	<!-- IF S_SEND_JABBER -->  		<tr> -			<td class="row1"><b class="genmed">{L_IM_MESSAGE}: </b></td> +			<td class="row1"><b class="genmed">{L_IM_MESSAGE}{L_COLON} </b></td>  			<td class="row2"><textarea class="post" name="message" rows="5" cols="45"></textarea></td>  		</tr>  		<tr> diff --git a/phpBB/styles/subsilver2/template/memberlist_search.html b/phpBB/styles/subsilver2/template/memberlist_search.html index ab1ecca2ee..c0434d8110 100644 --- a/phpBB/styles/subsilver2/template/memberlist_search.html +++ b/phpBB/styles/subsilver2/template/memberlist_search.html @@ -74,58 +74,58 @@  	<td class="row3" colspan="4"><span class="gensmall">{L_FIND_USERNAME_EXPLAIN}</span></td>  </tr>  <tr> -	<td class="row1"><b class="genmed">{L_USERNAME}:</b></td> +	<td class="row1"><b class="genmed">{L_USERNAME}{L_COLON}</b></td>  	<td class="row2"><input class="post" type="text" name="username" value="{USERNAME}" /></td> -	<td class="row1"><b class="genmed">{L_ICQ}:</b></td> +	<td class="row1"><b class="genmed">{L_ICQ}{L_COLON}</b></td>  	<td class="row2"><input class="post" type="text" name="icq" value="{ICQ}" /></td>  </tr>  <tr>  <!-- IF S_EMAIL_SEARCH_ALLOWED --> -	<td class="row1"><b class="genmed">{L_EMAIL}:</b></td> +	<td class="row1"><b class="genmed">{L_EMAIL}{L_COLON}</b></td>  	<td class="row2"><input class="post" type="text" name="email" value="{EMAIL}" /></td>  <!-- ELSE -->  	<td colspan="2" class="row1"> </td>  <!-- ENDIF --> -	<td class="row1"><b class="genmed">{L_AIM}:</b></td> +	<td class="row1"><b class="genmed">{L_AIM}{L_COLON}</b></td>  	<td class="row2"><input class="post" type="text" name="aim" value="{AIM}" /></td>  </tr>  <tr> -	<td class="row1"><b class="genmed">{L_JOINED}:</b></td> +	<td class="row1"><b class="genmed">{L_JOINED}{L_COLON}</b></td>  	<td class="row2"><select name="joined_select">{S_JOINED_TIME_OPTIONS}</select> <input class="post" type="text" name="joined" value="{JOINED}" /></td> -	<td class="row1"><b class="genmed">{L_YIM}:</b></td> +	<td class="row1"><b class="genmed">{L_YIM}{L_COLON}</b></td>  	<td class="row2"><input class="post" type="text" name="yahoo" value="{YAHOO}" /></td>  </tr>  <tr>  <!-- IF S_VIEWONLINE --> -	<td class="row1"><b class="genmed">{L_LAST_ACTIVE}:</b></td> +	<td class="row1"><b class="genmed">{L_LAST_ACTIVE}{L_COLON}</b></td>  	<td class="row2"><select name="active_select">{S_ACTIVE_TIME_OPTIONS}</select> <input class="post" type="text" name="active" value="{ACTIVE}" /></td>  <!-- ELSE -->  	<td colspan="2" class="row1"> </td>  <!-- ENDIF --> -	<td class="row1"><b class="genmed">{L_MSNM}:</b></td> +	<td class="row1"><b class="genmed">{L_MSNM}{L_COLON}</b></td>  	<td class="row2"><input class="post" type="text" name="msn" value="{MSNM}" /></td>  </tr>  <tr> -	<td class="row1"><b class="genmed">{L_POSTS}:</b></td> +	<td class="row1"><b class="genmed">{L_POSTS}{L_COLON}</b></td>  	<td class="row2"><select name="count_select">{S_COUNT_OPTIONS}</select> <input class="post" type="text" name="count" value="{COUNT}" /></td> -	<td class="row1"><b class="genmed">{L_JABBER}:</b></td> +	<td class="row1"><b class="genmed">{L_JABBER}{L_COLON}</b></td>  	<td class="row2"><input class="post" type="text" name="jabber" value="{JABBER}" /></td>  </tr>  <tr> -	<td class="row1"><b class="genmed">{L_SORT_BY}:</b></td> +	<td class="row1"><b class="genmed">{L_SORT_BY}{L_COLON}</b></td>  	<td class="row2" nowrap="nowrap"><select name="sk">{S_SORT_OPTIONS}</select> <select name="sd">{S_ORDER_SELECT}</select> </td>  <!-- IF S_IP_SEARCH_ALLOWED --> -	<td class="row1"><b class="genmed">{L_POST_IP}:</b></td> +	<td class="row1"><b class="genmed">{L_POST_IP}{L_COLON}</b></td>  	<td class="row2"><input class="post" type="text" name="ip" value="{IP}" /></td>  </tr>  <tr> -	<td class="row1"><b class="genmed">{L_GROUP}:</b></td> +	<td class="row1"><b class="genmed">{L_GROUP}{L_COLON}</b></td>  	<td class="row2" nowrap="nowrap"><select name="search_group_id">{S_GROUP_SELECT}</select></td>  	<td class="row1"> </td>  	<td class="row2"> </td>  </tr>  <!-- ELSE --> -	<td class="row1"><b class="genmed">{L_GROUP}:</b></td> +	<td class="row1"><b class="genmed">{L_GROUP}{L_COLON}</b></td>  	<td class="row2" nowrap="nowrap"><select name="search_group_id">{S_GROUP_SELECT}</select></td>  </tr>  <!-- ENDIF --> diff --git a/phpBB/styles/subsilver2/template/memberlist_view.html b/phpBB/styles/subsilver2/template/memberlist_view.html index 5d866214ce..464369a7a8 100644 --- a/phpBB/styles/subsilver2/template/memberlist_view.html +++ b/phpBB/styles/subsilver2/template/memberlist_view.html @@ -18,7 +18,7 @@  			<table cellspacing="1" cellpadding="2" border="0">  			<!-- IF S_USER_INACTIVE -->  			<tr> -				<td align="center" style="color: red;"><b class="gen">{L_USER_IS_INACTIVE}</b><br />{L_INACTIVE_REASON}: {USER_INACTIVE_REASON}<br /><br /></td> +				<td align="center" style="color: red;"><b class="gen">{L_USER_IS_INACTIVE}</b><br />{L_INACTIVE_REASON}{L_COLON} {USER_INACTIVE_REASON}<br /><br /></td>  			</tr>  			<!-- ENDIF -->  			<tr> @@ -67,32 +67,32 @@  		<td class="row1">  			<table width="100%" cellspacing="1" cellpadding="2" border="0">  			<tr> -				<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_JOINED}: </td> +				<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_JOINED}{L_COLON} </td>  				<td width="100%"><b class="gen">{JOINED}</b></td>  			</tr>  			<tr> -				<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_VISITED}: </td> +				<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_VISITED}{L_COLON} </td>  				<td width="100%"><b class="gen">{VISITED}</b></td>  			</tr>  			<!-- IF S_WARNINGS -->  				<tr> -					<td class="gen" align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap">{L_WARNINGS}: </td> +					<td class="gen" align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap">{L_WARNINGS}{L_COLON} </td>  					<td width="100%"><b class="gen">{WARNINGS}</b><!-- IF U_NOTES or U_WARN --><br /><span class="genmed"> [ <!-- IF U_NOTES --><a href="{U_NOTES}">{L_VIEW_NOTES}</a><!-- ENDIF --> <!-- IF U_WARN --><!-- IF U_NOTES --> | <!-- ENDIF --><a href="{U_WARN}">{L_WARN_USER}</a><!-- ENDIF --> ]</span><!-- ENDIF --></td>  				</tr>  			<!-- ENDIF -->  			<tr> -				<td class="gen" align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap">{L_TOTAL_POSTS}: </td> +				<td class="gen" align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap">{L_TOTAL_POSTS}{L_COLON} </td>  				<td><b class="gen">{POSTS}</b><span class="genmed"><!-- IF POSTS_PCT --><br />[{POSTS_PCT} / {POSTS_DAY}]<!-- ENDIF -->  				<!-- IF POSTS_IN_QUEUE and U_MCP_QUEUE --><br />[<a href="{U_MCP_QUEUE}">{L_POSTS_IN_QUEUE}</a>]<!-- ELSEIF POSTS_IN_QUEUE --><br />[{L_POSTS_IN_QUEUE}]<!-- ENDIF -->  				<!-- IF S_DISPLAY_SEARCH --><br /><a href="{U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a><!-- ENDIF --></span></td>  			</tr>  			<!-- IF S_SHOW_ACTIVITY -->  				<tr> -					<td class="gen" align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap">{L_ACTIVE_IN_FORUM}: </td> +					<td class="gen" align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap">{L_ACTIVE_IN_FORUM}{L_COLON} </td>  					<td><!-- IF ACTIVE_FORUM != '' --><b><a class="gen" href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></b><br /><span class="genmed">[ {ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT} ]</span><!-- ELSE --><span class="gen">-</span><!-- ENDIF --></td>  				</tr>  				<tr> -					<td class="gen" align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap">{L_ACTIVE_IN_TOPIC}: </td> +					<td class="gen" align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap">{L_ACTIVE_IN_TOPIC}{L_COLON} </td>  					<td><!-- IF ACTIVE_TOPIC != '' --><b><a class="gen" href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></b><br /><span class="genmed">[ {ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT} ]</span><!-- ELSE --><span class="gen">-</span><!-- ENDIF --></td>  				</tr>  			<!-- ENDIF --> @@ -107,33 +107,33 @@  		<td class="row1">  			<table width="100%" cellspacing="1" cellpadding="2" border="0">  			<tr> -				<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_EMAIL_ADDRESS}: </td> +				<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_EMAIL_ADDRESS}{L_COLON} </td>  				<td width="100%"><!-- IF U_EMAIL --><a href="{U_EMAIL}" class="imageset">{EMAIL_IMG}</a><!-- ENDIF --></td>  			</tr>  			<!-- IF U_PM -->  				<tr> -					<td class="gen" nowrap="nowrap" align="{S_CONTENT_FLOW_END}">{L_PM}: </td> +					<td class="gen" nowrap="nowrap" align="{S_CONTENT_FLOW_END}">{L_PM}{L_COLON} </td>  					<td><a href="{U_PM}" class="imageset">{PM_IMG}</a></td>  				</tr>  			<!-- ENDIF -->  			<tr> -				<td class="gen" nowrap="nowrap" align="{S_CONTENT_FLOW_END}">{L_MSNM}: </td> +				<td class="gen" nowrap="nowrap" align="{S_CONTENT_FLOW_END}">{L_MSNM}{L_COLON} </td>  				<td><!-- IF U_MSN --><a href="{U_MSN}" onclick="popup(this.href, 550, 320); return false" class="imageset">{MSN_IMG}</a><!-- ELSEIF USER_MSN -->{USER_MSN}<!-- ENDIF --></td>  			</tr>  			<tr> -				<td class="gen" nowrap="nowrap" align="{S_CONTENT_FLOW_END}">{L_YIM}: </td> +				<td class="gen" nowrap="nowrap" align="{S_CONTENT_FLOW_END}">{L_YIM}{L_COLON} </td>  				<td><!-- IF U_YIM --><a href="{U_YIM}" onclick="popup(this.href, 780, 550); return false" class="imageset">{YIM_IMG}</a><!-- ELSEIF USER_YIM -->{USER_YIM}<!-- ENDIF --></td>  			</tr>  			<tr> -				<td class="gen" nowrap="nowrap" align="{S_CONTENT_FLOW_END}">{L_AIM}: </td> +				<td class="gen" nowrap="nowrap" align="{S_CONTENT_FLOW_END}">{L_AIM}{L_COLON} </td>  				<td><!-- IF U_AIM --><a href="{U_AIM}" onclick="popup(this.href, 550, 320); return false" class="imageset">{AIM_IMG}</a><!-- ELSEIF USER_AIM -->{USER_AIM}<!-- ENDIF --></td>  			</tr>  			<tr> -				<td class="gen" nowrap="nowrap" align="{S_CONTENT_FLOW_END}">{L_ICQ}: </td> +				<td class="gen" nowrap="nowrap" align="{S_CONTENT_FLOW_END}">{L_ICQ}{L_COLON} </td>  				<td><!-- IF U_ICQ --><a href="{U_ICQ}" onclick="popup(this.href, 550, 320); return false" class="imageset">{ICQ_IMG}</a><!-- ELSEIF USER_ICQ -->{USER_ICQ}<!-- ENDIF --></td>  			</tr>  			<tr> -				<td class="gen" nowrap="nowrap" align="{S_CONTENT_FLOW_END}">{L_JABBER}: </td> +				<td class="gen" nowrap="nowrap" align="{S_CONTENT_FLOW_END}">{L_JABBER}{L_COLON} </td>  				<td><!-- IF U_JABBER --><a href="{U_JABBER}" onclick="popup(this.href, 550, 320); return false" class="imageset">{JABBER_IMG}</a><!-- ELSEIF USER_JABBER -->{USER_JABBER_IMG}<!-- ENDIF --></td>  			</tr>  			</table> @@ -141,41 +141,41 @@  		<td class="row1">  			<table cellspacing="1" cellpadding="2" border="0">  			<tr> -				<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_USERGROUPS}: </td> +				<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_USERGROUPS}{L_COLON} </td>  				<td><select name="g">{S_GROUP_OPTIONS}</select> <input class="btnlite" type="submit" name="submit" value="{L_GO}" /></td>  			</tr>  			<tr> -				<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_LOCATION}: </td> +				<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_LOCATION}{L_COLON} </td>  				<td><!-- IF LOCATION --><b class="genmed">{LOCATION}</b><!-- ENDIF --></td>  			</tr>  			<!-- IF AGE !== '' -->  			<tr> -				<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_AGE}: </td> +				<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_AGE}{L_COLON} </td>  				<td><b class="genmed">{AGE}</b></td>  			</tr>  			<!-- ENDIF -->  			<tr> -				<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_OCCUPATION}: </td> +				<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_OCCUPATION}{L_COLON} </td>  				<td><!-- IF OCCUPATION --><b class="genmed">{OCCUPATION}</b><!-- ENDIF --></td>  			</tr>  			<tr> -				<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_INTERESTS}: </td> +				<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_INTERESTS}{L_COLON} </td>  				<td><!-- IF INTERESTS --><b class="genmed">{INTERESTS}</b><!-- ENDIF --></td>  			</tr>  			<tr> -				<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_WEBSITE}: </td> +				<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_WEBSITE}{L_COLON} </td>  				<td><!-- IF U_WWW --><b><a class="genmed" href="{U_WWW}">{U_WWW}</a></b><!-- ENDIF --></td>  			</tr>  			<!-- IF S_PROFILE_FIELD1 -->  				<!-- Use a construct like this to include admin defined profile fields. Replace FIELD1 with the name of your field. -->  				<tr> -					<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{PROFILE_FIELD1_NAME}: </td> +					<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{PROFILE_FIELD1_NAME}{L_COLON} </td>  					<td><b class="genmed">{PROFILE_FIELD1_VALUE}</b></td>  				</tr>  			<!-- ENDIF -->  			<!-- BEGIN custom_fields -->  				<tr> -					<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{custom_fields.PROFILE_FIELD_NAME}: </td> +					<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{custom_fields.PROFILE_FIELD_NAME}{L_COLON} </td>  					<td><b class="genmed">{custom_fields.PROFILE_FIELD_VALUE}</b></td>  				</tr>  			<!-- END custom_fields --> diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html index 8bedec4c9e..e93dd056bf 100644 --- a/phpBB/styles/subsilver2/template/overall_header.html +++ b/phpBB/styles/subsilver2/template/overall_header.html @@ -39,7 +39,7 @@ function popup(url, width, height, name)  function jumpto()  { -	var page = prompt('{LA_JUMP_PAGE}:', '{ON_PAGE}'); +	var page = prompt('{LA_JUMP_PAGE}{L_COLON}', '{ON_PAGE}');  	var per_page = '{PER_PAGE}';  	var base_url = '{A_BASE_URL}'; diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html index ae7d2f88d6..4c9df6f060 100644 --- a/phpBB/styles/subsilver2/template/posting_body.html +++ b/phpBB/styles/subsilver2/template/posting_body.html @@ -23,7 +23,7 @@  		<h2><!-- IF TOPIC_TITLE --><a class="titles" href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a><!-- ELSE --><a class="titles" href="{U_VIEW_FORUM}">{FORUM_NAME}</a><!-- ENDIF --></h2>  		<!-- IF MODERATORS --> -			<p class="moderators">{L_MODERATORS}: {MODERATORS}</p> +			<p class="moderators">{L_MODERATORS}{L_COLON} {MODERATORS}</p>  		<!-- ENDIF -->  		<!-- IF U_MCP -->  			<p class="linkmcp">[ <a href="{U_MCP}">{L_MCP}</a> ]</p> @@ -69,8 +69,8 @@  		<td class="postdetails" style="padding: 4px;">{draftrow.DATE}</td>  		<td style="padding: 4px;"><b class="gen">{draftrow.DRAFT_SUBJECT}</b> -			<!-- IF draftrow.S_LINK_TOPIC --><br /><span class="gensmall">{L_TOPIC}: <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a></span> -			<!-- ELSEIF draftrow.S_LINK_FORUM --><br /><span class="gensmall">{L_FORUM}: <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a></span> +			<!-- IF draftrow.S_LINK_TOPIC --><br /><span class="gensmall">{L_TOPIC}{L_COLON} <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a></span> +			<!-- ELSEIF draftrow.S_LINK_FORUM --><br /><span class="gensmall">{L_FORUM}{L_COLON} <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a></span>  			<!-- ELSEIF draftrow.S_LINK_PM --><br /><span class="gensmall">{L_PRIVATE_MESSAGE}</span>  			<!-- ELSE --><br /><span class="gensmall">{L_NO_TOPIC_FORUM}</span><!-- ENDIF -->  		</td> @@ -116,14 +116,14 @@  <!-- IF S_DELETE_ALLOWED -->  	<tr> -		<td class="row1"><b class="genmed">{L_DELETE_POST}:</b></td> +		<td class="row1"><b class="genmed">{L_DELETE_POST}{L_COLON}</b></td>  		<td class="row2"><input type="checkbox" class="radio" name="delete" /> <span class="gensmall">[ {L_DELETE_POST_WARN} ]</span></td>  	</tr>  <!-- ENDIF -->  <!-- IF S_SHOW_TOPIC_ICONS or S_SHOW_PM_ICONS -->  	<tr> -		<td class="row1"><b class="genmed">{L_ICON}:</b></td> +		<td class="row1"><b class="genmed">{L_ICON}{L_COLON}</b></td>  		<td class="row2">  			<table width="100%" cellspacing="0" cellpadding="0" border="0">  			<tr> @@ -136,14 +136,14 @@  <!-- IF not S_PRIVMSGS and S_DISPLAY_USERNAME -->  	<tr> -		<td class="row1"><b class="genmed">{L_USERNAME}:</b></td> +		<td class="row1"><b class="genmed">{L_USERNAME}{L_COLON}</b></td>  		<td class="row2"><input class="post" type="text" tabindex="1" name="username" size="25" value="{USERNAME}" /></td>  	</tr>  <!-- ENDIF -->  <!-- IF S_PRIVMSGS -->  	<tr> -		<td class="row1"><b class="genmed">{L_TO}:</b></td> +		<td class="row1"><b class="genmed">{L_TO}{L_COLON}</b></td>  		<td class="row2">  			{S_HIDDEN_ADDRESS_FIELD}  		<!-- BEGIN to_recipient --> @@ -157,7 +157,7 @@  	</tr>  	<!-- IF S_ALLOW_MASS_PM -->  	<tr> -		<td class="row1"><b class="genmed">{L_BCC}:</b></td> +		<td class="row1"><b class="genmed">{L_BCC}{L_COLON}</b></td>  		<td class="row2">  		<!-- BEGIN bcc_recipient -->  			<span class="genmed nowrap"><strong> @@ -172,11 +172,11 @@  <!-- ENDIF -->  <tr> -	<td class="row1" width="22%"><b class="genmed">{L_SUBJECT}:</b></td> +	<td class="row1" width="22%"><b class="genmed">{L_SUBJECT}{L_COLON}</b></td>  	<td class="row2" width="78%"><input class="post" style="width:450px" type="text" name="subject" size="45" maxlength="<!-- IF S_NEW_MESSAGE -->120<!-- ELSE -->124<!-- ENDIF -->" tabindex="2" value="{SUBJECT}" /></td>  </tr>  <tr> -	<td class="row1" valign="top"><b class="genmed">{L_MESSAGE_BODY}:</b><br /><span class="gensmall">{L_MESSAGE_BODY_EXPLAIN} </span><br /><br /> +	<td class="row1" valign="top"><b class="genmed">{L_MESSAGE_BODY}{L_COLON}</b><br /><span class="gensmall">{L_MESSAGE_BODY_EXPLAIN} </span><br /><br />  	<!-- IF S_SMILIES_ALLOWED -->  		<table width="100%" cellspacing="5" cellpadding="0" border="0" align="center">  		<tr> @@ -227,14 +227,14 @@  <!-- IF S_INLINE_ATTACHMENT_OPTIONS -->  	<tr> -		<td class="row1"><b class="genmed">{L_ATTACHMENTS}:</b></td> +		<td class="row1"><b class="genmed">{L_ATTACHMENTS}{L_COLON}</b></td>  		<td class="row2"><select name="attachments">{S_INLINE_ATTACHMENT_OPTIONS}</select> <input type="button" class="btnbbcode" accesskey="a" value="{L_PLACE_INLINE}" name="attachinline" onclick="attach_form = document.forms[form_name].elements['attachments']; attach_inline(attach_form.value, attach_form.options[attach_form.selectedIndex].text);" onmouseover="helpline('a')" onmouseout="helpline('tip')" />  		</td>  	</tr>  <!-- ENDIF -->  <tr> -	<td class="row1" valign="top"><b class="genmed">{L_OPTIONS}:</b><br /> +	<td class="row1" valign="top"><b class="genmed">{L_OPTIONS}{L_COLON}</b><br />  		<table cellspacing="2" cellpadding="0" border="0">  		<tr>  			<td class="gensmall">{BBCODE_STATUS}</td> @@ -310,7 +310,7 @@  			<!-- IF S_TYPE_TOGGLE -->  				<tr>  					<td> </td> -					<td class="gen"><!-- IF S_EDIT_POST -->{L_CHANGE_TOPIC_TO}<!-- ELSE -->{L_POST_TOPIC_AS}<!-- ENDIF -->: <!-- BEGIN topic_type --><input type="radio" class="radio" name="topic_type" value="{topic_type.VALUE}"{topic_type.S_CHECKED} />{topic_type.L_TOPIC_TYPE}  <!-- END topic_type --></td> +					<td class="gen"><!-- IF S_EDIT_POST -->{L_CHANGE_TOPIC_TO}<!-- ELSE -->{L_POST_TOPIC_AS}<!-- ENDIF -->{L_COLON} <!-- BEGIN topic_type --><input type="radio" class="radio" name="topic_type" value="{topic_type.VALUE}"{topic_type.S_CHECKED} />{topic_type.L_TOPIC_TYPE}  <!-- END topic_type --></td>  				</tr>  			<!-- ENDIF -->  		<!-- ENDIF --> @@ -320,14 +320,14 @@  <!-- IF S_TOPIC_TYPE_ANNOUNCE or S_TOPIC_TYPE_STICKY -->  	<tr> -		<td class="row1"><b class="genmed">{L_STICK_TOPIC_FOR}:</b><br /><span class="gensmall">{L_STICKY_ANNOUNCE_TIME_LIMIT}</span></td> +		<td class="row1"><b class="genmed">{L_STICK_TOPIC_FOR}{L_COLON}</b><br /><span class="gensmall">{L_STICKY_ANNOUNCE_TIME_LIMIT}</span></td>  		<td class="row2"><input class="post" type="text" name="topic_time_limit" size="3" maxlength="3" value="{TOPIC_TIME_LIMIT}" /> <b class="gen">{L_DAYS}</b> <span class="gensmall">{L_STICK_TOPIC_FOR_EXPLAIN}</span></td>  	</tr>  <!-- ENDIF -->  <!-- IF S_EDIT_REASON -->  	<tr> -		<td class="row1" valign="top"><b class="genmed">{L_EDIT_REASON}:</b></td> +		<td class="row1" valign="top"><b class="genmed">{L_EDIT_REASON}{L_COLON}</b></td>  		<td class="row2"><input class="post" type="text" name="edit_reason" size="50" value="{EDIT_REASON}" /></td>  	</tr>  <!-- ENDIF --> @@ -355,7 +355,7 @@  		<!-- INCLUDE posting_poll_body.html -->  	<!-- ELSEIF S_POLL_DELETE -->  		<tr> -			<td class="row1"><span class="genmed"><b>{L_POLL_DELETE}:</b></span></td> +			<td class="row1"><span class="genmed"><b>{L_POLL_DELETE}{L_COLON}</b></span></td>  			<td class="row2"><input type="checkbox" class="radio" name="poll_delete" /></td>  		</tr>  	<!-- ENDIF --> diff --git a/phpBB/styles/subsilver2/template/posting_buttons.html b/phpBB/styles/subsilver2/template/posting_buttons.html index cfe69dee56..1a7093e1be 100644 --- a/phpBB/styles/subsilver2/template/posting_buttons.html +++ b/phpBB/styles/subsilver2/template/posting_buttons.html @@ -27,7 +27,7 @@  			d: '{LA_BBCODE_D_HELP}',  			tip: '{L_STYLES_TIP}'  			<!-- BEGIN custom_tags --> -				,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}' +				,cb_{custom_tags.BBCODE_ID}{L_COLON} '{custom_tags.A_BBCODE_HELPLINE}'  			<!-- END custom_tags -->  		} @@ -55,7 +55,7 @@  		<!-- IF S_BBCODE_FLASH -->  			<input type="button" class="btnbbcode" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" onmouseover="helpline('d')" onmouseout="helpline('tip')" />  		<!-- ENDIF --> -		<span class="genmed nowrap">{L_FONT_SIZE}: <select class="gensmall" name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" onmouseover="helpline('f')" onmouseout="helpline('tip')"> +		<span class="genmed nowrap">{L_FONT_SIZE}{L_COLON} <select class="gensmall" name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" onmouseover="helpline('f')" onmouseout="helpline('tip')">  			<option value="50">{L_FONT_TINY}</option>  			<option value="85">{L_FONT_SMALL}</option>  			<option value="100" selected="selected">{L_FONT_NORMAL}</option> diff --git a/phpBB/styles/subsilver2/template/posting_poll_body.html b/phpBB/styles/subsilver2/template/posting_poll_body.html index 3a523182f7..c41741ac51 100644 --- a/phpBB/styles/subsilver2/template/posting_poll_body.html +++ b/phpBB/styles/subsilver2/template/posting_poll_body.html @@ -6,31 +6,31 @@  	<td class="row3" colspan="2"><span class="gensmall">{L_ADD_POLL_EXPLAIN}</span></td>  </tr>  <tr> -	<td class="row1"><b class="genmed">{L_POLL_QUESTION}:</b></td> +	<td class="row1"><b class="genmed">{L_POLL_QUESTION}{L_COLON}</b></td>  	<td class="row2"><input class="post" type="text" name="poll_title" size="50" maxlength="255" value="{POLL_TITLE}" /></td>  </tr>  <tr> -	<td class="row1"><b class="genmed">{L_POLL_OPTIONS}:</b><br /><span class="gensmall">{L_POLL_OPTIONS_EXPLAIN}</span></td> +	<td class="row1"><b class="genmed">{L_POLL_OPTIONS}{L_COLON}</b><br /><span class="gensmall">{L_POLL_OPTIONS_EXPLAIN}</span></td>  	<td class="row2"><textarea style="width:450px" name="poll_option_text" rows="5" cols="35">{POLL_OPTIONS}</textarea></td>  </tr>  <tr> -	<td class="row1"><b class="genmed">{L_POLL_MAX_OPTIONS}:</b><br /><span class="gensmall">{L_POLL_MAX_OPTIONS_EXPLAIN}</span></td> +	<td class="row1"><b class="genmed">{L_POLL_MAX_OPTIONS}{L_COLON}</b><br /><span class="gensmall">{L_POLL_MAX_OPTIONS_EXPLAIN}</span></td>  	<td class="row2"><input class="post" type="text" name="poll_max_options" size="3" maxlength="3" value="{POLL_MAX_OPTIONS}" /></td>  </tr>  <tr> -	<td class="row1"><b class="genmed">{L_POLL_FOR}:</b></td> +	<td class="row1"><b class="genmed">{L_POLL_FOR}{L_COLON}</b></td>  	<td class="row2"><input class="post" type="text" name="poll_length" size="3" maxlength="3" value="{POLL_LENGTH}" /> <b class="gen">{L_DAYS}</b> <span class="gensmall">{L_POLL_FOR_EXPLAIN}</span></td>  </tr>  <!-- IF S_POLL_VOTE_CHANGE -->  	<tr> -		<td class="row1"><b class="genmed">{L_POLL_VOTE_CHANGE}:</b><br /><span class="gensmall">{L_POLL_VOTE_CHANGE_EXPLAIN}</span></td> +		<td class="row1"><b class="genmed">{L_POLL_VOTE_CHANGE}{L_COLON}</b><br /><span class="gensmall">{L_POLL_VOTE_CHANGE_EXPLAIN}</span></td>  		<td class="row2"><input type="checkbox" class="radio" name="poll_vote_change"{VOTE_CHANGE_CHECKED} /></td>  	</tr>  <!-- ENDIF -->  <!-- IF S_POLL_DELETE -->  	<tr> -		<td class="row1"><b class="genmed">{L_POLL_DELETE}:</b></td> +		<td class="row1"><b class="genmed">{L_POLL_DELETE}{L_COLON}</b></td>  		<td class="row2"><input type="checkbox" class="radio" name="poll_delete"<!-- IF S_POLL_DELETE_CHECKED --> checked="checked"<!-- ENDIF --> /></td>  	</tr>  <!-- ENDIF --> diff --git a/phpBB/styles/subsilver2/template/posting_preview.html b/phpBB/styles/subsilver2/template/posting_preview.html index b990428f36..b0dbef6a5a 100644 --- a/phpBB/styles/subsilver2/template/posting_preview.html +++ b/phpBB/styles/subsilver2/template/posting_preview.html @@ -4,7 +4,7 @@  	<th>{L_PREVIEW}</th>  </tr>  <tr>  -	<td class="row1">{MINI_POST_IMG}<span class="postdetails">{L_POSTED}: {POST_DATE}     {L_POST_SUBJECT}: {PREVIEW_SUBJECT}</span></td> +	<td class="row1">{MINI_POST_IMG}<span class="postdetails">{L_POSTED}{L_COLON} {POST_DATE}     {L_POST_SUBJECT}{L_COLON} {PREVIEW_SUBJECT}</span></td>  </tr>  <!-- IF S_HAS_POLL_OPTIONS -->  	<tr> @@ -48,7 +48,7 @@  				<table class="tablebg" width="100%" cellspacing="1">  				<tr> -					<td class="row3"><b class="genmed">{L_ATTACHMENTS}: </b></td> +					<td class="row3"><b class="genmed">{L_ATTACHMENTS}{L_COLON} </b></td>  				</tr>  				<!-- BEGIN attachment -->  					<tr> diff --git a/phpBB/styles/subsilver2/template/posting_review.html b/phpBB/styles/subsilver2/template/posting_review.html index 87266da44c..baf159aecd 100644 --- a/phpBB/styles/subsilver2/template/posting_review.html +++ b/phpBB/styles/subsilver2/template/posting_review.html @@ -34,7 +34,7 @@  					<table width="100%" cellspacing="0" cellpadding="0" border="0">  					<tr>  						<td> </td> -						<td class="gensmall" valign="middle" nowrap="nowrap"><b>{L_POST_SUBJECT}:</b> </td> +						<td class="gensmall" valign="middle" nowrap="nowrap"><b>{L_POST_SUBJECT}{L_COLON}</b> </td>  						<td class="gensmall" width="100%" valign="middle">{post_review_row.POST_SUBJECT}</td>  						<td> </td>  					</tr> @@ -57,7 +57,7 @@  									<table class="tablebg" width="100%" cellspacing="1">  									<tr> -										<td class="row3"><b class="genmed">{L_ATTACHMENTS}: </b></td> +										<td class="row3"><b class="genmed">{L_ATTACHMENTS}{L_COLON} </b></td>  									</tr>  									<!-- BEGIN attachment -->  										<tr> @@ -78,7 +78,7 @@  							<tr valign="middle">  								<td width="100%"> </td>  								<td width="10" nowrap="nowrap"><!-- IF S_IS_BOT -->{post_review_row.MINI_POST_IMG}<!-- ELSE --><a href="{post_review_row.U_MINI_POST}" class="imageset">{post_review_row.MINI_POST_IMG}</a><!-- ENDIF --></td> -								<td class="gensmall" nowrap="nowrap"><b>{L_POSTED}:</b> {post_review_row.POST_DATE}</td> +								<td class="gensmall" nowrap="nowrap"><b>{L_POSTED}{L_COLON}</b> {post_review_row.POST_DATE}</td>  							</tr>  							</table>  						</td> diff --git a/phpBB/styles/subsilver2/template/posting_topic_review.html b/phpBB/styles/subsilver2/template/posting_topic_review.html index cbd6746a8a..23ea56a216 100644 --- a/phpBB/styles/subsilver2/template/posting_topic_review.html +++ b/phpBB/styles/subsilver2/template/posting_topic_review.html @@ -34,7 +34,7 @@  					<table width="100%" cellspacing="0">  					<tr>  						<td> </td> -						<td class="gensmall" valign="middle" nowrap="nowrap"><b>{L_POST_SUBJECT}:</b> </td> +						<td class="gensmall" valign="middle" nowrap="nowrap"><b>{L_POST_SUBJECT}{L_COLON}</b> </td>  						<td class="gensmall" width="100%" valign="middle">{topic_review_row.POST_SUBJECT}</td>  						<td valign="top" nowrap="nowrap"> <!-- IF topic_review_row.POSTER_QUOTE and topic_review_row.DECODED_MESSAGE --><a href="#" onclick="addquote({topic_review_row.POST_ID},'{topic_review_row.POSTER_QUOTE}', '{LA_WROTE}'); return false;" class="imageset">{QUOTE_IMG}</a><!-- ENDIF --></td>  					</tr> @@ -65,7 +65,7 @@  										<table class="tablebg" width="100%" cellspacing="1">  										<tr> -											<td class="row3"><b class="genmed">{L_ATTACHMENTS}: </b></td> +											<td class="row3"><b class="genmed">{L_ATTACHMENTS}{L_COLON} </b></td>  										</tr>  										<!-- BEGIN attachment -->  											<tr> @@ -89,7 +89,7 @@  							<tr valign="middle">  								<td width="100%" align="{S_CONTENT_FLOW_BEGIN}"><span class="gensmall"><!-- IF topic_review_row.U_MCP_DETAILS -->[ <a href="{topic_review_row.U_MCP_DETAILS}">{L_POST_DETAILS}</a> ]<!-- ENDIF --></span></td>  								<td width="10" nowrap="nowrap"><!-- IF S_IS_BOT -->{topic_review_row.MINI_POST_IMG}<!-- ELSE --><a href="{topic_review_row.U_MINI_POST}" class="imageset">{topic_review_row.MINI_POST_IMG}</a><!-- ENDIF --></td> -								<td class="gensmall" nowrap="nowrap"><b>{L_POSTED}:</b> {topic_review_row.POST_DATE}</td> +								<td class="gensmall" nowrap="nowrap"><b>{L_POSTED}{L_COLON}</b> {topic_review_row.POST_DATE}</td>  							</tr>  							</table>  						</td> diff --git a/phpBB/styles/subsilver2/template/quickreply_editor.html b/phpBB/styles/subsilver2/template/quickreply_editor.html index 7a68a8f605..72dc5506bf 100644 --- a/phpBB/styles/subsilver2/template/quickreply_editor.html +++ b/phpBB/styles/subsilver2/template/quickreply_editor.html @@ -5,11 +5,11 @@  			<th align="center" colspan="2">{L_QUICKREPLY}</th>  		</tr>  		<tr> -			<td class="row1" width="22%"><b class="genmed">{L_SUBJECT}:</b></td> +			<td class="row1" width="22%"><b class="genmed">{L_SUBJECT}{L_COLON}</b></td>  			<td  class="row2" width="78%"><input class="post" style="width:450px" type="text" name="subject" size="45" maxlength="124" tabindex="2" value="{SUBJECT}" /></td>  		</tr>  		<tr> -			<td class="row1" width="22%"><b class="genmed">{L_MESSAGE}:</b></td> +			<td class="row1" width="22%"><b class="genmed">{L_MESSAGE}{L_COLON}</b></td>  			<td class="row2" valign="top" align="left" width="78%"><textarea name="message" rows="7" cols="76" tabindex="3"  style="width: 700px; height: 130px; min-width: 98%; max-width: 98%;"></textarea> </td>  		</tr>  		<tr> diff --git a/phpBB/styles/subsilver2/template/report_body.html b/phpBB/styles/subsilver2/template/report_body.html index bb963865e5..9ed510bb9f 100644 --- a/phpBB/styles/subsilver2/template/report_body.html +++ b/phpBB/styles/subsilver2/template/report_body.html @@ -10,19 +10,19 @@  	<td class="row3" colspan="2"><span class="gensmall"><!-- IF S_REPORT_POST -->{L_REPORT_POST_EXPLAIN}<!-- ELSE -->{L_REPORT_MESSAGE_EXPLAIN}<!-- ENDIF --></span></td>  </tr>  <tr> -	<td class="row1" width="22%"><b class="gen">{L_REASON}:</b></td> +	<td class="row1" width="22%"><b class="gen">{L_REASON}{L_COLON}</b></td>  	<td class="row2" width="78%"><select name="reason_id">  		<!-- BEGIN reason --><option value="{reason.ID}"<!-- IF reason.S_SELECTED --> selected="selected"<!-- ENDIF -->>{reason.TITLE} » {reason.DESCRIPTION}</option><!-- END reason -->  	</select></td>  </tr>  <!-- IF S_CAN_NOTIFY -->  	<tr> -		<td class="row1"><span class="gen"><b>{L_REPORT_NOTIFY}:</b></span><br /><span class="gensmall">{L_REPORT_NOTIFY_EXPLAIN}</span></td> +		<td class="row1"><span class="gen"><b>{L_REPORT_NOTIFY}{L_COLON}</b></span><br /><span class="gensmall">{L_REPORT_NOTIFY_EXPLAIN}</span></td>  		<td class="row2"><span class="gen"><input type="radio" class="radio" name="notify" value="1"<!-- IF S_NOTIFY --> checked="checked"<!-- ENDIF --> />  {L_YES}  <input type="radio" class="radio" name="notify" value="0"<!-- IF not S_NOTIFY --> checked="checked"<!-- ENDIF --> />  {L_NO}</span></td>  	</tr>  <!-- ENDIF -->  <tr> -	<td class="row1" valign="top"><span class="gen"><b>{L_MORE_INFO}:</b></span><br /><span class="gensmall">{L_CAN_LEAVE_BLANK}</span></td> +	<td class="row1" valign="top"><span class="gen"><b>{L_MORE_INFO}{L_COLON}</b></span><br /><span class="gensmall">{L_CAN_LEAVE_BLANK}</span></td>  	<td class="row2"><textarea class="post" name="report_text" rows="10" cols="50">{REPORT_TEXT}</textarea></td>  </tr>  <tr> diff --git a/phpBB/styles/subsilver2/template/search_body.html b/phpBB/styles/subsilver2/template/search_body.html index 763a229c83..c0199fbae8 100644 --- a/phpBB/styles/subsilver2/template/search_body.html +++ b/phpBB/styles/subsilver2/template/search_body.html @@ -9,36 +9,36 @@  		<th colspan="4">{L_SEARCH_QUERY}</th>  	</tr>  	<tr> -		<td class="row1" colspan="2" width="50%"><b class="genmed">{L_SEARCH_KEYWORDS}: </b><br /><span class="gensmall">{L_SEARCH_KEYWORDS_EXPLAIN}</span></td> +		<td class="row1" colspan="2" width="50%"><b class="genmed">{L_SEARCH_KEYWORDS}{L_COLON} </b><br /><span class="gensmall">{L_SEARCH_KEYWORDS_EXPLAIN}</span></td>  		<td class="row2" colspan="2" valign="top"><input type="text" style="width: 300px" class="post" name="keywords" size="30" /><br /><input type="radio" class="radio" name="terms" value="all" checked="checked" /> <span class="genmed">{L_SEARCH_ALL_TERMS}</span><br /><input type="radio" class="radio" name="terms" value="any" /> <span class="genmed">{L_SEARCH_ANY_TERMS}</span></td>  	</tr>  	<tr> -		<td class="row1" colspan="2"><b class="genmed">{L_SEARCH_AUTHOR}:</b><br /><span class="gensmall">{L_SEARCH_AUTHOR_EXPLAIN}</span></td> +		<td class="row1" colspan="2"><b class="genmed">{L_SEARCH_AUTHOR}{L_COLON}</b><br /><span class="gensmall">{L_SEARCH_AUTHOR_EXPLAIN}</span></td>  		<td class="row2" colspan="2" valign="middle"><input type="text" style="width: 300px" class="post" name="author" size="30" /></td>  	</tr>  	<tr> -		<td class="row1" colspan="2"><b class="genmed">{L_SEARCH_FORUMS}: </b><br /><span class="gensmall">{L_SEARCH_FORUMS_EXPLAIN}</span></td> +		<td class="row1" colspan="2"><b class="genmed">{L_SEARCH_FORUMS}{L_COLON} </b><br /><span class="gensmall">{L_SEARCH_FORUMS_EXPLAIN}</span></td>  		<td class="row2" colspan="2"><select name="fid[]" multiple="multiple" size="5">{S_FORUM_OPTIONS}</select></td>  	</tr>  	<tr>  		<th colspan="4">{L_SEARCH_OPTIONS}</th>  	</tr>  	<tr> -		<td class="row1" width="25%" nowrap="nowrap"><b class="genmed">{L_SEARCH_SUBFORUMS}: </b></td> +		<td class="row1" width="25%" nowrap="nowrap"><b class="genmed">{L_SEARCH_SUBFORUMS}{L_COLON} </b></td>  		<td class="row2" width="25%" nowrap="nowrap"><input type="radio" class="radio" name="sc" value="1" checked="checked" /> <span class="genmed">{L_YES}</span>  <input type="radio" class="radio" name="sc" value="0" /> <span class="genmed">{L_NO}</span></td> -		<td class="row1" width="25%" nowrap="nowrap"><b class="genmed">{L_SEARCH_WITHIN}: </b></td> +		<td class="row1" width="25%" nowrap="nowrap"><b class="genmed">{L_SEARCH_WITHIN}{L_COLON} </b></td>  		<td class="row2" width="25%" nowrap="nowrap"><input type="radio" class="radio" name="sf" value="all" checked="checked" /> <span class="genmed">{L_SEARCH_TITLE_MSG}</span><br /><input type="radio" class="radio" name="sf" value="msgonly" /> <span class="genmed">{L_SEARCH_MSG_ONLY}</span> <br /><input type="radio" class="radio" name="sf" value="titleonly" /> <span class="genmed">{L_SEARCH_TITLE_ONLY}</span> <br /><input type="radio" class="radio" name="sf" value="firstpost" /> <span class="genmed">{L_SEARCH_FIRST_POST}</span></td>  	</tr>  	<tr> -		<td class="row1"><b class="genmed">{L_RESULT_SORT}: </b></td> +		<td class="row1"><b class="genmed">{L_RESULT_SORT}{L_COLON} </b></td>  		<td class="row2" nowrap="nowrap">{S_SELECT_SORT_KEY}<br /><input type="radio" class="radio" name="sd" value="a" /> <span class="genmed">{L_SORT_ASCENDING}</span><br /><input type="radio" class="radio" name="sd" value="d" checked="checked" /> <span class="genmed">{L_SORT_DESCENDING}</span></td> -		<td class="row1" nowrap="nowrap"><b class="genmed">{L_DISPLAY_RESULTS}: </b></td> +		<td class="row1" nowrap="nowrap"><b class="genmed">{L_DISPLAY_RESULTS}{L_COLON} </b></td>  		<td class="row2" nowrap="nowrap"><input type="radio" class="radio" name="sr" value="posts" checked="checked" /> <span class="genmed">{L_POSTS}</span>  <input type="radio" class="radio" name="sr" value="topics" /> <span class="genmed">{L_TOPICS}</span></td>  	</tr>  	<tr> -		<td class="row1" width="25%"><b class="genmed">{L_RESULT_DAYS}: </b></td> +		<td class="row1" width="25%"><b class="genmed">{L_RESULT_DAYS}{L_COLON} </b></td>  		<td class="row2" width="25%" nowrap="nowrap">{S_SELECT_SORT_DAYS}</td> -		<td class="row1" nowrap="nowrap"><b class="genmed">{L_RETURN_FIRST}: </b></td> +		<td class="row1" nowrap="nowrap"><b class="genmed">{L_RETURN_FIRST}{L_COLON} </b></td>  		<td class="row2" nowrap="nowrap"><select name="ch">{S_CHARACTER_OPTIONS}</select> <span class="genmed">{L_POST_CHARACTERS}</span></td>  	</tr>  	<tr> diff --git a/phpBB/styles/subsilver2/template/search_results.html b/phpBB/styles/subsilver2/template/search_results.html index a143a186d7..8ced5a5301 100644 --- a/phpBB/styles/subsilver2/template/search_results.html +++ b/phpBB/styles/subsilver2/template/search_results.html @@ -7,8 +7,8 @@  	<td colspan="2"><span class="titles"><!-- IF SEARCH_TITLE -->{SEARCH_TITLE}<!-- ELSE -->{SEARCH_MATCHES}<!-- ENDIF --></span><br /></td>  </tr>  <tr> -	<td class="genmed"><!-- IF SEARCH_TOPIC -->{L_SEARCHED_TOPIC}: <a href="{U_SEARCH_TOPIC}"><b>{SEARCH_TOPIC}</b></a><br /><!-- ENDIF --><!-- IF SEARCH_WORDS -->{L_SEARCHED_FOR}: <a href="{U_SEARCH_WORDS}"><b>{SEARCH_WORDS}</b></a><!-- ENDIF --><!-- IF IGNORED_WORDS --> {L_IGNORED_TERMS}: <b>{IGNORED_WORDS}</b><!-- ENDIF --></td> -	<td align="{S_CONTENT_FLOW_END}"><!-- IF SEARCH_IN_RESULTS --><span class="genmed">{L_SEARCH_IN_RESULTS}: </span><input class="post" type="text" name="add_keywords" value="" /> <input class="btnlite" type="submit" name="submit" value="{L_GO}" /><!-- ENDIF --></td> +	<td class="genmed"><!-- IF SEARCH_TOPIC -->{L_SEARCHED_TOPIC}{L_COLON} <a href="{U_SEARCH_TOPIC}"><b>{SEARCH_TOPIC}</b></a><br /><!-- ENDIF --><!-- IF SEARCH_WORDS -->{L_SEARCHED_FOR}{L_COLON} <a href="{U_SEARCH_WORDS}"><b>{SEARCH_WORDS}</b></a><!-- ENDIF --><!-- IF IGNORED_WORDS --> {L_IGNORED_TERMS}{L_COLON} <b>{IGNORED_WORDS}</b><!-- ENDIF --></td> +	<td align="{S_CONTENT_FLOW_END}"><!-- IF SEARCH_IN_RESULTS --><span class="genmed">{L_SEARCH_IN_RESULTS}{L_COLON} </span><input class="post" type="text" name="add_keywords" value="" /> <input class="btnlite" type="submit" name="submit" value="{L_GO}" /><!-- ENDIF --></td>  </tr>  </table> @@ -43,7 +43,7 @@  					<a href="{searchresults.U_MCP_REPORT}" class="imageset">{REPORTED_IMG}</a>   				<!-- ENDIF -->  				<!-- IF .searchresults.pagination --> -					<p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}:  +					<p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}{L_COLON}   					<!-- BEGIN pagination -->  						<!-- IF searchresults.pagination.S_IS_PREV -->  						<!-- ELSEIF searchresults.pagination.S_IS_CURRENT --><strong>{searchresults.pagination.PAGE_NUMBER}</strong> @@ -72,7 +72,7 @@  		</tr>  	<!-- END searchresults -->  	<tr> -		<td class="cat" colspan="7" valign="middle" align="center"><!-- IF S_SELECT_SORT_DAYS or S_SELECT_SORT_KEY --><span class="gensmall">{L_DISPLAY_POSTS}:</span> {S_SELECT_SORT_DAYS}<!-- IF S_SELECT_SORT_KEY --> <span class="gensmall">{L_SORT_BY}:</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}<!-- ENDIF --> <input class="btnlite" type="submit" value="{L_GO}" name="sort" /><!-- ENDIF --></td> +		<td class="cat" colspan="7" valign="middle" align="center"><!-- IF S_SELECT_SORT_DAYS or S_SELECT_SORT_KEY --><span class="gensmall">{L_DISPLAY_POSTS}{L_COLON}</span> {S_SELECT_SORT_DAYS}<!-- IF S_SELECT_SORT_KEY --> <span class="gensmall">{L_SORT_BY}{L_COLON}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}<!-- ENDIF --> <input class="btnlite" type="submit" value="{L_GO}" name="sort" /><!-- ENDIF --></td>  	</tr>  	</table> @@ -89,7 +89,7 @@  		<!-- IF searchresults.S_IGNORE_POST -->  			<td class="gensmall" colspan="2" height="25" align="center">{searchresults.L_IGNORE_POST}</td>  		<!-- ELSE --> -				<td colspan="2" height="25"><p class="topictitle"><a name="p{searchresults.POST_ID}" id="p{searchresults.POST_ID}"></a> {L_FORUM}: <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a>   {L_TOPIC}: <a href="{searchresults.U_VIEW_TOPIC}">{searchresults.TOPIC_TITLE}</a> </p></td> +				<td colspan="2" height="25"><p class="topictitle"><a name="p{searchresults.POST_ID}" id="p{searchresults.POST_ID}"></a> {L_FORUM}{L_COLON} <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a>   {L_TOPIC}{L_COLON} <a href="{searchresults.U_VIEW_TOPIC}">{searchresults.TOPIC_TITLE}</a> </p></td>  			</tr>  			<tr class="row1">  				<td width="150" align="center" valign="middle"><b class="postauthor">{searchresults.POST_AUTHOR_FULL}</b></td> @@ -99,19 +99,19 @@  						<td class="gensmall">  							<div style="float: {S_CONTENT_FLOW_BEGIN};">  							<!-- IF searchresults.POST_SUBJECT neq "" --> -								 <b>{L_POST_SUBJECT}:</b> <a href="{searchresults.U_VIEW_POST}">{searchresults.POST_SUBJECT}</a> +								 <b>{L_POST_SUBJECT}{L_COLON}</b> <a href="{searchresults.U_VIEW_POST}">{searchresults.POST_SUBJECT}</a>  							<!-- ELSE -->  								[ <a href="{searchresults.U_VIEW_POST}">{L_JUMP_TO_POST}</a> ]  							<!-- ENDIF -->  							</div> -							<div style="float: {S_CONTENT_FLOW_END};"><b>{L_POSTED}:</b> {searchresults.POST_DATE} </div> +							<div style="float: {S_CONTENT_FLOW_END};"><b>{L_POSTED}{L_COLON}</b> {searchresults.POST_DATE} </div>  						</td>  					</tr>  					</table>  				</td>  			</tr>  			<tr class="row1"> -				<td width="150" align="center" valign="top"><br /><span class="postdetails">{L_REPLIES}: <b>{searchresults.TOPIC_REPLIES}</b><br />{L_VIEWS}: <b>{searchresults.TOPIC_VIEWS}</b></span><br /><br /></td> +				<td width="150" align="center" valign="top"><br /><span class="postdetails">{L_REPLIES}{L_COLON} <b>{searchresults.TOPIC_REPLIES}</b><br />{L_VIEWS}{L_COLON} <b>{searchresults.TOPIC_VIEWS}</b></span><br /><br /></td>  				<td valign="top">  					<table width="100%" cellspacing="5">  					<tr> @@ -130,7 +130,7 @@  		</tr>  	<!-- END searchresults -->  	<tr> -		<td class="cat" colspan="2" align="center"><!-- IF S_SELECT_SORT_KEY --><span class="gensmall">{L_SORT_BY}:</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" name="sort" value="{L_GO}" /><!-- ENDIF --></td> +		<td class="cat" colspan="2" align="center"><!-- IF S_SELECT_SORT_KEY --><span class="gensmall">{L_SORT_BY}{L_COLON}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" name="sort" value="{L_GO}" /><!-- ENDIF --></td>  	</tr>  	</table>  <!-- ENDIF --> diff --git a/phpBB/styles/subsilver2/template/searchbox.html b/phpBB/styles/subsilver2/template/searchbox.html index 622961c881..49de299ea2 100644 --- a/phpBB/styles/subsilver2/template/searchbox.html +++ b/phpBB/styles/subsilver2/template/searchbox.html @@ -1 +1 @@ -<form method="get" name="search" action="{S_SEARCHBOX_ACTION}"><span class="gensmall">{L_SEARCH_FOR}:</span> <input class="post" type="text" name="keywords" size="20" /> <input class="btnlite" type="submit" value="{L_GO}" />{S_SEARCH_LOCAL_HIDDEN_FIELDS}</form> +<form method="get" name="search" action="{S_SEARCHBOX_ACTION}"><span class="gensmall">{L_SEARCH_FOR}{L_COLON}</span> <input class="post" type="text" name="keywords" size="20" /> <input class="btnlite" type="submit" value="{L_GO}" />{S_SEARCH_LOCAL_HIDDEN_FIELDS}</form> diff --git a/phpBB/styles/subsilver2/template/timezone_option.html b/phpBB/styles/subsilver2/template/timezone_option.html index c7e47a8ee4..7fa310b1bc 100644 --- a/phpBB/styles/subsilver2/template/timezone_option.html +++ b/phpBB/styles/subsilver2/template/timezone_option.html @@ -1,5 +1,5 @@  <tr> -	<td class="row1" width="50%"><b class="genmed">{L_BOARD_TIMEZONE}:</b></td> +	<td class="row1" width="50%"><b class="genmed">{L_BOARD_TIMEZONE}{L_COLON}</b></td>  	<td class="row2">  		<!-- IF S_TZ_DATE_OPTIONS -->  		<div id="tz_select_date" style="display: none;"> diff --git a/phpBB/styles/subsilver2/template/ucp_agreement.html b/phpBB/styles/subsilver2/template/ucp_agreement.html index d5420f66a6..054d25282f 100644 --- a/phpBB/styles/subsilver2/template/ucp_agreement.html +++ b/phpBB/styles/subsilver2/template/ucp_agreement.html @@ -20,7 +20,7 @@  	<form method="post" action="{S_UCP_ACTION}" id="register">  		<table width="100%" cellspacing="0">  			<tr> -				<td class="gensmall" align="{S_CONTENT_FLOW_END}">{L_LANGUAGE}: <select name="lang" id="lang" onchange="change_language(this.value); return false;" title="{L_LANGUAGE}">{S_LANG_OPTIONS}</select></td> +				<td class="gensmall" align="{S_CONTENT_FLOW_END}">{L_LANGUAGE}{L_COLON} <select name="lang" id="lang" onchange="change_language(this.value); return false;" title="{L_LANGUAGE}">{S_LANG_OPTIONS}</select></td>  			</tr>  		</table>  		{S_HIDDEN_FIELDS} diff --git a/phpBB/styles/subsilver2/template/ucp_attachments.html b/phpBB/styles/subsilver2/template/ucp_attachments.html index 63885f5da9..0f6101aac7 100644 --- a/phpBB/styles/subsilver2/template/ucp_attachments.html +++ b/phpBB/styles/subsilver2/template/ucp_attachments.html @@ -28,7 +28,7 @@  		<!-- IF attachrow.S_ROW_COUNT is even --><tr class="row2"><!-- ELSE --><tr class="row1"><!-- ENDIF -->  		<td class="genmed" style="padding: 4px;" align="center" width="2%"> {attachrow.ROW_NUMBER} </td> -		<td style="padding: 4px;"><a class="gen" href="{attachrow.U_VIEW_ATTACHMENT}">{attachrow.FILENAME}</a><br /><span class="gensmall"><!-- IF attachrow.S_IN_MESSAGE --><b>{L_PM}: </b><!-- ELSE --><b>{L_TOPIC}: </b><!-- ENDIF --><a href="{attachrow.U_VIEW_TOPIC}">{attachrow.TOPIC_TITLE}</a></span></td> +		<td style="padding: 4px;"><a class="gen" href="{attachrow.U_VIEW_ATTACHMENT}">{attachrow.FILENAME}</a><br /><span class="gensmall"><!-- IF attachrow.S_IN_MESSAGE --><b>{L_PM}{L_COLON} </b><!-- ELSE --><b>{L_TOPIC}{L_COLON} </b><!-- ENDIF --><a href="{attachrow.U_VIEW_TOPIC}">{attachrow.TOPIC_TITLE}</a></span></td>  		<td class="gensmall" style="padding: 4px;" align="center" valign="middle" nowrap="nowrap"> {attachrow.POST_TIME} </td>  		<td class="genmed" style="padding: 4px;" align="center" valign="middle" nowrap="nowrap">{attachrow.SIZE}</td>  		<td class="genmed" style="padding: 4px;" align="center">{attachrow.DOWNLOAD_COUNT}</td> @@ -36,7 +36,7 @@  	</tr>  	<!-- END attachrow -->  	<tr>  -		<td class="cat" colspan="6"><div style="float: {S_CONTENT_FLOW_BEGIN};"><span class="gensmall">{L_SORT_BY}: </span><select name="sk">{S_SORT_OPTIONS}</select> <select name="sd">{S_ORDER_SELECT}</select> <input class="btnlite" type="submit" name="sort" value="{L_SORT}" /></div><div style="float: {S_CONTENT_FLOW_END};"><input class="btnlite" type="submit" name="delete" value="{L_DELETE_MARKED}" /> </div></td> +		<td class="cat" colspan="6"><div style="float: {S_CONTENT_FLOW_BEGIN};"><span class="gensmall">{L_SORT_BY}{L_COLON} </span><select name="sk">{S_SORT_OPTIONS}</select> <select name="sd">{S_ORDER_SELECT}</select> <input class="btnlite" type="submit" name="sort" value="{L_SORT}" /></div><div style="float: {S_CONTENT_FLOW_END};"><input class="btnlite" type="submit" name="delete" value="{L_DELETE_MARKED}" /> </div></td>  	</tr>  	</table> diff --git a/phpBB/styles/subsilver2/template/ucp_groups_manage.html b/phpBB/styles/subsilver2/template/ucp_groups_manage.html index decd40a6de..12319c9e4e 100644 --- a/phpBB/styles/subsilver2/template/ucp_groups_manage.html +++ b/phpBB/styles/subsilver2/template/ucp_groups_manage.html @@ -21,18 +21,18 @@  		<th colspan="2">{L_GROUP_DETAILS}</th>  	</tr>  	<tr> -		<td class="row1" width="35%"><label<!-- IF not S_SPECIAL_GROUP --> for="group_name"<!-- ENDIF -->>{L_GROUP_NAME}:</label></td> +		<td class="row1" width="35%"><label<!-- IF not S_SPECIAL_GROUP --> for="group_name"<!-- ENDIF -->>{L_GROUP_NAME}{L_COLON}</label></td>  		<td class="row2"><!-- IF S_SPECIAL_GROUP --><b<!-- IF GROUP_COLOUR --> style="color: #{GROUP_COLOUR};"<!-- ENDIF -->>{GROUP_NAME}</b><!-- ENDIF --><input name="group_name" type="<!-- IF S_SPECIAL_GROUP -->hidden<!-- ELSE -->text<!-- ENDIF -->" id="group_name" value="{GROUP_INTERNAL_NAME}" /></td>  	</tr>  	<tr> -		<td class="row1" width="35%"><label for="group_desc">{L_GROUP_DESC}:</label></td> +		<td class="row1" width="35%"><label for="group_desc">{L_GROUP_DESC}{L_COLON}</label></td>  		<td class="row2"><textarea id="group_desc" name="group_desc" rows="5" cols="45">{GROUP_DESC}</textarea>  			<br /><input type="checkbox" class="radio" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}   <input type="checkbox" class="radio" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}   <input type="checkbox" class="radio" name="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}  		</td>  	</tr>  	<!-- IF not S_SPECIAL_GROUP -->  		<tr> -			<td class="row1" width="35%"><label for="group_type">{L_GROUP_TYPE}:</label><br /><span>{L_GROUP_TYPE_EXPLAIN}</span></td> +			<td class="row1" width="35%"><label for="group_type">{L_GROUP_TYPE}{L_COLON}</label><br /><span>{L_GROUP_TYPE_EXPLAIN}</span></td>  			<td class="row2">  				<input name="group_type" type="radio" class="radio" id="group_type" value="{GROUP_TYPE_FREE}"{GROUP_FREE} /> {L_GROUP_OPEN}    				<input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_OPEN}"{GROUP_OPEN} /> {L_GROUP_REQUEST}   @@ -48,46 +48,46 @@  		<th colspan="2">{L_GROUP_SETTINGS_SAVE}</th>  	</tr>  	<tr> -		<td class="row1" width="35%"><label for="group_colour">{L_GROUP_COLOR}:</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></td> +		<td class="row1" width="35%"><label for="group_colour">{L_GROUP_COLOR}{L_COLON}</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></td>  		<td class="row2"><input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" />  <span>[ <a href="{U_SWATCH}" onclick="popup(this.href, 636, 150, '_swatch'); return false;">{L_COLOUR_SWATCH}</a> ]</span></td>  	</tr>  	<tr> -		<td class="row1" width="35%"><label for="group_rank">{L_GROUP_RANK}:</label></td> +		<td class="row1" width="35%"><label for="group_rank">{L_GROUP_RANK}{L_COLON}</label></td>  		<td class="row2"><select name="group_rank" id="group_rank">{S_RANK_OPTIONS}</select></td>  	</tr>  	<tr>  		<th colspan="2">{L_GROUP_AVATAR}</th>  	</tr>  	<tr> -		<td class="row1" width="35%"><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></td> +		<td class="row1" width="35%"><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></td>  		<td class="row2">{AVATAR_IMAGE}<br /><br /><input type="checkbox" class="radio" name="delete" /> <span>{L_DELETE_AVATAR}</span></td>  	</tr>  	<!-- IF not S_IN_AVATAR_GALLERY -->  		<!-- IF S_UPLOAD_AVATAR_FILE -->  			<tr> -				<td class="row1" width="35%"><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}:</label></td> +				<td class="row1" width="35%"><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}{L_COLON}</label></td>  				<td class="row2"><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_MAX_FILESIZE}" /><input type="file" id="uploadfile" name="uploadfile" /></td>  			</tr>  		<!-- ENDIF -->  		<!-- IF S_UPLOAD_AVATAR_URL -->  			<tr> -				<td class="row1" width="35%"><label for="uploadurl">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></td> +				<td class="row1" width="35%"><label for="uploadurl">{L_UPLOAD_AVATAR_URL}{L_COLON}</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></td>  				<td class="row2"><input name="uploadurl" type="text" id="uploadurl" value="" /></td>  			</tr>  		<!-- ENDIF -->  		<!-- IF S_LINK_AVATAR -->  		<tr> -			<td class="row1" width="35%"><label for="remotelink">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></td> +			<td class="row1" width="35%"><label for="remotelink">{L_LINK_REMOTE_AVATAR}{L_COLON}</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></td>  			<td class="row2"><input name="remotelink" type="text" id="remotelink" value="" /></td>  		</tr>  		<tr> -			<td class="row1" width="35%"><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></td> +			<td class="row1" width="35%"><label for="width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></td>  			<td class="row2"><input name="width" type="text" id="width" size="3" value="{AVATAR_WIDTH}" /> <span>px X </span> <input type="text" name="height" size="3" value="{AVATAR_HEIGHT}" /> <span>px</span></td>  		</tr>  		<!-- ENDIF -->  		<!-- IF S_DISPLAY_GALLERY -->  			<tr> -				<td class="row1" width="35%"><label>{L_AVATAR_GALLERY}:</label></td> +				<td class="row1" width="35%"><label>{L_AVATAR_GALLERY}{L_COLON}</label></td>  				<td class="row2"><input class="btnmain" type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" /></td>  			</tr>  		<!-- ENDIF --> @@ -97,7 +97,7 @@  			<th colspan="2">{L_AVATAR_GALLERY}</th>  		</tr>  		<tr> -			<td class="row1" width="35%"><label for="category">{L_AVATAR_CATEGORY}:</label></td> +			<td class="row1" width="35%"><label for="category">{L_AVATAR_CATEGORY}{L_COLON}</label></td>  			<td class="row2"><select name="category" id="category">{S_CAT_OPTIONS}</select> <input class="btnmain" type="submit" value="{L_GO}" name="display_gallery" /></td>  		</tr>  		<tr> @@ -204,11 +204,11 @@  		<th colspan="2">{L_ADD_USERS}</th>  	</tr>  	<tr> -		<td class="row1"><label for="default">{L_USER_GROUP_DEFAULT}:</label><br /><span>{L_USER_GROUP_DEFAULT_EXPLAIN}</span></td> +		<td class="row1"><label for="default">{L_USER_GROUP_DEFAULT}{L_COLON}</label><br /><span>{L_USER_GROUP_DEFAULT_EXPLAIN}</span></td>  		<td class="row2"><input name="default" type="radio" class="radio" value="1" /> {L_YES}   <input name="default" type="radio" class="radio" id="default" value="0" checked="checked" /> {L_NO}</td>  	</tr>  	<tr> -		<td class="row1"><label for="usernames">{L_USERNAME}:</label><br /><span>{L_USERNAMES_EXPLAIN}</span></td> +		<td class="row1"><label for="usernames">{L_USERNAME}{L_COLON}</label><br /><span>{L_USERNAMES_EXPLAIN}</span></td>  		<td class="row2"><textarea id="usernames" name="usernames" cols="40" rows="5"></textarea><br />[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</td>  	</tr>  	<tr> diff --git a/phpBB/styles/subsilver2/template/ucp_groups_membership.html b/phpBB/styles/subsilver2/template/ucp_groups_membership.html index 38179e254a..846d48007e 100644 --- a/phpBB/styles/subsilver2/template/ucp_groups_membership.html +++ b/phpBB/styles/subsilver2/template/ucp_groups_membership.html @@ -86,7 +86,7 @@  <!-- END nonmember -->  <tr> -	<td class="cat" colspan="3"><!-- IF S_CHANGE_DEFAULT --><div style="float: {S_CONTENT_FLOW_BEGIN};"><input class="btnlite" type="submit" name="change_default" value="{L_CHANGE_DEFAULT_GROUP}" /></div><!-- ENDIF --><div style="float: {S_CONTENT_FLOW_END};"><span class="genmed">{L_SELECT}: </span><select name="action"><option value="join">{L_JOIN_SELECTED}</option><option value="resign">{L_RESIGN_SELECTED}</option><option value="demote">{L_DEMOTE_SELECTED}</option></select> <input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" /> </div></td> +	<td class="cat" colspan="3"><!-- IF S_CHANGE_DEFAULT --><div style="float: {S_CONTENT_FLOW_BEGIN};"><input class="btnlite" type="submit" name="change_default" value="{L_CHANGE_DEFAULT_GROUP}" /></div><!-- ENDIF --><div style="float: {S_CONTENT_FLOW_END};"><span class="genmed">{L_SELECT}{L_COLON} </span><select name="action"><option value="join">{L_JOIN_SELECTED}</option><option value="resign">{L_RESIGN_SELECTED}</option><option value="demote">{L_DEMOTE_SELECTED}</option></select> <input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" /> </div></td>  </tr>  </table> diff --git a/phpBB/styles/subsilver2/template/ucp_header.html b/phpBB/styles/subsilver2/template/ucp_header.html index 1566a15929..1ac426d5c3 100644 --- a/phpBB/styles/subsilver2/template/ucp_header.html +++ b/phpBB/styles/subsilver2/template/ucp_header.html @@ -15,7 +15,7 @@  	</tr>  	<!-- IF not S_ALLOW_MASS_PM -->  	<tr> -		<td class="row1"><b class="genmed">{L_USERNAME}:</b><br />[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</td> +		<td class="row1"><b class="genmed">{L_USERNAME}{L_COLON}</b><br />[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</td>  	</tr>  	<tr> @@ -23,7 +23,7 @@  	</tr>  	<!-- ELSE -->  		<tr> -			<td class="row1"><b class="genmed">{L_USERNAMES}:</b></td> +			<td class="row1"><b class="genmed">{L_USERNAMES}{L_COLON}</b></td>  		</tr>  		<tr>  			<td class="row2"><textarea name="username_list" rows="5" cols="22" tabindex="1"></textarea><br /> @@ -33,7 +33,7 @@  	<!-- ENDIF -->  	<!-- IF S_GROUP_OPTIONS -->  		<tr> -			<td class="row1"><b class="genmed">{L_USERGROUPS}:</b></td> +			<td class="row1"><b class="genmed">{L_USERGROUPS}{L_COLON}</b></td>  		</tr>  		<tr>  			<td class="row2"><select name="group_list[]" multiple="multiple" size="5" style="width:150px">{S_GROUP_OPTIONS}</select></td> diff --git a/phpBB/styles/subsilver2/template/ucp_main_bookmarks.html b/phpBB/styles/subsilver2/template/ucp_main_bookmarks.html index ba19c45eab..e91417503f 100644 --- a/phpBB/styles/subsilver2/template/ucp_main_bookmarks.html +++ b/phpBB/styles/subsilver2/template/ucp_main_bookmarks.html @@ -42,9 +42,9 @@  		<!-- ELSE -->  			<td style="padding: 4px;" width="100%" valign="top">  				<p class="topictitle"><!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF -->{topicrow.ATTACH_ICON_IMG} <a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a></p> -				<!-- IF topicrow.S_GLOBAL_TOPIC --><span class="gensmall">{L_GLOBAL_ANNOUNCEMENT}</span><!-- ELSE --><span class="gensmall"><b>{L_FORUM}: </b><a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a></span><!-- ENDIF --> +				<!-- IF topicrow.S_GLOBAL_TOPIC --><span class="gensmall">{L_GLOBAL_ANNOUNCEMENT}</span><!-- ELSE --><span class="gensmall"><b>{L_FORUM}{L_COLON} </b><a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a></span><!-- ENDIF -->  				<!-- IF .topicrow.pagination --> -					<p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}:  +					<p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}{L_COLON}   					<!-- BEGIN pagination -->  						<!-- IF topicrow.pagination.S_IS_PREV -->  						<!-- ELSEIF topicrow.pagination.S_IS_CURRENT --><strong>{topicrow.pagination.PAGE_NUMBER}</strong> diff --git a/phpBB/styles/subsilver2/template/ucp_main_drafts.html b/phpBB/styles/subsilver2/template/ucp_main_drafts.html index 0259ae466f..8e18e9cabf 100644 --- a/phpBB/styles/subsilver2/template/ucp_main_drafts.html +++ b/phpBB/styles/subsilver2/template/ucp_main_drafts.html @@ -32,8 +32,8 @@  		<td class="postdetails" style="padding: 4px;" nowrap="nowrap">{draftrow.DATE}</td>  		<td style="padding: 4px;" valign="top" width="100%">  			<p class="topictitle">{draftrow.DRAFT_SUBJECT}</p> -			<!-- IF draftrow.S_LINK_TOPIC --><span class="gensmall">{L_TOPIC}: <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a></span> -			<!-- ELSEIF draftrow.S_LINK_FORUM --><span class="gensmall">{L_FORUM}: <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a></span> +			<!-- IF draftrow.S_LINK_TOPIC --><span class="gensmall">{L_TOPIC}{L_COLON} <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a></span> +			<!-- ELSEIF draftrow.S_LINK_FORUM --><span class="gensmall">{L_FORUM}{L_COLON} <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a></span>  			<!-- ELSEIF draftrow.S_LINK_PM --><span class="gensmall">{L_PRIVATE_MESSAGE}</span>  			<!-- ELSE --><span class="gensmall">{L_NO_TOPIC_FORUM}</span><!-- ENDIF -->  		</td> @@ -54,11 +54,11 @@  <!-- ELSEIF S_EDIT_DRAFT -->  	<tr> -		<td class="row1" width="22%"><b class="genmed">{L_SUBJECT}:</b></td> +		<td class="row1" width="22%"><b class="genmed">{L_SUBJECT}{L_COLON}</b></td>  		<td class="row2"><input class="post" style="width:450px" type="text" name="subject" size="45" maxlength="64" tabindex="2" value="{DRAFT_SUBJECT}" /></td>  	</tr>  	<tr>  -		<td class="row1" width="22%"><b class="genmed">{L_MESSAGE}: </b><br /><span class="gensmall">{L_EDIT_DRAFT_EXPLAIN}</span></td> +		<td class="row1" width="22%"><b class="genmed">{L_MESSAGE}{L_COLON} </b><br /><span class="gensmall">{L_EDIT_DRAFT_EXPLAIN}</span></td>  		<td class="row2">  			<script type="text/javascript">  			// <![CDATA[ diff --git a/phpBB/styles/subsilver2/template/ucp_main_front.html b/phpBB/styles/subsilver2/template/ucp_main_front.html index 1445a71a1b..5dea2b4f03 100644 --- a/phpBB/styles/subsilver2/template/ucp_main_front.html +++ b/phpBB/styles/subsilver2/template/ucp_main_front.html @@ -38,26 +38,26 @@  	<td class="row1" colspan="3">  		<table width="100%" cellspacing="1" cellpadding="4">  		<tr>  -			<td align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap"><b class="genmed">{L_JOINED}: </b></td> +			<td align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap"><b class="genmed">{L_JOINED}{L_COLON} </b></td>  			<td width="100%"><b class="gen">{JOINED}</b></td>  		</tr>  		<tr>  -			<td align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap"><b class="genmed">{L_TOTAL_POSTS}: </b></td> +			<td align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap"><b class="genmed">{L_TOTAL_POSTS}{L_COLON} </b></td>  			<td><!-- IF POSTS_PCT --><b class="gen">{POSTS}</b><br /><span class="genmed">[{POSTS_PCT} / {POSTS_DAY}]<!-- IF S_DISPLAY_SEARCH --><br /><a href="{U_SEARCH_SELF}">{L_SEARCH_YOUR_POSTS}</a><!-- ENDIF --></span><!-- ELSE --><b class="gen">{POSTS}<b><!-- ENDIF --></td>  		</tr>  		<!-- IF S_SHOW_ACTIVITY -->  			<tr> -				<td align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap"><b class="genmed">{L_ACTIVE_IN_FORUM}: </b></td> +				<td align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap"><b class="genmed">{L_ACTIVE_IN_FORUM}{L_COLON} </b></td>  				<td><!-- IF ACTIVE_FORUM != '' --><b><a class="gen" href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></b><br /><span class="genmed">[ {ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT} ]</span><!-- ELSE --><span class="gen">-</span><!-- ENDIF --></td>  			</tr>  			<tr> -				<td align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap"><b class="genmed">{L_ACTIVE_IN_TOPIC}: </b></td> +				<td align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap"><b class="genmed">{L_ACTIVE_IN_TOPIC}{L_COLON} </b></td>  				<td><!-- IF ACTIVE_TOPIC != '' --><b><a class="gen" href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></b><br /><span class="genmed">[ {ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT} ]</span><!-- ELSE --><span class="gen">-</span><!-- ENDIF --></td>  			</tr>  		<!-- ENDIF -->  		<!-- IF WARNINGS -->  			<tr> -				<td align="{S_CONTENT_FLOW_END}" valign="middle" nowrap="nowrap"><b class="genmed">{L_YOUR_WARNINGS}: </b></td> +				<td align="{S_CONTENT_FLOW_END}" valign="middle" nowrap="nowrap"><b class="genmed">{L_YOUR_WARNINGS}{L_COLON} </b></td>  				<td class="genmed">{WARNING_IMG} [ <b>{WARNINGS}</b> ]</td>  			</tr>  		<!-- ENDIF --> diff --git a/phpBB/styles/subsilver2/template/ucp_main_subscribed.html b/phpBB/styles/subsilver2/template/ucp_main_subscribed.html index 13d2935757..45094abe5f 100644 --- a/phpBB/styles/subsilver2/template/ucp_main_subscribed.html +++ b/phpBB/styles/subsilver2/template/ucp_main_subscribed.html @@ -51,9 +51,9 @@  			<td style="padding: 4px;" width="20" align="center" valign="middle">{topicrow.TOPIC_FOLDER_IMG}</td>  			<td style="padding: 4px;" width="100%" valign="top">  				<p class="topictitle"><!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}" class="imageset">{NEWEST_POST_IMG}</a> <!-- ENDIF -->{topicrow.ATTACH_ICON_IMG} <a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a></p> -				<!-- IF topicrow.S_GLOBAL_TOPIC --><span class="gensmall">{L_GLOBAL_ANNOUNCEMENT}</span><!-- ELSE --><span class="gensmall"><b>{L_FORUM}: </b><a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a></span><!-- ENDIF --> +				<!-- IF topicrow.S_GLOBAL_TOPIC --><span class="gensmall">{L_GLOBAL_ANNOUNCEMENT}</span><!-- ELSE --><span class="gensmall"><b>{L_FORUM}{L_COLON} </b><a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a></span><!-- ENDIF -->  				<!-- IF .topicrow.pagination --> -					<p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}:  +					<p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}{L_COLON}   					<!-- BEGIN pagination -->  						<!-- IF topicrow.pagination.S_IS_PREV -->  						<!-- ELSEIF topicrow.pagination.S_IS_CURRENT --><strong>{topicrow.pagination.PAGE_NUMBER}</strong> diff --git a/phpBB/styles/subsilver2/template/ucp_pm_history.html b/phpBB/styles/subsilver2/template/ucp_pm_history.html index f24474e85c..0cbbf33fbe 100644 --- a/phpBB/styles/subsilver2/template/ucp_pm_history.html +++ b/phpBB/styles/subsilver2/template/ucp_pm_history.html @@ -26,7 +26,7 @@  				</table>  			</td>  			<td width="100%"<!-- IF history_row.S_CURRENT_MSG --> style="background-color:lightblue"<!-- ENDIF -->> -				<div class="gensmall" style="float: {S_CONTENT_FLOW_BEGIN};"><b>{L_PM_SUBJECT}:</b> {history_row.SUBJECT}</div><div class="gensmall" style="float: {S_CONTENT_FLOW_END};"><b>{L_FOLDER}:</b> {history_row.FOLDER}</div> +				<div class="gensmall" style="float: {S_CONTENT_FLOW_BEGIN};"><b>{L_PM_SUBJECT}{L_COLON}</b> {history_row.SUBJECT}</div><div class="gensmall" style="float: {S_CONTENT_FLOW_END};"><b>{L_FOLDER}{L_COLON}</b> {history_row.FOLDER}</div>  			</td>  		</tr> @@ -48,7 +48,7 @@  						<tr valign="middle">  							<td width="100%"> </td>  							<td width="10" nowrap="nowrap">{history_row.MINI_POST_IMG}</td> -							<td class="gensmall" nowrap="nowrap"><b>{L_SENT_AT}:</b> {history_row.SENT_DATE}</td> +							<td class="gensmall" nowrap="nowrap"><b>{L_SENT_AT}{L_COLON}</b> {history_row.SENT_DATE}</td>  						</tr>  						</table>  					</td> diff --git a/phpBB/styles/subsilver2/template/ucp_pm_message_footer.html b/phpBB/styles/subsilver2/template/ucp_pm_message_footer.html index d1ef5ebd10..20c5c7fe9f 100644 --- a/phpBB/styles/subsilver2/template/ucp_pm_message_footer.html +++ b/phpBB/styles/subsilver2/template/ucp_pm_message_footer.html @@ -31,7 +31,7 @@  					<!-- ENDIF -->  				<!-- ELSE -->  					<form name="sortmsg" method="post" action="{S_PM_ACTION}" style="margin:0px"> -						<span class="gensmall">{L_DISPLAY_MESSAGES}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" name="sort" value="{L_GO}" /> +						<span class="gensmall">{L_DISPLAY_MESSAGES}{L_COLON}</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" name="sort" value="{L_GO}" />  					{S_FORM_TOKEN}  					</form>  				<!-- ENDIF --> diff --git a/phpBB/styles/subsilver2/template/ucp_pm_options.html b/phpBB/styles/subsilver2/template/ucp_pm_options.html index 3ff18d8c15..beb867c75a 100644 --- a/phpBB/styles/subsilver2/template/ucp_pm_options.html +++ b/phpBB/styles/subsilver2/template/ucp_pm_options.html @@ -20,7 +20,7 @@  </tr>  <!-- IF S_CHECK_DEFINED -->  	<tr> -		<td class="row1" width="50" align="{S_CONTENT_FLOW_BEGIN}" valign="top"><b class="gen">{L_IF}:</b></td> +		<td class="row1" width="50" align="{S_CONTENT_FLOW_BEGIN}" valign="top"><b class="gen">{L_IF}{L_COLON}</b></td>  		<td class="row2" align="center" valign="top"><!-- IF S_CHECK_SELECT --><select name="check_option">{S_CHECK_OPTIONS}</select><!-- ELSE --><b class="gen">{CHECK_CURRENT}</b><input type="hidden" name="check_option" value="{CHECK_OPTION}" /><!-- ENDIF --></td>  		<td class="row1" width="50" align="{S_CONTENT_FLOW_END}" valign="top"><!-- IF S_CHECK_SELECT --><input type="submit" name="next" value="{L_NEXT_STEP}" class="btnlite" /><!-- ELSE --> <!-- ENDIF --></td>  	</tr> @@ -98,11 +98,11 @@  		<th colspan="2">{L_RENAME_FOLDER}</th>  	</tr>  	<tr> -		<td class="row1" width="200"><b class="gen">{L_RENAME_FOLDER}: </b></td> +		<td class="row1" width="200"><b class="gen">{L_RENAME_FOLDER}{L_COLON} </b></td>  		<td class="row1"><select name="rename_folder_id">{S_FOLDER_OPTIONS}</select></td>  	</tr>  	<tr> -		<td class="row1" width="200"><b class="gen">{L_NEW_FOLDER_NAME}: </b></td> +		<td class="row1" width="200"><b class="gen">{L_NEW_FOLDER_NAME}{L_COLON} </b></td>  		<td class="row1"><input type="text" class="post" name="new_folder_name" size="30" maxlength="30" /></td>  	</tr>  	<tr> @@ -124,7 +124,7 @@  	</tr>  <!-- ELSE -->  	<tr> -		<td class="row1" width="200"><b class="gen">{L_ADD_FOLDER}: </b></td> +		<td class="row1" width="200"><b class="gen">{L_ADD_FOLDER}{L_COLON} </b></td>  		<td class="row1"><input type="text" class="post" name="foldername" size="30" maxlength="30" /></td>  	</tr>  	<tr> @@ -142,7 +142,7 @@  		<th colspan="3">{L_REMOVE_FOLDER}</th>  	</tr>  	<tr> -		<td class="row1" width="200"><b class="gen">{L_REMOVE_FOLDER}: </b></td> +		<td class="row1" width="200"><b class="gen">{L_REMOVE_FOLDER}{L_COLON} </b></td>  		<td class="row1"><select name="remove_folder_id">{S_FOLDER_OPTIONS}</select></td>  		<td class="row1"><b class="genmed">{L_AND}</b></td>  	</tr> @@ -168,19 +168,19 @@  	<th colspan="2">{L_FOLDER_OPTIONS}</th>  </tr>  <tr> -	<td class="row1" width="200"><span><b class="genmed">{L_IF_FOLDER_FULL}: </b></span></td> +	<td class="row1" width="200"><span><b class="genmed">{L_IF_FOLDER_FULL}{L_COLON} </b></span></td>  	<td class="row1"><input type="radio" class="radio" name="full_action" value="1"{S_DELETE_CHECKED} /> <span class="genmed">{L_DELETE_OLDEST_MESSAGES}</span></td>  </tr>  <tr>  	<td class="row1" width="200"> </td> -	<td class="row1"><input type="radio" class="radio" name="full_action" value="2"{S_MOVE_CHECKED} /> <span class="genmed">{L_MOVE_TO_FOLDER}: </span><select name="full_move_to">{S_FULL_FOLDER_OPTIONS}</select></td> +	<td class="row1"><input type="radio" class="radio" name="full_action" value="2"{S_MOVE_CHECKED} /> <span class="genmed">{L_MOVE_TO_FOLDER}{L_COLON} </span><select name="full_move_to">{S_FULL_FOLDER_OPTIONS}</select></td>  </tr>  <tr>  	<td class="row1" width="200"> </td>  	<td class="row1"><input type="radio" class="radio" name="full_action" value="3"{S_HOLD_CHECKED} /> <span class="genmed">{L_HOLD_NEW_MESSAGES}</span></td>  </tr>  <tr> -	<td class="row2" width="200"><b class="genmed">{L_DEFAULT_ACTION}: </b><br /><span class="gensmall">{L_DEFAULT_ACTION_EXPLAIN}</span></td> +	<td class="row2" width="200"><b class="genmed">{L_DEFAULT_ACTION}{L_COLON} </b><br /><span class="gensmall">{L_DEFAULT_ACTION_EXPLAIN}</span></td>  	<td class="row2"><span class="genmed">{DEFAULT_ACTION}</span></td>  </tr>  <tr> diff --git a/phpBB/styles/subsilver2/template/ucp_pm_viewfolder.html b/phpBB/styles/subsilver2/template/ucp_pm_viewfolder.html index 64c923e72c..edcf553b84 100644 --- a/phpBB/styles/subsilver2/template/ucp_pm_viewfolder.html +++ b/phpBB/styles/subsilver2/template/ucp_pm_viewfolder.html @@ -22,11 +22,11 @@  		<th colspan="2" valign="middle">{L_OPTIONS}</th>  	</tr>  	<tr> -		<td class="row1" width="35%">{L_DELIMITER}: </td> +		<td class="row1" width="35%">{L_DELIMITER}{L_COLON} </td>  		<td class="row2"><input class="post" type="text" name="delimiter" value="," /></td>  	</tr>  	<tr> -		<td class="row1" width="35%">{L_ENCLOSURE}: </td> +		<td class="row1" width="35%">{L_ENCLOSURE}{L_COLON} </td>  		<td class="row2"><input class="post" type="text" name="enclosure" value=""" /></td>  	</tr>  	<tr> diff --git a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html index faaa3f9593..be1e27c5f3 100644 --- a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html +++ b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html @@ -8,23 +8,23 @@  <table class="tablebg" width="100%" cellspacing="1" cellpadding="4">  <tr class="row1"> -	<td class="genmed" nowrap="nowrap" width="150"><b>{L_PM_SUBJECT}:</b></td> +	<td class="genmed" nowrap="nowrap" width="150"><b>{L_PM_SUBJECT}{L_COLON}</b></td>  	<td class="gen">{SUBJECT}</td>  </tr>  <tr class="row1"> -	<td class="genmed" nowrap="nowrap" width="150"><b>{L_PM_FROM}:</b></td> +	<td class="genmed" nowrap="nowrap" width="150"><b>{L_PM_FROM}{L_COLON}</b></td>  	<td class="gen">{MESSAGE_AUTHOR_FULL}</td>  </tr>  <tr class="row1"> -	<td class="genmed" nowrap="nowrap" width="150"><b>{L_SENT_AT}:</b></td> +	<td class="genmed" nowrap="nowrap" width="150"><b>{L_SENT_AT}{L_COLON}</b></td>  	<td class="gen">{SENT_DATE}</td>  </tr>  <!-- IF S_TO_RECIPIENT -->  	<tr class="row1"> -		<td class="genmed" nowrap="nowrap" width="150"><b>{L_TO}:</b></td> +		<td class="genmed" nowrap="nowrap" width="150"><b>{L_TO}{L_COLON}</b></td>  		<td class="gen">  		<!-- BEGIN to_recipient -->  			<!-- IF to_recipient.IS_GROUP --><span class="sep"><a href="{to_recipient.U_VIEW}">{to_recipient.NAME}</a></span><!-- ELSE -->{to_recipient.NAME_FULL} <!-- ENDIF --> @@ -35,7 +35,7 @@  <!-- IF S_BCC_RECIPIENT -->  	<tr class="row1"> -		<td class="genmed" nowrap="nowrap" width="150"><b>{L_BCC}:</b></td> +		<td class="genmed" nowrap="nowrap" width="150"><b>{L_BCC}{L_COLON}</b></td>  		<td class="gen">  		<!-- BEGIN bcc_recipient -->  			<!-- IF bcc_recipient.IS_GROUP --><span class="sep"><a href="{bcc_recipient.U_VIEW}">{bcc_recipient.NAME}</a></span><!-- ELSE -->{bcc_recipient.NAME_FULL} <!-- ENDIF --> @@ -69,7 +69,7 @@  					<table class="tablebg" width="100%" cellspacing="1">  					<tr> -						<td class="row3"><b class="genmed">{L_ATTACHMENTS}: </b></td> +						<td class="row3"><b class="genmed">{L_ATTACHMENTS}{L_COLON} </b></td>  					</tr>  					<!-- BEGIN attachment -->  						<tr> diff --git a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html index 041fca48a7..fd0244a79d 100644 --- a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html +++ b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html @@ -74,13 +74,13 @@ hr.sep {  <table width="85%" cellspacing="3" cellpadding="0" border="0" align="center">  <tr> -	<td width="10%" nowrap="nowrap">{L_PM_FROM}: </td> +	<td width="10%" nowrap="nowrap">{L_PM_FROM}{L_COLON} </td>  	<td><b>{MESSAGE_AUTHOR}</b> [ {SENT_DATE} ]</td>  </tr>  <!-- IF S_TO_RECIPIENT -->  	<tr> -		<td width="10%" nowrap="nowrap">{L_TO}:</td> +		<td width="10%" nowrap="nowrap">{L_TO}{L_COLON}</td>  		<td>  		<!-- BEGIN to_recipient -->  			<span<!-- IF to_recipient.IS_GROUP --> class="sep"<!-- ENDIF -->>{to_recipient.NAME}</span>  @@ -91,7 +91,7 @@ hr.sep {  <!-- IF S_BCC_RECIPIENT -->  	<tr> -		<td width="10%" nowrap="nowrap">{L_BCC}:</td> +		<td width="10%" nowrap="nowrap">{L_BCC}{L_COLON}</td>  		<td>  		<!-- BEGIN bcc_recipient -->  			<!-- IF bcc_recipient.COLOUR --><span style="color:{bcc_recipient.COLOUR}"><!-- ELSE --><span<!-- IF bcc_recipient.IS_GROUP --> class="sep"<!-- ENDIF -->><!-- ENDIF -->{bcc_recipient.NAME}</span>  diff --git a/phpBB/styles/subsilver2/template/ucp_prefs_personal.html b/phpBB/styles/subsilver2/template/ucp_prefs_personal.html index bf0e67d68b..5a169763fb 100644 --- a/phpBB/styles/subsilver2/template/ucp_prefs_personal.html +++ b/phpBB/styles/subsilver2/template/ucp_prefs_personal.html @@ -30,50 +30,50 @@  	</tr>  <!-- ENDIF -->  <tr>  -	<td class="row1" width="50%"><b class="genmed">{L_SHOW_EMAIL}:</b></td> +	<td class="row1" width="50%"><b class="genmed">{L_SHOW_EMAIL}{L_COLON}</b></td>  	<td class="row2"><input type="radio" class="radio" name="viewemail" value="1"<!-- IF S_VIEW_EMAIL --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_YES}</span>  <input type="radio" class="radio" name="viewemail" value="0"<!-- IF not S_VIEW_EMAIL --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NO}</span></td>  </tr>  <tr>  -	<td class="row1" width="50%"><b class="genmed">{L_ADMIN_EMAIL}:</b></td> +	<td class="row1" width="50%"><b class="genmed">{L_ADMIN_EMAIL}{L_COLON}</b></td>  	<td class="row2"><input type="radio" class="radio" name="massemail" value="1"<!-- IF S_MASS_EMAIL --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_YES}</span>  <input type="radio" class="radio" name="massemail" value="0"<!-- IF not S_MASS_EMAIL --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NO}</span></td>  </tr>  <tr>  -	<td class="row1" width="50%"><b class="genmed">{L_ALLOW_PM}:</b><br /><span class="gensmall">{L_ALLOW_PM_EXPLAIN}</span></td> +	<td class="row1" width="50%"><b class="genmed">{L_ALLOW_PM}{L_COLON}</b><br /><span class="gensmall">{L_ALLOW_PM_EXPLAIN}</span></td>  	<td class="row2"><input type="radio" class="radio" name="allowpm" value="1"<!-- IF S_ALLOW_PM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_YES}</span>  <input type="radio" class="radio" name="allowpm" value="0"<!-- IF not S_ALLOW_PM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NO}</span></td>  </tr>  <!-- IF S_CAN_HIDE_ONLINE -->  	<tr>  -		<td class="row1" width="50%"><b class="genmed">{L_HIDE_ONLINE}:</b><br /><span class="gensmall">{L_HIDE_ONLINE_EXPLAIN}</span></td> +		<td class="row1" width="50%"><b class="genmed">{L_HIDE_ONLINE}{L_COLON}</b><br /><span class="gensmall">{L_HIDE_ONLINE_EXPLAIN}</span></td>  		<td class="row2"><input type="radio" class="radio" name="hideonline" value="1"<!-- IF S_HIDE_ONLINE --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_YES}</span>  <input type="radio" class="radio" name="hideonline" value="0"<!-- IF not S_HIDE_ONLINE --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NO}</span></td>  	</tr>  <!-- ENDIF -->  <!-- IF S_SELECT_NOTIFY -->  	<tr>  -		<td class="row1" width="50%"><b class="genmed">{L_NOTIFY_METHOD}:</b><br /><span class="gensmall">{L_NOTIFY_METHOD_EXPLAIN}</span></td> +		<td class="row1" width="50%"><b class="genmed">{L_NOTIFY_METHOD}{L_COLON}</b><br /><span class="gensmall">{L_NOTIFY_METHOD_EXPLAIN}</span></td>  		<td class="row2"><input type="radio" class="radio" name="notifymethod" value="0"<!-- IF S_NOTIFY_EMAIL --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NOTIFY_METHOD_EMAIL}</span>  <input type="radio" class="radio" name="notifymethod" value="1"<!-- IF S_NOTIFY_IM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NOTIFY_METHOD_IM}</span>  <input type="radio" class="radio" name="notifymethod" value="2"<!-- IF S_NOTIFY_BOTH --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NOTIFY_METHOD_BOTH}</span></td>  	</tr>  <!-- ENDIF -->  <tr>  -	<td class="row1" width="50%"><b class="genmed">{L_NOTIFY_ON_PM}:</b></td> +	<td class="row1" width="50%"><b class="genmed">{L_NOTIFY_ON_PM}{L_COLON}</b></td>  	<td class="row2"><input type="radio" class="radio" name="notifypm" value="1"<!-- IF S_NOTIFY_PM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_YES}</span>  <input type="radio" class="radio" name="notifypm" value="0"<!-- IF not S_NOTIFY_PM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NO}</span></td>  </tr>  <tr>  -	<td class="row1" width="50%"><b class="genmed">{L_POPUP_ON_PM}:</b></td> +	<td class="row1" width="50%"><b class="genmed">{L_POPUP_ON_PM}{L_COLON}</b></td>  	<td class="row2"><input type="radio" class="radio" name="popuppm" value="1"<!-- IF S_POPUP_PM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_YES}</span>  <input type="radio" class="radio" name="popuppm" value="0"<!-- IF not S_POPUP_PM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NO}</span></td>  </tr>  <tr> -	<td class="row1" width="50%"><b class="genmed">{L_BOARD_LANGUAGE}:</b></td> +	<td class="row1" width="50%"><b class="genmed">{L_BOARD_LANGUAGE}{L_COLON}</b></td>  	<td class="row2"><select name="lang">{S_LANG_OPTIONS}</select></td>  </tr>  <!-- IF S_STYLE_OPTIONS -->  <tr> -	<td class="row1" width="50%"><b class="genmed">{L_BOARD_STYLE}:</b></td> +	<td class="row1" width="50%"><b class="genmed">{L_BOARD_STYLE}{L_COLON}</b></td>  	<td class="row2"><select name="style">{S_STYLE_OPTIONS}</select></td>  </tr>  <!-- ENDIF -->  <!-- INCLUDE timezone_option.html -->  <tr> -	<td class="row1" width="50%"><b class="genmed">{L_BOARD_DATE_FORMAT}:</b><br /><span class="gensmall">{L_BOARD_DATE_FORMAT_EXPLAIN}</span></td> +	<td class="row1" width="50%"><b class="genmed">{L_BOARD_DATE_FORMAT}{L_COLON}</b><br /><span class="gensmall">{L_BOARD_DATE_FORMAT_EXPLAIN}</span></td>  	<td class="row2">  		<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} diff --git a/phpBB/styles/subsilver2/template/ucp_prefs_post.html b/phpBB/styles/subsilver2/template/ucp_prefs_post.html index 9f086fa8b5..03f1472942 100644 --- a/phpBB/styles/subsilver2/template/ucp_prefs_post.html +++ b/phpBB/styles/subsilver2/template/ucp_prefs_post.html @@ -10,19 +10,19 @@  	</tr>  <!-- ENDIF -->  <tr> -	<td class="row1" width="50%"><b class="genmed">{L_DEFAULT_BBCODE}:</b></td> +	<td class="row1" width="50%"><b class="genmed">{L_DEFAULT_BBCODE}{L_COLON}</b></td>  	<td class="row2"><input type="radio" class="radio" name="bbcode" value="1"<!-- IF S_BBCODE --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_YES}</span>   <input type="radio" class="radio" name="bbcode" value="0"<!-- IF not S_BBCODE --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_NO}</span></td>  </tr>  <tr> -	<td class="row1" width="50%"><b class="genmed">{L_DEFAULT_SMILIES}:</b></td> +	<td class="row1" width="50%"><b class="genmed">{L_DEFAULT_SMILIES}{L_COLON}</b></td>  	<td class="row2"><input type="radio" class="radio" name="smilies" value="1"<!-- IF S_SMILIES --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_YES}</span>   <input type="radio" class="radio" name="smilies" value="0"<!-- IF not S_SMILIES --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_NO}</span></td>  </tr>  <tr> -	<td class="row1" width="50%"><b class="genmed">{L_DEFAULT_ADD_SIG}:</b></td> +	<td class="row1" width="50%"><b class="genmed">{L_DEFAULT_ADD_SIG}{L_COLON}</b></td>  	<td class="row2"><input type="radio" class="radio" name="sig" value="1"<!-- IF S_SIG --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_YES}</span>   <input type="radio" class="radio" name="sig" value="0"<!-- IF not S_SIG --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_NO}</span></td>  </tr>  <tr> -	<td class="row1" width="50%"><b class="genmed">{L_DEFAULT_NOTIFY}:</b></td> +	<td class="row1" width="50%"><b class="genmed">{L_DEFAULT_NOTIFY}{L_COLON}</b></td>  	<td class="row2"><input type="radio" class="radio" name="notify" value="1"<!-- IF S_NOTIFY --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_YES}</span>   <input type="radio" class="radio" name="notify" value="0"<!-- IF not S_NOTIFY --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_NO}</span></td>  </tr>  <tr> diff --git a/phpBB/styles/subsilver2/template/ucp_prefs_view.html b/phpBB/styles/subsilver2/template/ucp_prefs_view.html index 7d8c7d4333..cc1b20a987 100644 --- a/phpBB/styles/subsilver2/template/ucp_prefs_view.html +++ b/phpBB/styles/subsilver2/template/ucp_prefs_view.html @@ -10,28 +10,28 @@  	</tr>  <!-- ENDIF -->  <tr> -	<td class="row1" width="50%"><b class="genmed">{L_VIEW_IMAGES}:</b></td> +	<td class="row1" width="50%"><b class="genmed">{L_VIEW_IMAGES}{L_COLON}</b></td>  	<td class="row2"><input type="radio" class="radio" name="images" value="1"<!-- IF S_IMAGES --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_YES}</span>   <input type="radio" class="radio" name="images" value="0"<!-- IF not S_IMAGES --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_NO}</span></td>  </tr>  <tr> -	<td class="row1" width="50%"><b class="genmed">{L_VIEW_FLASH}:</b></td> +	<td class="row1" width="50%"><b class="genmed">{L_VIEW_FLASH}{L_COLON}</b></td>  	<td class="row2"><input type="radio" class="radio" name="flash" value="1"<!-- IF S_FLASH --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_YES}</span>   <input type="radio" class="radio" name="flash" value="0"<!-- IF not S_FLASH --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_NO}</span></td>  </tr>  <tr> -	<td class="row1" width="50%"><b class="genmed">{L_VIEW_SMILIES}:</b></td> +	<td class="row1" width="50%"><b class="genmed">{L_VIEW_SMILIES}{L_COLON}</b></td>  	<td class="row2"><input type="radio" class="radio" name="smilies" value="1"<!-- IF S_SMILIES --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_YES}</span>   <input type="radio" class="radio" name="smilies" value="0"<!-- IF not S_SMILIES --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_NO}</span></td>  </tr>  <tr> -	<td class="row1" width="50%"><b class="genmed">{L_VIEW_SIGS}:</b></td> +	<td class="row1" width="50%"><b class="genmed">{L_VIEW_SIGS}{L_COLON}</b></td>  	<td class="row2"><input type="radio" class="radio" name="sigs" value="1"<!-- IF S_SIGS --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_YES}</span>   <input type="radio" class="radio" name="sigs" value="0"<!-- IF not S_SIGS --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_NO}</span></td>  </tr>  <tr> -	<td class="row1" width="50%"><b class="genmed">{L_VIEW_AVATARS}:</b></td> +	<td class="row1" width="50%"><b class="genmed">{L_VIEW_AVATARS}{L_COLON}</b></td>  	<td class="row2"><input type="radio" class="radio" name="avatars" value="1"<!-- IF S_AVATARS --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_YES}</span>   <input type="radio" class="radio" name="avatars" value="0"<!-- IF not S_AVATARS --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_NO}</span></td>  </tr>  <!-- IF S_CHANGE_CENSORS -->  	<tr> -		<td class="row1" width="50%"><b class="genmed">{L_DISABLE_CENSORS}:</b></td> +		<td class="row1" width="50%"><b class="genmed">{L_DISABLE_CENSORS}{L_COLON}</b></td>  		<td class="row2"><input type="radio" class="radio" name="wordcensor" value="1"<!-- IF S_DISABLE_CENSORS --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_YES}</span>   <input type="radio" class="radio" name="wordcensor" value="0"<!-- IF not S_DISABLE_CENSORS --> checked="checked"<!-- ENDIF --> /><span class="gen">{L_NO}</span></td>  	</tr>  <!-- ENDIF --> @@ -39,30 +39,30 @@  	<td colspan="2" class="spacer"></td>  </tr>  <tr> -	<td class="row1" width="50%"><b class="genmed">{L_VIEW_TOPICS_DAYS}:</b></td> +	<td class="row1" width="50%"><b class="genmed">{L_VIEW_TOPICS_DAYS}{L_COLON}</b></td>  	<td class="row2">{S_TOPIC_SORT_DAYS}</td>  </tr>  <tr> -	<td class="row1" width="50%"><b class="genmed">{L_VIEW_TOPICS_KEY}:</b></td> +	<td class="row1" width="50%"><b class="genmed">{L_VIEW_TOPICS_KEY}{L_COLON}</b></td>  	<td class="row2">{S_TOPIC_SORT_KEY}</td>  </tr>  <tr> -	<td class="row1" width="50%"><b class="genmed">{L_VIEW_TOPICS_DIR}:</b></td> +	<td class="row1" width="50%"><b class="genmed">{L_VIEW_TOPICS_DIR}{L_COLON}</b></td>  	<td class="row2">{S_TOPIC_SORT_DIR}</td>  </tr>  <tr>  	<td colspan="2" class="spacer"></td>  </tr>  <tr> -	<td class="row1" width="50%"><b class="genmed">{L_VIEW_POSTS_DAYS}:</b></td> +	<td class="row1" width="50%"><b class="genmed">{L_VIEW_POSTS_DAYS}{L_COLON}</b></td>  	<td class="row2">{S_POST_SORT_DAYS}</td>  </tr>  <tr> -	<td class="row1" width="50%"><b class="genmed">{L_VIEW_POSTS_KEY}:</b></td> +	<td class="row1" width="50%"><b class="genmed">{L_VIEW_POSTS_KEY}{L_COLON}</b></td>  	<td class="row2">{S_POST_SORT_KEY}</td>  </tr>  <tr> -	<td class="row1" width="50%"><b class="genmed">{L_VIEW_POSTS_DIR}:</b></td> +	<td class="row1" width="50%"><b class="genmed">{L_VIEW_POSTS_DIR}{L_COLON}</b></td>  	<td class="row2">{S_POST_SORT_DIR}</td>  </tr>  <tr> diff --git a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html index 3101cb9c18..160f8a2399 100644 --- a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html +++ b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html @@ -10,7 +10,7 @@  	</tr>  <!-- ENDIF -->  <tr>  -	<td class="row1" width="35%"><b class="genmed">{L_CURRENT_IMAGE}: </b><br /><span class="gensmall">{L_AVATAR_EXPLAIN}</span></td> +	<td class="row1" width="35%"><b class="genmed">{L_CURRENT_IMAGE}{L_COLON} </b><br /><span class="gensmall">{L_AVATAR_EXPLAIN}</span></td>  	<td class="row2" align="center"><br />  		<!-- IF AVATAR -->{AVATAR}<br /><br /><input type="checkbox" class="radio" name="delete" /> <span class="gensmall">{L_DELETE_AVATAR}</span>  		<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /> @@ -23,29 +23,29 @@  <!-- ENDIF -->  <!-- IF S_UPLOAD_AVATAR_FILE -->  	<tr>  -		<td class="row1" width="35%"><b class="genmed">{L_UPLOAD_AVATAR_FILE}: </b></td> +		<td class="row1" width="35%"><b class="genmed">{L_UPLOAD_AVATAR_FILE}{L_COLON} </b></td>  		<td class="row2"><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_SIZE}" /><input class="post" type="file" name="uploadfile" /></td>  	</tr>  <!-- ENDIF -->  <!-- IF S_UPLOAD_AVATAR_URL -->  	<tr>  -		<td class="row1" width="35%"><b class="genmed">{L_UPLOAD_AVATAR_URL}: </b><br /><span class="gensmall">{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></td> +		<td class="row1" width="35%"><b class="genmed">{L_UPLOAD_AVATAR_URL}{L_COLON} </b><br /><span class="gensmall">{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></td>  		<td class="row2"><input class="post" type="text" name="uploadurl" size="40" value="{AVATAR_URL}" /></td>  	</tr>  <!-- ENDIF -->  <!-- IF S_LINK_AVATAR -->  	<tr>  -		<td class="row1" width="35%"><b class="genmed">{L_LINK_REMOTE_AVATAR}: </b><br /><span class="gensmall">{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></td> +		<td class="row1" width="35%"><b class="genmed">{L_LINK_REMOTE_AVATAR}{L_COLON} </b><br /><span class="gensmall">{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></td>  		<td class="row2"><input class="post" type="text" name="remotelink" size="40" value="{AVATAR_REMOTE}" /></td>  	</tr>  	<tr>  -		<td class="row1" width="35%"><b class="genmed">{L_LINK_REMOTE_SIZE}: </b><br /><span class="gensmall">{L_LINK_REMOTE_SIZE_EXPLAIN}</span></td> +		<td class="row1" width="35%"><b class="genmed">{L_LINK_REMOTE_SIZE}{L_COLON} </b><br /><span class="gensmall">{L_LINK_REMOTE_SIZE_EXPLAIN}</span></td>  		<td class="row2"><input class="post" type="text" name="width" size="3" value="{AVATAR_WIDTH}" /> <span class="gen">{L_PIXEL} × </span> <input class="post" type="text" name="height" size="3" value="{AVATAR_HEIGHT}" /> <span class="gen">{L_PIXEL}</span></td>  	</tr>  <!-- ENDIF -->  <!-- IF S_DISPLAY_GALLERY -->  	<tr>  -		<td class="row1" width="35%"><b class="genmed">{L_AVATAR_GALLERY}: </b></td> +		<td class="row1" width="35%"><b class="genmed">{L_AVATAR_GALLERY}{L_COLON} </b></td>  		<td class="row2"><strong><a href="{U_GALLERY}">{L_DISPLAY_GALLERY}</a></strong></td>  	</tr>  <!-- ENDIF --> @@ -55,7 +55,7 @@  		<th colspan="2">{L_AVATAR_GALLERY}</th>  	</tr>  	<tr>  -		<td class="cat" colspan="2" align="center" valign="middle"><span class="genmed">{L_AVATAR_CATEGORY}: </span><select name="category">{S_CAT_OPTIONS}</select>  <input class="btnlite" tabindex="0" type="submit" value="{L_GO}" name="display_gallery" /></td> +		<td class="cat" colspan="2" align="center" valign="middle"><span class="genmed">{L_AVATAR_CATEGORY}{L_COLON} </span><select name="category">{S_CAT_OPTIONS}</select>  <input class="btnlite" tabindex="0" type="submit" value="{L_GO}" name="display_gallery" /></td>  	</tr>  	<tr>   		<td class="row1" colspan="2" align="center"> diff --git a/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html b/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html index 6d5e65a050..19259aebc8 100644 --- a/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html +++ b/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html @@ -13,51 +13,51 @@  	<td class="row1" colspan="2"><span class="gensmall">{L_PROFILE_INFO_NOTICE}</span></td>  </tr>  <tr>  -	<td class="row1" width="35%"><b class="genmed">{L_UCP_ICQ}: </b></td> +	<td class="row1" width="35%"><b class="genmed">{L_UCP_ICQ}{L_COLON} </b></td>  	<td class="row2"><input class="post" type="text" name="icq" size="30" maxlength="15" value="{ICQ}" /></td>  </tr>  <tr>  -	<td class="row1" width="35%"><b class="genmed">{L_UCP_AIM}: </b></td> +	<td class="row1" width="35%"><b class="genmed">{L_UCP_AIM}{L_COLON} </b></td>  	<td class="row2"><input class="post" type="text" name="aim" size="30" maxlength="255" value="{AIM}" /></td>  </tr>  <tr>  -	<td class="row1" width="35%"><b class="genmed">{L_UCP_MSNM}: </b></td> +	<td class="row1" width="35%"><b class="genmed">{L_UCP_MSNM}{L_COLON} </b></td>  	<td class="row2"><input class="post" type="text" name="msn" size="30" maxlength="255" value="{MSN}" /></td>  </tr>  <tr>  -	<td class="row1" width="35%"><b class="genmed">{L_UCP_YIM}: </b></td> +	<td class="row1" width="35%"><b class="genmed">{L_UCP_YIM}{L_COLON} </b></td>  	<td class="row2"><input class="post" type="text" name="yim" size="30" maxlength="255" value="{YIM}" /></td>  </tr>  <tr>  -	<td class="row1" width="35%"><b class="genmed">{L_UCP_JABBER}: </b></td> +	<td class="row1" width="35%"><b class="genmed">{L_UCP_JABBER}{L_COLON} </b></td>  	<td class="row2"><input class="post" type="text" name="jabber" size="30" maxlength="255" value="{JABBER}" /></td>  </tr>  <tr>  -	<td class="row1" width="35%"><b class="genmed">{L_WEBSITE}: </b></td> +	<td class="row1" width="35%"><b class="genmed">{L_WEBSITE}{L_COLON} </b></td>  	<td class="row2"><input class="post" type="text" name="website" size="30" maxlength="255" value="{WEBSITE}" /></td>  </tr>  <tr>  -	<td class="row1" width="35%"><b class="genmed">{L_LOCATION}: </b></td> +	<td class="row1" width="35%"><b class="genmed">{L_LOCATION}{L_COLON} </b></td>  	<td class="row2"><input class="post" type="text" name="location" size="30" maxlength="100" value="{LOCATION}" /></td>  </tr>  <tr>  -	<td class="row1" width="35%"><b class="genmed">{L_OCCUPATION}: </b></td> +	<td class="row1" width="35%"><b class="genmed">{L_OCCUPATION}{L_COLON} </b></td>  	<td class="row2"><textarea class="post" name="occupation" rows="3" cols="30">{OCCUPATION}</textarea></td>  </tr>  <tr>  -	<td class="row1" width="35%"><b class="genmed">{L_INTERESTS}: </b></td> +	<td class="row1" width="35%"><b class="genmed">{L_INTERESTS}{L_COLON} </b></td>  	<td class="row2"><textarea class="post" name="interests" rows="3" cols="30">{INTERESTS}</textarea></td>  </tr>  <!-- IF S_BIRTHDAYS_ENABLED -->  	<tr>  -		<td class="row1" width="35%"><b class="genmed">{L_BIRTHDAY}: </b><br /><span class="gensmall">{L_BIRTHDAY_EXPLAIN}</span></td> -		<td class="row2"><span class="genmed">{L_DAY}:</span> <select name="bday_day">{S_BIRTHDAY_DAY_OPTIONS}</select> <span class="genmed">{L_MONTH}:</span> <select name="bday_month">{S_BIRTHDAY_MONTH_OPTIONS}</select> <span class="genmed">{L_YEAR}:</span> <select name="bday_year">{S_BIRTHDAY_YEAR_OPTIONS}</select></td> +		<td class="row1" width="35%"><b class="genmed">{L_BIRTHDAY}{L_COLON} </b><br /><span class="gensmall">{L_BIRTHDAY_EXPLAIN}</span></td> +		<td class="row2"><span class="genmed">{L_DAY}{L_COLON}</span> <select name="bday_day">{S_BIRTHDAY_DAY_OPTIONS}</select> <span class="genmed">{L_MONTH}{L_COLON}</span> <select name="bday_month">{S_BIRTHDAY_MONTH_OPTIONS}</select> <span class="genmed">{L_YEAR}{L_COLON}</span> <select name="bday_year">{S_BIRTHDAY_YEAR_OPTIONS}</select></td>  	</tr>  <!-- ENDIF -->  <!-- BEGIN profile_fields -->  	<tr>   		<td class="row1" width="35%"> -			<b class="genmed">{profile_fields.LANG_NAME}: </b> +			<b class="genmed">{profile_fields.LANG_NAME}{L_COLON} </b>  			<!-- IF profile_fields.S_REQUIRED --><b>*</b><!-- ENDIF -->  			<!-- IF profile_fields.LANG_EXPLAIN --><br /><span class="gensmall">{profile_fields.LANG_EXPLAIN}</span><!-- ENDIF -->  		</td> diff --git a/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html b/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html index 71b34499d1..5b65fdb8af 100644 --- a/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html +++ b/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html @@ -15,20 +15,20 @@  	</tr>  <!-- ENDIF -->  <tr> -	<td class="row1" width="35%"><b class="genmed">{L_USERNAME}: </b><br /><span class="gensmall">{L_USERNAME_EXPLAIN}</span></td> +	<td class="row1" width="35%"><b class="genmed">{L_USERNAME}{L_COLON} </b><br /><span class="gensmall">{L_USERNAME_EXPLAIN}</span></td>  	<td class="row2"><!-- IF S_CHANGE_USERNAME --><input type="text" class="post" name="username" size="30" value="{USERNAME}" /><!-- ELSE --><b class="gen">{USERNAME}</b><!-- ENDIF --></td>  </tr>  <tr> -	<td class="row1" width="35%"><b class="genmed">{L_EMAIL_ADDRESS}: </b></td> +	<td class="row1" width="35%"><b class="genmed">{L_EMAIL_ADDRESS}{L_COLON} </b></td>  	<td class="row2"><!-- IF S_CHANGE_EMAIL --><input type="text" class="post" name="email" size="30" maxlength="100" value="{EMAIL}" /><!-- ELSE --><b class="gen">{EMAIL}</b><!-- ENDIF --></td>  </tr>  <!-- IF S_CHANGE_PASSWORD -->  	<tr> -		<td class="row1" width="35%"><b class="genmed">{L_NEW_PASSWORD}: </b><br /><span class="gensmall">{L_CHANGE_PASSWORD_EXPLAIN}</span></td> +		<td class="row1" width="35%"><b class="genmed">{L_NEW_PASSWORD}{L_COLON} </b><br /><span class="gensmall">{L_CHANGE_PASSWORD_EXPLAIN}</span></td>  		<td class="row2"><input type="password" class="post" name="new_password" size="30" maxlength="255" value="{NEW_PASSWORD}" /></td>  	</tr>  	<tr> -		<td class="row1" width="35%"><b class="genmed">{L_CONFIRM_PASSWORD}: </b><br /><span class="gensmall">{L_CONFIRM_PASSWORD_EXPLAIN}</span></td> +		<td class="row1" width="35%"><b class="genmed">{L_CONFIRM_PASSWORD}{L_COLON} </b><br /><span class="gensmall">{L_CONFIRM_PASSWORD_EXPLAIN}</span></td>  		<td class="row2"><input type="password" class="post" name="password_confirm" size="30" maxlength="255" value="{PASSWORD_CONFIRM}" /></td>  	</tr>  <!-- ENDIF --> @@ -36,7 +36,7 @@  	<th colspan="2">{L_CONFIRM_CHANGES}</th>  </tr>  <tr> -	<td class="row1" width="35%"><b class="genmed">{L_CURRENT_PASSWORD}: </b><br /><span class="gensmall"><!-- IF S_CHANGE_PASSWORD -->{L_CURRENT_CHANGE_PASSWORD_EXPLAIN}<!-- ELSE -->{L_CURRENT_PASSWORD_EXPLAIN}<!-- ENDIF --></span></td> +	<td class="row1" width="35%"><b class="genmed">{L_CURRENT_PASSWORD}{L_COLON} </b><br /><span class="gensmall"><!-- IF S_CHANGE_PASSWORD -->{L_CURRENT_CHANGE_PASSWORD_EXPLAIN}<!-- ELSE -->{L_CURRENT_PASSWORD_EXPLAIN}<!-- ENDIF --></span></td>  	<td class="row2"><input type="password" class="post" name="cur_password" size="30" maxlength="255" value="{CUR_PASSWORD}" /></td>  </tr>  <tr> diff --git a/phpBB/styles/subsilver2/template/ucp_register.html b/phpBB/styles/subsilver2/template/ucp_register.html index 095c97ed49..01808dfc69 100644 --- a/phpBB/styles/subsilver2/template/ucp_register.html +++ b/phpBB/styles/subsilver2/template/ucp_register.html @@ -34,23 +34,23 @@  <!-- ENDIF -->  <tr> -	<td class="row1" width="38%"><b class="genmed">{L_USERNAME}: </b><br /><span class="gensmall">{L_USERNAME_EXPLAIN}</span></td> +	<td class="row1" width="38%"><b class="genmed">{L_USERNAME}{L_COLON} </b><br /><span class="gensmall">{L_USERNAME_EXPLAIN}</span></td>  	<td class="row2"><input class="post" type="text" name="username" size="25" value="{USERNAME}" /></td>  </tr>  <tr> -	<td class="row1"><b class="genmed">{L_EMAIL_ADDRESS}: </b></td> +	<td class="row1"><b class="genmed">{L_EMAIL_ADDRESS}{L_COLON} </b></td>  	<td class="row2"><input class="post" type="text" name="email" size="25" maxlength="100" value="{EMAIL}" /></td>  </tr>  <tr> -	<td class="row1"><b class="genmed">{L_PASSWORD}: </b><br /><span class="gensmall">{L_PASSWORD_EXPLAIN}</span></td> +	<td class="row1"><b class="genmed">{L_PASSWORD}{L_COLON} </b><br /><span class="gensmall">{L_PASSWORD_EXPLAIN}</span></td>  	<td class="row2"><input class="post" type="password" name="new_password" size="25" value="{PASSWORD}" /></td>  </tr>  <tr> -	<td class="row1"><b class="genmed">{L_CONFIRM_PASSWORD}: </b></td> +	<td class="row1"><b class="genmed">{L_CONFIRM_PASSWORD}{L_COLON} </b></td>  	<td class="row2"><input class="post" type="password" name="password_confirm" size="25" value="{PASSWORD_CONFIRM}" /></td>  </tr>  <tr> -	<td class="row1"><b class="genmed">{L_LANGUAGE}: </b></td> +	<td class="row1"><b class="genmed">{L_LANGUAGE}{L_COLON} </b></td>  	<td class="row2"><select name="lang" onchange="change_language(this.value); return false;">{S_LANG_OPTIONS}</select></td>  </tr> @@ -63,7 +63,7 @@  <!-- BEGIN profile_fields -->  	<tr>  		<td class="row1" width="35%"> -			<b class="genmed">{profile_fields.LANG_NAME}: </b> +			<b class="genmed">{profile_fields.LANG_NAME}{L_COLON} </b>  			<!-- IF profile_fields.S_REQUIRED --><b>*</b><!-- ENDIF -->  			<!-- IF profile_fields.LANG_EXPLAIN --><br /><span class="gensmall">{profile_fields.LANG_EXPLAIN}</span><!-- ENDIF -->  		</td> diff --git a/phpBB/styles/subsilver2/template/ucp_remind.html b/phpBB/styles/subsilver2/template/ucp_remind.html index bf3ded394c..5151ccfad3 100644 --- a/phpBB/styles/subsilver2/template/ucp_remind.html +++ b/phpBB/styles/subsilver2/template/ucp_remind.html @@ -9,11 +9,11 @@  	<th colspan="2">{L_SEND_PASSWORD}</th>  </tr>  <tr>  -	<td class="row1" width="38%"><b class="genmed">{L_USERNAME}: </b></td> +	<td class="row1" width="38%"><b class="genmed">{L_USERNAME}{L_COLON} </b></td>  	<td class="row2"><input type="text" class="post" name="username" size="25" value="{USERNAME}" /></td>  </tr>  <tr>  -	<td class="row1"><b class="genmed">{L_EMAIL_ADDRESS}: </b><br /><span class="gensmall">{L_EMAIL_REMIND}</span></td> +	<td class="row1"><b class="genmed">{L_EMAIL_ADDRESS}{L_COLON} </b><br /><span class="gensmall">{L_EMAIL_REMIND}</span></td>  	<td class="row2"><input type="text" class="post" name="email" size="25" maxlength="100" value="{EMAIL}" /></td>  </tr>  <tr>  diff --git a/phpBB/styles/subsilver2/template/ucp_resend.html b/phpBB/styles/subsilver2/template/ucp_resend.html index 3180334180..7e88f6ede2 100644 --- a/phpBB/styles/subsilver2/template/ucp_resend.html +++ b/phpBB/styles/subsilver2/template/ucp_resend.html @@ -9,11 +9,11 @@  	<th colspan="2">{L_UCP_RESEND}</th>  </tr>  <tr> -	<td class="row1" width="38%"><b class="genmed">{L_USERNAME}: </b></td> +	<td class="row1" width="38%"><b class="genmed">{L_USERNAME}{L_COLON} </b></td>  	<td class="row2"><input type="text" class="post" name="username" size="25" value="{USERNAME}" /></td>  </tr>  <tr> -	<td class="row1"><b class="genmed">{L_EMAIL_ADDRESS}: </b><br /><span class="gensmall">{L_EMAIL_REMIND}</span></td> +	<td class="row1"><b class="genmed">{L_EMAIL_ADDRESS}{L_COLON} </b><br /><span class="gensmall">{L_EMAIL_REMIND}</span></td>  	<td class="row2"><input type="text" class="post" name="email" size="25" maxlength="100" value="{EMAIL}" /></td>  </tr>  <tr> diff --git a/phpBB/styles/subsilver2/template/ucp_zebra_foes.html b/phpBB/styles/subsilver2/template/ucp_zebra_foes.html index fb1167654e..6149a80e69 100644 --- a/phpBB/styles/subsilver2/template/ucp_zebra_foes.html +++ b/phpBB/styles/subsilver2/template/ucp_zebra_foes.html @@ -13,11 +13,11 @@  	</tr>  <!-- ENDIF -->  <tr> -	<td class="row1" width="40%"><b class="genmed">{L_YOUR_FOES}:</b><br /><span class="gensmall">{L_YOUR_FOES_EXPLAIN}</span></td> +	<td class="row1" width="40%"><b class="genmed">{L_YOUR_FOES}{L_COLON}</b><br /><span class="gensmall">{L_YOUR_FOES_EXPLAIN}</span></td>  	<td class="row2" align="center"><!-- IF S_USERNAME_OPTIONS --><select name="usernames[]" multiple="multiple" size="5">{S_USERNAME_OPTIONS}</select><!-- ELSE --><b class="genmed">{L_NO_FOES}</b><!-- ENDIF --></td>  </tr>  <tr> -	<td class="row1"><b class="genmed">{L_ADD_FOES}:</b><br /><span class="gensmall">{L_ADD_FOES_EXPLAIN} [ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</span></td> +	<td class="row1"><b class="genmed">{L_ADD_FOES}{L_COLON}</b><br /><span class="gensmall">{L_ADD_FOES_EXPLAIN} [ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</span></td>  	<td class="row2" align="center"><textarea name="add" rows="5" cols="30">{USERNAMES}</textarea><br /></td>  </tr>  <tr> diff --git a/phpBB/styles/subsilver2/template/ucp_zebra_friends.html b/phpBB/styles/subsilver2/template/ucp_zebra_friends.html index 6ba4f0f671..45280a35c5 100644 --- a/phpBB/styles/subsilver2/template/ucp_zebra_friends.html +++ b/phpBB/styles/subsilver2/template/ucp_zebra_friends.html @@ -13,11 +13,11 @@  	</tr>  <!-- ENDIF -->  <tr> -	<td class="row1" width="40%"><b class="genmed">{L_YOUR_FRIENDS}:</b><br /><span class="gensmall">{L_YOUR_FRIENDS_EXPLAIN}</span></td> +	<td class="row1" width="40%"><b class="genmed">{L_YOUR_FRIENDS}{L_COLON}</b><br /><span class="gensmall">{L_YOUR_FRIENDS_EXPLAIN}</span></td>  	<td class="row2" align="center"><!-- IF S_USERNAME_OPTIONS --><select name="usernames[]" multiple="multiple" size="5">{S_USERNAME_OPTIONS}</select><!-- ELSE --><b class="genmed">{L_NO_FRIENDS}</b><!-- ENDIF --></td>  </tr>  <tr> -	<td class="row1"><b class="genmed">{L_ADD_FRIENDS}:</b><br /><span class="gensmall">{L_ADD_FRIENDS_EXPLAIN} [ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</span></td> +	<td class="row1"><b class="genmed">{L_ADD_FRIENDS}{L_COLON}</b><br /><span class="gensmall">{L_ADD_FRIENDS_EXPLAIN} [ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</span></td>  	<td class="row2" align="center"><textarea name="add" rows="5" cols="30">{USERNAMES}</textarea><br /></td>  </tr>  <tr> diff --git a/phpBB/styles/subsilver2/template/viewforum_body.html b/phpBB/styles/subsilver2/template/viewforum_body.html index 7f241ce874..c5e66a07ca 100644 --- a/phpBB/styles/subsilver2/template/viewforum_body.html +++ b/phpBB/styles/subsilver2/template/viewforum_body.html @@ -41,7 +41,7 @@  			<!-- ENDIF -->  			<td class="row1">  				<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}" class="imageset">{NEWEST_POST_IMG}</a><!-- ENDIF --> -				{topicrow.ATTACH_ICON_IMG} <!-- IF topicrow.S_HAS_POLL or topicrow.S_TOPIC_MOVED --><b>{topicrow.TOPIC_TYPE}</b> <!-- ENDIF --><a title="{L_POSTED}: {topicrow.FIRST_POST_TIME}" href="{topicrow.U_VIEW_TOPIC}"class="topictitle">{topicrow.TOPIC_TITLE}</a> +				{topicrow.ATTACH_ICON_IMG} <!-- IF topicrow.S_HAS_POLL or topicrow.S_TOPIC_MOVED --><b>{topicrow.TOPIC_TYPE}</b> <!-- ENDIF --><a title="{L_POSTED}{L_COLON} {topicrow.FIRST_POST_TIME}" href="{topicrow.U_VIEW_TOPIC}"class="topictitle">{topicrow.TOPIC_TITLE}</a>  				<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED -->  					<a href="{topicrow.U_MCP_QUEUE}" class="imageset">{UNAPPROVED_IMG}</a>   				<!-- ENDIF --> @@ -49,11 +49,11 @@  					<a href="{topicrow.U_MCP_REPORT}" class="imageset">{REPORTED_IMG}</a>   				<!-- ENDIF -->  				<!-- IF .topicrow.pagination --> -					<p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}:  +					<p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}{L_COLON}  					<!-- BEGIN pagination -->  						<!-- IF topicrow.pagination.S_IS_PREV -->  						<!-- ELSEIF topicrow.pagination.S_IS_CURRENT --><strong>{topicrow.pagination.PAGE_NUMBER}</strong> -						<!-- ELSEIF topicrow.pagination.S_IS_ELLIPSIS --> {L_ELLIPSIS}  +						<!-- ELSEIF topicrow.pagination.S_IS_ELLIPSIS --> {L_ELLIPSIS}  						<!-- ELSEIF topicrow.pagination.S_IS_NEXT -->  						<!-- ELSE --><a href="{topicrow.pagination.PAGE_URL}">{topicrow.pagination.PAGE_NUMBER}</a>  						<!-- ENDIF --> @@ -101,7 +101,7 @@  		<h2><a class="titles" href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2>  		<!-- IF MODERATORS --> -			<p class="moderators"><!-- IF S_SINGLE_MODERATOR -->{L_MODERATOR}<!-- ELSE -->{L_MODERATORS}<!-- ENDIF -->: {MODERATORS}</p> +			<p class="moderators"><!-- IF S_SINGLE_MODERATOR -->{L_MODERATOR}<!-- ELSE -->{L_MODERATORS}<!-- ENDIF -->{L_COLON} {MODERATORS}</p>  		<!-- ENDIF -->  		<!-- IF U_MCP -->  			<p class="linkmcp">[ <a href="{U_MCP}">{L_MCP}</a> ]</p> @@ -131,7 +131,7 @@  			<td class="cat"><h4><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a></h4></td>  		</tr>  		<tr> -			<td class="row1" align="center"><span class="genmed">{L_USERNAME}:</span> <input class="post" type="text" name="username" size="10" />  <span class="genmed">{L_PASSWORD}:</span> <input class="post" type="password" name="password" size="10" /><!-- IF S_AUTOLOGIN_ENABLED -->  <span class="gensmall">{L_LOG_ME_IN}</span> <input type="checkbox" class="radio" name="autologin" /><!-- ENDIF -->  <input type="submit" class="btnmain" name="login" value="{L_LOGIN}" /></td> +			<td class="row1" align="center"><span class="genmed">{L_USERNAME}{L_COLON}</span> <input class="post" type="text" name="username" size="10" />  <span class="genmed">{L_PASSWORD}{L_COLON}</span> <input class="post" type="password" name="password" size="10" /><!-- IF S_AUTOLOGIN_ENABLED -->  <span class="gensmall">{L_LOG_ME_IN}</span> <input type="checkbox" class="radio" name="autologin" /><!-- ENDIF -->  <input type="submit" class="btnmain" name="login" value="{L_LOGIN}" /></td>  		</tr>  		</table>  		{S_LOGIN_REDIRECT} @@ -201,7 +201,7 @@  				<!-- ENDIF -->  				<td class="row1">  					<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}" class="imageset">{NEWEST_POST_IMG}</a><!-- ENDIF --> -					{topicrow.ATTACH_ICON_IMG} <!-- IF topicrow.S_HAS_POLL or topicrow.S_TOPIC_MOVED --><b>{topicrow.TOPIC_TYPE}</b> <!-- ENDIF --><a title="{L_POSTED}: {topicrow.FIRST_POST_TIME}" href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a> +					{topicrow.ATTACH_ICON_IMG} <!-- IF topicrow.S_HAS_POLL or topicrow.S_TOPIC_MOVED --><b>{topicrow.TOPIC_TYPE}</b> <!-- ENDIF --><a title="{L_POSTED}{L_COLON} {topicrow.FIRST_POST_TIME}" href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>  					<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED -->  						<a href="{topicrow.U_MCP_QUEUE}" class="imageset">{topicrow.UNAPPROVED_IMG}</a>   					<!-- ENDIF --> @@ -209,11 +209,11 @@  						<a href="{topicrow.U_MCP_REPORT}" class="imageset">{REPORTED_IMG}</a>   					<!-- ENDIF -->  					<!-- IF .topicrow.pagination --> -						<p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}:  +						<p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}{L_COLON}  						<!-- BEGIN pagination -->  							<!-- IF topicrow.pagination.S_IS_PREV -->  							<!-- ELSEIF topicrow.pagination.S_IS_CURRENT --><strong>{topicrow.pagination.PAGE_NUMBER}</strong> -							<!-- ELSEIF topicrow.pagination.S_IS_ELLIPSIS --> {L_ELLIPSIS}  +							<!-- ELSEIF topicrow.pagination.S_IS_ELLIPSIS --> {L_ELLIPSIS}  							<!-- ELSEIF topicrow.pagination.S_IS_NEXT -->  							<!-- ELSE --><a href="{topicrow.pagination.PAGE_URL}">{topicrow.pagination.PAGE_NUMBER}</a>  							<!-- ENDIF --> @@ -252,7 +252,7 @@  			<!-- ELSE -->  				<td class="cat" colspan="6">  			<!-- ENDIF --> -					<form method="post" action="{S_FORUM_ACTION}"><span class="gensmall">{L_DISPLAY_TOPICS}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" name="sort" value="{L_GO}" /></form> +					<form method="post" action="{S_FORUM_ACTION}"><span class="gensmall">{L_DISPLAY_TOPICS}{L_COLON}</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" name="sort" value="{L_GO}" /></form>  				</td>  		</tr>  		<!-- ENDIF --> diff --git a/phpBB/styles/subsilver2/template/viewonline_body.html b/phpBB/styles/subsilver2/template/viewonline_body.html index 9820124375..70b8b52efa 100644 --- a/phpBB/styles/subsilver2/template/viewonline_body.html +++ b/phpBB/styles/subsilver2/template/viewonline_body.html @@ -21,7 +21,7 @@  </tr>  <!-- BEGIN user_row -->  	<tr> -		<td class="row1"><p class="gen">{user_row.USERNAME_FULL}</p><!-- IF user_row.USER_IP --><p class="gensmall">{L_IP}: <a href="{user_row.U_USER_IP}">{user_row.USER_IP}</a> » <a href="{user_row.U_WHOIS}" onclick="popup(this.href, 750, 500); return false;">{L_WHOIS}</a></p><!-- ENDIF --> +		<td class="row1"><p class="gen">{user_row.USERNAME_FULL}</p><!-- IF user_row.USER_IP --><p class="gensmall">{L_IP}{L_COLON} <a href="{user_row.U_USER_IP}">{user_row.USER_IP}</a> » <a href="{user_row.U_WHOIS}" onclick="popup(this.href, 750, 500); return false;">{L_WHOIS}</a></p><!-- ENDIF -->  			<!-- IF user_row.USER_BROWSER -->{user_row.USER_BROWSER}<!-- ENDIF --></td>  		<td class="row2" align="center" nowrap="nowrap"><p class="genmed"> {user_row.LASTUPDATE}</p></td>  		<td class="row1"><p class="genmed"><a href="{user_row.U_FORUM_LOCATION}">{user_row.FORUM_LOCATION}</a></p></td> diff --git a/phpBB/styles/subsilver2/template/viewtopic_body.html b/phpBB/styles/subsilver2/template/viewtopic_body.html index a4e2dd886a..e2834ffa0b 100644 --- a/phpBB/styles/subsilver2/template/viewtopic_body.html +++ b/phpBB/styles/subsilver2/template/viewtopic_body.html @@ -18,7 +18,7 @@  	<h2><a class="titles" href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a></h2>  <!-- IF MODERATORS --> -	<p class="moderators"><!-- IF S_SINGLE_MODERATOR -->{L_MODERATOR}<!-- ELSE -->{L_MODERATORS}<!-- ENDIF -->: {MODERATORS}</p> +	<p class="moderators"><!-- IF S_SINGLE_MODERATOR -->{L_MODERATOR}<!-- ELSE -->{L_MODERATORS}<!-- ENDIF -->{L_COLON} {MODERATORS}</p>  <!-- ENDIF -->  <!-- IF U_MCP -->  	<p class="linkmcp">[ <a href="{U_MCP}">{L_MCP}</a> ]</p> @@ -109,7 +109,7 @@  		<!-- ENDIF -->  		<!-- IF S_DISPLAY_RESULTS -->  			<tr> -				<td class="gensmall" colspan="4" align="center"><b>{L_TOTAL_VOTES} : {TOTAL_VOTES}</b></td> +				<td class="gensmall" colspan="4" align="center"><b>{L_TOTAL_VOTES}{L_COLON} {TOTAL_VOTES}</b></td>  			</tr>  		<!-- ELSE -->  			<tr> @@ -150,7 +150,7 @@  				<!-- IF postrow.POST_ICON_IMG -->  					<td><img src="{T_ICONS_PATH}{postrow.POST_ICON_IMG}" width="{postrow.POST_ICON_IMG_WIDTH}" height="{postrow.POST_ICON_IMG_HEIGHT}" alt="" title="" /></td>  				<!-- ENDIF --> -					<td class="gensmall" width="100%"><div style="float: {S_CONTENT_FLOW_BEGIN};"> <b>{L_POST_SUBJECT}:</b> <a href="#p{postrow.POST_ID}">{postrow.POST_SUBJECT}</a></div><div style="float: {S_CONTENT_FLOW_END};"><!-- IF S_IS_BOT -->{postrow.MINI_POST_IMG}<!-- ELSE --><a href="{postrow.U_MINI_POST}" class="imageset">{postrow.MINI_POST_IMG}</a><!-- ENDIF --><b>{L_POSTED}:</b> {postrow.POST_DATE} </div></td> +					<td class="gensmall" width="100%"><div style="float: {S_CONTENT_FLOW_BEGIN};"> <b>{L_POST_SUBJECT}{L_COLON}</b> <a href="#p{postrow.POST_ID}">{postrow.POST_SUBJECT}</a></div><div style="float: {S_CONTENT_FLOW_END};"><!-- IF S_IS_BOT -->{postrow.MINI_POST_IMG}<!-- ELSE --><a href="{postrow.U_MINI_POST}" class="imageset">{postrow.MINI_POST_IMG}</a><!-- ENDIF --><b>{L_POSTED}{L_COLON}</b> {postrow.POST_DATE} </div></td>  				</tr>  				</table>  			</td> @@ -188,17 +188,17 @@  				</table>  				<span class="postdetails"> -					<!-- IF postrow.POSTER_JOINED --><br /><b>{L_JOINED}:</b> {postrow.POSTER_JOINED}<!-- ENDIF --> -					<!-- IF postrow.POSTER_POSTS != '' --><br /><b>{L_POSTS}:</b> {postrow.POSTER_POSTS}<!-- ENDIF --> -					<!-- IF postrow.POSTER_FROM --><br /><b>{L_LOCATION}:</b> {postrow.POSTER_FROM}<!-- ENDIF --> +					<!-- IF postrow.POSTER_JOINED --><br /><b>{L_JOINED}{L_COLON}</b> {postrow.POSTER_JOINED}<!-- ENDIF --> +					<!-- IF postrow.POSTER_POSTS != '' --><br /><b>{L_POSTS}{L_COLON}</b> {postrow.POSTER_POSTS}<!-- ENDIF --> +					<!-- IF postrow.POSTER_FROM --><br /><b>{L_LOCATION}{L_COLON}</b> {postrow.POSTER_FROM}<!-- ENDIF -->  					<!-- IF postrow.S_PROFILE_FIELD1 -->  						<!-- Use a construct like this to include admin defined profile fields. Replace FIELD1 with the name of your field. --> -						<br /><b>{postrow.PROFILE_FIELD1_NAME}:</b> {postrow.PROFILE_FIELD1_VALUE} +						<br /><b>{postrow.PROFILE_FIELD1_NAME}{L_COLON}</b> {postrow.PROFILE_FIELD1_VALUE}  					<!-- ENDIF -->  					<!-- BEGIN custom_fields --> -						<br /><b>{postrow.custom_fields.PROFILE_FIELD_NAME}:</b> {postrow.custom_fields.PROFILE_FIELD_VALUE} +						<br /><b>{postrow.custom_fields.PROFILE_FIELD_NAME}{L_COLON}</b> {postrow.custom_fields.PROFILE_FIELD_VALUE}  					<!-- END custom_fields -->  				</span> @@ -224,7 +224,7 @@  						<table class="tablebg" width="100%" cellspacing="1">  						<tr> -							<td class="row3"><b class="genmed">{L_ATTACHMENTS}: </b></td> +							<td class="row3"><b class="genmed">{L_ATTACHMENTS}{L_COLON} </b></td>  						</tr>  						<!-- BEGIN attachment -->  							<tr> @@ -268,9 +268,9 @@  						<tr valign="middle">  							<td class="gensmall" align="{S_CONTENT_FLOW_END}">  							<!-- IF not S_IS_BOT --> -								<!-- IF postrow.U_REPORT --><a href="{postrow.U_REPORT}" class="imageset">{REPORT_IMG}</a> <!-- ENDIF -->  -								<!-- IF postrow.U_INFO --><a href="{postrow.U_INFO}" class="imageset">{INFO_IMG}</a> <!-- ENDIF -->  -								<!-- IF postrow.U_WARN --><a href="{postrow.U_WARN}" class="imageset">{WARN_IMG}</a> <!-- ENDIF -->  +								<!-- IF postrow.U_REPORT --><a href="{postrow.U_REPORT}" class="imageset">{REPORT_IMG}</a> <!-- ENDIF --> +								<!-- IF postrow.U_INFO --><a href="{postrow.U_INFO}" class="imageset">{INFO_IMG}</a> <!-- ENDIF --> +								<!-- IF postrow.U_WARN --><a href="{postrow.U_WARN}" class="imageset">{WARN_IMG}</a> <!-- ENDIF -->  								<!-- IF postrow.U_DELETE --><a href="{postrow.U_DELETE}" class="imageset">{DELETE_IMG}</a> <!-- ENDIF -->  							<!-- ENDIF -->  							</td> @@ -298,7 +298,7 @@  	<!-- IF not S_IS_BOT -->  	<table width="100%" cellspacing="1" class="tablebg">  	<tr align="center"> -		<td class="cat"><form name="viewtopic" method="post" action="{S_TOPIC_ACTION}"><span class="gensmall">{L_DISPLAY_POSTS}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" value="{L_GO}" name="sort" /></form></td> +		<td class="cat"><form name="viewtopic" method="post" action="{S_TOPIC_ACTION}"><span class="gensmall">{L_DISPLAY_POSTS}{L_COLON}</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" value="{L_GO}" name="sort" /></form></td>  	</tr>  	</table>  	<!-- ENDIF --> @@ -350,7 +350,7 @@  	<td width="40%" valign="top" nowrap="nowrap" align="{S_CONTENT_FLOW_BEGIN}">  	<!-- IF .quickmod -->  		<form method="post" action="{S_MOD_ACTION}"> -			<span class="gensmall">{L_QUICK_MOD}:</span> +			<span class="gensmall">{L_QUICK_MOD}{L_COLON}</span>  			<select name="action" id="quick-mod-select">  				<!-- BEGIN quickmod -->  				<option value="{quickmod.VALUE}">{quickmod.TITLE}</option> diff --git a/phpBB/styles/subsilver2/template/viewtopic_print.html b/phpBB/styles/subsilver2/template/viewtopic_print.html index 7e84b6fdad..78fab17d02 100644 --- a/phpBB/styles/subsilver2/template/viewtopic_print.html +++ b/phpBB/styles/subsilver2/template/viewtopic_print.html @@ -88,11 +88,11 @@ hr.sep {  	<table width="85%" cellspacing="3" cellpadding="0" border="0" align="center">  	<tr> -		<td width="10%" nowrap="nowrap">{L_AUTHOR}: </td> +		<td width="10%" nowrap="nowrap">{L_AUTHOR}{L_COLON} </td>  		<td><b>{postrow.POST_AUTHOR}</b> [ {postrow.POST_DATE} ]</td>  	</tr>  	<tr> -		<td width="10%" nowrap="nowrap">{L_POST_SUBJECT}: </td> +		<td width="10%" nowrap="nowrap">{L_POST_SUBJECT}{L_COLON} </td>  		<td><b>{postrow.POST_SUBJECT}</b></td>  	</tr>  	<tr> @@ -103,7 +103,7 @@ hr.sep {  			<table class="tablebg" width="100%" cellspacing="1">  			<tr> -				<td><b class="genmed">{L_ATTACHMENTS}: </b></td> +				<td><b class="genmed">{L_ATTACHMENTS}{L_COLON} </b></td>  			</tr>  			<!-- BEGIN attachment -->  				<tr> | 
