Index: branches/release-35/default_templates/entry_summary.mtml
===================================================================
--- branches/release-35/default_templates/entry_summary.mtml (revision 1961)
+++ branches/release-35/default_templates/entry_summary.mtml (revision 1975)
@@ -12,6 +12,6 @@
             </span>
 <MTUnless name="hide_counts" eq="1">
-            <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>
+            <MTIfCommentsActive><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"><$MTEntryTrackbackCount singular="<__trans phrase="1 TrackBack">" plural="<__trans phrase="# TrackBacks">"$></a></MTIfPingsActive>
 </MTUnless>
         </div>
