Index: branches/release-35/default_templates/trackbacks.mtml
===================================================================
--- branches/release-35/default_templates/trackbacks.mtml (revision 1921)
+++ branches/release-35/default_templates/trackbacks.mtml (revision 1976)
@@ -2,6 +2,5 @@
 <MTIfPingsActive>
 <div id="trackbacks" class="trackbacks">
-    <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>
-
+    <h2 class="trackbacks-header"><$MTEntryTrackbackCount singular="<__trans phrase="1 TrackBack">" plural="<__trans phrase="# TrackBacks">"$></h2>
 
     <mt:ignore><!-- Display TrackBack details if TrackBacks are being accepted --></mt:ignore>
Index: branches/release-35/default_templates/comments.mtml
===================================================================
--- branches/release-35/default_templates/comments.mtml (revision 1963)
+++ branches/release-35/default_templates/comments.mtml (revision 1976)
@@ -7,5 +7,5 @@
     <MTComments>
         <MTCommentsHeader>
-    <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>
+    <h2 class="comments-header"><$MTEntryCommentCount singular="<__trans phrase="1 Comment">" plural="<__trans phrase="# Comments">"$></h2>
     <div class="comments-content">
         </MTCommentsHeader>
Index: branches/release-35/default_templates/entry.mtml
===================================================================
--- branches/release-35/default_templates/entry.mtml (revision 1970)
+++ branches/release-35/default_templates/entry.mtml (revision 1976)
@@ -38,8 +38,8 @@
                                         </span>
 <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>
+                                        <span class="separator">|</span> <a href="<$MTEntryPermalink$>#comments"><$MTEntryCommentCount singular="<__trans phrase="1 Comment">" plural="<__trans phrase="# Comments">"$></a>
 </MTIfCommentsActive>
 <MTIfPingsActive>
-                                        <span class="separator">|</span> <a href="<$MTEntryPermalink$>#trackbacks"><mt:if tag="EntryTrackbackCount" eq="1"><__trans phrase="1 TrackBack"><mt:else><__trans phrase="[_1] TrackBacks" params="<$MTEntryTrackbackCount$>"></mt:if></a>
+                                        <span class="separator">|</span> <a href="<$MTEntryPermalink$>#trackbacks"><$MTEntryTrackbackCount" singular="<__trans phrase="1 TrackBack">" plural="<__trans phrase="# TrackBacks">"$></a>
 </MTIfPingsActive>
                                     </div>