From 4c4b82416b8c7b3a8f97b12ca96699bea0bde91d Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 12 Nov 2012 15:06:44 +0100
Subject: [PATCH] [feature/avatars] Replace colon usage with {L_COLON}

PHPBB3-10018
---
 phpBB/adm/style/acp_avatar_options_local.html                 | 2 +-
 phpBB/adm/style/acp_avatar_options_remote.html                | 4 ++--
 phpBB/adm/style/acp_avatar_options_upload.html                | 4 ++--
 phpBB/adm/style/acp_groups.html                               | 2 +-
 phpBB/adm/style/acp_users_avatar.html                         | 2 +-
 phpBB/styles/prosilver/template/ucp_avatar_options_local.html | 2 +-
 .../styles/prosilver/template/ucp_avatar_options_remote.html  | 4 ++--
 .../styles/prosilver/template/ucp_avatar_options_upload.html  | 4 ++--
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/phpBB/adm/style/acp_avatar_options_local.html b/phpBB/adm/style/acp_avatar_options_local.html
index d762fa9008..02ff58fe15 100644
--- a/phpBB/adm/style/acp_avatar_options_local.html
+++ b/phpBB/adm/style/acp_avatar_options_local.html
@@ -1,5 +1,5 @@
 <dl>
-	<dt><label for="category">{L_AVATAR_CATEGORY}:</label></dt>
+	<dt><label for="category">{L_AVATAR_CATEGORY}{L_COLON}</label></dt>
 	<dd><select name="av_local_cat" id="category">
 		<option value="">{L_NO_AVATAR_CATEGORY}</option>
 		<!-- BEGIN av_local_cats -->
diff --git a/phpBB/adm/style/acp_avatar_options_remote.html b/phpBB/adm/style/acp_avatar_options_remote.html
index 02704c5be8..ec5a22b691 100644
--- a/phpBB/adm/style/acp_avatar_options_remote.html
+++ b/phpBB/adm/style/acp_avatar_options_remote.html
@@ -1,9 +1,9 @@
 <dl>
-	<dt><label for="av_remote_url">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
+	<dt><label for="av_remote_url">{L_LINK_REMOTE_AVATAR}{L_COLON}</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
 	<dd><input type="text" name="av_remote_url" id="av_remote_url" value="{AV_REMOTE_URL}" 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="av_remote_width"><input type="text" name="av_remote_width" id="av_remote_width" size="3" value="{AV_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; 
 		<label for="av_remote_height"><input type="text" name="av_remote_height" id="av_remote_height" size="3" value="{AV_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
diff --git a/phpBB/adm/style/acp_avatar_options_upload.html b/phpBB/adm/style/acp_avatar_options_upload.html
index 9c8dd9af01..d0a4f516e1 100644
--- a/phpBB/adm/style/acp_avatar_options_upload.html
+++ b/phpBB/adm/style/acp_avatar_options_upload.html
@@ -1,11 +1,11 @@
 <dl>
-	<dt><label for="av_upload_file">{L_UPLOAD_AVATAR_FILE}:</label></dt>
+	<dt><label for="av_upload_file">{L_UPLOAD_AVATAR_FILE}{L_COLON}</label></dt>
 	<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AV_UPLOAD_SIZE}" /><input type="file" name="av_upload_file" id="av_upload_file" class="inputbox autowidth" /></dd>
 </dl>
 
 <!-- IF S_UPLOAD_AVATAR_URL -->
 	<dl>
-		<dt><label for="av_upload_url">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
+		<dt><label for="av_upload_url">{L_UPLOAD_AVATAR_URL}{L_COLON}</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
 		<dd><input type="text" name="av_upload_url" id="av_upload_url" value="" class="inputbox" /></dd>
 	</dl>
 <!-- ENDIF -->
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index 3a551adca7..6fb2908b0a 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -103,7 +103,7 @@
 	<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}</dd>
 	</dl>
 	<dl>
diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html
index 62c80f14c1..c179e1958d 100644
--- a/phpBB/adm/style/acp_users_avatar.html
+++ b/phpBB/adm/style/acp_users_avatar.html
@@ -47,7 +47,7 @@
 		</dl>
 		<!-- 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>{AVATAR}</dd>
 		</dl>
 	</fieldset>
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_local.html b/phpBB/styles/prosilver/template/ucp_avatar_options_local.html
index 9f726e2ff9..9ca9b6e9ec 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options_local.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options_local.html
@@ -1,4 +1,4 @@
-<label for="category">{L_AVATAR_CATEGORY}: <select name="av_local_cat" id="category">
+<label for="category">{L_AVATAR_CATEGORY}{L_COLON} <select name="av_local_cat" id="category">
 <option value="">{L_NO_AVATAR_CATEGORY}</option>
 <!-- BEGIN av_local_cats -->
 <option value="{av_local_cats.NAME}"<!-- IF av_local_cats.SELECTED --> selected="selected"<!-- ENDIF -->>{av_local_cats.NAME}</option>
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html b/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
index 02704c5be8..ec5a22b691 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
@@ -1,9 +1,9 @@
 <dl>
-	<dt><label for="av_remote_url">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
+	<dt><label for="av_remote_url">{L_LINK_REMOTE_AVATAR}{L_COLON}</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
 	<dd><input type="text" name="av_remote_url" id="av_remote_url" value="{AV_REMOTE_URL}" 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="av_remote_width"><input type="text" name="av_remote_width" id="av_remote_width" size="3" value="{AV_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; 
 		<label for="av_remote_height"><input type="text" name="av_remote_height" id="av_remote_height" size="3" value="{AV_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_upload.html b/phpBB/styles/prosilver/template/ucp_avatar_options_upload.html
index 9c8dd9af01..d0a4f516e1 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options_upload.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options_upload.html
@@ -1,11 +1,11 @@
 <dl>
-	<dt><label for="av_upload_file">{L_UPLOAD_AVATAR_FILE}:</label></dt>
+	<dt><label for="av_upload_file">{L_UPLOAD_AVATAR_FILE}{L_COLON}</label></dt>
 	<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AV_UPLOAD_SIZE}" /><input type="file" name="av_upload_file" id="av_upload_file" class="inputbox autowidth" /></dd>
 </dl>
 
 <!-- IF S_UPLOAD_AVATAR_URL -->
 	<dl>
-		<dt><label for="av_upload_url">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
+		<dt><label for="av_upload_url">{L_UPLOAD_AVATAR_URL}{L_COLON}</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
 		<dd><input type="text" name="av_upload_url" id="av_upload_url" value="" class="inputbox" /></dd>
 	</dl>
 <!-- ENDIF -->