diff --git a/rhodecode/public/js/rhodecode/i18n/be.js b/rhodecode/public/js/rhodecode/i18n/be.js
--- a/rhodecode/public/js/rhodecode/i18n/be.js
+++ b/rhodecode/public/js/rhodecode/i18n/be.js
@@ -10,8 +10,11 @@ var _TM = {
     'Close': 'Close',
     'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
     'Delete this comment?': 'Delete this comment?',
+    'Diff to Commit ': 'Diff to Commit ',
     'Follow': 'Follow',
     'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
+    'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
+    'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
     'Loading ...': 'Loading ...',
     'Loading failed': 'Loading failed',
     'Loading more results...': 'Loading more results...',
@@ -27,6 +30,7 @@ var _TM = {
     'No tags available yet.': 'No tags available yet.',
     'No user groups available yet.': 'No user groups available yet.',
     'No users available yet.': 'No users available yet.',
+    'Note Comment': 'Note Comment',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': 'Open new pull request',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
@@ -39,6 +43,7 @@ var _TM = {
     'Send': 'Send',
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
+    'Show at Commit ': 'Show at Commit ',
     'Show more': 'Show more',
     'Show selected commit __S': 'Show selected commit __S',
     'Show selected commits __S ... __E': 'Show selected commits __S ... __E',
@@ -48,6 +53,8 @@ var _TM = {
     'Submitting...': 'Submitting...',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
+    'TODO comment': 'TODO comment',
+    'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.',
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
     'Unfollow': 'Unfollow',
     'Updating...': 'Updating...',
@@ -62,6 +69,9 @@ var _TM = {
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
     'just now': 'just now',
+    'resolve comment': 'resolve comment',
+    'showing {0} out of {1} commit': 'showing {0} out of {1} commit',
+    'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
     'specify commit': 'specify commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
diff --git a/rhodecode/public/js/rhodecode/i18n/de.js b/rhodecode/public/js/rhodecode/i18n/de.js
--- a/rhodecode/public/js/rhodecode/i18n/de.js
+++ b/rhodecode/public/js/rhodecode/i18n/de.js
@@ -10,8 +10,11 @@ var _TM = {
     'Close': 'Close',
     'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
     'Delete this comment?': 'Delete this comment?',
+    'Diff to Commit ': 'Diff to Commit ',
     'Follow': 'Follow',
     'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
+    'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
+    'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
     'Loading ...': 'Loading ...',
     'Loading failed': 'Loading failed',
     'Loading more results...': 'Loading more results...',
@@ -27,6 +30,7 @@ var _TM = {
     'No tags available yet.': 'No tags available yet.',
     'No user groups available yet.': 'No user groups available yet.',
     'No users available yet.': 'No users available yet.',
+    'Note Comment': 'Note Comment',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': 'Open new pull request',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
@@ -39,6 +43,7 @@ var _TM = {
     'Send': 'Senden',
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
+    'Show at Commit ': 'Show at Commit ',
     'Show more': 'Show more',
     'Show selected commit __S': 'Show selected commit __S',
     'Show selected commits __S ... __E': 'Show selected commits __S ... __E',
@@ -48,6 +53,8 @@ var _TM = {
     'Submitting...': 'Submitting...',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
+    'TODO comment': 'TODO comment',
+    'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.',
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
     'Unfollow': 'Unfollow',
     'Updating...': 'Updating...',
@@ -62,6 +69,9 @@ var _TM = {
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
     'just now': 'jetzt gerade',
+    'resolve comment': 'resolve comment',
+    'showing {0} out of {1} commit': 'showing {0} out of {1} commit',
+    'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
     'specify commit': 'specify commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
diff --git a/rhodecode/public/js/rhodecode/i18n/en.js b/rhodecode/public/js/rhodecode/i18n/en.js
--- a/rhodecode/public/js/rhodecode/i18n/en.js
+++ b/rhodecode/public/js/rhodecode/i18n/en.js
@@ -10,8 +10,11 @@ var _TM = {
     'Close': 'Close',
     'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
     'Delete this comment?': 'Delete this comment?',
+    'Diff to Commit ': 'Diff to Commit ',
     'Follow': 'Follow',
     'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
+    'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
+    'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
     'Loading ...': 'Loading ...',
     'Loading failed': 'Loading failed',
     'Loading more results...': 'Loading more results...',
@@ -27,6 +30,7 @@ var _TM = {
     'No tags available yet.': 'No tags available yet.',
     'No user groups available yet.': 'No user groups available yet.',
     'No users available yet.': 'No users available yet.',
+    'Note Comment': 'Note Comment',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': 'Open new pull request',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
@@ -39,6 +43,7 @@ var _TM = {
     'Send': 'Send',
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
+    'Show at Commit ': 'Show at Commit ',
     'Show more': 'Show more',
     'Show selected commit __S': 'Show selected commit __S',
     'Show selected commits __S ... __E': 'Show selected commits __S ... __E',
@@ -48,6 +53,8 @@ var _TM = {
     'Submitting...': 'Submitting...',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
+    'TODO comment': 'TODO comment',
+    'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.',
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
     'Unfollow': 'Unfollow',
     'Updating...': 'Updating...',
@@ -62,6 +69,9 @@ var _TM = {
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
     'just now': 'just now',
+    'resolve comment': 'resolve comment',
+    'showing {0} out of {1} commit': 'showing {0} out of {1} commit',
+    'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
     'specify commit': 'specify commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
diff --git a/rhodecode/public/js/rhodecode/i18n/es.js b/rhodecode/public/js/rhodecode/i18n/es.js
--- a/rhodecode/public/js/rhodecode/i18n/es.js
+++ b/rhodecode/public/js/rhodecode/i18n/es.js
@@ -10,8 +10,11 @@ var _TM = {
     'Close': 'Close',
     'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
     'Delete this comment?': 'Delete this comment?',
+    'Diff to Commit ': 'Diff to Commit ',
     'Follow': 'Follow',
     'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
+    'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
+    'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
     'Loading ...': 'Loading ...',
     'Loading failed': 'Loading failed',
     'Loading more results...': 'Loading more results...',
@@ -27,6 +30,7 @@ var _TM = {
     'No tags available yet.': 'No tags available yet.',
     'No user groups available yet.': 'No user groups available yet.',
     'No users available yet.': 'No users available yet.',
+    'Note Comment': 'Note Comment',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': 'Open new pull request',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
@@ -39,6 +43,7 @@ var _TM = {
     'Send': 'Send',
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
+    'Show at Commit ': 'Show at Commit ',
     'Show more': 'Show more',
     'Show selected commit __S': 'Show selected commit __S',
     'Show selected commits __S ... __E': 'Show selected commits __S ... __E',
@@ -48,6 +53,8 @@ var _TM = {
     'Submitting...': 'Submitting...',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
+    'TODO comment': 'TODO comment',
+    'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.',
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
     'Unfollow': 'Unfollow',
     'Updating...': 'Updating...',
@@ -62,6 +69,9 @@ var _TM = {
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
     'just now': 'just now',
+    'resolve comment': 'resolve comment',
+    'showing {0} out of {1} commit': 'showing {0} out of {1} commit',
+    'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
     'specify commit': 'specify commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
diff --git a/rhodecode/public/js/rhodecode/i18n/fr.js b/rhodecode/public/js/rhodecode/i18n/fr.js
--- a/rhodecode/public/js/rhodecode/i18n/fr.js
+++ b/rhodecode/public/js/rhodecode/i18n/fr.js
@@ -10,8 +10,11 @@ var _TM = {
     'Close': 'Close',
     'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
     'Delete this comment?': 'Delete this comment?',
+    'Diff to Commit ': 'Diff to Commit ',
     'Follow': 'Follow',
     'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
+    'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
+    'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
     'Loading ...': 'Loading ...',
     'Loading failed': 'Loading failed',
     'Loading more results...': 'Loading more results...',
@@ -27,6 +30,7 @@ var _TM = {
     'No tags available yet.': 'No tags available yet.',
     'No user groups available yet.': 'No user groups available yet.',
     'No users available yet.': 'No users available yet.',
+    'Note Comment': 'Note Comment',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': 'Nouvelle requête de pull',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
@@ -39,6 +43,7 @@ var _TM = {
     'Send': 'Envoyer',
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
+    'Show at Commit ': 'Show at Commit ',
     'Show more': 'Show more',
     'Show selected commit __S': 'Show selected commit __S',
     'Show selected commits __S ... __E': 'Show selected commits __S ... __E',
@@ -48,6 +53,8 @@ var _TM = {
     'Submitting...': 'Envoi…',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
+    'TODO comment': 'TODO comment',
+    'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.',
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
     'Unfollow': 'Unfollow',
     'Updating...': 'Updating...',
@@ -62,6 +69,9 @@ var _TM = {
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
     'just now': 'à l’instant',
+    'resolve comment': 'resolve comment',
+    'showing {0} out of {1} commit': 'showing {0} out of {1} commit',
+    'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
     'specify commit': 'specify commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
diff --git a/rhodecode/public/js/rhodecode/i18n/it.js b/rhodecode/public/js/rhodecode/i18n/it.js
--- a/rhodecode/public/js/rhodecode/i18n/it.js
+++ b/rhodecode/public/js/rhodecode/i18n/it.js
@@ -10,8 +10,11 @@ var _TM = {
     'Close': 'Close',
     'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
     'Delete this comment?': 'Delete this comment?',
+    'Diff to Commit ': 'Diff to Commit ',
     'Follow': 'Segui',
     'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
+    'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
+    'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
     'Loading ...': 'Caricamento ...',
     'Loading failed': 'Loading failed',
     'Loading more results...': 'Loading more results...',
@@ -27,6 +30,7 @@ var _TM = {
     'No tags available yet.': 'No tags available yet.',
     'No user groups available yet.': 'No user groups available yet.',
     'No users available yet.': 'No users available yet.',
+    'Note Comment': 'Note Comment',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': 'Apri una richiesta PULL',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
@@ -39,6 +43,7 @@ var _TM = {
     'Send': 'Invia',
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
+    'Show at Commit ': 'Show at Commit ',
     'Show more': 'Mostra ancora',
     'Show selected commit __S': 'Show selected commit __S',
     'Show selected commits __S ... __E': 'Show selected commits __S ... __E',
@@ -48,6 +53,8 @@ var _TM = {
     'Submitting...': 'Inoltro...',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
+    'TODO comment': 'TODO comment',
+    'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.',
     'There are currently no open pull requests requiring your participation.': 'Al momento non ci sono richieste di PULL che richiedono il tuo intervento',
     'Unfollow': 'Smetti di seguire',
     'Updating...': 'Updating...',
@@ -62,6 +69,9 @@ var _TM = {
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
     'just now': 'proprio ora',
+    'resolve comment': 'resolve comment',
+    'showing {0} out of {1} commit': 'showing {0} out of {1} commit',
+    'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
     'specify commit': 'specify commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
diff --git a/rhodecode/public/js/rhodecode/i18n/ja.js b/rhodecode/public/js/rhodecode/i18n/ja.js
--- a/rhodecode/public/js/rhodecode/i18n/ja.js
+++ b/rhodecode/public/js/rhodecode/i18n/ja.js
@@ -10,8 +10,11 @@ var _TM = {
     'Close': 'Close',
     'Comment text will be set automatically based on currently selected status ({0}) ...': '選択したステータス ({0}) を元にコメントが自動的に設定されます...',
     'Delete this comment?': 'Delete this comment?',
+    'Diff to Commit ': 'Diff to Commit ',
     'Follow': 'フォロー',
     'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
+    'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
+    'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
     'Loading ...': '読み込み中...',
     'Loading failed': '読み込み失敗',
     'Loading more results...': '結果を読み込み中...',
@@ -27,6 +30,7 @@ var _TM = {
     'No tags available yet.': 'まだタグがありません。',
     'No user groups available yet.': 'まだユーザーグループがありません。',
     'No users available yet.': 'まだユーザーがいません。',
+    'Note Comment': 'Note Comment',
     'One result is available, press enter to select it.': '1 件の結果があります。 Enter で選択できます。',
     'Open new pull request': '新しいプルリクエストを作成',
     'Open new pull request for selected commit': '選択したコミットから新しいプルリクエストを作成',
@@ -39,6 +43,7 @@ var _TM = {
     'Send': '送信',
     'Set status to Approved': 'ステータスを承認にする',
     'Set status to Rejected': 'ステータスを拒否にする',
+    'Show at Commit ': 'Show at Commit ',
     'Show more': 'もっと表示',
     'Show selected commit __S': 'Show selected commit __S',
     'Show selected commits __S ... __E': 'Show selected commits __S ... __E',
@@ -48,6 +53,8 @@ var _TM = {
     'Submitting...': '送信中...',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
+    'TODO comment': 'TODO comment',
+    'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.',
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
     'Unfollow': 'アンフォロー',
     'Updating...': 'Updating...',
@@ -62,6 +69,9 @@ var _TM = {
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
     'just now': 'たったいま',
+    'resolve comment': 'resolve comment',
+    'showing {0} out of {1} commit': 'showing {0} out of {1} commit',
+    'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
     'specify commit': 'specify commit',
     'truncated result': '省略された結果',
     'truncated results': '省略された結果',
diff --git a/rhodecode/public/js/rhodecode/i18n/js_translations.js b/rhodecode/public/js/rhodecode/i18n/js_translations.js
--- a/rhodecode/public/js/rhodecode/i18n/js_translations.js
+++ b/rhodecode/public/js/rhodecode/i18n/js_translations.js
@@ -4,8 +4,11 @@
 _gettext('Close');
 _gettext('Comment text will be set automatically based on currently selected status ({0}) ...');
 _gettext('Delete this comment?');
+_gettext('Diff to Commit ');
 _gettext('Follow');
 _gettext('Invite reviewers to this discussion');
+_gettext('Leave a comment on line {0}.');
+_gettext('Leave a comment, or click resolve button to resolve TODO comment #{0}');
 _gettext('Loading ...');
 _gettext('Loading failed');
 _gettext('Loading more results...');
@@ -21,6 +24,7 @@
 _gettext('No tags available yet.');
 _gettext('No user groups available yet.');
 _gettext('No users available yet.');
+_gettext('Note Comment');
 _gettext('One result is available, press enter to select it.');
 _gettext('Open new pull request');
 _gettext('Open new pull request for selected commit');
@@ -33,6 +37,7 @@
 _gettext('Send');
 _gettext('Set status to Approved');
 _gettext('Set status to Rejected');
+_gettext('Show at Commit ');
 _gettext('Show more');
 _gettext('Show selected commit __S');
 _gettext('Show selected commits __S ... __E');
@@ -42,6 +47,8 @@
 _gettext('Submitting...');
 _gettext('Switch to chat');
 _gettext('Switch to comment');
+_gettext('TODO comment');
+_gettext('TODO from comment {0} was fixed.');
 _gettext('There are currently no open pull requests requiring your participation.');
 _gettext('Unfollow');
 _gettext('Updating...');
@@ -56,6 +63,9 @@
 _gettext('in {0} and {1}');
 _gettext('in {0}, {1}');
 _gettext('just now');
+_gettext('resolve comment');
+_gettext('showing {0} out of {1} commit');
+_gettext('showing {0} out of {1} commits');
 _gettext('specify commit');
 _gettext('truncated result');
 _gettext('truncated results');
diff --git a/rhodecode/public/js/rhodecode/i18n/pl.js b/rhodecode/public/js/rhodecode/i18n/pl.js
--- a/rhodecode/public/js/rhodecode/i18n/pl.js
+++ b/rhodecode/public/js/rhodecode/i18n/pl.js
@@ -10,8 +10,11 @@ var _TM = {
     'Close': 'Zamknij',
     'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
     'Delete this comment?': 'Delete this comment?',
+    'Diff to Commit ': 'Diff to Commit ',
     'Follow': 'Obserwuj',
     'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
+    'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
+    'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
     'Loading ...': 'Ładuję...',
     'Loading failed': 'Loading failed',
     'Loading more results...': 'Loading more results...',
@@ -27,6 +30,7 @@ var _TM = {
     'No tags available yet.': 'No tags available yet.',
     'No user groups available yet.': 'No user groups available yet.',
     'No users available yet.': 'No users available yet.',
+    'Note Comment': 'Note Comment',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': 'Otwórz nową prośbę o połączenie gałęzi',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
@@ -39,6 +43,7 @@ var _TM = {
     'Send': 'Wyślij',
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
+    'Show at Commit ': 'Show at Commit ',
     'Show more': 'Pokaż więcej',
     'Show selected commit __S': 'Show selected commit __S',
     'Show selected commits __S ... __E': 'Show selected commits __S ... __E',
@@ -48,6 +53,8 @@ var _TM = {
     'Submitting...': 'Przesyłanie...',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
+    'TODO comment': 'TODO comment',
+    'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.',
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
     'Unfollow': 'Nie obserwuj',
     'Updating...': 'Updating...',
@@ -62,6 +69,9 @@ var _TM = {
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
     'just now': 'przed chwilą',
+    'resolve comment': 'resolve comment',
+    'showing {0} out of {1} commit': 'showing {0} out of {1} commit',
+    'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
     'specify commit': 'specify commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
diff --git a/rhodecode/public/js/rhodecode/i18n/pt.js b/rhodecode/public/js/rhodecode/i18n/pt.js
--- a/rhodecode/public/js/rhodecode/i18n/pt.js
+++ b/rhodecode/public/js/rhodecode/i18n/pt.js
@@ -10,8 +10,11 @@ var _TM = {
     'Close': 'Close',
     'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
     'Delete this comment?': 'Delete this comment?',
+    'Diff to Commit ': 'Diff to Commit ',
     'Follow': 'Seguir',
     'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
+    'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
+    'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
     'Loading ...': 'Carregando...',
     'Loading failed': 'Loading failed',
     'Loading more results...': 'Loading more results...',
@@ -27,6 +30,7 @@ var _TM = {
     'No tags available yet.': 'No tags available yet.',
     'No user groups available yet.': 'No user groups available yet.',
     'No users available yet.': 'No users available yet.',
+    'Note Comment': 'Note Comment',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': 'Crie novo pull request',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
@@ -39,6 +43,7 @@ var _TM = {
     'Send': 'Enviar',
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
+    'Show at Commit ': 'Show at Commit ',
     'Show more': 'Mostrar mais',
     'Show selected commit __S': 'Show selected commit __S',
     'Show selected commits __S ... __E': 'Show selected commits __S ... __E',
@@ -48,6 +53,8 @@ var _TM = {
     'Submitting...': 'Enviando...',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
+    'TODO comment': 'TODO comment',
+    'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.',
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
     'Unfollow': 'Parar de seguir',
     'Updating...': 'Updating...',
@@ -62,6 +69,9 @@ var _TM = {
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
     'just now': 'agora há pouco',
+    'resolve comment': 'resolve comment',
+    'showing {0} out of {1} commit': 'showing {0} out of {1} commit',
+    'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
     'specify commit': 'specify commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
diff --git a/rhodecode/public/js/rhodecode/i18n/ru.js b/rhodecode/public/js/rhodecode/i18n/ru.js
--- a/rhodecode/public/js/rhodecode/i18n/ru.js
+++ b/rhodecode/public/js/rhodecode/i18n/ru.js
@@ -10,8 +10,11 @@ var _TM = {
     'Close': 'Close',
     'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
     'Delete this comment?': 'Delete this comment?',
+    'Diff to Commit ': 'Diff to Commit ',
     'Follow': 'Наблюдать',
     'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
+    'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
+    'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
     'Loading ...': 'Загрузка...',
     'Loading failed': 'Loading failed',
     'Loading more results...': 'Loading more results...',
@@ -27,6 +30,7 @@ var _TM = {
     'No tags available yet.': 'No tags available yet.',
     'No user groups available yet.': 'No user groups available yet.',
     'No users available yet.': 'No users available yet.',
+    'Note Comment': 'Note Comment',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': 'Создать новый pull запрос',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
@@ -39,6 +43,7 @@ var _TM = {
     'Send': 'Отправить',
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
+    'Show at Commit ': 'Show at Commit ',
     'Show more': 'Показать еще',
     'Show selected commit __S': 'Show selected commit __S',
     'Show selected commits __S ... __E': 'Show selected commits __S ... __E',
@@ -48,6 +53,8 @@ var _TM = {
     'Submitting...': 'Применение...',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
+    'TODO comment': 'TODO comment',
+    'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.',
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
     'Unfollow': 'Не наблюдать',
     'Updating...': 'Updating...',
@@ -62,6 +69,9 @@ var _TM = {
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
     'just now': 'прямо сейчас',
+    'resolve comment': 'resolve comment',
+    'showing {0} out of {1} commit': 'showing {0} out of {1} commit',
+    'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
     'specify commit': 'specify commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
diff --git a/rhodecode/public/js/rhodecode/i18n/zh.js b/rhodecode/public/js/rhodecode/i18n/zh.js
--- a/rhodecode/public/js/rhodecode/i18n/zh.js
+++ b/rhodecode/public/js/rhodecode/i18n/zh.js
@@ -10,8 +10,11 @@ var _TM = {
     'Close': 'Close',
     'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
     'Delete this comment?': 'Delete this comment?',
+    'Diff to Commit ': 'Diff to Commit ',
     'Follow': 'Follow',
     'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
+    'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
+    'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
     'Loading ...': 'Loading ...',
     'Loading failed': 'Loading failed',
     'Loading more results...': 'Loading more results...',
@@ -27,6 +30,7 @@ var _TM = {
     'No tags available yet.': 'No tags available yet.',
     'No user groups available yet.': 'No user groups available yet.',
     'No users available yet.': 'No users available yet.',
+    'Note Comment': 'Note Comment',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': '新建拉取请求',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
@@ -39,6 +43,7 @@ var _TM = {
     'Send': '发送',
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
+    'Show at Commit ': 'Show at Commit ',
     'Show more': 'Show more',
     'Show selected commit __S': 'Show selected commit __S',
     'Show selected commits __S ... __E': 'Show selected commits __S ... __E',
@@ -48,6 +53,8 @@ var _TM = {
     'Submitting...': '提交中……',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
+    'TODO comment': 'TODO comment',
+    'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.',
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
     'Unfollow': 'Unfollow',
     'Updating...': 'Updating...',
@@ -62,6 +69,9 @@ var _TM = {
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
     'just now': '刚才',
+    'resolve comment': 'resolve comment',
+    'showing {0} out of {1} commit': 'showing {0} out of {1} commit',
+    'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
     'specify commit': 'specify commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',