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 remote-tracking branch 'PayBas/ticket/12608' into develop-ascraeus

Browse Source 
* PayBas/ticket/12608:
  [ticket/12608] Change CSS classes to prevent styling conflicts
  [ticket/12608] Add subSilver
  [ticket/12608] Changed get_styling() to get_style_class()
  [ticket/12608] Remove somewhat redundant reported color style
  [ticket/12608] Improved LTR and various bugfixes
  [ticket/12608] Clean up whitespace
  [ticket/12608] Add styling (CSS class) options to notifications
  [ticket/12608] Updated tests
  [ticket/12608] Improve notifications drop-down menu styling in header
This commit is contained in:
Cesar G
2014-06-22 15:44:06 -07:00
parent 4f2acbaed2 1a3c1d5b9a
commit 74a37259f7
22 changed files with 430 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
phpBB/language/en/common.php
View File

@@ -442,29 +442,32 @@ $lang = array_merge($lang, array(
// A, B, C and 2 others replied...
// A, B, C and others replied...
'NOTIFICATION_BOOKMARK' => array(
1 => '%1$s replied to the topic “%2$s” you have bookmarked.',
1 => '<strong>Reply</strong> from %1$s in bookmarked topic:',
),
'NOTIFICATION_GROUP_REQUEST' => '%1$s is requesting to join the group %2$s.',
'NOTIFICATION_GROUP_REQUEST_APPROVED' => 'Your request to join the group %1$s has been approved.',
'NOTIFICATION_PM' => '%1$s sent you a Private Message "%2$s".',
'NOTIFICATION_FORUM' => '<em>Forum:</em> %1$s',
'NOTIFICATION_GROUP_REQUEST' => '<strong>Group request</strong> from %1$s to join the group %2$s.',
'NOTIFICATION_GROUP_REQUEST_APPROVED' => '<strong>Group request approved</strong> to join the group %1$s.',
'NOTIFICATION_PM' => '<strong>Private Message</strong> from %1$s:',
'NOTIFICATION_POST' => array(
1 => '%1$s replied to the topic “%2$s”.',
1 => '<strong>Reply</strong> from %1$s in topic:',
),
'NOTIFICATION_POST_APPROVED' => 'Your post was approved "%2$s".',
'NOTIFICATION_POST_DISAPPROVED' => 'Your post "%1$s" was disapproved for reason: "%2$s".',
'NOTIFICATION_POST_IN_QUEUE' => 'A new post titled "%2$s" was posted by %1$s and needs approval.',
'NOTIFICATION_POST_APPROVED' => '<strong>Post approved</strong>:',
'NOTIFICATION_POST_DISAPPROVED' => '<strong>Post disapproved</strong>:',
'NOTIFICATION_POST_IN_QUEUE' => '<strong>Post approval</strong> request by %1$s:',
'NOTIFICATION_QUOTE' => array(
1 => '%1$s quoted you in the post “%2$s”.',
1 => '<strong>Quoted</strong> by %1$s in:',
),
'NOTIFICATION_REPORT_PM' => '%1$s reported a Private Message "%2$s" for reason: "%3$s".',
'NOTIFICATION_REPORT_POST' => '%1$s reported a post "%2$s" for reason: "%3$s".',
'NOTIFICATION_REPORT_CLOSED' => '%1$s closed the report you made for "%2$s".',
'NOTIFICATION_TOPIC' => '%1$s posted a new topic "%2$s" in the forum "%3$s".',
'NOTIFICATION_TOPIC_APPROVED' => 'Your topic "%2$s" in the forum "%3$s" was approved.',
'NOTIFICATION_TOPIC_DISAPPROVED' => 'Your topic "%1$s" was disapproved for reason: "%2$s".',
'NOTIFICATION_TOPIC_IN_QUEUE' => 'A new topic titled "%2$s" was posted by %1$s and needs approval.',
'NOTIFICATION_REFERENCE' => '"%1$s"',
'NOTIFICATION_REASON' => '<em>Reason:</em> %1$s.',
'NOTIFICATION_REPORT_PM' => '<strong>Private Message reported</strong> by %1$s:',
'NOTIFICATION_REPORT_POST' => '<strong>Post reported</strong> by %1$s:',
'NOTIFICATION_REPORT_CLOSED' => '<strong>Report closed</strong> by %1$s for:',
'NOTIFICATION_TOPIC' => '<strong>New topic</strong> by %1$s:',
'NOTIFICATION_TOPIC_APPROVED' => '<strong>Topic approved</strong>:',
'NOTIFICATION_TOPIC_DISAPPROVED' => '<strong>Topic disapproved</strong>:',
'NOTIFICATION_TOPIC_IN_QUEUE' => '<strong>Topic approval</strong> request by %1$s:',
'NOTIFICATION_TYPE_NOT_EXIST' => 'The notification type "%s" is missing from the file system.',
'NOTIFICATION_ADMIN_ACTIVATE_USER' => 'The user “%1$s” is newly registered and requires activation.',
'NOTIFICATION_ADMIN_ACTIVATE_USER' => '<strong>Activation required</strong> for newly registered user: “%1$s”',
// Used in conjuction with NOTIFICATION_BOOKMARK and NOTIFICATION_POST.
'NOTIFICATION_MANY_OTHERS' => 'others',
'NOTIFICATION_X_OTHERS' => array(