Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.601
diff -u -r1.601 comment.module
--- modules/comment/comment.module	9 Nov 2007 07:46:10 -0000	1.601
+++ modules/comment/comment.module	13 Nov 2007 15:44:27 -0000
@@ -404,9 +404,9 @@
 
         if ($all) {
           $links['comment_comments'] = array(
-            'title' => format_plural($all, '1 comment', '@count comments'),
+            'title' => format_plural($all, '1 reply', '@count replies'),
             'href' => "node/$node->nid",
-            'attributes' => array('title' => t('Jump to the first comment of this posting.')),
+            'attributes' => array('title' => t('Jump to the first reply.')),
             'fragment' => 'comments'
           );
 
@@ -414,10 +414,10 @@
 
           if ($new) {
             $links['comment_new_comments'] = array(
-              'title' => format_plural($new, '1 new comment', '@count new comments'),
+              'title' => format_plural($new, '1 new reply', '@count new replies'),
               'href' => "node/$node->nid",
               'query' => comment_new_page_count($all, $new, $node),
-              'attributes' => array('title' => t('Jump to the first new comment of this posting.')),
+              'attributes' => array('title' => t('Jump to the first new reply.')),
               'fragment' => 'new'
             );
           }
@@ -426,9 +426,9 @@
           if ($node->comment == COMMENT_NODE_READ_WRITE) {
             if (user_access('post comments')) {
               $links['comment_add'] = array(
-                'title' => t('Add new comment'),
+                'title' => t('Reply'),
                 'href' => "comment/reply/$node->nid",
-                'attributes' => array('title' => t('Add a new comment to this page.')),
+                'attributes' => array('title' => t('Reply to this post.')),
                 'fragment' => 'comment-form'
               );
             }
@@ -447,9 +447,9 @@
         if (user_access('post comments')) {
           if (variable_get('comment_form_location_'. $node->type, COMMENT_FORM_SEPARATE_PAGE) == COMMENT_FORM_SEPARATE_PAGE) {
             $links['comment_add'] = array(
-              'title' => t('Add new comment'),
+              'title' => t('Reply'),
               'href' => "comment/reply/$node->nid",
-              'attributes' => array('title' => t('Share your thoughts and opinions related to this posting.')),
+              'attributes' => array('title' => t('Reply to this post.')),
               'fragment' => 'comment-form'
             );
           }
@@ -1312,17 +1312,17 @@
   $form['nid'] = array('#type' => 'value', '#value' => $edit['nid']);
   $form['uid'] = array('#type' => 'value', '#value' => !empty($edit['uid']) ? $edit['uid'] : NULL);
 
-  $form['preview'] = array('#type' => 'button', '#value' => t('Preview comment'), '#weight' => 19);
+  $form['preview'] = array('#type' => 'button', '#value' => t('Preview'), '#weight' => 19);
   $form['#token'] = 'comment'. $edit['nid'] . (isset($edit['pid']) ? $edit['pid'] : '');
 
   // Only show post button if preview is optional or if we are in preview mode.
   // We show the post button in preview mode even if there are form errors so that
   // optional form elements (e.g., captcha) can be updated in preview mode.
-  if (!form_get_errors() && ((variable_get('comment_preview_'. $node->type, COMMENT_PREVIEW_REQUIRED) == COMMENT_PREVIEW_OPTIONAL) || ($op == t('Preview comment')) || ($op == t('Post comment')))) {
-    $form['submit'] = array('#type' => 'submit', '#value' => t('Post comment'), '#weight' => 20);
+  if (!form_get_errors() && ((variable_get('comment_preview_'. $node->type, COMMENT_PREVIEW_REQUIRED) == COMMENT_PREVIEW_OPTIONAL) || ($op == t('Preview')) || ($op == t('Save')))) {
+    $form['submit'] = array('#type' => 'submit', '#value' => t('Save'), '#weight' => 20);
   }
 
-  if ($op == t('Preview comment')) {
+  if ($op == t('Preview')) {
     $form['#after_build'] = array('comment_form_add_preview');
   }
 
@@ -1340,7 +1340,7 @@
 function comment_form_add_preview($form, &$form_state) {
   global $user;
   $edit = $form_state['values'];
-  drupal_set_title(t('Preview comment'));
+  drupal_set_title(t('Preview reply'));
 
   $output = '';
   $node = node_load($edit['nid']);