diff --git nodecomment.module nodecomment.module
index e8d52f1..e71eccd 100755
--- nodecomment.module
+++ nodecomment.module
@@ -53,6 +53,13 @@ function nodecomment_theme() {
     'arguments' => array('comments' => NULL, 'title' => NULL),
   );
 
+  $items['nodecomment_comment_count'] = array(
+    'arguments' => array('count' => NULL, 'type' => NULL),
+  );
+  $items['nodecomment_new_comment_count'] = array(
+    'arguments' => array('count' => NULL, 'type' => NULL),
+  );  
+  
   return $items;
 }
 
@@ -696,15 +703,8 @@ function nodecomment_link($type, $node = NULL, $teaser = FALSE) {
           $new = nodecomment_num_new($node->nid);
 
           if ($all) {
-            // Tokens for the following format_plural replacements.  @comments
-            // is first in the list, so that @comments doesn't get replaced when
-            // replacing @comment.
-            $tokens = array(
-              '@comments' => variable_get('node_comment_plural_'. $node->type, 'comments'),
-              '@comment' => node_get_types('name', $node->comment_type),
-            );
             $links['comment_comments'] = array(
-              'title' => format_plural($all, '1 @comment', '@count @comments', $tokens),
+              'title' => theme('nodecomment_comment_count', $all, $node->comment_type),
               'href' => "node/$node->nid",
               'attributes' => array('title' => t('Jump to the first comment of this posting.')),
               'fragment' => 'comments'
@@ -712,7 +712,7 @@ function nodecomment_link($type, $node = NULL, $teaser = FALSE) {
 
             if ($new) {
               $links['comment_new_comments'] = array(
-                'title' => format_plural($new, '1 new @comment', '@count new @comments', $tokens),
+                'title' => theme('nodecomment_new_comment_count', $new, $node->comment_type),
                 'href' => "node/$node->nid",
                 'query' => nodecomment_new_page_count($all, $new, $node),
                 'attributes' => array('title' => t('Jump to the first new comment of this posting.')),
@@ -1245,3 +1245,21 @@ function theme_nodecomment_topic_review($comments, $title) {
 
   return $output;
 }
+
+/**
+ * Return plural form of number of comments.
+ * 
+ * Use $type to provide different strings per nodetype.
+ */
+function theme_nodecomment_comment_count($count, $type) {
+  return format_plural($count, '1 comment', '@count comments');
+}
+
+/**
+ * Return plural form of number of new comments.
+ * 
+ * Use $type to provide different strings per nodetype.
+ */
+function theme_nodecomment_new_comment_count($count, $type) {
+  return format_plural($count, '1 new comment', '@count new comments');
+}