Index: branches/release-34/default_templates/comments.mtml
===================================================================
--- branches/release-34/default_templates/comments.mtml (revision 1851)
+++ branches/release-34/default_templates/comments.mtml (revision 1889)
@@ -15,9 +15,10 @@
                     <div class="asset-meta">
                         <span class="byline">
-                            <__trans phrase="By"> <span class="vcard author"><$MTCommentAuthorLink default_name="Anonymous" show_email="0"$></span><MTIfNonEmpty tag="CommentAuthorIdentity"><$MTCommentAuthorIdentity$></MTIfNonEmpty>
-                            <MTCommentParent>
-                            <__trans phrase="replied to"> <a href="#comment-<$MTCommentID$>"><$MTCommentAuthor$></a>
-                            </MTCommentParent>
-                            <__trans phrase="on"> <a href="#comment-<$MTCommentID$>"><abbr class="published" title="<$MTCommentDate format_name="iso8601"$>"><$MTCommentDate$></abbr></a>
+                            <mt:IfCommentParent>
+                                <__trans phrase="[_1] replied to <a href="[_2]">comment from [_3]</a>" params="<MTIfNonEmpty tag="CommentAuthorIdentity"><$MTCommentAuthorIdentity$></MTIfNonEmpty> <span class="vcard author"><$MTCommentAuthorLink default_name="Anonymous" show_email="0"$></span>%%<mt:CommentParent>#comment-<$MTCommentID$></mt:CommentParent>%%<mt:CommentParent><$MTCommentAuthor$></mt:CommentParent>">
+                            <mt:else>
+                                <MTIfNonEmpty tag="CommentAuthorIdentity"><$MTCommentAuthorIdentity$></MTIfNonEmpty> <span class="vcard author"><$MTCommentAuthorLink default_name="Anonymous" show_email="0"$></span>
+                            </mt:IfCommentParent>
+                            | <a href="#comment-<$MTCommentID$>"><abbr class="published" title="<$MTCommentDate format_name="iso8601"$>"><$MTCommentDate$></abbr></a>
                             <MTIfCommentsAccepted> | <$MTCommentReplyLink$></MTIfCommentsAccepted>
                         </span>
@@ -73,10 +74,10 @@
                     </div>
                     <div id="comment-form-remember-me">
-                        <label for="comment-bake-cookie"><input type="checkbox" id="comment-bake-cookie" name="bakecookie" onclick="if (!this.checked) forgetMe(document.comments_form)" value="1" />
-                            <__trans phrase="Remember personal info?"></label>
+                        <input type="checkbox" id="comment-bake-cookie" name="bakecookie" onclick="if (!this.checked) forgetMe(document.comments_form)" value="1" />
+                        <label for="comment-bake-cookie"><__trans phrase="Remember personal info?"></label>
                     </div>
                     <div id="comment-form-reply">
-                        <label for="comment-reply" id="comment-reply-label"><input type="checkbox" id="comment-reply" name="comment_reply" value="" onclick="setCommentParentID();" />
-                            <__trans phrase="Replying to"></label>
+                        <input type="checkbox" id="comment-reply" name="comment_reply" value="" onclick="setCommentParentID();" />
+                        <label for="comment-reply" id="comment-reply-label"></label>
                     </div>
                 </div>
Index: branches/release-34/default_templates/comment_preview.mtml
===================================================================
--- branches/release-34/default_templates/comment_preview.mtml (revision 1851)
+++ branches/release-34/default_templates/comment_preview.mtml (revision 1889)
@@ -32,9 +32,10 @@
                                         <div class="asset-meta">
                                             <span class="byline">
-                                                <__trans phrase="By"> <span class="vcard author"><$MTCommentAuthorLink default_name="Anonymous" show_email="0"$></span><MTIfNonEmpty tag="CommentAuthorIdentity"><$MTCommentAuthorIdentity$></MTIfNonEmpty>
-                                                <MTCommentParent>
-                                                <__trans phrase="replied to"> <a href="#comment-<$MTCommentID$>"><$MTCommentAuthor$></a>
-                                                </MTCommentParent>
-                                                <__trans phrase="on"> <a href="#comment-<$MTCommentID$>"><abbr class="published" title="<$MTCommentDate format_name="iso8601"$>"><$MTCommentDate$></abbr></a>
+                                                <mt:IfCommentParent>
+                                                    <__trans phrase="[_1] replied to <a href="[_2]">comment from [_3]</a>" params="<MTIfNonEmpty tag="CommentAuthorIdentity"><$MTCommentAuthorIdentity$></MTIfNonEmpty> <span class="vcard author"><$MTCommentAuthorLink default_name="Anonymous" show_email="0"$></span>%%<mt:CommentParent>#comment-<$MTCommentID$></mt:CommentParent>%%<mt:CommentParent><$MTCommentAuthor$></mt:CommentParent>">
+                                                <mt:else>
+                                                    <MTIfNonEmpty tag="CommentAuthorIdentity"><$MTCommentAuthorIdentity$></MTIfNonEmpty> <span class="vcard author"><$MTCommentAuthorLink default_name="Anonymous" show_email="0"$></span>
+                                                </mt:IfCommentParent>
+                                                | <a href="#comment-<$MTCommentID$>"><abbr class="published" title="<$MTCommentDate format_name="iso8601"$>"><$MTCommentDate$></abbr></a>
                                                 <MTIfCommentsAccepted> | <$MTCommentReplyLink$></MTIfCommentsAccepted>
                                             </span>
Index: branches/release-34/default_templates/javascript.mtml
===================================================================
--- branches/release-34/default_templates/javascript.mtml (revision 1887)
+++ branches/release-34/default_templates/javascript.mtml (revision 1889)
@@ -175,24 +175,15 @@
     
     var checkbox = document.getElementById('comment-reply');
-
-    // Clear the current label but NOT our checkbox!
     var label = document.getElementById('comment-reply-label');
-    for(var i = 1; i < label.childNodes.length; i++) {
-        label.removeChild(label.childNodes[i]);
-    }
-    
+    var text = document.getElementById('comment-text');
+
     // Populate label with new values
-    var reply_text = document.createTextNode(' <__trans phrase="Replying to"> ');
-    label.appendChild(reply_text);
-
-    var anchor = document.createElement('a');
-    anchor.setAttribute('href', '#comment-' + parent_id);
-    anchor.innerHTML = author;
-    label.appendChild(anchor);
-    
+    var reply_text = '<__trans phrase="Replying to <a href="#comment-[_1]">comment from [_2]</a>" params="'+ parent_id +'%%'+ author +'">';
+    label.innerHTML = reply_text;
+
     checkbox.value = parent_id; 
-    checkbox.setAttribute('checked', true);
-    checkbox.focus();
-    
+    checkbox.checked = true;
+    text.focus();
+
     setCommentParentID();
 }