diff options
author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2012-11-10 10:58:44 -0600 |
---|---|---|
committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2012-11-10 10:58:44 -0600 |
commit | 68363e362d4b6d3fe717a8ffae95ab13eb374e9f (patch) | |
tree | eea655f80184a3cee5a95abec5da1437c6e9aa5a /phpBB/styles/prosilver/template/posting_preview.html | |
parent | 6c8c54d4d2575cd40fe873cd2108b031ae5830a6 (diff) | |
parent | f5ed04f8ff0c65e1bfe6a4953b974315dd2790d7 (diff) | |
download | forums-68363e362d4b6d3fe717a8ffae95ab13eb374e9f.tar forums-68363e362d4b6d3fe717a8ffae95ab13eb374e9f.tar.gz forums-68363e362d4b6d3fe717a8ffae95ab13eb374e9f.tar.bz2 forums-68363e362d4b6d3fe717a8ffae95ab13eb374e9f.tar.xz forums-68363e362d4b6d3fe717a8ffae95ab13eb374e9f.zip |
Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103
Conflicts:
phpBB/install/schemas/mssql_schema.sql
phpBB/report.php
phpBB/styles/prosilver/template/ucp_prefs_personal.html
phpBB/styles/subsilver2/template/ucp_prefs_personal.html
Diffstat (limited to 'phpBB/styles/prosilver/template/posting_preview.html')
-rw-r--r-- | phpBB/styles/prosilver/template/posting_preview.html | 4 |
1 files changed, 2 insertions, 2 deletions
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> |