' . __( 'You can assign keywords to your posts using tags. Unlike categories, tags have no hierarchy, meaning there’s no relationship from one tag to another.' ) . '
'; if ( 'link_category' == $taxonomy ) - $help .= '' . __( 'You can delete Link Categories in the Bulk Action pulldown, but that action does not delete the links within the category. Instead, it moves them to the default Link Category.' ) . '
'; + $help .= '' . __( 'You can delete Link Categories in the Bulk Action pull-down, but that action does not delete the links within the category. Instead, it moves them to the default Link Category.' ) . '
'; else $help .='' . __( 'What’s the difference between categories and tags? Normally, tags are ad-hoc keywords that identify important information in your post (names, subjects, etc) that may or may not recur in other posts, while categories are pre-determined sections. If you think of your site like a book, the categories are like the Table of Contents and the tags are like the terms in the index.' ) . '
'; diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php index 39537915be..08a7b4b8dd 100644 --- a/wp-admin/includes/upgrade.php +++ b/wp-admin/includes/upgrade.php @@ -248,7 +248,7 @@ To delete a comment, just log in and view the post's comments. There you wi ...or something like this: -The XYZ Doohickey Company was founded in 1971, and has been providing quality doohickies to the public ever since. Located in Gotham City, XYZ employs over 2,000 people and does all kinds of awesome things for the Gotham community.+
The XYZ Doohickey Company was founded in 1971, and has been providing quality doohickeys to the public ever since. Located in Gotham City, XYZ employs over 2,000 people and does all kinds of awesome things for the Gotham community.As a new WordPress user, you should go to your dashboard to delete this page and create new pages for your content. Have fun!" ), admin_url() ); if ( is_multisite() ) diff --git a/wp-includes/js/tinymce/langs/wp-langs-en.js b/wp-includes/js/tinymce/langs/wp-langs-en.js index 7269e3d4b7..5efd014348 100644 --- a/wp-includes/js/tinymce/langs/wp-langs-en.js +++ b/wp-includes/js/tinymce/langs/wp-langs-en.js @@ -106,7 +106,7 @@ iespell_desc:"Run spell checking", download:"ieSpell not detected. Do you want to install it now?" }, advhr:{ -advhr_desc:"Horizontale rule" +advhr_desc:"Horizontal rule" }, emotions:{ emotions_desc:"Emotions" @@ -400,7 +400,7 @@ playcount:"Play count", rate:"Rate", uimode:"UI Mode", flash_options:"Flash options", -qt_options:"Quicktime options", +qt_options:"QuickTime options", wmp_options:"Windows media player options", rmp_options:"Real media player options", shockwave_options:"Shockwave options", diff --git a/wp-includes/js/tinymce/langs/wp-langs.php b/wp-includes/js/tinymce/langs/wp-langs.php index 05e89d870d..f9586d600e 100644 --- a/wp-includes/js/tinymce/langs/wp-langs.php +++ b/wp-includes/js/tinymce/langs/wp-langs.php @@ -129,7 +129,7 @@ function wp_mce_translation() { ), 'advhr' => array( - 'advhr_desc' => __('Horizontale rule') + 'advhr_desc' => __('Horizontal rule') ), 'emotions' => array( @@ -443,7 +443,7 @@ function wp_mce_translation() { 'rate' => __('Rate'), 'uimode' => __('UI Mode'), 'flash_options' => __('Flash options'), - 'qt_options' => __('Quicktime options'), + 'qt_options' => __('QuickTime options'), 'wmp_options' => __('Windows media player options'), 'rmp_options' => __('Real media player options'), 'shockwave_options' => __('Shockwave options'), diff --git a/wp-includes/js/tinymce/wp-mce-help.php b/wp-includes/js/tinymce/wp-mce-help.php index 0cf05500ea..add970e77b 100644 --- a/wp-includes/js/tinymce/wp-mce-help.php +++ b/wp-includes/js/tinymce/wp-mce-help.php @@ -230,7 +230,7 @@ if ( tinymce.isMac )
()
-by Moxiecode Systems AB. It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances.'), '') ?>
+by Moxiecode Systems AB. It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances.'), '') ?>
Moxiecode Systems AB, All rights reserved.') ?>
TinyMCE website.') ?>
diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php index 0581a104ca..11a35b32df 100644 --- a/wp-includes/post-template.php +++ b/wp-includes/post-template.php @@ -1416,9 +1416,9 @@ function wp_list_post_revisions( $post_id = 0, $args = null ) {