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/subsilver2/template/bbcode.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/subsilver2/template/bbcode.html')
-rw-r--r-- | phpBB/styles/subsilver2/template/bbcode.html | 8 |
1 files changed, 4 insertions, 4 deletions
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 --> |