WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Dashboard: Improve grammar for WordPress News help text. 

Also, move planet URL to a separate string to match the URL which is used for the feed.

Props ramiy for initial patch.
Fixes #35681.
Built from https://develop.svn.wordpress.org/trunk@37553


git-svn-id: http://core.svn.wordpress.org/trunk@37521 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2016-05-24 21:22:28 +00:00
parent d23b1534b8
commit 76ade1b21d
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-admin/index.php
View File

@ -69,9 +69,17 @@ if ( current_user_can( 'edit_posts' ) )
if ( is_blog_admin() && current_user_can( 'edit_posts' ) ) if ( is_blog_admin() && current_user_can( 'edit_posts' ) )
$help .= '<p>' . __( "<strong>Quick Draft</strong> &mdash; Allows you to create a new post and save it as a draft. Also displays links to the 5 most recent draft posts you've started." ) . '</p>'; $help .= '<p>' . __( "<strong>Quick Draft</strong> &mdash; Allows you to create a new post and save it as a draft. Also displays links to the 5 most recent draft posts you've started." ) . '</p>';
if ( ! is_multisite() && current_user_can( 'install_plugins' ) ) if ( ! is_multisite() && current_user_can( 'install_plugins' ) )
$help .= '<p>' . __( '<strong>WordPress News</strong> &mdash; Latest news from the official WordPress project, the <a href="https://planet.wordpress.org/">WordPress Planet</a>, and popular and recent plugins.' ) . '</p>'; $help .= '<p>' . sprintf(
/* translators: %s: WordPress Planet URL */
__( '<strong>WordPress News</strong> &mdash; Latest news from the official WordPress project, the <a href="%s">WordPress Planet</a>, and popular plugins.' ),
__( 'https://planet.wordpress.org/' )
) . '</p>';
else else
$help .= '<p>' . __( '<strong>WordPress News</strong> &mdash; Latest news from the official WordPress project, the <a href="https://planet.wordpress.org/">WordPress Planet</a>.' ) . '</p>'; $help .= '<p>' . sprintf(
/* translators: %s: WordPress Planet URL */
__( '<strong>WordPress News</strong> &mdash; Latest news from the official WordPress project and the <a href="%s">WordPress Planet</a>.' ),
__( 'https://planet.wordpress.org/' )
) . '</p>';
if ( current_user_can( 'edit_theme_options' ) ) if ( current_user_can( 'edit_theme_options' ) )
$help .= '<p>' . __( '<strong>Welcome</strong> &mdash; Shows links for some of the most common tasks when setting up a new site.' ) . '</p>'; $help .= '<p>' . __( '<strong>Welcome</strong> &mdash; Shows links for some of the most common tasks when setting up a new site.' ) . '</p>';

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.6-alpha-37552'; $wp_version = '4.6-alpha-37553';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.