From 1cfe56a1aab3afcf60ada80b9c48ece65e24bf67 Mon Sep 17 00:00:00 2001 From: Bob Vincent Date: Wed, 25 May 2011 20:33:29 -0400 Subject: [PATCH] Issue #431612 by catch, RoboPhred, Freso, pillarsdotnet: Stop using post as a noun. --- includes/common.inc | 4 +- includes/form.inc | 2 +- modules/aggregator/aggregator.module | 2 +- modules/blog/blog.module | 16 ++++++------ modules/blog/blog.test | 6 ++-- modules/book/book.module | 2 +- modules/book/book.pages.inc | 6 ++-- modules/comment/comment.install | 2 +- modules/comment/comment.module | 12 ++++---- modules/dashboard/dashboard.module | 2 +- modules/field_ui/field_ui.api.php | 2 +- modules/field_ui/field_ui.module | 2 +- modules/forum/forum-icon.tpl.php | 6 ++-- modules/forum/forum-list.tpl.php | 19 +++++++------- modules/forum/forum-submitted.tpl.php | 6 ++-- modules/forum/forum.admin.inc | 4 +- modules/forum/forum.css | 2 +- modules/forum/forum.install | 2 +- modules/forum/forum.module | 42 ++++++++++++++++---------------- modules/forum/forum.test | 8 +++--- modules/locale/locale.admin.inc | 2 +- modules/locale/locale.module | 2 +- modules/node/content_types.inc | 4 +- modules/node/content_types.js | 2 +- modules/node/node.admin.inc | 4 +- modules/node/node.install | 2 +- modules/node/node.module | 2 +- modules/node/node.pages.inc | 6 ++-- modules/node/node.test | 30 +++++++++++----------- modules/node/node.tpl.php | 2 +- modules/php/php.module | 8 +++--- modules/rdf/rdf.test | 8 +++--- modules/system/system.admin.inc | 6 ++-- modules/system/system.api.php | 2 +- modules/system/system.install | 2 +- modules/system/system.module | 6 ++-- modules/translation/translation.module | 16 ++++++------ modules/trigger/trigger.test | 4 +- profiles/standard/standard.install | 2 +- themes/bartik/templates/node.tpl.php | 2 +- 40 files changed, 129 insertions(+), 130 deletions(-) diff --git a/includes/common.inc b/includes/common.inc index 95e03e8cc93e6d41ee5780e9019bd9e50607f547..91eb5ca3fc9bf183e59d435c4175e8fd789ab144 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -1665,8 +1665,8 @@ function format_xml_elements($array) { * Example with additional replacements: * @code * $output = format_plural($update_count, - * 'Changed the content type of 1 post from %old-type to %new-type.', - * 'Changed the content type of @count posts from %old-type to %new-type.', + * 'Changed the content type of 1 item from %old-type to %new-type.', + * 'Changed the content type of @count items from %old-type to %new-type.', * array('%old-type' => $info->old_type, '%new-type' => $info->new_type))); * @endcode * diff --git a/includes/form.inc b/includes/form.inc index c0e2ec7c1556098585935ecb579fd0dc203d6d73..264a33872f7d29876c1696ca5759fc8af8462ddf 100644 --- a/includes/form.inc +++ b/includes/form.inc @@ -4075,7 +4075,7 @@ function _form_set_class(&$element, $class = array()) { * @code * function batch_test_finished($success, $results, $operations) { * if ($success) { - * $message = format_plural(count($results), 'One post processed.', '@count posts processed.'); + * $message = format_plural(count($results), 'One item processed.', '@count items processed.'); * } * else { * $message = t('Finished with an error.'); diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module index 1e1686af8bf2a671c4a674f3c12777bf0a41d784..540ff1c6f4776d0a0c16b779524ed12a7d783f38 100644 --- a/modules/aggregator/aggregator.module +++ b/modules/aggregator/aggregator.module @@ -32,7 +32,7 @@ function aggregator_help($path, $arg) { $output .= ''; return $output; case 'admin/config/services/aggregator': - $output = '

' . t('Thousands of sites (particularly news sites and blogs) publish their latest headlines and posts in feeds, using a number of standardized XML-based formats. Formats supported by the aggregator include RSS, RDF, and Atom.', array('@rss' => 'http://cyber.law.harvard.edu/rss/', '@rdf' => 'http://www.w3.org/RDF/', '@atom' => 'http://www.atomenabled.org')) . '

'; + $output = '

' . t('Thousands of sites (particularly news sites and blogs) publish their latest headlines and content in feeds, using a number of standardized XML-based formats. Formats supported by the aggregator include RSS, RDF, and Atom.', array('@rss' => 'http://cyber.law.harvard.edu/rss/', '@rdf' => 'http://www.w3.org/RDF/', '@atom' => 'http://www.atomenabled.org')) . '

'; $output .= '

' . t('Current feeds are listed below, and new feeds may be added. For each feed or feed category, the latest items block may be enabled at the blocks administration page.', array('@addfeed' => url('admin/config/services/aggregator/add/feed'), '@block' => url('admin/structure/block'))) . '

'; return $output; case 'admin/config/services/aggregator/add/feed': diff --git a/modules/blog/blog.module b/modules/blog/blog.module index 98ebe5159a75e12a22cff597b4760a493c2ea059..e0e68be8d92d674a2988b70927f58d564658ce43 100644 --- a/modules/blog/blog.module +++ b/modules/blog/blog.module @@ -49,7 +49,7 @@ function blog_help($path, $arg) { $output .= '
' . t('Navigation') . '
'; $output .= '
' . t("There is an optional Blogs menu item added to the Navigation menu, which displays all blogs available on your site, and a My blog item displaying the current user's blog entries.") . '
'; $output .= '
' . t('Blocks') . '
'; - $output .= '
' . t('The Blog module also creates a default Recent blog posts block that may be enabled at the blocks administration page.', array('@blocks' => url('admin/structure/block'))) . '
'; + $output .= '
' . t('The Blog module also creates a default Recent blog entries block that may be enabled at the blocks administration page.', array('@blocks' => url('admin/structure/block'))) . '
'; $output .= ''; return $output; } @@ -170,14 +170,14 @@ function blog_menu_local_tasks_alter(&$data, $router_item, $root_path) { function blog_page_user_access($account) { // The visitor must be able to access the site's content. // For a blog to 'exist' the user must either be able to - // create new blog entries, or it must have existing posts. - return $account->uid && user_access('access content') && (user_access('create blog content', $account) || _blog_post_exists($account)); + // create new blog entries, or it must have existing entries. + return $account->uid && user_access('access content') && (user_access('create blog content', $account) || _blog_entry_exists($account)); } /** - * Helper function to determine if a user has blog posts already. + * Helper function to determine if a user has blog entries already. */ -function _blog_post_exists($account) { +function _blog_entry_exists($account) { return (bool)db_select('node', 'n') ->fields('n', array('nid')) ->condition('type', 'blog') @@ -193,7 +193,7 @@ function _blog_post_exists($account) { * Implements hook_block_info(). */ function blog_block_info() { - $block['recent']['info'] = t('Recent blog posts'); + $block['recent']['info'] = t('Recent blog entries'); $block['recent']['properties']['administrative'] = TRUE; return $block; } @@ -205,7 +205,7 @@ function blog_block_configure($delta = '') { if ($delta == 'recent') { $form['blog_block_count'] = array( '#type' => 'select', - '#title' => t('Number of recent blog posts to display'), + '#title' => t('Number of recent blog entries to display'), '#default_value' => variable_get('blog_block_count', 10), '#options' => drupal_map_assoc(array(2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 25, 30)), ); @@ -241,7 +241,7 @@ function blog_block_view($delta = '') { ->execute(); if ($node_title_list = node_title_list($result)) { - $block['subject'] = t('Recent blog posts'); + $block['subject'] = t('Recent blog entries'); $block['content']['blog_list'] = $node_title_list; $block['content']['blog_more'] = array( '#theme' => 'more_link', diff --git a/modules/blog/blog.test b/modules/blog/blog.test index 6ff66a2abb6dd5fd660c1cd774bbb0cca0176a50..7aaf584d61d6a75bd519aa6c0a949ef656ce2dd2 100644 --- a/modules/blog/blog.test +++ b/modules/blog/blog.test @@ -69,11 +69,11 @@ class BlogTestCase extends DrupalWebTestCase { $edit['blocks[blog_recent][region]'] = 'sidebar_second'; $this->drupalPost('admin/structure/block', $edit, t('Save blocks')); $this->assertResponse(200); - // Verify ability to change number of recent blog posts in block. + // Verify ability to change number of recent blog entries in block. $edit = array(); $edit['blog_block_count'] = 5; $this->drupalPost('admin/structure/block/manage/blog/recent/configure', $edit, t('Save block')); - $this->assertEqual(variable_get('blog_block_count', 10), 5, t('Number of recent blog posts changed.')); + $this->assertEqual(variable_get('blog_block_count', 10), 5, t('Number of recent blog entries changed.')); // Do basic tests for each user. $this->doBasicTests($this->any_user, TRUE); @@ -139,7 +139,7 @@ class BlogTestCase extends DrupalWebTestCase { // Verify the blog block was displayed. $this->drupalGet(''); $this->assertResponse(200); - $this->assertText(t('Recent blog posts'), t('Blog block was displayed')); + $this->assertText(t('Recent blog entries'), t('Blog block was displayed')); // View blog node. $this->drupalGet('node/' . $node->nid); diff --git a/modules/book/book.module b/modules/book/book.module index de9561fecf1e90dc4134d31fc67d25431431d904..06560d833b01f5e705d5a523b78de8005656df2c 100644 --- a/modules/book/book.module +++ b/modules/book/book.module @@ -881,7 +881,7 @@ function book_node_update($node) { function book_node_delete($node) { if (!empty($node->book['bid'])) { if ($node->nid == $node->book['bid']) { - // Handle deletion of a top-level post. + // Handle deletion of a top-level book node. $result = db_query("SELECT b.nid FROM {menu_links} ml INNER JOIN {book} b on b.mlid = ml.mlid WHERE ml.plid = :plid", array( ':plid' => $node->book['mlid'] )); diff --git a/modules/book/book.pages.inc b/modules/book/book.pages.inc index 1617f008503977e66e66e6122444864b9ae4bd9a..2d5067befc56d80535bf382712acfdbb91b7864a 100644 --- a/modules/book/book.pages.inc +++ b/modules/book/book.pages.inc @@ -168,7 +168,7 @@ function book_outline_form_submit($form, &$form_state) { if (_book_update_outline($node)) { if ($node->book['parent_mismatch']) { // This will usually only happen when JS is disabled. - drupal_set_message(t('The post has been added to the selected book. You may now position it relative to other pages.')); + drupal_set_message(t('The content has been added to the selected book. You may now position it relative to other pages.')); $form_state['redirect'] = "node/" . $node->nid . "/outline"; } else { @@ -176,7 +176,7 @@ function book_outline_form_submit($form, &$form_state) { } } else { - drupal_set_message(t('There was an error adding the post to the book.'), 'error'); + drupal_set_message(t('There was an error adding the content to the book.'), 'error'); } } @@ -214,7 +214,7 @@ function book_remove_form_submit($form, &$form_state) { db_delete('book') ->condition('nid', $node->nid) ->execute(); - drupal_set_message(t('The post has been removed from the book.')); + drupal_set_message(t('The content has been removed from the book.')); } $form_state['redirect'] = 'node/' . $node->nid; } diff --git a/modules/comment/comment.install b/modules/comment/comment.install index 1dd67f4dddf5f421d4caec27b12cf56b2d8812c8..c4842bf1e57746704c311317db87084fa540e84c 100644 --- a/modules/comment/comment.install +++ b/modules/comment/comment.install @@ -195,7 +195,7 @@ function comment_schema() { ); $schema['node_comment_statistics'] = array( - 'description' => 'Maintains statistics of node and comments posts to show "new" and "updated" flags.', + 'description' => 'Maintains statistics of nodes and comments to show "new" and "updated" flags.', 'fields' => array( 'nid' => array( 'type' => 'int', diff --git a/modules/comment/comment.module b/modules/comment/comment.module index 60a9ca40aabfb825fb43410d4799d1ea51d0f484..54b041e0cbcd3baff80e61c4b01510451b6b0430 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -6,7 +6,7 @@ * * When enabled, the Drupal comment module creates a discussion * board for each Drupal node. Users can post comments to discuss - * a forum topic, weblog post, story, collaborative book page, etc. + * a forum topic, weblog entry, story, collaborative book page, etc. */ /** @@ -635,7 +635,7 @@ function comment_node_view($node, $view_mode) { 'title' => format_plural($new, '1 new comment', '@count new comments'), 'href' => "node/$node->nid", 'query' => comment_new_page_count($node->comment_count, $new, $node), - 'attributes' => array('title' => t('Jump to the first new comment of this posting.')), + 'attributes' => array('title' => t('Jump to the first new comment.')), 'fragment' => 'new', 'html' => TRUE, ); @@ -672,7 +672,7 @@ function comment_node_view($node, $view_mode) { if ($comment_form_location == COMMENT_FORM_SEPARATE_PAGE || (!empty($node->comment_count) && user_access('access comments'))) { $links['comment-add'] = array( 'title' => t('Add new comment'), - 'attributes' => array('title' => t('Share your thoughts and opinions related to this posting.')), + 'attributes' => array('title' => t('Share your thoughts and opinions related to this content.')), 'href' => "node/$node->nid", 'fragment' => 'comment-form', ); @@ -1407,7 +1407,7 @@ function comment_user_delete($account) { * * Authenticated users can edit their comments as long they have not been * replied to. This prevents people from changing or revising their statements - * based on the replies to their posts. + * based on the replies to their content. * * @param $op * The operation that is to be performed on the comment. Only 'edit' is @@ -2223,8 +2223,8 @@ function comment_form_submit($form, &$form_state) { $redirect = array('node/' . $node->nid, array('query' => $query, 'fragment' => 'comment-' . $comment->cid)); } else { - watchdog('content', 'Comment: unauthorized comment submitted or comment submitted to a closed post %subject.', array('%subject' => $comment->subject), LOG_WARNING); - drupal_set_message(t('Comment: unauthorized comment submitted or comment submitted to a closed post %subject.', array('%subject' => $comment->subject)), 'error'); + watchdog('content', 'Comment: unauthorized comment submitted or comment submitted to a closed subject %subject.', array('%subject' => $comment->subject), LOG_WARNING); + drupal_set_message(t('Comment: unauthorized comment submitted or comment submitted to a closed subject %subject.', array('%subject' => $comment->subject)), 'error'); // Redirect the user to the node they are commenting on. $redirect = 'node/' . $node->nid; } diff --git a/modules/dashboard/dashboard.module b/modules/dashboard/dashboard.module index 08a4cd2b765930db94a7eee9a90bca3062393ee3..eec07570623a02adede82f9e0e933ae41c80529f 100644 --- a/modules/dashboard/dashboard.module +++ b/modules/dashboard/dashboard.module @@ -14,7 +14,7 @@ function dashboard_help($path, $arg) { $output .= '
' . t('Tracking user activity') . '
'; $output .= '
' . t("By enabling blocks such as Who's online and Who's new, site users can track who is logged in and new user signups at a centralized location.") . '
'; $output .= '
' . t('Tracking content activity') . '
'; - $output .= '
' . t('By enabling blocks such as Recent blog posts, New forum topics and Recent comments, site users can view newly added site content at a glance.') . '
'; + $output .= '
' . t('By enabling blocks such as Recent blog entries, New forum topics and Recent comments, site users can view newly added site content at a glance.') . '
'; $output .= ''; return $output; diff --git a/modules/field_ui/field_ui.api.php b/modules/field_ui/field_ui.api.php index e07a9373df33fa1fb86e13facadbee2b1a5fdf78..bcd19c1cd741a6e32e2e276d641256f2983f5285 100644 --- a/modules/field_ui/field_ui.api.php +++ b/modules/field_ui/field_ui.api.php @@ -82,7 +82,7 @@ function hook_field_instance_settings_form($field, $instance) { t('No'), t('Yes'), ), - '#description' => t('Display the summary to allow the user to input a summary value. Hide the summary to automatically fill it with a trimmed portion from the main post. '), + '#description' => t('Display the summary to allow the user to input a summary value. Hide the summary to automatically fill it with a trimmed portion from the full content. '), '#default_value' => !empty($settings['display_summary']) ? $settings['display_summary'] : 0, ); } diff --git a/modules/field_ui/field_ui.module b/modules/field_ui/field_ui.module index b828fff2c8c94174fbc1f8ba99827098e9d615f4..2b55121a1879cfa0b8f98c618e2854849f101aa5 100644 --- a/modules/field_ui/field_ui.module +++ b/modules/field_ui/field_ui.module @@ -38,7 +38,7 @@ function field_ui_help($path, $arg) { $output .= '
' . t('Fields on user accounts') . '
'; $output .= '
' . t('Fields on user accounts are defined on a site-wide basis on the Manage fields tab of the Account settings page. When you define a field for user accounts, each user account will have that field added to it. For example, you could add a long text field to allow users to include a biography.', array('@fields' => url('admin/config/people/accounts/fields'), '@accounts' => url('admin/config/people/accounts'))) . '
'; $output .= '
' . t('Fields on comments') . '
'; - $output .= '
' . t('Fields on comments are defined at the content-type level, on the Comment fields tab of the content type edit page (which you can reach from the Content types page). When you add a field for comments, each comment on a content item of that type will have that field added to it. For example, you could add a website field to the comments on forum posts, to allow forum commenters to add a link to their website.', array('@types' => url('admin/structure/types'))) . '
'; + $output .= '
' . t('Fields on comments are defined at the content-type level, on the Comment fields tab of the content type edit page (which you can reach from the Content types page). When you add a field for comments, each comment on a content item of that type will have that field added to it. For example, you could add a website field to the comments on forum topics, to allow forum commenters to add a link to their website.', array('@types' => url('admin/structure/types'))) . '
'; $output .= ''; return $output; diff --git a/modules/forum/forum-icon.tpl.php b/modules/forum/forum-icon.tpl.php index 9cf2cd8d3b28984a41d385c45dbbed28e17821ae..97b1880f3f6c90fd4ea85b1a76365fec07c9aa05 100644 --- a/modules/forum/forum-icon.tpl.php +++ b/modules/forum/forum-icon.tpl.php @@ -2,13 +2,13 @@ /** * @file - * Default theme implementation to display an appropriate icon for a forum post. + * Default theme implementation to display an appropriate icon for a forum topic. * * Available variables: - * - $new_posts: Indicates whether or not the topic contains new posts. + * - $new_comments: Indicates whether or not the topic contains new comments. * - $icon_class: The icon to display. May be one of 'hot', 'hot-new', 'new', * 'default', 'closed', or 'sticky'. - * - $first_new: Indicates whether this is the first topic with new posts. + * - $first_new: Indicates whether this is the first topic with new comments. * * @see template_preprocess_forum_icon() * @see theme_forum_icon() diff --git a/modules/forum/forum-list.tpl.php b/modules/forum/forum-list.tpl.php index bc0935f888234303ebc034fa2dc6ba88ee52b5c0..522d541523889c25597f41be2551b5b0fecb58b3 100644 --- a/modules/forum/forum-list.tpl.php +++ b/modules/forum/forum-list.tpl.php @@ -18,13 +18,12 @@ * - $forum->name: The name of the forum. * - $forum->link: The URL to link to this forum. * - $forum->description: The description of this forum. - * - $forum->new_topics: True if the forum contains unread posts. - * - $forum->new_url: A URL to the forum's unread posts. - * - $forum->new_text: Text for the above URL which tells how many new posts. - * - $forum->old_topics: A count of posts that have already been read. - * - $forum->num_posts: The total number of posts in the forum. - * - $forum->last_reply: Text representing the last time a forum was posted or - * commented in. + * - $forum->new_topics: True if the forum contains unread comments. + * - $forum->new_url: A URL to the forum's unread comments. + * - $forum->new_text: Text for the above URL which tells how many new comments. + * - $forum->old_topics: A count of topics that have already been read. + * - $forum->num_comments: The total number of comments in the forum. + * - $forum->last_reply: Text representing the last time a forum was posted in. * * @see template_preprocess_forum_list() * @see theme_forum_list() @@ -35,8 +34,8 @@ - - + + @@ -62,7 +61,7 @@ new_text; ?> - num_posts ?> + num_comments ?> last_reply ?> diff --git a/modules/forum/forum-submitted.tpl.php b/modules/forum/forum-submitted.tpl.php index d310448c7b25c0f11380ad9004ba4dc012de719e..ea9cb958129af7fd11bfdf91e8d44d83b180d154 100644 --- a/modules/forum/forum-submitted.tpl.php +++ b/modules/forum/forum-submitted.tpl.php @@ -7,9 +7,9 @@ * * Available variables: * - * - $author: The author of the post. - * - $time: How long ago the post was created. - * - $topic: An object with the raw data of the post. Unsafe, be sure + * - $author: The author of the topic. + * - $time: How long ago the topic was created. + * - $topic: An object with the raw data of the topic. Unsafe, be sure * to clean this data before printing. * * @see template_preprocess_forum_submitted() diff --git a/modules/forum/forum.admin.inc b/modules/forum/forum.admin.inc index 1e6b3655159180758950a4401a2a3f3a8bd07703..62cb355d322d8bb2b60b16ddf524ab23e03bc2e0 100644 --- a/modules/forum/forum.admin.inc +++ b/modules/forum/forum.admin.inc @@ -186,7 +186,7 @@ function forum_confirm_delete($form, &$form_state, $tid) { $form['tid'] = array('#type' => 'value', '#value' => $tid); $form['name'] = array('#type' => 'value', '#value' => $term->name); - return confirm_form($form, t('Are you sure you want to delete the forum %name?', array('%name' => $term->name)), 'admin/structure/forum', t('Deleting a forum or container will also delete its sub-forums, if any. To delete posts in this forum, visit content administration first. This action cannot be undone.', array('@content' => url('admin/content'))), t('Delete'), t('Cancel')); + return confirm_form($form, t('Are you sure you want to delete the forum %name?', array('%name' => $term->name)), 'admin/structure/forum', t('Deleting a forum or container will also delete its sub-forums, if any. To delete content in this forum, visit content administration first. This action cannot be undone.', array('@content' => url('admin/content'))), t('Delete'), t('Cancel')); } /** @@ -221,7 +221,7 @@ function forum_admin_settings($form) { '#options' => $number, '#description' => t('Default number of forum topics displayed per page.'), ); - $forder = array(1 => t('Date - newest first'), 2 => t('Date - oldest first'), 3 => t('Posts - most active first'), 4 => t('Posts - least active first')); + $forder = array(1 => t('Date - newest first'), 2 => t('Date - oldest first'), 3 => t('Topics - most active first'), 4 => t('Topics - least active first')); $form['forum_order'] = array('#type' => 'radios', '#title' => t('Default order'), '#default_value' => variable_get('forum_order', 1), diff --git a/modules/forum/forum.css b/modules/forum/forum.css index 3f3ed98481ce779676bbf7dc6a7d44964afc7fed..9e2f66efe72b3459f1e2e42dacadbd888915bf6e 100644 --- a/modules/forum/forum.css +++ b/modules/forum/forum.css @@ -4,7 +4,7 @@ margin: 0.5em; } #forum td.created, -#forum td.posts, +#forum td.comments, #forum td.topics, #forum td.last-reply, #forum td.replies, diff --git a/modules/forum/forum.install b/modules/forum/forum.install index b5817ab2992f53f80be7fd6ba3d8d90cc86eef22..cb4b68db2fae3698a25afd295262fdafae5fc0a0 100644 --- a/modules/forum/forum.install +++ b/modules/forum/forum.install @@ -59,7 +59,7 @@ function forum_enable() { ); field_create_field($field); - // Create a default forum so forum posts can be created. + // Create a default forum so forum topics can be created. $edit = array( 'name' => t('General discussion'), 'description' => '', diff --git a/modules/forum/forum.module b/modules/forum/forum.module index c58b5c905e9b7ca8675160ce0f4365de8e58699d..2e87d6c5bda81b1bbaae7e8a0bd90e71f4fefaa4 100644 --- a/modules/forum/forum.module +++ b/modules/forum/forum.module @@ -29,7 +29,7 @@ function forum_help($path, $arg) { $output .= '
' . t('Setting up forum structure') . '
'; $output .= '
' . t('Visit the Forums page to set up containers and forums to hold your discussion topics.', array('@forums' => url('admin/structure/forum'))) . '
'; $output .= '
' . t('Starting a discussion') . '
'; - $output .= '
' . t('The Forum topic link on the Add new content page creates the first post of a new threaded discussion, or thread.', array('@create-topic' => url('node/add/forum'), '@content-add' => url('node/add'))) . '
'; + $output .= '
' . t('The Forum topic link on the Add new content page creates the first comment of a new threaded discussion, or thread.', array('@create-topic' => url('node/add/forum'), '@content-add' => url('node/add'))) . '
'; $output .= '
' . t('Navigation') . '
'; $output .= '
' . t('Enabling the Forum module provides a default Forums menu item in the navigation menu that links to the Forums page.', array('@forums' => url('forum'))) . '
'; $output .= '
' . t('Moving forum topics') . '
'; @@ -70,7 +70,7 @@ function forum_theme() { ), 'forum_icon' => array( 'template' => 'forum-icon', - 'variables' => array('new_posts' => NULL, 'num_posts' => 0, 'comment_mode' => 0, 'sticky' => 0, 'first_new' => FALSE), + 'variables' => array('new_comments' => NULL, 'num_comments' => 0, 'comment_mode' => 0, 'sticky' => 0, 'first_new' => FALSE), ), 'forum_submitted' => array( 'template' => 'forum-submitted', @@ -725,8 +725,8 @@ function forum_form($node, $form_state) { * @return * A tree of taxonomy objects, with the following additional properties: * - 'num_topics': Number of topics in the forum - * - 'num_posts': Total number of posts in all topics - * - 'last_post': Most recent post for the forum + * - 'num_comments': Total number of comment in all topics + * - 'last_comment': Most recent comment for the forum * - 'forums': An array of child forums */ function forum_forum_load($tid = NULL) { @@ -792,11 +792,11 @@ function forum_forum_load($tid = NULL) { // Merge in the topic and post counters. if (!empty($counts[$forum->tid])) { $forum->num_topics = $counts[$forum->tid]->topic_count; - $forum->num_posts = $counts[$forum->tid]->topic_count + $counts[$forum->tid]->comment_count; + $forum->num_comments = $counts[$forum->tid]->topic_count + $counts[$forum->tid]->comment_count; } else { $forum->num_topics = 0; - $forum->num_posts = 0; + $forum->num_comments = 0; } // Query "Last Post" information for this forum. @@ -816,14 +816,14 @@ function forum_forum_load($tid = NULL) { ->execute() ->fetchObject(); - // Merge in the "Last Post" information. - $last_post = new stdClass(); + // Merge in the "Last Comment" information. + $last_comment = new stdClass(); if (!empty($topic->last_comment_timestamp)) { - $last_post->created = $topic->last_comment_timestamp; - $last_post->name = $topic->last_comment_name; - $last_post->uid = $topic->last_comment_uid; + $last_comment->created = $topic->last_comment_timestamp; + $last_comment->name = $topic->last_comment_name; + $last_comment->uid = $topic->last_comment_uid; } - $forum->last_post = $last_post; + $forum->last_comment = $last_comment; $forums[$forum->tid] = $forum; } @@ -1072,7 +1072,7 @@ function template_preprocess_forum_list(&$variables) { } $variables['forums'][$id]->old_topics = $forum->num_topics - $variables['forums'][$id]->new_topics; } - $variables['forums'][$id]->last_reply = theme('forum_submitted', array('topic' => $forum->last_post)); + $variables['forums'][$id]->last_reply = theme('forum_submitted', array('topic' => $forum->last_comment)); } // Give meaning to $tid for themers. $tid actually stands for term id. $variables['forum_id'] = $variables['tid']; @@ -1106,7 +1106,7 @@ function template_preprocess_forum_topic_list(&$variables) { if (!empty($variables['topics'])) { $row = 0; foreach ($variables['topics'] as $id => $topic) { - $variables['topics'][$id]->icon = theme('forum_icon', array('new_posts' => $topic->new, 'num_posts' => $topic->comment_count, 'comment_mode' => $topic->comment_mode, 'sticky' => $topic->sticky, 'first_new' => $topic->first_new)); + $variables['topics'][$id]->icon = theme('forum_icon', array('new_comments' => $topic->new, 'num_comments' => $topic->comment_count, 'comment_mode' => $topic->comment_mode, 'sticky' => $topic->sticky, 'first_new' => $topic->first_new)); $variables['topics'][$id]->zebra = $row % 2 == 0 ? 'odd' : 'even'; $row++; @@ -1151,8 +1151,8 @@ function template_preprocess_forum_topic_list(&$variables) { * Process variables to format the icon for each individual topic. * * $variables contains the following data: - * - $new_posts - * - $num_posts = 0 + * - $new_comments + * - $num_comments = 0 * - $comment_mode = 0 * - $sticky = 0 * - $first_new @@ -1162,13 +1162,13 @@ function template_preprocess_forum_topic_list(&$variables) { */ function template_preprocess_forum_icon(&$variables) { $variables['hot_threshold'] = variable_get('forum_hot_topic', 15); - if ($variables['num_posts'] > $variables['hot_threshold']) { - $variables['icon_class'] = $variables['new_posts'] ? 'hot-new' : 'hot'; - $variables['icon_title'] = $variables['new_posts'] ? t('Hot topic, new comments') : t('Hot topic'); + if ($variables['num_comments'] > $variables['hot_threshold']) { + $variables['icon_class'] = $variables['new_comments'] ? 'hot-new' : 'hot'; + $variables['icon_title'] = $variables['new_comments'] ? t('Hot topic, new comments') : t('Hot topic'); } else { - $variables['icon_class'] = $variables['new_posts'] ? 'new' : 'default'; - $variables['icon_title'] = $variables['new_posts'] ? t('New comments') : t('Normal topic'); + $variables['icon_class'] = $variables['new_comments'] ? 'new' : 'default'; + $variables['icon_title'] = $variables['new_comments'] ? t('New comments') : t('Normal topic'); } if ($variables['comment_mode'] == COMMENT_NODE_CLOSED || $variables['comment_mode'] == COMMENT_NODE_HIDDEN) { diff --git a/modules/forum/forum.test b/modules/forum/forum.test index 1dc45c6fdf61b4d13b81acd5b4ec41afdb268532..54323b788a5a040784068434444ad1e2f4aa9470 100644 --- a/modules/forum/forum.test +++ b/modules/forum/forum.test @@ -99,7 +99,7 @@ class ForumTestCase extends DrupalWebTestCase { // Verify that this user can edit forum content authored by another user. $this->verifyForums($this->edit_own_topics_user, $own_topics_user_node, TRUE); - // Verify the topic and post counts on the forum page. + // Verify the topic and comment counts on the forum page. $this->drupalGet('forum'); // Verify row for testing forum. @@ -117,9 +117,9 @@ class ForumTestCase extends DrupalWebTestCase { $xpath = $this->buildXPathQuery('//tr[@id=:forum]//td[@class="topics"]//a', $forum_arg); $this->assertFieldByXPath($xpath, $unread_topics, t('Number of unread topics found.')); - // Verify total number of posts in forum. - $xpath = $this->buildXPathQuery('//tr[@id=:forum]//td[@class="posts"]', $forum_arg); - $this->assertFieldByXPath($xpath, '6', t('Number of posts found.')); + // Verify total number of items in forum. + $xpath = $this->buildXPathQuery('//tr[@id=:forum]//td[@class="comments"]', $forum_arg); + $this->assertFieldByXPath($xpath, '6', t('Number of items found.')); // Test loading multiple forum nodes on the front page. $this->drupalLogin($this->drupalCreateUser(array('administer content types', 'create forum content'))); diff --git a/modules/locale/locale.admin.inc b/modules/locale/locale.admin.inc index dff6537d8d4728f8432a4ea5091a1f87e31a5a6f..acdf50c48c82deba5145e69492f5335a62b3291a 100644 --- a/modules/locale/locale.admin.inc +++ b/modules/locale/locale.admin.inc @@ -442,7 +442,7 @@ function locale_languages_delete_form($form, &$form_state, $langcode) { } else { $form['langcode'] = array('#type' => 'value', '#value' => $langcode); - return confirm_form($form, t('Are you sure you want to delete the language %name?', array('%name' => t($languages[$langcode]->name))), 'admin/config/regional/language', t('Deleting a language will remove all interface translations associated with it, and posts in this language will be set to be language neutral. This action cannot be undone.'), t('Delete'), t('Cancel')); + return confirm_form($form, t('Are you sure you want to delete the language %name?', array('%name' => t($languages[$langcode]->name))), 'admin/config/regional/language', t('Deleting a language will remove all interface translations associated with it, and content in this language will be set to be language neutral. This action cannot be undone.'), t('Delete'), t('Cancel')); } } diff --git a/modules/locale/locale.module b/modules/locale/locale.module index 07884614a51e6b2d84ae1c91b842bbb83df46200..2c9f62d1dec0fb895b5ab07af94ecd8cc9a273a6 100644 --- a/modules/locale/locale.module +++ b/modules/locale/locale.module @@ -328,7 +328,7 @@ function locale_form_node_type_form_alter(&$form, &$form_state) { '#title' => t('Multilingual support'), '#default_value' => variable_get('language_content_type_' . $form['#node_type']->type, 0), '#options' => array(t('Disabled'), t('Enabled')), - '#description' => t('Enable multilingual support for this content type. If enabled, a language selection field will be added to the editing form, allowing you to select from one of the enabled languages. If disabled, new posts are saved with the default language. Existing content will not be affected by changing this option.', array('!languages' => url('admin/config/regional/language'))), + '#description' => t('Enable multilingual support for this content type. If enabled, a language selection field will be added to the editing form, allowing you to select from one of the enabled languages. If disabled, new content is saved with the default language. Existing content will not be affected by changing this option.', array('!languages' => url('admin/config/regional/language'))), ); } } diff --git a/modules/node/content_types.inc b/modules/node/content_types.inc index 15f4fb14d3bf1323721830827f1eabb974b7e51d..6e1f9cc8dee3b725ff3c8da06a75161307d85283 100644 --- a/modules/node/content_types.inc +++ b/modules/node/content_types.inc @@ -357,7 +357,7 @@ function node_node_type_insert($info) { $update_count = node_type_update_nodes($info->old_type, $info->type); if ($update_count) { - drupal_set_message(format_plural($update_count, 'Changed the content type of 1 post from %old-type to %type.', 'Changed the content type of @count posts from %old-type to %type.', array('%old-type' => $info->old_type, '%type' => $info->type))); + drupal_set_message(format_plural($update_count, 'Changed the content type of 1 node from %old-type to %type.', 'Changed the content type of @count nodes from %old-type to %type.', array('%old-type' => $info->old_type, '%type' => $info->type))); } } } @@ -370,7 +370,7 @@ function node_node_type_update($info) { $update_count = node_type_update_nodes($info->old_type, $info->type); if ($update_count) { - drupal_set_message(format_plural($update_count, 'Changed the content type of 1 post from %old-type to %type.', 'Changed the content type of @count posts from %old-type to %type.', array('%old-type' => $info->old_type, '%type' => $info->type))); + drupal_set_message(format_plural($update_count, 'Changed the content type of 1 node from %old-type to %type.', 'Changed the content type of @count nodes from %old-type to %type.', array('%old-type' => $info->old_type, '%type' => $info->type))); } } } diff --git a/modules/node/content_types.js b/modules/node/content_types.js index 0031c323fac33019341d5aab9757ecf2702b2e8f..4875bf024673e53e26932c542a7429c58614b663 100644 --- a/modules/node/content_types.js +++ b/modules/node/content_types.js @@ -24,7 +24,7 @@ Drupal.behaviors.contentTypes = { vals.push(Drupal.checkPlain($(this).text())); }); if (!$('#edit-node-submitted', context).is(':checked')) { - vals.unshift(Drupal.t("Don't display post information")); + vals.unshift(Drupal.t("Don't display submission information")); } return vals.join(', '); }); diff --git a/modules/node/node.admin.inc b/modules/node/node.admin.inc index a6ea1b5e5b6de1a2371f473687ecb0c3c42920d8..1c2d2753af76f7b84fa761a5b17331223ea6b05a 100644 --- a/modules/node/node.admin.inc +++ b/modules/node/node.admin.inc @@ -593,8 +593,8 @@ function node_multiple_delete_confirm_submit($form, &$form_state) { if ($form_state['values']['confirm']) { node_delete_multiple(array_keys($form_state['values']['nodes'])); $count = count($form_state['values']['nodes']); - watchdog('content', 'Deleted @count posts.', array('@count' => $count)); - drupal_set_message(format_plural($count, 'Deleted 1 post.', 'Deleted @count posts.')); + watchdog('content', 'Deleted @count nodes.', array('@count' => $count)); + drupal_set_message(format_plural($count, 'Deleted 1 node.', 'Deleted @count nodes.')); } $form_state['redirect'] = 'admin/content'; } diff --git a/modules/node/node.install b/modules/node/node.install index e322e81c0a41ce190e2325143ca1e311cfb1d498..6db95de551e6a5b18a323b11bb251520e540dd51 100644 --- a/modules/node/node.install +++ b/modules/node/node.install @@ -89,7 +89,7 @@ function node_schema() { 'default' => 0, ), 'tnid' => array( - 'description' => 'The translation set id for this node, which equals the node id of the source post in each set.', + 'description' => 'The translation set id for this node, which equals the node id of the source node in each set.', 'type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, diff --git a/modules/node/node.module b/modules/node/node.module index 524a57fa7e744d116e9306af60d7a2420f99fb3a..78b703745020d98fb7370981d488b9afe14098e1 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -1462,7 +1462,7 @@ function template_preprocess_node(&$variables) { // Make the field variables available with the appropriate language. field_attach_preprocess('node', $node, $variables['content'], $variables); - // Display post information only on certain node types. + // Display submission information only on certain node types. if (variable_get('node_submitted_' . $node->type, TRUE)) { $variables['display_submitted'] = TRUE; $variables['submitted'] = t('Submitted by !username on !datetime', array('!username' => $variables['name'], '!datetime' => $variables['date'])); diff --git a/modules/node/node.pages.inc b/modules/node/node.pages.inc index 5879963b5eb580fefff216ae8dd1f829c6e44864..a0242c9224e0833e3915adc9dd764a309100b4df 100644 --- a/modules/node/node.pages.inc +++ b/modules/node/node.pages.inc @@ -384,9 +384,9 @@ function theme_node_preview($variables) { $elements = node_view($node, 'full'); $full = drupal_render($elements); - // Do we need to preview trimmed version of post as well as full version? + // Do we need to preview trimmed version of content as well as full version? if ($trimmed != $full) { - drupal_set_message(t('The trimmed version of your post shows what your post looks like when promoted to the main page or when exported for syndication. You can insert the delimiter "<!--break-->" (without the quotes) to fine-tune where your post gets split.')); + drupal_set_message(t('The trimmed version of your content shows what your content looks like when promoted to the main page or when exported for syndication. You can insert the delimiter "<!--break-->" (without the quotes) to fine-tune where your content gets split.')); $output .= '

' . t('Preview trimmed version') . '

'; $output .= $trimmed; $output .= '

' . t('Preview full version') . '

'; @@ -424,7 +424,7 @@ function node_form_submit($form, &$form_state) { else { // In the unlikely case something went wrong on save, the node will be // rebuilt and node form redisplayed the same way as in preview. - drupal_set_message(t('The post could not be saved.'), 'error'); + drupal_set_message(t('The content could not be saved.'), 'error'); $form_state['rebuild'] = TRUE; } // Clear the page and block caches. diff --git a/modules/node/node.test b/modules/node/node.test index 8a871c0c731fcf61fd5c52d0bb8e962c4e916f46..e43ac4100f67b8e7f568c1cd3ea3ba285aded199 100644 --- a/modules/node/node.test +++ b/modules/node/node.test @@ -494,7 +494,7 @@ class NodeCreationTestCase extends DrupalWebTestCase { $this->drupalPost('node/add/page', $edit, t('Save')); // Check that the Basic page has been created. - $this->assertRaw(t('!post %title has been created.', array('!post' => 'Basic page', '%title' => $edit["title"])), t('Basic page created.')); + $this->assertRaw(t('!content %title has been created.', array('!content' => 'Basic page', '%title' => $edit["title"])), t('Basic page created.')); // Check that the node exists in the database. $node = $this->drupalGetNodeByTitle($edit["title"]); @@ -689,13 +689,13 @@ class NodeBlockTestCase extends DrupalWebTestCase { } /** - * Check that the post information displays when enabled for a content type. + * Check that the submission information displays when enabled for a content type. */ -class NodePostSettingsTestCase extends DrupalWebTestCase { +class NodeSubmissionSettingsTestCase extends DrupalWebTestCase { public static function getInfo() { return array( - 'name' => 'Node post information display', - 'description' => 'Check that the post information (submitted by Username on date) text displays appropriately.', + 'name' => 'Node submission information display', + 'description' => 'Check that the submission information (submitted by Username on date) text displays appropriately.', 'group' => 'Node', ); } @@ -708,11 +708,11 @@ class NodePostSettingsTestCase extends DrupalWebTestCase { } /** - * Set "Basic page" content type to display post information and confirm its presence on a new node. + * Set "Basic page" content type to display submission information and confirm its presence on a new node. */ - function testPagePostInfo() { + function testPageSubmissionInfo() { - // Set "Basic page" content type to display post information. + // Set "Basic page" content type to display submission information. $edit = array(); $edit['node_submitted'] = TRUE; $this->drupalPost('admin/structure/types/manage/page', $edit, t('Save content type')); @@ -724,18 +724,18 @@ class NodePostSettingsTestCase extends DrupalWebTestCase { $edit["body[$langcode][0][value]"] = $this->randomName(16); $this->drupalPost('node/add/page', $edit, t('Save')); - // Check that the post information is displayed. + // Check that the submission information is displayed. $node = $this->drupalGetNodeByTitle($edit["title"]); $elements = $this->xpath('//div[contains(@class,:class)]', array(':class' => 'submitted')); - $this->assertEqual(count($elements), 1, t('Post information is displayed.')); + $this->assertEqual(count($elements), 1, t('Submission information is displayed.')); } /** - * Set "Basic page" content type to not display post information and confirm its absence on a new node. + * Set "Basic page" content type to not display submission information and confirm its absence on a new node. */ - function testPageNotPostInfo() { + function testPageNotSubmissionInfo() { - // Set "Basic page" content type to display post information. + // Set "Basic page" content type to display submission information. $edit = array(); $edit['node_submitted'] = FALSE; $this->drupalPost('admin/structure/types/manage/page', $edit, t('Save content type')); @@ -747,9 +747,9 @@ class NodePostSettingsTestCase extends DrupalWebTestCase { $edit["body[$langcode][0][value]"] = $this->randomName(16); $this->drupalPost('node/add/page', $edit, t('Save')); - // Check that the post information is displayed. + // Check that the submission information is displayed. $node = $this->drupalGetNodeByTitle($edit["title"]); - $this->assertNoRaw('', t('Post information is not displayed.')); + $this->assertNoRaw('', t('Submission information is not displayed.')); } } diff --git a/modules/node/node.tpl.php b/modules/node/node.tpl.php index 6d0f489d71df9d4e0dfd4fade820b8c6492f6022..bc19ce424311822380d4e584dec8e8083cc24b2b 100644 --- a/modules/node/node.tpl.php +++ b/modules/node/node.tpl.php @@ -57,7 +57,7 @@ * - $teaser: Flag for the teaser state (shortcut for $view_mode == 'teaser'). * - $page: Flag for the full page state. * - $promote: Flag for front page promotion state. - * - $sticky: Flags for sticky post setting. + * - $sticky: Flags for sticky content setting. * - $status: Flag for published status. * - $comment: State of comment settings for the node. * - $readmore: Flags true if the teaser content of the node cannot hold the diff --git a/modules/php/php.module b/modules/php/php.module index 37bf9a1f337f280b8bb34a6d769d795650007038..6b28a173980fb4925ce8cb4d4db9ef93c28c6b57 100644 --- a/modules/php/php.module +++ b/modules/php/php.module @@ -88,8 +88,8 @@ function _php_filter_tips($filter, $format, $long = FALSE) { global $base_url; if ($long) { $output = '

' . t('Using custom PHP code') . '

'; - $output .= '

' . t('Custom PHP code may be embedded in some types of site content, including posts and blocks. While embedding PHP code inside a post or block is a powerful and flexible feature when used by a trusted user with PHP experience, it is a significant and dangerous security risk when used improperly. Even a small mistake when posting PHP code may accidentally compromise your site.') . '

'; - $output .= '

' . t('If you are unfamiliar with PHP, SQL, or Drupal, avoid using custom PHP code within posts. Experimenting with PHP may corrupt your database, render your site inoperable, or significantly compromise security.') . '

'; + $output .= '

' . t('Custom PHP code may be embedded in some types of site content, including nodes and blocks. While embedding PHP code inside a node or block is a powerful and flexible feature when used by a trusted user with PHP experience, it is a significant and dangerous security risk when used improperly. Even a small mistake when posting PHP code may accidentally compromise your site.') . '

'; + $output .= '

' . t('If you are unfamiliar with PHP, SQL, or Drupal, avoid using custom PHP code within nodes. Experimenting with PHP may corrupt your database, render your site inoperable, or significantly compromise security.') . '

'; $output .= '

' . t('Notes:') . '

'; $output .= '
  • ' . t('Remember to double-check each line for syntax and logic errors before saving.') . '
    • '; $output .= '
  • ' . t('Statements must be correctly terminated with semicolons.') . '
    • '; @@ -97,8 +97,8 @@ function _php_filter_tips($filter, $format, $long = FALSE) { $output .= '
  • ' . t('register_globals is turned off. If you need to use forms, understand and use the functions in the Drupal Form API.', array('@formapi' => url('http://api.drupal.org/api/group/form_api/7'))) . '
    • '; $output .= '
  • ' . t('Use a print or return statement in your code to output content.') . '
    • '; $output .= '
  • ' . t('Develop and test your PHP code using a separate test script and sample database before deploying on a production site.') . '
    • '; - $output .= '
  • ' . t('Consider including your custom PHP code within a site-specific module or template.php file rather than embedding it directly into a post or block.') . '
    • '; - $output .= '
  • ' . t('Be aware that the ability to embed PHP code within content is provided by the PHP Filter module. If this module is disabled or deleted, then blocks and posts with embedded PHP may display, rather than execute, the PHP code.') . '
'; + $output .= '
  • ' . t('Consider including your custom PHP code within a site-specific module or template.php file rather than embedding it directly into a node or block.') . '
    • '; + $output .= '
  • ' . t('Be aware that the ability to embed PHP code within content is provided by the PHP Filter module. If this module is disabled or deleted, then blocks and nodes with embedded PHP may display, rather than execute, the PHP code.') . '
    • '; $output .= '

    ' . t('A basic example: Creating a "Welcome" block that greets visitors with a simple message.') . '

    '; $output .= '
    • ' . t('

      Add a custom block to your site, named "Welcome" . With its text format set to "PHP code" (or another format supporting PHP input), add the following in the Block body:

      diff --git a/modules/rdf/rdf.test b/modules/rdf/rdf.test
index 9f786ab5b50a3cf1b3f297899c79aa50f2d53762..38d42962f77bb8703771c6ffdf776ec3faea660c 100644
--- a/modules/rdf/rdf.test
+++ b/modules/rdf/rdf.test
@@ -304,7 +304,7 @@ class RdfMappingDefinitionTestCase extends TaxonomyWebTestCase {
     $blog_title = $this->xpath("//meta[@property='dc:title' and @content='$node->title']");
     $blog_meta = $this->xpath("//div[(@about='$url') and (@typeof='sioct:Weblog')]//span[contains(@property, 'dc:date') and contains(@property, 'dc:created') and @datatype='xsd:dateTime' and @content='$isoDate']");
     $this->assertTrue(!empty($blog_title), t('Property dc:title is present in meta tag.'));
-    $this->assertTrue(!empty($blog_meta), t('RDF type is present on post. Properties dc:date and dc:created are present on post date.'));
+    $this->assertTrue(!empty($blog_meta), t('RDF type is present on node. Properties dc:date and dc:created are present on node date.'));
   }
 
   /**
@@ -322,7 +322,7 @@ class RdfMappingDefinitionTestCase extends TaxonomyWebTestCase {
     $test_bundle_title = $this->xpath("//meta[@property='dc:title' and @content='$node->title']");
     $test_bundle_meta = $this->xpath("//div[(@about='$url') and contains(@typeof, 'foo:mapping_install1') and contains(@typeof, 'bar:mapping_install2')]//span[contains(@property, 'dc:date') and contains(@property, 'dc:created') and @datatype='xsd:dateTime' and @content='$isoDate']");
     $this->assertTrue(!empty($test_bundle_title), t('Property dc:title is present in meta tag.'));
-    $this->assertTrue(!empty($test_bundle_meta), t('RDF type is present on post. Properties dc:date and dc:created are present on post date.'));
+    $this->assertTrue(!empty($test_bundle_meta), t('RDF type is present on node. Properties dc:date and dc:created are present on node date.'));
   }
 
   /**
@@ -341,7 +341,7 @@ class RdfMappingDefinitionTestCase extends TaxonomyWebTestCase {
     $random_bundle_title = $this->xpath("//meta[@property='dc:title' and @content='$node->title']");
     $random_bundle_meta = $this->xpath("//div[(@about='$url') and contains(@typeof, 'sioc:Item') and contains(@typeof, 'foaf:Document')]//span[contains(@property, 'dc:date') and contains(@property, 'dc:created') and @datatype='xsd:dateTime' and @content='$isoDate']");
     $this->assertTrue(!empty($random_bundle_title), t('Property dc:title is present in meta tag.'));
-    $this->assertTrue(!empty($random_bundle_meta), t('RDF type is present on post. Properties dc:date and dc:created are present on post date.'));
+    $this->assertTrue(!empty($random_bundle_meta), t('RDF type is present on node. Properties dc:date and dc:created are present on node date.'));
   }
 
   /**
@@ -387,7 +387,7 @@ class RdfMappingDefinitionTestCase extends TaxonomyWebTestCase {
     $author_about = $this->xpath('//a[@typeof="sioc:UserAccount" and @about=:account-uri and @property="foaf:name" and contains(@xml:lang, "")]', array(
       ':account-uri' => $account_uri,
     ));
-    $this->assertTrue(!empty($author_about), t('RDFa markup found on author information on post. xml:lang on username is set to empty string.'));
+    $this->assertTrue(!empty($author_about), t('RDFa markup found on author information on node. xml:lang on username is set to empty string.'));
   }
 
   /**
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index 9e7d69dd3aed5d6a6a6abecef02fa05c3b1157a2..e0a13fd377bfb2050759e1f77af401295636f21a 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -406,7 +406,7 @@ function system_theme_settings($form, &$form_state, $key = '') {
     'logo'                      => t('Logo'),
     'name'                      => t('Site name'),
     'slogan'                    => t('Site slogan'),
-    'node_user_picture'         => t('User pictures in posts'),
+    'node_user_picture'         => t('User pictures in nodes'),
     'comment_user_picture'      => t('User pictures in comments'),
     'comment_user_verification' => t('User verification status in comments'),
     'favicon'                   => t('Shortcut icon'),
@@ -1476,10 +1476,10 @@ function system_site_information_settings() {
     '#title' => t('Front page'),
   );
   $form['front_page']['default_nodes_main'] = array(
-    '#type' => 'select', '#title' => t('Number of posts on front page'),
+    '#type' => 'select', '#title' => t('Nodes on front page'),
     '#default_value' => variable_get('default_nodes_main', 10),
     '#options' => drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30)),
-    '#description' => t('The maximum number of posts displayed on overview pages such as the front page.')
+    '#description' => t('The maximum number of nodes displayed on overview pages such as the front page.')
   );
   $form['front_page']['site_frontpage'] = array(
     '#type' => 'textfield',
diff --git a/modules/system/system.api.php b/modules/system/system.api.php
index c2a613e9ea7012efb45f5827d72d3c1af32661ca..94a27d02feaabb305ed13bc151c8852f007b146e 100644
--- a/modules/system/system.api.php
+++ b/modules/system/system.api.php
@@ -2035,7 +2035,7 @@ function hook_theme($existing, $type, $theme, $path) {
       'variables' => array('tid' => NULL, 'topics' => NULL, 'sortby' => NULL, 'forum_per_page' => NULL),
     ),
     'forum_icon' => array(
-      'variables' => array('new_posts' => NULL, 'num_posts' => 0, 'comment_mode' => 0, 'sticky' => 0),
+      'variables' => array('new_posts' => NULL, 'num_comments' => 0, 'comment_mode' => 0, 'sticky' => 0),
     ),
     'status_report' => array(
       'render element' => 'requirements',
diff --git a/modules/system/system.install b/modules/system/system.install
index 6d2fc80975af0363ae3ffde7164262ab378d2211..1794014c109737323312198f046abe6fe2042bda 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -1480,7 +1480,7 @@ function system_schema() {
         'default' => 0,
       ),
       'cache' => array(
-        'description' => "The time of this user's last post. This is used when the site has specified a minimum_cache_lifetime. See cache_get().",
+        'description' => "The time of this user's last content submission. This is used when the site has specified a minimum_cache_lifetime. See cache_get().",
         'type' => 'int',
         'not null' => TRUE,
         'default' => 0,
diff --git a/modules/system/system.module b/modules/system/system.module
index 3ebc65706702b56310fc9b9916f96b8dad9decae..8f50f5554d9815e3e593c3d20460e12eede81f0f 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -83,7 +83,7 @@ function system_help($path, $arg) {
       $output .= '
      ' . t('Configuring basic site settings') . '
      ';
       $output .= '
      ' . t('The System module also handles basic configuration options for your site, including Date and time settings, File system settings, Clean URL support, Site name and other information, and a Maintenance mode for taking your site temporarily offline.', array('@date-time-settings' => url('admin/config/regional/date-time'), '@file-system' => url('admin/config/media/file-system'), '@clean-url' => url('admin/config/search/clean-urls'), '@site-info' => url('admin/config/system/site-information'), '@maintenance-mode' => url('admin/config/development/maintenance'))) . '
      ';
       $output .= '
      ' . t('Configuring actions') . '
      ';
-      $output .= '
      ' . t('Actions are individual tasks that the system can do, such as unpublishing a piece of content or banning a user. Modules, such as the Trigger module, can fire these actions when certain system events happen; for example, when a new post is added or when a user logs in. Modules may also provide additional actions. Visit the Actions page to configure actions.', array('@trigger-help' => url('admin/help/trigger'), '@actions' => url('admin/config/system/actions'))) . '
      ';
+      $output .= '
      ' . t('Actions are individual tasks that the system can do, such as unpublishing a piece of content or banning a user. Modules, such as the Trigger module, can fire these actions when certain system events happen; for example, when content is added or when a user logs in. Modules may also provide additional actions. Visit the Actions page to configure actions.', array('@trigger-help' => url('admin/help/trigger'), '@actions' => url('admin/config/system/actions'))) . '
      ';
       $output .= '';
       return $output;
     case 'admin/index':
@@ -969,7 +969,7 @@ function system_menu() {
   );
   $items['admin/config/system/site-information'] = array(
     'title' => 'Site information',
-    'description' => t('Change site name, e-mail address, slogan, default front page, and number of posts per page, error pages.'),
+    'description' => t('Change site name, e-mail address, slogan, default front page, and number of nodes per page, error pages.'),
     'page callback' => 'drupal_get_form',
     'page arguments' => array('system_site_information_settings'),
     'access arguments' => array('administer site configuration'),
@@ -3092,7 +3092,7 @@ function system_send_email_action_form($context) {
     '#title' => t('Recipient'),
     '#default_value' => $context['recipient'],
     '#maxlength' => '254',
-    '#description' => t('The email address to which the message should be sent OR enter [node:author:mail], [comment:author:mail], etc. if you would like to send an e-mail to the author of the original post.'),
+    '#description' => t('The email address to which the message should be sent OR enter [node:author:mail], [comment:author:mail], etc. if you would like to send an e-mail to the author of the original content.'),
   );
   $form['subject'] = array(
     '#type' => 'textfield',
diff --git a/modules/translation/translation.module b/modules/translation/translation.module
index 697929f6681467df7d21c3b060604461ca14e68e..c5998e9e8187b04893201f1f78d50c9dc68f4017 100644
--- a/modules/translation/translation.module
+++ b/modules/translation/translation.module
@@ -4,17 +4,17 @@
  * @file
  *   Manages content translations.
  *
- *   Translations are managed in sets of posts, which represent the same
+ *   Translations are managed in sets of nodes, which represent the same
  *   information in different languages. Only content types for which the
  *   administrator explicitly enabled translations could have translations
  *   associated. Translations are managed in sets with exactly one source
- *   post per set. The source post is used to translate to different
- *   languages, so if the source post is significantly updated, the
+ *   node per set. The source node is used to translate to different
+ *   languages, so if the source node is significantly updated, the
  *   editor can decide to mark all translations outdated.
  *
  *   The node table stores the values used by this module:
  *    - 'tnid' is the translation set id, which equals the node id
- *      of the source post.
+ *      of the source node.
  *    - 'translate' is a flag, either indicating that the translation
  *      is up to date (0) or needs to be updated (1).
  */
@@ -46,7 +46,7 @@ function translation_help($path, $arg) {
       $output .= '';
       return $output;
     case 'node/%/translate':
-      $output = '
      ' . t('Translations of a piece of content are managed with translation sets. Each translation set has one source post and any number of translations in any of the enabled languages. All translations are tracked to be up to date or outdated based on whether the source post was modified significantly.', array('!languages' => url('admin/config/regional/language'))) . '
      ';
+      $output = '
      ' . t('Translations of a piece of content are managed with translation sets. Each translation set has one source node and any number of translations in any of the enabled languages. All translations are tracked to be up to date or outdated based on whether the source node was modified significantly.', array('!languages' => url('admin/config/regional/language'))) . '
      ';
       return $output;
   }
 }
@@ -113,7 +113,7 @@ function translation_form_node_type_form_alter(&$form, &$form_state) {
   // Add translation option to content type form.
   $form['workflow']['language_content_type']['#options'][TRANSLATION_ENABLED] = t('Enabled, with translation');
   // Description based on text from locale.module.
-  $form['workflow']['language_content_type']['#description'] = t('Enable multilingual support for this content type. If enabled, a language selection field will be added to the editing form, allowing you to select from one of the enabled languages. You can also turn on translation for this content type, which lets you have content translated to any of the installed languages. If disabled, new posts are saved with the default language. Existing content will not be affected by changing this option.', array('!languages' => url('admin/config/regional/language')));
+  $form['workflow']['language_content_type']['#description'] = t('Enable multilingual support for this content type. If enabled, a language selection field will be added to the editing form, allowing you to select from one of the enabled languages. You can also turn on translation for this content type, which lets you have content translated to any of the installed languages. If disabled, new nodes are saved with the default language. Existing content will not be affected by changing this option.', array('!languages' => url('admin/config/regional/language')));
 }
 
 /**
@@ -181,7 +181,7 @@ function translation_form_node_form_alter(&$form, &$form_state) {
           '#type' => 'checkbox',
           '#title' => t('Flag translations as outdated'),
           '#default_value' => 0,
-          '#description' => t('If you made a significant change, which means translations should be updated, you can flag all translations of this post as outdated. This will not change any other property of those posts, like whether they are published or not.'),
+          '#description' => t('If you made a significant change, which means translations should be updated, you can flag all translations of this node as outdated. This will not change any other property of those nodes, like whether they are published or not.'),
         );
         $form['translation']['status'] = array('#type' => 'value', '#value' => 0);
       }
@@ -190,7 +190,7 @@ function translation_form_node_form_alter(&$form, &$form_state) {
           '#type' => 'checkbox',
           '#title' => t('This translation needs to be updated'),
           '#default_value' => $node->translate,
-          '#description' => t('When this option is checked, this translation needs to be updated because the source post has changed. Uncheck when the translation is up to date again.'),
+          '#description' => t('When this option is checked, this translation needs to be updated because the source node has changed. Uncheck when the translation is up to date again.'),
         );
       }
     }
diff --git a/modules/trigger/trigger.test b/modules/trigger/trigger.test
index 9a9a4ba282406f7c81b6ceefc4ee1704c126686d..4cdf72c90877df4ec255c92fb8b4c949699c2350 100644
--- a/modules/trigger/trigger.test
+++ b/modules/trigger/trigger.test
@@ -721,7 +721,7 @@ class TriggerOrphanedActionsTestCase extends DrupalWebTestCase {
     $edit["title"] = '!SimpleTest test node! ' . $this->randomName(10);
     $edit["body[$langcode][0][value]"] = '!SimpleTest test body! ' . $this->randomName(32) . ' ' . $this->randomName(32);
     $this->drupalPost('node/add/page', $edit, t('Save'));
-    $this->assertRaw(t('!post %title has been created.', array('!post' => 'Basic page', '%title' => $edit["title"])), t('Make sure the Basic page has actually been created'));
+    $this->assertRaw(t('!content %title has been created.', array('!content' => 'Basic page', '%title' => $edit["title"])), t('Make sure the Basic page has actually been created'));
 
     // Action should have been fired.
     $this->assertTrue(variable_get('trigger_test_generic_any_action', FALSE), t('Trigger test action successfully fired.'));
@@ -735,6 +735,6 @@ class TriggerOrphanedActionsTestCase extends DrupalWebTestCase {
 
     // If the node body was updated successfully we have dealt with the
     // unavailable action.
-    $this->assertRaw(t('!post %title has been updated.', array('!post' => 'Basic page', '%title' => $edit["title"])), t('Make sure the Basic page can be updated with the missing trigger function.'));
+    $this->assertRaw(t('!content %title has been updated.', array('!content' => 'Basic page', '%title' => $edit["title"])), t('Make sure the Basic page can be updated with the missing trigger function.'));
   }
 }
diff --git a/profiles/standard/standard.install b/profiles/standard/standard.install
index 70829064d1bc3c929f20c3c112bbc0957e1e752d..54453a350afa0b516e1e294296431f730ca58b87 100644
--- a/profiles/standard/standard.install
+++ b/profiles/standard/standard.install
@@ -210,7 +210,7 @@ function standard_install() {
       'type' => 'article',
       'name' => st('Article'),
       'base' => 'node_content',
-      'description' => st('Use articles for time-sensitive content like news, press releases or blog posts.'),
+      'description' => st('Use articles for time-sensitive content like news, press releases or blog entries.'),
       'custom' => 1,
       'modified' => 1,
       'locked' => 0,
diff --git a/themes/bartik/templates/node.tpl.php b/themes/bartik/templates/node.tpl.php
index f215b477bb3200ea9bdb0f989e110110d58a4bdf..88fa74c1c6ec8670ab94c36076b5a053fd3fd85c 100644
--- a/themes/bartik/templates/node.tpl.php
+++ b/themes/bartik/templates/node.tpl.php
@@ -57,7 +57,7 @@
  * - $teaser: Flag for the teaser state (shortcut for $view_mode == 'teaser').
  * - $page: Flag for the full page state.
  * - $promote: Flag for front page promotion state.
- * - $sticky: Flags for sticky post setting.
+ * - $sticky: Flags for sticky content setting.
  * - $status: Flag for published status.
  * - $comment: State of comment settings for the node.
  * - $readmore: Flags true if the teaser content of the node cannot hold the
-- 
1.7.4.1