Index: /branches/release-40/php/lib/l10n_ja.php
===================================================================
--- /branches/release-40/php/lib/l10n_ja.php (revision 2412)
+++ /branches/release-40/php/lib/l10n_ja.php (revision 2613)
@@ -69,5 +69,5 @@
 ## php/lib/function.mtcommentauthor.php
 
-## php/lib/function.mtcommentreplylink.php
+## php/lib/function.mtcommentreplytolink.php
 	'Reply' => '返信',
 
Index: /branches/release-40/php/lib/function.mtcommentreplytolink.php
===================================================================
--- /branches/release-40/php/lib/function.mtcommentreplytolink.php (revision 2613)
+++ /branches/release-40/php/lib/function.mtcommentreplytolink.php (revision 2613)
@@ -0,0 +1,27 @@
+<?php
+# Movable Type (r) Open Source (C) 2001-2008 Six Apart, Ltd.
+# This program is distributed under the terms of the
+# GNU General Public License, version 2.
+#
+# $Id$
+
+function smarty_function_mtcommentreplytolink($args, &$ctx) {
+    $comment = $ctx->stash('comment');
+    if (!$comment) return '';
+
+    global $mt;
+    $label = $args['label'];
+    $label or $label = $args['text'];
+    $label or $label = $mt->translate("Reply");
+
+    $onclick = $args['onclick'];
+    $onclick or $onclick = "mtReplyCommentOnClick(%d, '%s')";
+
+    $comment_author = $comment['comment_author'];
+    require_once("MTUtil.php");
+    $comment_author = encode_js($comment_author);
+
+    $onclick = sprintf($onclick, $comment['comment_id'], $comment_author);
+    return sprintf("<a title=\"%s\" href=\"javascript:void(0);\" onclick=\"$onclick\">%s</a>",
+        $label, $label);
+}
Index: /anches/release-40/php/lib/function.mtcommentreplylink.php
===================================================================
--- /branches/release-40/php/lib/function.mtcommentreplylink.php (revision 2256)
+++  (revision )
@@ -1,27 +1,0 @@
-<?php
-# Movable Type (r) Open Source (C) 2001-2008 Six Apart, Ltd.
-# This program is distributed under the terms of the
-# GNU General Public License, version 2.
-#
-# $Id$
-
-function smarty_function_mtcommentreplylink($args, &$ctx) {
-    $comment = $ctx->stash('comment');
-    if (!$comment) return '';
-
-    global $mt;
-    $label = $args['label'];
-    $label or $label = $args['text'];
-    $label or $label = $mt->translate("Reply");
-
-    $onclick = $args['onclick'];
-    $onclick or $onclick = "mtReplyCommentOnClick(%d, '%s')";
-
-    $comment_author = $comment['comment_author'];
-    require_once("MTUtil.php");
-    $comment_author = encode_js($comment_author);
-
-    $onclick = sprintf($onclick, $comment['comment_id'], $comment_author);
-    return sprintf("<a title=\"%s\" href=\"javascript:void(0);\" onclick=\"$onclick\">%s</a>",
-        $label, $label);
-}
Index: /branches/release-40/default_templates/comments.mtml
===================================================================
--- /branches/release-40/default_templates/comments.mtml (revision 2603)
+++ /branches/release-40/default_templates/comments.mtml (revision 2613)
@@ -27,5 +27,5 @@
                             | <a href="<$mt:CommentLink$>"><abbr class="published" title="<$mt:CommentDate format_name="iso8601"$>"><$mt:CommentDate$></abbr></a>
         <mt:IfCommentsAccepted>
-                            | <$mt:CommentReplyLink$>
+                            | <$mt:CommentReplyToLink$>
         </mt:IfCommentsAccepted>
                         </span>
Index: /branches/release-40/lib/MT/L10N/es.pm
===================================================================
--- /branches/release-40/lib/MT/L10N/es.pm (revision 2456)
+++ /branches/release-40/lib/MT/L10N/es.pm (revision 2613)
@@ -58,5 +58,5 @@
 	'Category Weekly' => 'Categorías semanales',
 
-## php/lib/function.mtcommentreplylink.php
+## php/lib/function.mtcommentreplytolink.php
 	'Reply' => 'Responder',
 
Index: /branches/release-40/lib/MT/L10N/fr.pm
===================================================================
--- /branches/release-40/lib/MT/L10N/fr.pm (revision 2405)
+++ /branches/release-40/lib/MT/L10N/fr.pm (revision 2613)
@@ -4,5 +4,5 @@
 #
 #
-# $Id:$
+# $Id$
 
 package MT::L10N::fr;
@@ -55,5 +55,5 @@
 	'Category Weekly' => 'Par catégories et semaines',
 
-## php/lib/function.mtcommentreplylink.php
+## php/lib/function.mtcommentreplytolink.php
 	'Reply' => 'Répondre',
 
Index: /branches/release-40/lib/MT/L10N/de.pm
===================================================================
--- /branches/release-40/lib/MT/L10N/de.pm (revision 2456)
+++ /branches/release-40/lib/MT/L10N/de.pm (revision 2613)
@@ -58,5 +58,5 @@
 	'Category Weekly' => 'Kategorie wöchentlich',
 
-## php/lib/function.mtcommentreplylink.php
+## php/lib/function.mtcommentreplytolink.php
 	'Reply' => 'Antworten',
 
Index: /branches/release-40/lib/MT/L10N/nl.pm
===================================================================
--- /branches/release-40/lib/MT/L10N/nl.pm (revision 2456)
+++ /branches/release-40/lib/MT/L10N/nl.pm (revision 2613)
@@ -58,5 +58,5 @@
 	'Category Weekly' => 'per categorie per week',
 
-## php/lib/function.mtcommentreplylink.php
+## php/lib/function.mtcommentreplytolink.php
 	'Reply' => 'Antwoorden',
 
Index: /branches/release-40/lib/MT/L10N/ja.pm
===================================================================
--- /branches/release-40/lib/MT/L10N/ja.pm (revision 2564)
+++ /branches/release-40/lib/MT/L10N/ja.pm (revision 2613)
@@ -77,5 +77,5 @@
 ## php/lib/function.mtcommentauthor.php
 
-## php/lib/function.mtcommentreplylink.php
+## php/lib/function.mtcommentreplytolink.php
 	'Reply' => '返信',
 
Index: /branches/release-40/lib/MT/Template/ContextHandlers.pm
===================================================================
--- /branches/release-40/lib/MT/Template/ContextHandlers.pm (revision 2606)
+++ /branches/release-40/lib/MT/Template/ContextHandlers.pm (revision 2613)
@@ -390,5 +390,5 @@
             CommentDate => \&_hdlr_comment_date,
             CommentParentID => \&_hdlr_comment_parent_id,
-            CommentReplyLink => \&_hdlr_comment_reply_link,
+            CommentReplyToLink => \&_hdlr_comment_reply_link,
             CommentPreviewAuthor => \&_hdlr_comment_author,
             CommentPreviewIP => \&_hdlr_comment_ip,
@@ -10672,5 +10672,5 @@
 ###########################################################################
 
-=head2 CommentReplyLink
+=head2 CommentReplyToLink
 
 Produces the "Reply" link for the current comment in context.
Index: /branches/release-40/tmpl/cms/include/comment_detail.tmpl
===================================================================
--- /branches/release-40/tmpl/cms/include/comment_detail.tmpl (revision 2003)
+++ /branches/release-40/tmpl/cms/include/comment_detail.tmpl (revision 2613)
@@ -9,5 +9,5 @@
                    </MTCommentParent>
                    <__trans phrase="on [_1]" params='<a href="#comment-<$MTCommentID$>"><abbr class="published" title="<$MTCommentDate format_name="iso8601"$>"><$MTCommentDate$></abbr></a>'>
-                   <MTIfCommentsAccepted> | <$MTCommentReplyLink$></MTIfCommentsAccepted>
+                   <MTIfCommentsAccepted> | <$MTCommentReplyToLink$></MTIfCommentsAccepted>
                </span>
             </div>