diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-12-07 15:50:24 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-12-07 15:50:24 +0100 |
| commit | 37530abd394ebc22480a133ffd1ca41276d73b43 (patch) | |
| tree | d59e135f641a1ed06968ff2e649f3cfc7e138cbb /phpBB/styles/subsilver2/template/bbcode.html | |
| parent | 70d23380aa55c2aab33c1c2e5cea57f186314584 (diff) | |
| parent | b0948fb3470056b14a743dcfeb59aea0f35d0029 (diff) | |
| download | forums-37530abd394ebc22480a133ffd1ca41276d73b43.tar forums-37530abd394ebc22480a133ffd1ca41276d73b43.tar.gz forums-37530abd394ebc22480a133ffd1ca41276d73b43.tar.bz2 forums-37530abd394ebc22480a133ffd1ca41276d73b43.tar.xz forums-37530abd394ebc22480a133ffd1ca41276d73b43.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714
* 'develop' of https://github.com/phpbb/phpbb3: (645 commits)
[ticket/10679] Update module basename, we added the xcp_ prefix in 3.1
[ticket/10679] Use module_auth to limit access to the module
[ticket/10679] Add new permission for changing profile field information
[ticket/11219] Coding guidelines and naming consistency changes
[ticket/10841] Revert more whitespace changes.
[ticket/10841] Revert whitespace changes.
[ticket/10841] adding space after if
[ticket/10841] removing unnecessary spacing
[ticket/10841] changing affectedrows check to COUNT in sql
[ticket/10841] Modifying style and language selectors in UCP
[ticket/11247] Fix wrong property reference in flock class.
[ticket/10602] Avoid a race condition.
[ticket/10602] Use last_queue_run for its intended purpose.
[ticket/10716] Collect standard error from executed php process.
[ticket/10716] Skip test if php is not in PATH.
[ticket/10716] Exclude our dependencies from linting.
[ticket/10103] New and improved wording.
[ticket/10716] Only lint on php 5.3+.
[ticket/10103] Assert with messages.
[ticket/10103] assertLessThan/assertGreaterThan.
...
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 --> |