--- a/rhodecode/templates/changeset/changeset_file_comment.html	Thu May 17 12:54:44 2012 +0200
+++ b/rhodecode/templates/changeset/changeset_file_comment.html	Tue May 22 22:15:29 2012 +0200
@@ -42,10 +42,10 @@
     <div class="overlay"><div class="overlay-text">${_('Submitting...')}</div></div>
       ${h.form(h.url('changeset_comment', repo_name=c.repo_name, revision=changeset.raw_id),class_='inline-form')}
       <div class="clearfix">
-          <div class="comment-help">${_('Commenting on line')} {1}. ${_('Comments parsed using')}
-          <a href="${h.url('rst_help')}">RST</a> ${_('syntax')} ${_('with')}
-          <span style="color:#003367" class="tooltip" title="${_('Use @username inside this text to send notification to this RhodeCode user')}">@mention</span> ${_('support')}
-          </div>          
+          <div class="comment-help">${_('Commenting on line {1}.')}
+          ${(_('Comments parsed using %s syntax with %s support.') % (('<a href="%s">RST</a>' % h.url('rst_help')),
+          	'<span style="color:#003367" class="tooltip" title="%s">@mention</span>' %
+          	_('Use @username inside this text to send notification to this RhodeCode user')))|n}</div>
           <textarea id="text_{1}" name="text"></textarea>
       </div>
       <div class="comment-button">
@@ -59,7 +59,7 @@
       ${h.form('')}
       <div class="clearfix">
           <div class="comment-help">
-            ${'You need to be logged in to comment.'} <a href="${h.url('login_home',came_from=h.url.current())}">${_('Login now')}</a>
+            ${_('You need to be logged in to comment.')} <a href="${h.url('login_home',came_from=h.url.current())}">${_('Login now')}</a>
           </div>
       </div>
       <div class="comment-button">
@@ -73,7 +73,7 @@
 
 
 <%def name="inlines(changeset)">
-    <div class="comments-number">${len(c.comments)} comment(s) (${c.inline_cnt} ${_('inline')})</div>
+    <div class="comments-number">${ungettext("%d comment", "%d comments", len(c.comments)) % len(c.comments)} ${ungettext("(%d inline)", "(%d inline)", c.inline_cnt) % c.inline_cnt}</div>
     %for path, lines in c.inline_comments:
         % for line,comments in lines.iteritems():
             <div style="display:none" class="inline-comment-placeholder" path="${path}" target_id="${h.safeid(h.safe_unicode(path))}">
@@ -105,8 +105,9 @@
         <strong>${_('Leave a comment')}</strong>
         <div class="clearfix">
             <div class="comment-help">
-                ${_('Comments parsed using')} <a href="${h.url('rst_help')}">RST</a> ${_('syntax')}
-                ${_('with')} <span style="color:#003367" class="tooltip" title="${_('Use @username inside this text to send notification to this RhodeCode user')}">@mention</span> ${_('support')}
+                ${(_('Comments parsed using %s syntax with %s support.') % (('<a href="%s">RST</a>' % h.url('rst_help')),
+          		'<span style="color:#003367" class="tooltip" title="%s">@mention</span>' %
+          		_('Use @username inside this text to send notification to this RhodeCode user')))|n}
                 | <span class="tooltip" title="${_('Check this to change current status of code-review for this changeset')}"> ${_('change status')}
                   <input style="vertical-align: bottom;margin-bottom:-2px" id="show_changeset_status_box" type="checkbox" name="change_changeset_status" />
                   </span>