aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm/style/install_update_diff.html
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2012-08-03 11:50:59 -0500
committerAndreas Fischer <bantu@phpbb.com>2012-11-10 00:23:03 +0100
commitd124cd2d593bf66abf173e1c5b97c7f371a09dc4 (patch)
tree981af20c62ee34b0af80b1453f5036e2c5b21c7a /phpBB/adm/style/install_update_diff.html
parent6e7e70a18abc4368bc0728db420d1f7f61ad8686 (diff)
downloadforums-d124cd2d593bf66abf173e1c5b97c7f371a09dc4.tar
forums-d124cd2d593bf66abf173e1c5b97c7f371a09dc4.tar.gz
forums-d124cd2d593bf66abf173e1c5b97c7f371a09dc4.tar.bz2
forums-d124cd2d593bf66abf173e1c5b97c7f371a09dc4.tar.xz
forums-d124cd2d593bf66abf173e1c5b97c7f371a09dc4.zip
[ticket/10780] Replace colon usage in adm template output with {L_COLON}
Same as 46a7940a976ec1f54078f803ec949aa2bfbf6316, but for ACP templates PHPBB3-10780
Diffstat (limited to 'phpBB/adm/style/install_update_diff.html')
-rw-r--r--phpBB/adm/style/install_update_diff.html4
1 files changed, 2 insertions, 2 deletions
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>