Index: /branches/release-35/default_templates/trackbacks.mtml
===================================================================
--- /branches/release-35/default_templates/trackbacks.mtml (revision 1851)
+++ /branches/release-35/default_templates/trackbacks.mtml (revision 1921)
@@ -2,5 +2,5 @@
 <MTIfPingsActive>
 <div id="trackbacks" class="trackbacks">
-    <h2 class="trackbacks-header"><__trans phrase="[_1] TrackBacks" params="<$MTEntryTrackbackCount$>"></h2>
+    <h2 class="trackbacks-header"><mt:if tag="EntryTrackbackCount" eq="1"><__trans phrase="1 TrackBack"><mt:else><__trans phrase="[_1] TrackBacks" params="<$MTEntryTrackbackCount$>"></mt:if></h2>
 
 
Index: /branches/release-35/default_templates/entry_summary.mtml
===================================================================
--- /branches/release-35/default_templates/entry_summary.mtml (revision 1901)
+++ /branches/release-35/default_templates/entry_summary.mtml (revision 1921)
@@ -21,6 +21,6 @@
             <span class="separator">|</span> <a class="permalink" rel="bookmark" href="<$MTEntryPermalink$>"><__trans phrase="Permalink"></a>
 <MTUnless name="hide_counts" eq="1">
-            <MTIfCommentsActive><span class="separator">|</span> <a href="<$MTEntryPermalink$>#comments"><__trans phrase="Comments ([_1])" params="<$MTEntryCommentCount$>"></a></MTIfCommentsActive>
-            <MTIfPingsActive><span class="separator">|</span> <a href="<$MTEntryPermalink$>#trackback"><__trans phrase="TrackBacks ([_1])" params="<$MTEntryTrackbackCount$>"></a></MTIfPingsActive>
+            <MTIfCommentsActive><span class="separator">|</span> <a href="<$MTEntryPermalink$>#comments"><mt:if tag="EntryCommentCount" eq="1"><__trans phrase="1 Comment"><mt:else><__trans phrase="[_1] Comments" params="<$MTEntryCommentCount$>"></mt:if></a></MTIfCommentsActive>
+            <MTIfPingsActive><span class="separator">|</span> <a href="<$MTEntryPermalink$>#trackback"><mt:if tag="EntryTrackbackCount" eq="1"><__trans phrase="1 TrackBack"><mt:else><__trans phrase="[_1] TrackBacks" params="<$MTEntryTrackbackCount$>"></mt:if></a></MTIfPingsActive>
 </MTUnless>
         </div>
Index: /branches/release-35/default_templates/comments.mtml
===================================================================
--- /branches/release-35/default_templates/comments.mtml (revision 1889)
+++ /branches/release-35/default_templates/comments.mtml (revision 1921)
@@ -7,5 +7,5 @@
     <MTComments>
         <MTCommentsHeader>
-    <h2 class="comments-header"><__trans phrase="[_1] Comments" params="<$MTEntryCommentCount$>"></h2>
+    <h2 class="comments-header"><mt:if tag="EntryCommentCount" eq="1"><__trans phrase="1 Comment"><mt:else><__trans phrase="[_1] Comments" params="<$MTEntryCommentCount$>"></mt:if></h2>
     <div class="comments-content">
         </MTCommentsHeader>
Index: /branches/release-35/default_templates/entry.mtml
===================================================================
--- /branches/release-35/default_templates/entry.mtml (revision 1901)
+++ /branches/release-35/default_templates/entry.mtml (revision 1921)
@@ -39,8 +39,8 @@
                                         <span class="separator">|</span> <a class="permalink" rel="bookmark" href="<$MTEntryPermalink$>"><__trans phrase="Permalink"></a>
 <MTIfCommentsActive>
-                                        <span class="separator">|</span> <a href="<$MTEntryPermalink$>#comments"><__trans phrase="Comments ([_1])" params="<$MTEntryCommentCount$>"></a>
+                                        <span class="separator">|</span> <a href="<$MTEntryPermalink$>#comments"><mt:if tag="EntryCommentCount" eq="1"><__trans phrase="1 Comment"><mt:else><__trans phrase="[_1] Comments" params="<$MTEntryCommentCount$>"></mt:if></a>
 </MTIfCommentsActive>
 <MTIfPingsActive>
-                                        <span class="separator">|</span> <a href="<$MTEntryPermalink$>#trackback"><__trans phrase="TrackBacks ([_1])" params="<$MTEntryTrackbackCount$>"></a>
+                                        <span class="separator">|</span> <a href="<$MTEntryPermalink$>#trackback"><mt:if tag="EntryTrackbackCount" eq="1"><__trans phrase="1 TrackBack"><mt:else><__trans phrase="[_1] TrackBacks" params="<$MTEntryTrackbackCount$>"></mt:if></a>
 </MTIfPingsActive>
                                     </div>