diff options
Diffstat (limited to 'phpBB')
19 files changed, 28 insertions, 21 deletions
diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html index eda5a416f4..a7bde1e77a 100644 --- a/phpBB/adm/style/acp_users.html +++ b/phpBB/adm/style/acp_users.html @@ -184,7 +184,7 @@ </table> <!-- ELSE --> <div class="errorbox"> - <p>{L_NO_ENTRIES}</p> + <p>{L_USER_NO_ATTACHMENTS}</p> </div> <!-- ENDIF --> <fieldset class="display-options"> diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index a7f84091fc..e86fe1430d 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -185,9 +185,10 @@ p a { <div class="paragraph"> <ul class="menu"> + <li>[Fix] (X)HTML issues within the templates (Bug #11255, #11255)</li> + <li>[Fix] Tiny language and grammar changes</li> + <li>[Fix] Several tiny style related fixes</li> <li>[Fix] MCP looses forum_id in some panels (Bug #11255)</li> - <li>[Fix] (X)HTML name/id property collision login_forum.html (Bug #11255)</li> - <li>[Fix] (X)HTML </dl> missing in memberlist_im.html for prosilver (Bug #11255)</li> <li>[Fix] Moderation queue used unfriendly notification of no posts/topics (Bug #11291)</li> <li>[Fix] Array in Oracle DBAL not always set (Bug #11475)</li> <li>[Fix] Improper continue; in acp_styles.php (Bug #11523)</li> @@ -204,6 +205,10 @@ p a { <li>[Fix] Renamed two indicies for Oracle support (Bug #11457)</li> <li>[Fix] Added support for ISO-8859-8-i in the character set convertor</li> <li>[Fix] Added support for Oracle's "easy connect naming"</li> + <li>[Fix] Let Mark/Unmark All work in Manage Drafts (Bug #11679)</li> + <li>[Fix] Display correct message if no attachments found in user administration (Bug #11629)</li> + <li>[Fix] Let the "Delete all board cookies" being displayed for guests too (only prosilver) (Bug #11603)</li> + <li>[Fix] Do not display view topic link in MCP while there is no link present (Bug #11573)</li> </ul> </div> diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 32ef227377..77aa273251 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -193,7 +193,7 @@ $lang = array_merge($lang, array( 'COPPA_MAIL' => 'COPPA mailing address', 'COPPA_MAIL_EXPLAIN' => 'This is the mailing address where parents will send COPPA registration forms.', 'ENABLE_COPPA' => 'Enable COPPA', - 'ENABLE_COPPA_EXPLAIN' => 'This requires users to declare whether they are 13 or over for compliance with the U.S. COPPA Act. If this is disabled the COPPA specific groups will no longer be displayed.', + 'ENABLE_COPPA_EXPLAIN' => 'This requires users to declare whether they are 13 or over for compliance with the U.S. COPPA. If this is disabled the COPPA specific groups will no longer be displayed.', 'MAX_CHARS' => 'Max', 'MIN_CHARS' => 'Min', 'NO_AUTH_PLUGIN' => 'No suitable auth plugin found.', diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php index df14105eb2..33ad3354d8 100644 --- a/phpBB/language/en/acp/styles.php +++ b/phpBB/language/en/acp/styles.php @@ -32,7 +32,7 @@ if (empty($lang) || !is_array($lang)) $lang = array_merge($lang, array( 'ACP_IMAGESETS_EXPLAIN' => 'Imagesets comprise all the button, forum, folder, etc. and other non-style specific images used by the board. Here you can edit, export or delete existing imagesets and import or activate new sets.', - 'ACP_STYLES_EXPLAIN' => 'Here you can manage the available styles on your board. A style consists off a template, theme and imageset. You may alter existing styles, delete, deactivate, reactivate, create or import new ones. You can also see what a style will look like using the preview function. The current default style is noted by the presence of an asterisk (*). Also listed is the total user count for each style, note that overriding user styles will not be reflected here.', + 'ACP_STYLES_EXPLAIN' => 'Here you can manage the available styles on your board. A style consists of a template, theme and imageset. You may alter existing styles, delete, deactivate, reactivate, create or import new ones. You can also see what a style will look like using the preview function. The current default style is noted by the presence of an asterisk (*). Also listed is the total user count for each style, note that overriding user styles will not be reflected here.', 'ACP_TEMPLATES_EXPLAIN' => 'A template set comprises all the markup used to generate the layout of your board. Here you can edit existing template sets, delete, export, import and preview sets. You can also modify the templating code used to generate BBCode.', 'ACP_THEMES_EXPLAIN' => 'From here you can create, install, edit, delete and export themes. A theme is the combination of colours and images that are applied to your templates to define the basic look of your board. The range of options open to you depends on the configuration of your server and phpBB installation, see the manual for further details. Please note that when creating new themes the use of an existing theme as a basis is optional.', 'ADD_IMAGESET' => 'Create imageset', diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php index 7c09a99c42..eabdd93d22 100644 --- a/phpBB/language/en/acp/users.php +++ b/phpBB/language/en/acp/users.php @@ -111,6 +111,7 @@ $lang = array_merge($lang, array( 'USER_GROUP_NORMAL' => 'Normal groups user is a member of', 'USER_GROUP_PENDING' => 'Groups user is in pending mode', 'USER_GROUP_SPECIAL' => 'Special groups user is a member of', + 'USER_NO_ATTACHMENTS' => 'There are no attached files to display.', 'USER_OVERVIEW_UPDATED' => 'User details updated.', 'USER_POSTS_DELETED' => 'Successfully removed all posts made by this user.', 'USER_POSTS_MOVED' => 'Successfully moved users posts to target forum.', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 029f63e1c0..e81d75325c 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -84,7 +84,7 @@ $lang = array_merge($lang, array( 'AVATAR_PHP_SIZE_OVERRUN' => 'The avatar’s filesize is too large. The maximum allowed upload size is %d MB.<br />Please note this is set in php.ini and cannot be overridden.', 'AVATAR_URL_INVALID' => 'The URL you specified is invalid.', 'AVATAR_URL_NOT_FOUND' => 'The file specified could not be found.', - 'AVATAR_WRONG_FILESIZE' => 'The avatar must be between 0 and %1d %2s.', + 'AVATAR_WRONG_FILESIZE' => 'The avatar’s filesize must be between 0 and %1d %2s.', 'AVATAR_WRONG_SIZE' => 'The submitted avatar is %5$d pixels wide and %6$d pixels high. Avatars must be at least %1$d pixels wide and %2$d pixels high, but no larger than %3$d pixels wide and %4$d pixels high.', 'BACK_TO_TOP' => 'Top', @@ -490,6 +490,7 @@ $lang = array_merge($lang, array( 'SELECT_DESTINATION_FORUM' => 'Please select a destination forum', 'SELECT_FORUM' => 'Select a forum', 'SEND_EMAIL' => 'E-mail', + 'SEND_EMAIL_USER' => 'E-mail', // Used as: {L_SEND_EMAIL_USER} {USERNAME} -> E-mail UserX 'SEND_PRIVATE_MESSAGE' => 'Send private message', 'SETTINGS' => 'Settings', 'SIGNATURE' => 'Signature', diff --git a/phpBB/language/en/email/coppa_resend_inactive.txt b/phpBB/language/en/email/coppa_resend_inactive.txt index b1e45213e9..ab8363b350 100644 --- a/phpBB/language/en/email/coppa_resend_inactive.txt +++ b/phpBB/language/en/email/coppa_resend_inactive.txt @@ -2,7 +2,7 @@ Subject: Welcome to "{SITENAME}" - {U_BOARD} {WELCOME_MSG} -In compliance with the COPPA act your account is currently inactive. +In compliance with the COPPA your account is currently inactive. Please print this message out and have your parent or guardian sign and date it. Then fax it to: diff --git a/phpBB/language/en/email/coppa_welcome_inactive.txt b/phpBB/language/en/email/coppa_welcome_inactive.txt index 1167502c8a..f34479a6fe 100644 --- a/phpBB/language/en/email/coppa_welcome_inactive.txt +++ b/phpBB/language/en/email/coppa_welcome_inactive.txt @@ -2,7 +2,7 @@ Subject: Welcome to "{SITENAME}" - {U_BOARD} {WELCOME_MSG} -In compliance with the COPPA act your account is currently inactive. +In compliance with the COPPA your account is currently inactive. Please print this message out and have your parent or guardian sign and date it. Then fax it to: diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php index e37efbba6c..a407f7f4d0 100644 --- a/phpBB/language/en/help_faq.php +++ b/phpBB/language/en/help_faq.php @@ -68,7 +68,7 @@ $help = array( ), array( 0 => 'What does the “Delete all board cookies” do?', - 1 => '“Delete all board cookies”deletes the cookies created by phpBB which keep you authenticated and logged into the board. It also provides functions such as read tracking if they have been enabled by the board owner. If you are having login or logout problems, deleting board cookies may help.', + 1 => '“Delete all board cookies” deletes the cookies created by phpBB which keep you authenticated and logged into the board. It also provides functions such as read tracking if they have been enabled by the board owner. If you are having login or logout problems, deleting board cookies may help.', ), array( 0 => '--', diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php index 33e626f452..26f0c54e2d 100644 --- a/phpBB/language/en/mcp.php +++ b/phpBB/language/en/mcp.php @@ -218,7 +218,7 @@ $lang = array_merge($lang, array( 'NO_POST_SELECTED' => 'You must select at least one post to perform this action.', 'NO_REASON_DISAPPROVAL' => 'Please give an appropriate reason for disapproval.', 'NO_REPORT' => 'No report found', - 'NO_REPORTS' => 'No reports', + 'NO_REPORTS' => 'No reports found', 'NO_REPORT_SELECTED' => 'You must select at least one report to perform this action.', 'NO_TOPIC_ICON' => 'None', 'NO_TOPIC_SELECTED' => 'You must select at least one topic to perform this action.', @@ -326,7 +326,7 @@ $lang = array_merge($lang, array( 'UNAPPROVED_POST_TOTAL' => 'In total there is <strong>1</strong> post waiting for approval.', 'UNLOCK' => 'Unlock', 'UNLOCK_POST' => 'Unlock post', - 'UNLOCK_POST_EXPLAIN' => 'Allow editing.', + 'UNLOCK_POST_EXPLAIN' => 'Allow editing', 'UNLOCK_POST_POST' => 'Unlock post', 'UNLOCK_POST_POST_CONFIRM' => 'Are you sure you want to allow editing this post?', 'UNLOCK_POST_POSTS' => 'Unlock selected posts', diff --git a/phpBB/styles/prosilver/template/mcp_front.html b/phpBB/styles/prosilver/template/mcp_front.html index 722f4d59f5..71126aab01 100644 --- a/phpBB/styles/prosilver/template/mcp_front.html +++ b/phpBB/styles/prosilver/template/mcp_front.html @@ -123,7 +123,7 @@ <td>{log.ACTION}</td> <td><span>{log.USERNAME}</span></td> <td><span>{log.IP}</span></td> - <td><a href="{log.U_VIEW_TOPIC}" title="{L_VIEW_TOPIC}">{L_VIEW_TOPIC}</a></td> + <td><span><!-- IF log.U_VIEW_TOPIC --><a href="{log.U_VIEW_TOPIC}" title="{L_VIEW_TOPIC}">{L_VIEW_TOPIC}</a><!-- ENDIF --> </span></td> <td><span><!-- IF log.U_VIEWLOGS --><a href="{log.U_VIEWLOGS}">{L_VIEW_TOPIC_LOGS}</a><!-- ENDIF --> </span></td> <td><span>{log.TIME}</span></td> </tr> diff --git a/phpBB/styles/prosilver/template/memberlist_email.html b/phpBB/styles/prosilver/template/memberlist_email.html index 614efa73ee..137c4939f4 100644 --- a/phpBB/styles/prosilver/template/memberlist_email.html +++ b/phpBB/styles/prosilver/template/memberlist_email.html @@ -28,7 +28,7 @@ function checkForm(formObj) //--> </script> -<h2 class="titlespace">{L_SEND_EMAIL} {USERNAME}</h2> +<h2 class="titlespace">{L_SEND_EMAIL_USER} {USERNAME}</h2> <form method="post" action="{S_POST_ACTION}" id="post" onsubmit="return checkForm(this)"> diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html index 5b50f74689..cd1f90d2c0 100644 --- a/phpBB/styles/prosilver/template/memberlist_view.html +++ b/phpBB/styles/prosilver/template/memberlist_view.html @@ -44,7 +44,7 @@ <h3>{L_CONTACT_USER} {USERNAME}</h3> <dl class="details"> - <!-- IF U_EMAIL --><dt>{L_EMAIL_ADDRESS}:</dt> <dd><a href="{U_EMAIL}">{L_SEND_EMAIL} {USERNAME}</a></dd><!-- ENDIF --> + <!-- IF U_EMAIL --><dt>{L_EMAIL_ADDRESS}:</dt> <dd><a href="{U_EMAIL}">{L_SEND_EMAIL_USER} {USERNAME}</a></dd><!-- ENDIF --> <!-- IF U_WWW --><dt>{L_WEBSITE}:</dt> <dd><a href="{U_WWW}" title="{L_VISIT_WEBSITE}: {U_WWW}">{U_WWW}</a></dd><!-- ENDIF --> <!-- IF U_PM --><dt>{L_PM}:</dt> <dd><a href="{U_PM}">{L_SEND_PRIVATE_MESSAGE}</a></dd> <!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html index 05fc5087bd..d56102f0bf 100644 --- a/phpBB/styles/prosilver/template/overall_footer.html +++ b/phpBB/styles/prosilver/template/overall_footer.html @@ -15,7 +15,7 @@ <!-- IF U_BUMP_TOPIC --><a href="{U_BUMP_TOPIC}" title="{L_BUMP_TOPIC}" class="icon-bump">{L_BUMP_TOPIC}</a> <!-- ENDIF --> <!-- ENDIF --> </li> - <li class="rightside"><a href="{U_TEAM}">{L_THE_TEAM}</a> • <!-- IF S_USER_LOGGED_IN and not S_IS_BOT --><a href="{U_DELETE_COOKIES}">{L_DELETE_COOKIES}</a> • <!-- ENDIF -->{S_TIMEZONE}</li> + <li class="rightside"><a href="{U_TEAM}">{L_THE_TEAM}</a> • <!-- IF not S_IS_BOT --><a href="{U_DELETE_COOKIES}">{L_DELETE_COOKIES}</a> • <!-- ENDIF -->{S_TIMEZONE}</li> </ul> <span class="corners-bottom"><span></span></span></div> diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html index 0cf67c300b..4e988903c0 100644 --- a/phpBB/styles/prosilver/template/posting_editor.html +++ b/phpBB/styles/prosilver/template/posting_editor.html @@ -30,7 +30,7 @@ </dl> <!-- ENDIF --> <dl class="pmlist"> - <dt><textarea id="username_list" name="username_list"></textarea></dt> + <dt><textarea id="username_list" name="username_list" class="inputbox"></textarea></dt> <dd><span><a href="{U_FIND_USERNAME}" onclick="find_username(); return false">{L_FIND_USERNAME}</a></span></dd> <dd><input type="submit" name="add_to" value="{L_ADD}" class="button2" /></dd> <dd><input type="submit" name="add_bcc" value="{L_ADD_BCC}" class="button2" /></dd> diff --git a/phpBB/styles/prosilver/template/ucp_main_drafts.html b/phpBB/styles/prosilver/template/ucp_main_drafts.html index b60e478ce3..a7a952fa02 100644 --- a/phpBB/styles/prosilver/template/ucp_main_drafts.html +++ b/phpBB/styles/prosilver/template/ucp_main_drafts.html @@ -60,7 +60,7 @@ <!-- IF .draftrow --> <fieldset class="display-actions"> <input class="button2" type="submit" name="delete" value="{L_DELETE_MARKED}" /> - <div><a href="#" onclick="marklist('post', '', true); return false;">{L_MARK_ALL}</a> • <a href="#" onclick="marklist('post', '', false); return false;">{L_UNMARK_ALL}</a></div> + <div><a href="#" onclick="marklist('postform', '', true); return false;">{L_MARK_ALL}</a> • <a href="#" onclick="marklist('postform', '', false); return false;">{L_UNMARK_ALL}</a></div> </fieldset> <!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/viewtopic_print.html b/phpBB/styles/prosilver/template/viewtopic_print.html index c9fb542eb4..db6a5c7648 100644 --- a/phpBB/styles/prosilver/template/viewtopic_print.html +++ b/phpBB/styles/prosilver/template/viewtopic_print.html @@ -23,10 +23,10 @@ <div id="page-header"> <h1>{SITENAME}</h1> - <p>{SITE_DESCRIPTION}<br />{U_FORUM}</p> + <p>{SITE_DESCRIPTION}<br /><a href="{U_FORUM}">{U_FORUM}</a></p> <h2>{TOPIC_TITLE}</h2> - <p>{U_TOPIC}</p> + <p><a href="{U_TOPIC}">{U_TOPIC}</a></p> </div> <div id="page-body"> diff --git a/phpBB/styles/subsilver2/template/index_body.html b/phpBB/styles/subsilver2/template/index_body.html index 894549fe08..1a78fff7c7 100644 --- a/phpBB/styles/subsilver2/template/index_body.html +++ b/phpBB/styles/subsilver2/template/index_body.html @@ -10,7 +10,7 @@ <!-- INCLUDE forumlist_body.html --> -<span class="gensmall"><a href="{U_DELETE_COOKIES}">{L_DELETE_COOKIES}</a> | <a href="{U_TEAM}">{L_THE_TEAM}</a></span><br /> +<span class="gensmall"><!-- IF not S_IS_BOT --><a href="{U_DELETE_COOKIES}">{L_DELETE_COOKIES}</a><!-- ENDIF --> | <a href="{U_TEAM}">{L_THE_TEAM}</a></span><br /> <br clear="all" /> diff --git a/phpBB/styles/subsilver2/template/memberlist_email.html b/phpBB/styles/subsilver2/template/memberlist_email.html index ebea654f58..92df7910a5 100644 --- a/phpBB/styles/subsilver2/template/memberlist_email.html +++ b/phpBB/styles/subsilver2/template/memberlist_email.html @@ -33,7 +33,7 @@ function checkForm(formObj) <table class="tablebg" width="100%" cellspacing="1"> <tr> - <th colspan="2">{L_SEND_EMAIL}</th> + <th colspan="2">{L_SEND_EMAIL_USER} {USERNAME}</th> </tr> <!-- IF ERROR_MESSAGE --> <tr> |