makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.2.x'

Browse source
This commit is contained in:
Marc Alexander 2018-02-19 21:27:07 +01:00
commit 09718a565b
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
4 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/adm/style/admin.css
View file

@ -2753,7 +2753,7 @@ fieldset.permissions .permissions-switch {
} }
.rtl .roles-options > span { .rtl .roles-options > span {
background: url('../images/arrow_down.gif') no-repeat 7px .7em; background: url("../images/arrow_down.gif") no-repeat 7px 0.7em;
} }
.roles-options li { .roles-options li {

4
phpBB/language/en/common.php
View file

@ -138,8 +138,10 @@ $lang = array_merge($lang, array(
1 => 'Users browsing this forum: %2$s and %1$d guest', 1 => 'Users browsing this forum: %2$s and %1$d guest',
2 => 'Users browsing this forum: %2$s and %1$d guests', 2 => 'Users browsing this forum: %2$s and %1$d guests',
), ),
'BUTTON_DELETE' => 'Delete',
'BUTTON_EDIT' => 'Edit', 'BUTTON_EDIT' => 'Edit',
'BUTTON_FORUM_LOCKED' => 'Locked', 'BUTTON_FORUM_LOCKED' => 'Locked',
'BUTTON_INFORMATION' => 'Information',
'BUTTON_NEW_TOPIC' => 'New Topic', 'BUTTON_NEW_TOPIC' => 'New Topic',
'BUTTON_PM' => 'PM', 'BUTTON_PM' => 'PM',
'BUTTON_PM_FORWARD' => 'Forward', 'BUTTON_PM_FORWARD' => 'Forward',
@ -148,7 +150,9 @@ $lang = array_merge($lang, array(
'BUTTON_PM_REPLY_ALL' => 'Reply All', 'BUTTON_PM_REPLY_ALL' => 'Reply All',
'BUTTON_POST_REPLY' => 'Post Reply', 'BUTTON_POST_REPLY' => 'Post Reply',
'BUTTON_QUOTE' => 'Quote', 'BUTTON_QUOTE' => 'Quote',
'BUTTON_REPORT' => 'Report',
'BUTTON_TOPIC_LOCKED' => 'Locked', 'BUTTON_TOPIC_LOCKED' => 'Locked',
'BUTTON_WARN' => 'Warn',
'BYTES' => 'Bytes', 'BYTES' => 'Bytes',
'BYTES_SHORT' => 'B', 'BYTES_SHORT' => 'B',

8
phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
View file

@ -91,28 +91,28 @@
<!-- IF U_EDIT --> <!-- IF U_EDIT -->
<li> <li>
<a href="{U_EDIT}" title="{L_POST_EDIT_PM}" class="button button-icon-only"> <a href="{U_EDIT}" title="{L_POST_EDIT_PM}" class="button button-icon-only">
<i class="icon fa-pencil fa-fw" aria-hidden="true"></i><span class="sr-only">{L_POST_EDIT_PM}</span> <i class="icon fa-pencil fa-fw" aria-hidden="true"></i><span class="sr-only">{L_BUTTON_EDIT}</span>
</a> </a>
</li> </li>
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF U_DELETE --> <!-- IF U_DELETE -->
<li> <li>
<a href="{U_DELETE}" title="{L_DELETE_MESSAGE}" class="button button-icon-only"> <a href="{U_DELETE}" title="{L_DELETE_MESSAGE}" class="button button-icon-only">
<i class="icon fa-times fa-fw" aria-hidden="true"></i><span class="sr-only">{L_DELETE_MESSAGE}</span> <i class="icon fa-times fa-fw" aria-hidden="true"></i><span class="sr-only">{L_BUTTON_DELETE}</span>
</a> </a>
</li> </li>
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF U_REPORT --> <!-- IF U_REPORT -->
<li> <li>
<a href="{U_REPORT}" title="{L_REPORT_PM}" class="button button-icon-only"> <a href="{U_REPORT}" title="{L_REPORT_PM}" class="button button-icon-only">
<i class="icon fa-exclamation fa-fw" aria-hidden="true"></i><span class="sr-only">{L_REPORT_PM}</span> <i class="icon fa-exclamation fa-fw" aria-hidden="true"></i><span class="sr-only">{L_BUTTON_REPORT}</span>
</a> </a>
</li> </li>
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF U_QUOTE --> <!-- IF U_QUOTE -->
<li> <li>
<a href="{U_QUOTE}" title="{L_POST_QUOTE_PM}" class="button button-icon-only"> <a href="{U_QUOTE}" title="{L_POST_QUOTE_PM}" class="button button-icon-only">
<i class="icon fa-quote-left fa-fw" aria-hidden="true"></i><span class="sr-only">{L_POST_QUOTE_PM}</span> <i class="icon fa-quote-left fa-fw" aria-hidden="true"></i><span class="sr-only">{L_BUTTON_QUOTE}</span>
</a> </a>
</li> </li>
<!-- ENDIF --> <!-- ENDIF -->

10
phpBB/styles/prosilver/template/viewtopic_body.html
View file

@ -242,35 +242,35 @@
<!-- IF postrow.U_DELETE --> <!-- IF postrow.U_DELETE -->
<li> <li>
<a href="{postrow.U_DELETE}" title="{L_DELETE_POST}" class="button button-icon-only"> <a href="{postrow.U_DELETE}" title="{L_DELETE_POST}" class="button button-icon-only">
<i class="icon fa-times fa-fw" aria-hidden="true"></i><span class="sr-only">{L_DELETE_POST}</span> <i class="icon fa-times fa-fw" aria-hidden="true"></i><span class="sr-only">{L_BUTTON_DELETE}</span>
</a> </a>
</li> </li>
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF postrow.U_REPORT --> <!-- IF postrow.U_REPORT -->
<li> <li>
<a href="{postrow.U_REPORT}" title="{L_REPORT_POST}" class="button button-icon-only"> <a href="{postrow.U_REPORT}" title="{L_REPORT_POST}" class="button button-icon-only">
<i class="icon fa-exclamation fa-fw" aria-hidden="true"></i><span class="sr-only">{L_REPORT_POST}</span> <i class="icon fa-exclamation fa-fw" aria-hidden="true"></i><span class="sr-only">{L_BUTTON_REPORT}</span>
</a> </a>
</li> </li>
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF postrow.U_WARN --> <!-- IF postrow.U_WARN -->
<li> <li>
<a href="{postrow.U_WARN}" title="{L_WARN_USER}" class="button button-icon-only"> <a href="{postrow.U_WARN}" title="{L_WARN_USER}" class="button button-icon-only">
<i class="icon fa-exclamation-triangle fa-fw" aria-hidden="true"></i><span class="sr-only">{L_WARN_USER}</span> <i class="icon fa-exclamation-triangle fa-fw" aria-hidden="true"></i><span class="sr-only">{L_BUTTON_WARN}</span>
</a> </a>
</li> </li>
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF postrow.U_INFO --> <!-- IF postrow.U_INFO -->
<li> <li>
<a href="{postrow.U_INFO}" title="{L_INFORMATION}" class="button button-icon-only"> <a href="{postrow.U_INFO}" title="{L_INFORMATION}" class="button button-icon-only">
<i class="icon fa-info fa-fw" aria-hidden="true"></i><span class="sr-only">{L_INFORMATION}</span> <i class="icon fa-info fa-fw" aria-hidden="true"></i><span class="sr-only">{L_BUTTON_INFORMATION}</span>
</a> </a>
</li> </li>
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF postrow.U_QUOTE --> <!-- IF postrow.U_QUOTE -->
<li> <li>
<a href="{postrow.U_QUOTE}" title="{L_REPLY_WITH_QUOTE}" class="button button-icon-only"> <a href="{postrow.U_QUOTE}" title="{L_REPLY_WITH_QUOTE}" class="button button-icon-only">
<i class="icon fa-quote-left fa-fw" aria-hidden="true"></i><span class="sr-only">{L_QUOTE}</span> <i class="icon fa-quote-left fa-fw" aria-hidden="true"></i><span class="sr-only">{L_BUTTON_QUOTE}</span>
</a> </a>
</li> </li>
<!-- ENDIF --> <!-- ENDIF -->