mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* develop-olympus:
  [ticket/10607] Added 'Powered by' translation string.

Conflicts:
	phpBB/adm/index.php
	phpBB/language/en/common.php
This commit is contained in:
Oleg Pudeyev
2012-04-04 15:33:51 -04:00
parent 714fafe106 21639d5d54
commit 7d6b289671
9 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/styles/prosilver/template/overall_footer.html
View File

@@ -19,7 +19,7 @@
<span class="corners-bottom"><span></span></span></div>
</div>
<div class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
<div class="copyright">{CREDIT_LINE}
<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->
<!-- IF U_ACP --><br /><strong><a href="{U_ACP}">{L_ACP}</a></strong><!-- ENDIF -->

2
phpBB/styles/prosilver/template/simple_footer.html
View File

@@ -1,6 +1,6 @@
</div>
<div class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
<div class="copyright">{CREDIT_LINE}
<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->
</div>

2
phpBB/styles/subsilver2/template/overall_footer.html
View File

@@ -3,7 +3,7 @@
<div id="wrapfooter">
<!-- IF U_ACP --><span class="gensmall">[ <a href="{U_ACP}">{L_ACP}</a> ]</span><br /><br /><!-- ENDIF -->
<span class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
<span class="copyright">{CREDIT_LINE}
<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
<!-- IF DEBUG_OUTPUT --><br /><bdo dir="ltr">[ {DEBUG_OUTPUT} ]</bdo><!-- ENDIF --></span>
</div>

2
phpBB/styles/subsilver2/template/simple_footer.html
View File

@@ -2,7 +2,7 @@
</div>
<div id="wrapfooter">
<span class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group</span>
<span class="copyright">{CREDIT_LINE}
</div>
<script type="text/javascript" src="{T_JQUERY_LINK}"></script>