diff --git a/rhodecode/controllers/admin/permissions.py b/rhodecode/controllers/admin/permissions.py
--- a/rhodecode/controllers/admin/permissions.py
+++ b/rhodecode/controllers/admin/permissions.py
@@ -67,11 +67,11 @@ class PermissionsController(BaseControll
                                     ('group.admin', _('Admin'),)]
         self.register_choices = [
             ('hg.register.none',
-                _('disabled')),
+                _('Disabled')),
             ('hg.register.manual_activate',
-                _('allowed with manual account activation')),
+                _('Allowed with manual account activation')),
             ('hg.register.auto_activate',
-                _('allowed with automatic account activation')), ]
+                _('Allowed with automatic account activation')), ]
 
         self.create_choices = [('hg.create.none', _('Disabled')),
                                ('hg.create.repository', _('Enabled'))]
diff --git a/rhodecode/controllers/admin/repos.py b/rhodecode/controllers/admin/repos.py
--- a/rhodecode/controllers/admin/repos.py
+++ b/rhodecode/controllers/admin/repos.py
@@ -194,7 +194,7 @@ class ReposController(BaseRepoController
 
         except Exception:
             log.error(traceback.format_exc())
-            msg = _('error occurred during creation of repository %s') \
+            msg = _('Error creating repository %s') \
                     % form_result.get('repo_name')
             h.flash(msg, category='error')
             if c.rhodecode_user.is_admin:
@@ -362,7 +362,7 @@ class ReposController(BaseRepoController
         #action_logger(self.rhodecode_user, 'admin_changed_repo_permissions',
         #              repo_name, self.ip_addr, self.sa)
         Session().commit()
-        h.flash(_('updated repository permissions'), category='success')
+        h.flash(_('Repository permissions updated'), category='success')
         return redirect(url('edit_repo', repo_name=repo_name))
 
     @HasRepoPermissionAllDecorator('repository.admin')
@@ -473,10 +473,10 @@ class ReposController(BaseRepoController
             if repo.enable_locking:
                 if repo.locked[0]:
                     Repository.unlock(repo)
-                    action = _('unlocked')
+                    action = _('Unlocked')
                 else:
                     Repository.lock(repo, c.rhodecode_user.user_id)
-                    action = _('locked')
+                    action = _('Locked')
 
                 h.flash(_('Repository has been %s') % action,
                         category='success')
diff --git a/rhodecode/controllers/changeset.py b/rhodecode/controllers/changeset.py
--- a/rhodecode/controllers/changeset.py
+++ b/rhodecode/controllers/changeset.py
@@ -80,21 +80,21 @@ def _ignorews_url(GET, fileid=None):
     fileid = str(fileid) if fileid else None
     params = defaultdict(list)
     _update_with_GET(params, GET)
-    lbl = _('show white space')
+    lbl = _('Show white space')
     ig_ws = get_ignore_ws(fileid, GET)
     ln_ctx = get_line_ctx(fileid, GET)
     # global option
     if fileid is None:
         if ig_ws is None:
             params['ignorews'] += [1]
-            lbl = _('ignore white space')
+            lbl = _('Ignore white space')
         ctx_key = 'context'
         ctx_val = ln_ctx
     # per file options
     else:
         if ig_ws is None:
             params[fileid] += ['WS:1']
-            lbl = _('ignore white space')
+            lbl = _('Ignore white space')
 
         ctx_key = fileid
         ctx_val = 'C:%s' % ln_ctx
diff --git a/rhodecode/controllers/feed.py b/rhodecode/controllers/feed.py
--- a/rhodecode/controllers/feed.py
+++ b/rhodecode/controllers/feed.py
@@ -88,9 +88,8 @@ class FeedController(BaseRepoController)
 
     def __get_desc(self, cs):
         desc_msg = []
-        desc_msg.append('%s %s %s<br/>' % (h.person(cs.author),
-                                           _('commited on'),
-                                           h.fmt_date(cs.date)))
+        desc_msg.append((_('%s committed on %s')
+                         % (h.person(cs.author), h.fmt_date(cs.date))) + '<br/>')
         #branches, tags, bookmarks
         if cs.branch:
             desc_msg.append('branch: %s<br/>' % cs.branch)
@@ -103,7 +102,7 @@ class FeedController(BaseRepoController)
         # rev link
         _url = url('changeset_home', repo_name=cs.repository.name,
                    revision=cs.raw_id, qualified=True)
-        desc_msg.append('changesest: <a href="%s">%s</a>' % (_url, cs.raw_id[:8]))
+        desc_msg.append('changeset: <a href="%s">%s</a>' % (_url, cs.raw_id[:8]))
 
         desc_msg.append('<pre>')
         desc_msg.append(cs.message)
diff --git a/rhodecode/controllers/files.py b/rhodecode/controllers/files.py
--- a/rhodecode/controllers/files.py
+++ b/rhodecode/controllers/files.py
@@ -85,7 +85,7 @@ class FilesController(BaseRepoController
             url_ = url('files_add_home',
                        repo_name=c.repo_name,
                        revision=0, f_path='')
-            add_new = h.link_to(_('click here to add new file'), url_)
+            add_new = h.link_to(_('Click here to add new file'), url_)
             h.flash(h.literal(_('There are no files yet %s') % add_new),
                     category='warning')
             redirect(h.url('summary_home', repo_name=repo_name))
@@ -369,7 +369,7 @@ class FilesController(BaseRepoController
                 return redirect(url('changeset_home', repo_name=c.repo_name,
                                     revision='tip'))
             if location.startswith('/') or location.startswith('.') or '../' in location:
-                h.flash(_('location must be relative path and must not '
+                h.flash(_('Location must be relative path and must not '
                           'contain .. in path'), category='warning')
                 return redirect(url('changeset_home', repo_name=c.repo_name,
                                     revision='tip'))
@@ -417,7 +417,7 @@ class FilesController(BaseRepoController
         try:
             dbrepo = RepoModel().get_by_repo_name(repo_name)
             if not dbrepo.enable_downloads:
-                return _('downloads disabled')
+                return _('Downloads disabled')
 
             if c.rhodecode_repo.alias == 'hg':
                 # patch and reset hooks section of UI config to not run any
diff --git a/rhodecode/controllers/pullrequests.py b/rhodecode/controllers/pullrequests.py
--- a/rhodecode/controllers/pullrequests.py
+++ b/rhodecode/controllers/pullrequests.py
@@ -215,7 +215,7 @@ class PullrequestsController(BaseRepoCon
             elif errors.error_dict.get('pullrequest_title'):
                 msg = _('Pull request requires a title with min. 3 chars')
             else:
-                msg = _('error during creation of pull request')
+                msg = _('Error creating pull request')
 
             h.flash(msg, 'error')
             return redirect(url('pullrequest_home', repo_name=repo_name))
@@ -423,7 +423,7 @@ class PullrequestsController(BaseRepoCon
 
         allowed_to_change_status = self._get_is_allowed_change_status(pull_request)
         if status and change_status and allowed_to_change_status:
-            _def = (_('status change -> %s')
+            _def = (_('Status change -> %s')
                             % ChangesetStatus.get_status_lbl(status))
             if close_pr:
                 _def = _('Closing with') + ' ' + _def
diff --git a/rhodecode/lib/diffs.py b/rhodecode/lib/diffs.py
--- a/rhodecode/lib/diffs.py
+++ b/rhodecode/lib/diffs.py
@@ -63,7 +63,7 @@ def wrapped_diff(filenode_old, filenode_
         filenode_old = FileNode(filenode_new.path, '', EmptyChangeset())
 
     if filenode_old.is_binary or filenode_new.is_binary:
-        diff = wrap_to_table(_('binary file'))
+        diff = wrap_to_table(_('Binary file'))
         stats = (0, 0)
         size = 0
 
diff --git a/rhodecode/model/notification.py b/rhodecode/model/notification.py
--- a/rhodecode/model/notification.py
+++ b/rhodecode/model/notification.py
@@ -221,26 +221,24 @@ class NotificationModel(BaseModel):
         #alias
         _n = notification
         _map = {
-            _n.TYPE_CHANGESET_COMMENT: _('commented on changeset at %(when)s'),
-            _n.TYPE_MESSAGE: _('sent message at %(when)s'),
-            _n.TYPE_MENTION: _('mentioned you at %(when)s'),
-            _n.TYPE_REGISTRATION: _('registered in RhodeCode at %(when)s'),
-            _n.TYPE_PULL_REQUEST: _('opened new pull request at %(when)s'),
-            _n.TYPE_PULL_REQUEST_COMMENT: _('commented on pull request at %(when)s')
+            _n.TYPE_CHANGESET_COMMENT: _('%(user)s commented on changeset at %(when)s'),
+            _n.TYPE_MESSAGE: _('%(user)s sent message at %(when)s'),
+            _n.TYPE_MENTION: _('%(user)s mentioned you at %(when)s'),
+            _n.TYPE_REGISTRATION: _('%(user)s registered in RhodeCode at %(when)s'),
+            _n.TYPE_PULL_REQUEST: _('%(user)s opened new pull request at %(when)s'),
+            _n.TYPE_PULL_REQUEST_COMMENT: _('%(user)s commented on pull request at %(when)s')
         }
+        tmpl = _map[notification.type_]
 
-        # action == _map string
-        tmpl = "%(user)s %(action)s "
         if show_age:
             when = h.age(notification.created_on)
         else:
             when = h.fmt_date(notification.created_on)
 
-        data = dict(
+        return tmpl % dict(
             user=notification.created_by_user.username,
-            action=_map[notification.type_] % {'when': when},
-        )
-        return tmpl % data
+            when=when,
+            )
 
 
 class EmailNotificationModel(BaseModel):
diff --git a/rhodecode/model/user.py b/rhodecode/model/user.py
--- a/rhodecode/model/user.py
+++ b/rhodecode/model/user.py
@@ -229,7 +229,7 @@ class UserModel(BaseModel):
             self.sa.flush()
 
             # notification to admins
-            subject = _('new user registration')
+            subject = _('New user registration')
             body = ('New user registration\n'
                     '---------------------\n'
                     '- Username: %s\n'
@@ -331,7 +331,7 @@ class UserModel(BaseModel):
                                                        'reset_url': link})
                 log.debug('sending email')
                 run_task(tasks.send_email, user_email,
-                         _("password reset link"), body, body)
+                         _("Password reset link"), body, body)
                 log.info('send new password mail to %s' % user_email)
             else:
                 log.debug("password reset email %s not found" % user_email)
diff --git a/rhodecode/templates/admin/defaults/defaults.html b/rhodecode/templates/admin/defaults/defaults.html
--- a/rhodecode/templates/admin/defaults/defaults.html
+++ b/rhodecode/templates/admin/defaults/defaults.html
@@ -8,7 +8,7 @@
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
-    ${_('defaults')}
+    ${_('Defaults')}
 </%def>
 
 <%def name="page_nav()">
diff --git a/rhodecode/templates/admin/ldap/ldap.html b/rhodecode/templates/admin/ldap/ldap.html
--- a/rhodecode/templates/admin/ldap/ldap.html
+++ b/rhodecode/templates/admin/ldap/ldap.html
@@ -8,7 +8,7 @@
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
-    ${_('ldap')}
+    ${_('LDAP')}
 </%def>
 
 <%def name="page_nav()">
diff --git a/rhodecode/templates/admin/permissions/permissions.html b/rhodecode/templates/admin/permissions/permissions.html
--- a/rhodecode/templates/admin/permissions/permissions.html
+++ b/rhodecode/templates/admin/permissions/permissions.html
@@ -8,7 +8,7 @@
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
-    ${_('permissions')}
+    ${_('Permissions')}
 </%def>
 
 <%def name="page_nav()">
@@ -47,7 +47,7 @@
                     <label for="overwrite_default_repo">
                     <span class="tooltip"
                     title="${h.tooltip(_('All default permissions on each repository will be reset to chosen permission, note that all custom default permission on repositories will be lost'))}">
-                    ${_('overwrite existing settings')}</span> </label>
+                    ${_('Overwrite existing settings')}</span> </label>
                 </div>
             </div>
             <div class="field">
@@ -60,7 +60,7 @@
                     <label for="overwrite_default_group">
                     <span class="tooltip"
                     title="${h.tooltip(_('All default permissions on each repository group will be reset to chosen permission, note that all custom default permission on repository groups will be lost'))}">
-                    ${_('overwrite existing settings')}</span> </label>
+                    ${_('Overwrite existing settings')}</span> </label>
 
                 </div>
             </div>
@@ -180,7 +180,7 @@
                     ${h.hidden('del_ip',ip.ip_id)}
                     ${h.hidden('default_user', 'True')}
                     ${h.submit('remove_',_('delete'),id="remove_ip_%s" % ip.ip_id,
-                    class_="delete_icon action_button", onclick="return  confirm('"+_('Confirm to delete this ip: %s') % ip.ip_addr+"');")}
+                    class_="delete_icon action_button", onclick="return confirm('"+_('Confirm to delete this ip: %s') % ip.ip_addr+"');")}
                 ${h.end_form()}
               </td>
           </tr>
diff --git a/rhodecode/templates/admin/repos/repo_add.html b/rhodecode/templates/admin/repos/repo_add.html
--- a/rhodecode/templates/admin/repos/repo_add.html
+++ b/rhodecode/templates/admin/repos/repo_add.html
@@ -16,7 +16,7 @@
     ${_('Repositories')}
     %endif
     &raquo;
-    ${_('add new')}
+    ${_('Add new')}
 </%def>
 
 <%def name="page_nav()">
diff --git a/rhodecode/templates/admin/repos/repo_add_base.html b/rhodecode/templates/admin/repos/repo_add_base.html
--- a/rhodecode/templates/admin/repos/repo_add_base.html
+++ b/rhodecode/templates/admin/repos/repo_add_base.html
@@ -70,7 +70,7 @@
             </div>
          </div>
         <div class="buttons">
-          ${h.submit('add',_('add'),class_="ui-btn large")}
+          ${h.submit('add',_('Add'),class_="ui-btn large")}
         </div>
     </div>
 </div>
diff --git a/rhodecode/templates/admin/repos_groups/repos_groups_edit.html b/rhodecode/templates/admin/repos_groups/repos_groups_edit.html
--- a/rhodecode/templates/admin/repos_groups/repos_groups_edit.html
+++ b/rhodecode/templates/admin/repos_groups/repos_groups_edit.html
@@ -10,7 +10,7 @@
     &raquo;
     ${h.link_to(_('Repository groups'),h.url('repos_groups'))}
     &raquo;
-    ${_('Edit repository group')} "${c.repos_group.name}"
+    ${_('Edit repository group %s') % c.repos_group.name}"
 </%def>
 
 <%def name="page_nav()">
diff --git a/rhodecode/templates/admin/repos_groups/repos_groups_show.html b/rhodecode/templates/admin/repos_groups/repos_groups_show.html
--- a/rhodecode/templates/admin/repos_groups/repos_groups_show.html
+++ b/rhodecode/templates/admin/repos_groups/repos_groups_show.html
@@ -9,7 +9,7 @@
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
-    ${_('repository groups')}
+    ${_('Repository groups')}
 </%def>
 
 <%def name="page_nav()">
@@ -39,7 +39,7 @@
                         <th class="left"><a href="#">${_('Group name')}</a></th>
                         <th class="left"><a href="#">${_('Description')}</a></th>
                         <th class="left"><a href="#">${_('Number of toplevel repositories')}</a></th>
-                        <th class="left" colspan="2">${_('action')}</th>
+                        <th class="left" colspan="2">${_('Action')}</th>
                     </tr>
                 </thead>
 
@@ -57,7 +57,7 @@
                       <td>${gr.group_description}</td>
                       <td><b>${gr_cn}</b></td>
                       <td>
-                       <a href="${h.url('edit_repos_group',group_name=gr.group_name)}" title="${_('edit')}">
+                       <a href="${h.url('edit_repos_group',group_name=gr.group_name)}" title="${_('Edit')}">
                          ${h.submit('edit_%s' % gr.group_name,_('edit'),class_="edit_icon action_button")}
                        </a>
                       </td>
diff --git a/rhodecode/templates/admin/settings/settings.html b/rhodecode/templates/admin/settings/settings.html
--- a/rhodecode/templates/admin/settings/settings.html
+++ b/rhodecode/templates/admin/settings/settings.html
@@ -8,7 +8,7 @@
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
-    ${_('settings')}
+    ${_('Settings')}
 </%def>
 
 <%def name="page_nav()">
@@ -267,7 +267,7 @@
                     ${h.text('paths_root_path',size=30,readonly="readonly")}
                     <span id="path_unlock" class="tooltip"
                             title="${h.tooltip(_('This a crucial application setting. If you are really sure you need to change this, you must restart application in order to make this setting take effect. Click this label to unlock.'))}">
-                        ${_('unlock')}
+                        ${_('Unlock')}
                     </span>
                     <span class="help-block">${_('Location where repositories are stored. After changing this value a restart, and rescan is required')}</span>
                 </div>
diff --git a/rhodecode/templates/admin/users/user_add.html b/rhodecode/templates/admin/users/user_add.html
--- a/rhodecode/templates/admin/users/user_add.html
+++ b/rhodecode/templates/admin/users/user_add.html
@@ -9,7 +9,7 @@
     &raquo;
     ${h.link_to(_('Users'),h.url('users'))}
     &raquo;
-    ${_('add new user')}
+    ${_('Add new user')}
 </%def>
 
 <%def name="page_nav()">
@@ -91,7 +91,7 @@
              </div>
 
             <div class="buttons">
-              ${h.submit('save',_('save'),class_="ui-btn large")}
+              ${h.submit('save',_('Save'),class_="ui-btn large")}
             </div>
         </div>
     </div>
diff --git a/rhodecode/templates/admin/users/user_edit.html b/rhodecode/templates/admin/users/user_edit.html
--- a/rhodecode/templates/admin/users/user_edit.html
+++ b/rhodecode/templates/admin/users/user_edit.html
@@ -10,7 +10,7 @@
     &raquo;
     ${h.link_to(_('Users'),h.url('users'))}
     &raquo;
-    ${_('edit')} "${c.user.username}"
+    ${_('Edit %s') % c.user.username}
 </%def>
 
 <%def name="page_nav()">
diff --git a/rhodecode/templates/admin/users/users.html b/rhodecode/templates/admin/users/users.html
--- a/rhodecode/templates/admin/users/users.html
+++ b/rhodecode/templates/admin/users/users.html
@@ -74,17 +74,17 @@
   // main table sorting
   var myColumnDefs = [
       {key:"gravatar",label:"",sortable:false,},
-      {key:"username",label:"${_('username')}",sortable:true,
+      {key:"username",label:"${_('Username')}",sortable:true,
           sortOptions: { sortFunction: usernamelinkSort }
       },
-      {key:"firstname",label:"${_('firstname')}",sortable:true,},
-      {key:"lastname",label:"${_('lastname')}",sortable:true,},
-      {key:"last_login",label:"${_('last login')}",sortable:true,
+      {key:"firstname",label:"${_('Firstname')}",sortable:true,},
+      {key:"lastname",label:"${_('Lastname')}",sortable:true,},
+      {key:"last_login",label:"${_('Last login')}",sortable:true,
           sortOptions: { sortFunction: lastLoginSort }},
-      {key:"active",label:"${_('active')}",sortable:true,},
-      {key:"admin",label:"${_('admin')}",sortable:true,},
-      {key:"ldap",label:"${_('ldap')}",sortable:true,},
-      {key:"action",label:"${_('action')}",sortable:false},
+      {key:"active",label:"${_('Active')}",sortable:true,},
+      {key:"admin",label:"${_('Admin')}",sortable:true,},
+      {key:"ldap",label:"${_('LDAP')}",sortable:true,},
+      {key:"action",label:"${_('Action')}",sortable:false},
   ];
 
   var myDataTable = new YAHOO.widget.DataTable("users_list_wrap", myColumnDefs, myDataSource,{
diff --git a/rhodecode/templates/admin/users_groups/users_group_add.html b/rhodecode/templates/admin/users_groups/users_group_add.html
--- a/rhodecode/templates/admin/users_groups/users_group_add.html
+++ b/rhodecode/templates/admin/users_groups/users_group_add.html
@@ -9,7 +9,7 @@
     &raquo;
     ${h.link_to(_('User groups'),h.url('users_groups'))}
     &raquo;
-    ${_('add new user group')}
+    ${_('Add new user group')}
 </%def>
 
 <%def name="page_nav()">
@@ -46,7 +46,7 @@
              </div>
 
             <div class="buttons">
-              ${h.submit('save',_('save'),class_="ui-btn large")}
+              ${h.submit('save',_('Save'),class_="ui-btn large")}
             </div>
         </div>
     </div>
diff --git a/rhodecode/templates/admin/users_groups/users_group_edit.html b/rhodecode/templates/admin/users_groups/users_group_edit.html
--- a/rhodecode/templates/admin/users_groups/users_group_edit.html
+++ b/rhodecode/templates/admin/users_groups/users_group_edit.html
@@ -10,7 +10,7 @@
     &raquo;
     ${h.link_to(_('UserGroups'),h.url('users_groups'))}
     &raquo;
-    ${_('edit')} "${c.users_group.users_group_name}"
+    ${_('Edit %s') % c.users_group.users_group_name}
 </%def>
 
 <%def name="page_nav()">
@@ -87,7 +87,7 @@
 
                 </div>
                 <div class="buttons">
-                  ${h.submit('Save',_('save'),class_="ui-btn large")}
+                  ${h.submit('Save',_('Save'),class_="ui-btn large")}
                 </div>
             </div>
     </div>
diff --git a/rhodecode/templates/admin/users_groups/users_groups.html b/rhodecode/templates/admin/users_groups/users_groups.html
--- a/rhodecode/templates/admin/users_groups/users_groups.html
+++ b/rhodecode/templates/admin/users_groups/users_groups.html
@@ -8,7 +8,7 @@
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
-    ${_('user groups')}
+    ${_('User groups')}
 </%def>
 
 <%def name="page_nav()">
@@ -31,10 +31,10 @@
     <div class="table">
         <table class="table_disp">
         <tr class="header">
-            <th class="left">${_('group name')}</th>
-            <th class="left">${_('members')}</th>
-            <th class="left">${_('active')}</th>
-            <th class="left">${_('action')}</th>
+            <th class="left">${_('Group name')}</th>
+            <th class="left">${_('Members')}</th>
+            <th class="left">${_('Active')}</th>
+            <th class="left">${_('Action')}</th>
         </tr>
             %for cnt,u_group in enumerate(c.users_groups_list):
                 <tr class="parity${cnt%2}">
diff --git a/rhodecode/templates/base/base.html b/rhodecode/templates/base/base.html
--- a/rhodecode/templates/base/base.html
+++ b/rhodecode/templates/base/base.html
@@ -63,21 +63,21 @@
 
 <%def name="admin_menu()">
   <ul class="admin_menu">
-      <li>${h.link_to(_('admin journal'),h.url('admin_home'),class_='journal ')}</li>
-      <li>${h.link_to(_('repositories'),h.url('repos'),class_='repos')}</li>
-      <li>${h.link_to(_('repository groups'),h.url('repos_groups'),class_='repos_groups')}</li>
-      <li>${h.link_to(_('users'),h.url('users'),class_='users')}</li>
-      <li>${h.link_to(_('user groups'),h.url('users_groups'),class_='groups')}</li>
-      <li>${h.link_to(_('permissions'),h.url('edit_permission',id='default'),class_='permissions')}</li>
-      <li>${h.link_to(_('ldap'),h.url('ldap_home'),class_='ldap')}</li>
-      <li>${h.link_to(_('defaults'),h.url('defaults'),class_='defaults')}</li>
-      <li class="last">${h.link_to(_('settings'),h.url('admin_settings'),class_='settings')}</li>
+      <li>${h.link_to(_('Admin journal'),h.url('admin_home'),class_='journal ')}</li>
+      <li>${h.link_to(_('Repositories'),h.url('repos'),class_='repos')}</li>
+      <li>${h.link_to(_('Repository groups'),h.url('repos_groups'),class_='repos_groups')}</li>
+      <li>${h.link_to(_('Users'),h.url('users'),class_='users')}</li>
+      <li>${h.link_to(_('User groups'),h.url('users_groups'),class_='groups')}</li>
+      <li>${h.link_to(_('Permissions'),h.url('edit_permission',id='default'),class_='permissions')}</li>
+      <li>${h.link_to(_('LDAP'),h.url('ldap_home'),class_='ldap')}</li>
+      <li>${h.link_to(_('Defaults'),h.url('defaults'),class_='defaults')}</li>
+      <li class="last">${h.link_to(_('Settings'),h.url('admin_settings'),class_='settings')}</li>
   </ul>
 </%def>
 
 <%def name="admin_menu_simple()">
   <ul>
-      <li>${h.link_to(_('repository groups'),h.url('repos_groups'),class_='repos_groups')}</li>
+      <li>${h.link_to(_('Repository groups'),h.url('repos_groups'),class_='repos_groups')}</li>
   </ul>
 </%def>
 
diff --git a/rhodecode/templates/changelog/changelog.html b/rhodecode/templates/changelog/changelog.html
--- a/rhodecode/templates/changelog/changelog.html
+++ b/rhodecode/templates/changelog/changelog.html
@@ -86,18 +86,18 @@
                                     %endif
                                     %if h.is_hg(c.rhodecode_repo):
                                         %for book in cs.bookmarks:
-                                            <div class="bookbook" title="${'%s %s' % (_('bookmark'),book)}">
+                                            <div class="bookbook" title="${_('Bookmark %s') % book}">
                                                 ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
                                             </div>
                                         %endfor
                                     %endif
                                     %for tag in cs.tags:
-                                        <div class="tagtag"  title="${'%s %s' % (_('tag'),tag)}">
+                                        <div class="tagtag" title="${_('Tag %s') % tag}">
                                             ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
                                         </div>
                                     %endfor
                                     %if (not c.branch_name) and cs.branch:
-                                        <div class="branchtag" title="${'%s %s' % (_('branch'),cs.branch)}">
+                                        <div class="branchtag" title="${_('Branch %s' % cs.branch)}">
                                             ${h.link_to(h.shorter(cs.branch),h.url('changelog_home',repo_name=c.repo_name,branch=cs.branch))}
                                         </div>
                                     %endif
diff --git a/rhodecode/templates/changelog/changelog_details.html b/rhodecode/templates/changelog/changelog_details.html
--- a/rhodecode/templates/changelog/changelog_details.html
+++ b/rhodecode/templates/changelog/changelog_details.html
@@ -1,11 +1,11 @@
 ## small box that displays changed/added/removed details fetched by AJAX
 
 % if len(c.cs.affected_files) <= c.affected_files_cut_off:
-<span class="removed tooltip" title="<b>${h.tooltip(_('removed'))}</b>${h.changed_tooltip(c.cs.removed)}">${len(c.cs.removed)}</span>
-<span class="changed tooltip" title="<b>${h.tooltip(_('changed'))}</b>${h.changed_tooltip(c.cs.changed)}">${len(c.cs.changed)}</span>
-<span class="added tooltip"   title="<b>${h.tooltip(_('added'))}</b>${h.changed_tooltip(c.cs.added)}">${len(c.cs.added)}</span>
+<span class="removed tooltip" title="<b>${h.tooltip(_('Removed'))}</b>${h.changed_tooltip(c.cs.removed)}">${len(c.cs.removed)}</span>
+<span class="changed tooltip" title="<b>${h.tooltip(_('Changed'))}</b>${h.changed_tooltip(c.cs.changed)}">${len(c.cs.changed)}</span>
+<span class="added tooltip"   title="<b>${h.tooltip(_('Added'))}</b>${h.changed_tooltip(c.cs.added)}">${len(c.cs.added)}</span>
 % else:
- <span class="removed tooltip" title="${h.tooltip(_('affected %s files') % len(c.cs.affected_files))}">!</span>
- <span class="changed tooltip" title="${h.tooltip(_('affected %s files') % len(c.cs.affected_files))}">!</span>
- <span class="added tooltip"   title="${h.tooltip(_('affected %s files') % len(c.cs.affected_files))}">!</span>
+ <span class="removed tooltip" title="${h.tooltip(_('Affected %s files') % len(c.cs.affected_files))}">!</span>
+ <span class="changed tooltip" title="${h.tooltip(_('Affected %s files') % len(c.cs.affected_files))}">!</span>
+ <span class="added tooltip"   title="${h.tooltip(_('Affected %s files') % len(c.cs.affected_files))}">!</span>
 % endif
diff --git a/rhodecode/templates/changeset/changeset.html b/rhodecode/templates/changeset/changeset.html
--- a/rhodecode/templates/changeset/changeset.html
+++ b/rhodecode/templates/changeset/changeset.html
@@ -64,9 +64,9 @@
                     %endif
                 </div>
                 <div class="diff-actions">
-                  <a href="${h.url('changeset_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id)}"  class="tooltip" title="${h.tooltip(_('raw diff'))}"><img class="icon" src="${h.url('/images/icons/page_white.png')}"/></a>
-                  <a href="${h.url('changeset_patch_home',repo_name=c.repo_name,revision=c.changeset.raw_id)}"  class="tooltip" title="${h.tooltip(_('patch diff'))}"><img class="icon" src="${h.url('/images/icons/page_add.png')}"/></a>
-                  <a href="${h.url('changeset_download_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='download')}"  class="tooltip" title="${h.tooltip(_('download diff'))}"><img class="icon" src="${h.url('/images/icons/page_save.png')}"/></a>
+                  <a href="${h.url('changeset_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id)}"  class="tooltip" title="${h.tooltip(_('Raw diff'))}"><img class="icon" src="${h.url('/images/icons/page_white.png')}"/></a>
+                  <a href="${h.url('changeset_patch_home',repo_name=c.repo_name,revision=c.changeset.raw_id)}"  class="tooltip" title="${h.tooltip(_('Patch diff'))}"><img class="icon" src="${h.url('/images/icons/page_add.png')}"/></a>
+                  <a href="${h.url('changeset_download_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='download')}"  class="tooltip" title="${h.tooltip(_('Download diff'))}"><img class="icon" src="${h.url('/images/icons/page_save.png')}"/></a>
                   ${c.ignorews_url(request.GET)}
                   ${c.context_url(request.GET)}
                 </div>
@@ -88,13 +88,13 @@
                  <div class="right">
                      <div class="changes">
                         % if (len(c.changeset.affected_files) <= c.affected_files_cut_off) or c.fulldiff:
-                         <span class="removed" title="${_('removed')}">${len(c.changeset.removed)}</span>
-                         <span class="changed" title="${_('changed')}">${len(c.changeset.changed)}</span>
-                         <span class="added" title="${_('added')}">${len(c.changeset.added)}</span>
+                         <span class="removed" title="${_('Removed')}">${len(c.changeset.removed)}</span>
+                         <span class="changed" title="${_('Changed')}">${len(c.changeset.changed)}</span>
+                         <span class="added" title="${_('Added')}">${len(c.changeset.added)}</span>
                         % else:
-                         <span class="removed" title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span>
-                         <span class="changed" title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span>
-                         <span class="added"   title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span>
+                         <span class="removed" title="${_('Affected %s files') % len(c.changeset.affected_files)}">!</span>
+                         <span class="changed" title="${_('Affected %s files') % len(c.changeset.affected_files)}">!</span>
+                         <span class="added"   title="${_('Affected %s files') % len(c.changeset.affected_files)}">!</span>
                         % endif
                      </div>
 
@@ -103,12 +103,12 @@
                  <span class="merge">${_('merge')}</span>
                  %endif
                      %if c.changeset.branch:
-                     <span class="branchtag" title="${'%s %s' % (_('branch'),c.changeset.branch)}">
+                     <span class="branchtag" title="${_('Branch %s') % c.changeset.branch}">
                      ${h.link_to(c.changeset.branch,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}
                      </span>
                      %endif
                      %for tag in c.changeset.tags:
-                         <span class="tagtag"  title="${'%s %s' % (_('tag'),tag)}">
+                         <span class="tagtag"  title="${_('Tag %s') % tag}">
                          ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span>
                      %endfor
                  </span>
@@ -131,7 +131,7 @@
                   </div>
               %endfor
               % if c.limited_diff:
-                <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}" onclick="return confirm('${_("confirm to show potentially huge diff")}')">${_('Show full diff')}</a></h5>
+                <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}" onclick="return confirm('${_("Showing a huge diff might take some time and resources")}')">${_('Show full diff')}</a></h5>
               % endif
             </div>
         </div>
@@ -143,7 +143,7 @@
     ${diff_block.diff_block(c.changes[c.changeset.raw_id])}
 
     % if c.limited_diff:
-      <h4>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}" onclick="return confirm('${_("confirm to show potentially huge diff")}')">${_('Show full diff')}</a></h4>
+      <h4>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}" onclick="return confirm('${_("Showing a huge diff might take some time and resources")}')">${_('Show full diff')}</a></h4>
     % endif
 
     ## template for inline comment form
diff --git a/rhodecode/templates/changeset/changeset_range.html b/rhodecode/templates/changeset/changeset_range.html
--- a/rhodecode/templates/changeset/changeset_range.html
+++ b/rhodecode/templates/changeset/changeset_range.html
@@ -77,19 +77,19 @@
                 <span class="merge">${_('merge')}</span>
                 %endif
                 %if cs.branch:
-                <span class="branchtag" title="${'%s %s' % (_('branch'),cs.branch)}">
+                <span class="branchtag" title="${_('Branch %s') % cs.branch}">
                    ${h.link_to(h.shorter(cs.branch),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
                 </span>
                 %endif
                 %if h.is_hg(c.rhodecode_repo):
                   %for book in cs.bookmarks:
-                  <span class="bookbook" title="${'%s %s' % (_('bookmark'),book)}">
+                  <span class="bookbook" title="${_('Bookmark %s') % book}">
                      ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
                   </span>
                   %endfor
                 %endif
                 %for tag in cs.tags:
-                    <span class="tagtag"  title="${'%s %s' % (_('tag'),tag)}">
+                    <span class="tagtag" title="${_('Tag %s') % tag}">
                     ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span>
                 %endfor
               </span>
diff --git a/rhodecode/templates/changeset/diff_block.html b/rhodecode/templates/changeset/diff_block.html
--- a/rhodecode/templates/changeset/diff_block.html
+++ b/rhodecode/templates/changeset/diff_block.html
@@ -5,7 +5,7 @@
 ##
 <%def name="diff_block(change)">
 <div class="diff-collapse">
-    <span target="${'diff-container-%s' % (id(change))}" class="diff-collapse-button">&uarr; ${_('collapse diff')} &uarr;</span>
+    <span target="${'diff-container-%s' % (id(change))}" class="diff-collapse-button">&uarr; ${_('Collapse diff')} &uarr;</span>
 </div>
 <div class="diff-container" id="${'diff-container-%s' % (id(change))}">
 %for FID,(cs1, cs2, change, path, diff, stats) in change.iteritems():
@@ -19,15 +19,15 @@
                     revision=cs2,f_path=h.safe_unicode(path)))}
                 </div>
                 <div class="diff-actions">
-                  <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(path),diff2=cs2,diff1=cs1,diff='diff',fulldiff=1)}" class="tooltip" title="${h.tooltip(_('show full diff for this file'))}"><img class="icon" src="${h.url('/images/icons/page_white_go.png')}"/></a>
-                  <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(path),diff2=cs2,diff1=cs1,diff='raw')}" class="tooltip" title="${h.tooltip(_('raw diff'))}"><img class="icon" src="${h.url('/images/icons/page_white.png')}"/></a>
-                  <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(path),diff2=cs2,diff1=cs1,diff='download')}" class="tooltip" title="${h.tooltip(_('download diff'))}"><img class="icon" src="${h.url('/images/icons/page_save.png')}"/></a>
+                  <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(path),diff2=cs2,diff1=cs1,diff='diff',fulldiff=1)}" class="tooltip" title="${h.tooltip(_('Show full diff for this file'))}"><img class="icon" src="${h.url('/images/icons/page_white_go.png')}"/></a>
+                  <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(path),diff2=cs2,diff1=cs1,diff='raw')}" class="tooltip" title="${h.tooltip(_('Raw diff'))}"><img class="icon" src="${h.url('/images/icons/page_white.png')}"/></a>
+                  <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(path),diff2=cs2,diff1=cs1,diff='download')}" class="tooltip" title="${h.tooltip(_('Download diff'))}"><img class="icon" src="${h.url('/images/icons/page_save.png')}"/></a>
                   ${c.ignorews_url(request.GET, h.FID(cs2,path))}
                   ${c.context_url(request.GET, h.FID(cs2,path))}
                 </div>
                 <span style="float:right;margin-top:-3px">
                   <label>
-                  ${_('show inline comments')}
+                  ${_('Show inline comments')}
                   ${h.checkbox('',checked="checked",class_="show-inline-comments",id_for=h.FID(cs2,path))}
                   </label>
                 </span>
@@ -52,8 +52,8 @@
           <div class="changeset_header">
               <div class="changeset_file">
                   ${h.safe_unicode(filenode_path)} |
-                  <a class="spantag" href="${h.url('files_home', repo_name=c.other_repo.repo_name, f_path=filenode_path, revision=c.org_ref)}" title="${_('show file at latest version in this repo')}">${c.org_ref_type}@${h.short_id(c.org_ref) if c.org_ref_type=='rev' else c.org_ref}</a> -&gt;
-                  <a class="spantag" href="${h.url('files_home', repo_name=c.repo_name, f_path=filenode_path, revision=c.other_ref)}" title="${_('show file at initial version in this repo')}">${c.other_ref_type}@${h.short_id(c.other_ref) if c.other_ref_type=='rev' else c.other_ref}</a>
+                  <a class="spantag" href="${h.url('files_home', repo_name=c.other_repo.repo_name, f_path=filenode_path, revision=c.org_ref)}" title="${_('Show file at latest version in this repo')}">${c.org_ref_type}@${h.short_id(c.org_ref) if c.org_ref_type=='rev' else c.org_ref}</a> -&gt;
+                  <a class="spantag" href="${h.url('files_home', repo_name=c.repo_name, f_path=filenode_path, revision=c.other_ref)}" title="${_('Show file at initial version in this repo')}">${c.other_ref_type}@${h.short_id(c.other_ref) if c.other_ref_type=='rev' else c.other_ref}</a>
               </div>
           </div>
       </div>
diff --git a/rhodecode/templates/data_table/_dt_elements.html b/rhodecode/templates/data_table/_dt_elements.html
--- a/rhodecode/templates/data_table/_dt_elements.html
+++ b/rhodecode/templates/data_table/_dt_elements.html
@@ -58,9 +58,9 @@
 
    ##PRIVATE/PUBLIC
    %if private and c.visual.show_private_icon:
-     <img class="icon" title="${_('private repository')}" alt="${_('private repository')}" src="${h.url('/images/icons/lock.png')}"/>
+     <img class="icon" title="${_('Private repository')}" alt="${_('Private repository')}" src="${h.url('/images/icons/lock.png')}"/>
    %elif not private and c.visual.show_public_icon:
-     <img class="icon" title="${_('public repository')}" alt="${_('public repository')}" src="${h.url('/images/icons/lock_open.png')}"/>
+     <img class="icon" title="${_('Public repository')}" alt="${_('Public repository')}" src="${h.url('/images/icons/lock_open.png')}"/>
    %endif
 
    ##NAME
@@ -71,7 +71,7 @@
    %endif
    %if fork_of:
         <a href="${h.url('summary_home',repo_name=fork_of.repo_name)}">
-        <img class="icon" alt="${_('fork')}" title="${_('Fork of')} ${fork_of.repo_name}" src="${h.url('/images/icons/arrow_divide.png')}"/></a>
+        <img class="icon" alt="${_('Fork')}" title="${_('Fork of %s') % fork_of.repo_name}" src="${h.url('/images/icons/arrow_divide.png')}"/></a>
    %endif
   </div>
 </%def>
diff --git a/rhodecode/templates/files/files.html b/rhodecode/templates/files/files.html
--- a/rhodecode/templates/files/files.html
+++ b/rhodecode/templates/files/files.html
@@ -27,7 +27,7 @@
         ${self.breadcrumbs()}
         <ul class="links">
             <li>
-              <span style="text-transform: uppercase;"><a href="#">${_('branch')}: ${c.changeset.branch}</a></span>
+              <span style="text-transform: uppercase;"><a href="#">${_('Branch')}: ${c.changeset.branch}</a></span>
             </li>
         </ul>
     </div>
diff --git a/rhodecode/templates/files/files_add.html b/rhodecode/templates/files/files_add.html
--- a/rhodecode/templates/files/files_add.html
+++ b/rhodecode/templates/files/files_add.html
@@ -28,7 +28,7 @@
         <ul class="links">
             <li>
               <span style="text-transform: uppercase;">
-              <a href="#">${_('branch')}: ${c.cs.branch}</a></span>
+              <a href="#">${_('Branch')}: ${c.cs.branch}</a></span>
             </li>
         </ul>
     </div>
@@ -72,7 +72,7 @@
                     <pre id="editor_pre"></pre>
                     <textarea id="editor" name="content" style="display:none"></textarea>
                 </div>
-                <div style="padding: 10px;color:#666666">${_('commit message')}</div>
+                <div style="padding: 10px;color:#666666">${_('Commit message')}</div>
                 <textarea id="commit" name="message" style="height: 100px;width: 99%;margin-left:4px" placeholder="${c.default_message}"></textarea>
             </div>
             <div style="text-align: l;padding-top: 5px">
diff --git a/rhodecode/templates/files/files_browser.html b/rhodecode/templates/files/files_browser.html
--- a/rhodecode/templates/files/files_browser.html
+++ b/rhodecode/templates/files/files_browser.html
@@ -10,25 +10,25 @@
         <div class="browser-nav">
             ${h.form(h.url.current())}
             <div class="info_box">
-              <span class="rev">${_('view')}@rev</span>
-              <a class="ui-btn ypjax-link" href="${c.url_prev}" title="${_('previous revision')}">&laquo;</a>
+              <span class="rev">${_('View')}@rev</span>
+              <a class="ui-btn ypjax-link" href="${c.url_prev}" title="${_('Previous revision')}">&laquo;</a>
               ${h.text('at_rev',value=c.changeset.revision,size=5)}
-              <a class="ui-btn ypjax-link" href="${c.url_next}" title="${_('next revision')}">&raquo;</a>
-              ## ${h.submit('view',_('view'),class_="ui-btn")}
+              <a class="ui-btn ypjax-link" href="${c.url_next}" title="${_('Next revision')}">&raquo;</a>
+              ## ${h.submit('view',_('View'),class_="ui-btn")}
             </div>
             ${h.end_form()}
         </div>
         <div class="browser-branch">
            ${h.checkbox('stay_at_branch',c.changeset.branch,c.changeset.branch==c.branch)}
-           <label>${_('follow current branch')}</label>
+           <label>${_('Follow current branch')}</label>
         </div>
         <div class="browser-search">
               <div id="search_activate_id" class="search_activate">
-                  <a class="ui-btn" id="filter_activate" href="#">${_('search file list')}</a>
+                  <a class="ui-btn" id="filter_activate" href="#">${_('Search file list')}</a>
               </div>
               % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
                     <div id="add_node_id" class="add_node">
-                        <a class="ui-btn" href="${h.url('files_add_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path)}">${_('add new file')}</a>
+                        <a class="ui-btn" href="${h.url('files_add_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path)}">${_('Add new file')}</a>
                     </div>
               % endif
         <div>
diff --git a/rhodecode/templates/files/files_edit.html b/rhodecode/templates/files/files_edit.html
--- a/rhodecode/templates/files/files_edit.html
+++ b/rhodecode/templates/files/files_edit.html
@@ -28,7 +28,7 @@
         <ul class="links">
             <li>
               <span style="text-transform: uppercase;">
-              <a href="#">${_('branch')}: ${c.cs.branch}</a></span>
+              <a href="#">${_('Branch')}: ${c.cs.branch}</a></span>
             </li>
         </ul>
     </div>
@@ -44,12 +44,12 @@
                     <div class="left item">${h.format_byte_size(c.file.size,binary=True)}</div>
                     <div class="left item last">${c.file.mimetype}</div>
                     <div class="buttons">
-                      ${h.link_to(_('show annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")}
-                      ${h.link_to(_('show as raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")}
-                      ${h.link_to(_('download as raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")}
+                      ${h.link_to(_('Show annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")}
+                      ${h.link_to(_('Show as raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")}
+                      ${h.link_to(_('Download as raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")}
                       % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
                        % if not c.file.is_binary:
-                        ${h.link_to(_('source'),h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")}
+                        ${h.link_to(_('Source'),h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")}
                        % endif
                       % endif
                     </div>
@@ -58,7 +58,7 @@
             </div>
                 <pre id="editor_pre"></pre>
                 <textarea id="editor" name="content" style="display:none">${h.escape(c.file.content)|n}</textarea>
-                <div style="padding: 10px;color:#666666">${_('commit message')}</div>
+                <div style="padding: 10px;color:#666666">${_('Commit message')}</div>
                 <textarea id="commit" name="message" style="height: 60px;width: 99%;margin-left:4px" placeholder="${c.default_message}"></textarea>
             </div>
             <div style="text-align: left;padding-top: 5px">
diff --git a/rhodecode/templates/files/files_history_box.html b/rhodecode/templates/files/files_history_box.html
--- a/rhodecode/templates/files/files_history_box.html
+++ b/rhodecode/templates/files/files_history_box.html
@@ -6,9 +6,9 @@
             ${h.form(h.url('files_diff_home',repo_name=c.repo_name,f_path=c.f_path),method='get')}
             ${h.hidden('diff2',c.file_changeset.raw_id)}
             ${h.select('diff1',c.file_changeset.raw_id,c.file_history)}
-            ${h.submit('diff',_('diff to revision'),class_="ui-btn")}
-            ${h.submit('show_rev',_('show at revision'),class_="ui-btn")}
-            ${h.link_to(_('show full history'),h.url('shortlog_file_home',repo_name=c.repo_name, revision=c.file_changeset.raw_id, f_path=c.f_path),class_="ui-btn")}
+            ${h.submit('diff',_('Diff to revision'),class_="ui-btn")}
+            ${h.submit('show_rev',_('Show at revision'),class_="ui-btn")}
+            ${h.link_to(_('Show full history'),h.url('shortlog_file_home',repo_name=c.repo_name, revision=c.file_changeset.raw_id, f_path=c.f_path),class_="ui-btn")}
             ${h.hidden('annotate', c.annotate)}
             ${h.end_form()}
             </div>
diff --git a/rhodecode/templates/files/files_source.html b/rhodecode/templates/files/files_source.html
--- a/rhodecode/templates/files/files_source.html
+++ b/rhodecode/templates/files/files_source.html
@@ -18,17 +18,17 @@
             <div class="left item last"><pre>${c.file.mimetype}</pre></div>
             <div class="buttons">
               %if c.annotate:
-                ${h.link_to(_('show source'),    h.url('files_home',         repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path),class_="ui-btn")}
+                ${h.link_to(_('Show source'),    h.url('files_home',         repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path),class_="ui-btn")}
               %else:
-                ${h.link_to(_('show annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path),class_="ui-btn")}
+                ${h.link_to(_('Show annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path),class_="ui-btn")}
               %endif
-              ${h.link_to(_('show as raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path),class_="ui-btn")}
-              ${h.link_to(_('download as raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path),class_="ui-btn")}
+              ${h.link_to(_('Show as raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path),class_="ui-btn")}
+              ${h.link_to(_('Download as raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path),class_="ui-btn")}
               % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
                % if c.on_branch_head and c.changeset.branch and not c.file.is_binary:
-                ${h.link_to(_('edit on branch:%s') % c.changeset.branch,h.url('files_edit_home',repo_name=c.repo_name,revision=c.changeset.branch,f_path=c.f_path),class_="ui-btn")}
+                ${h.link_to(_('Edit on branch:%s') % c.changeset.branch,h.url('files_edit_home',repo_name=c.repo_name,revision=c.changeset.branch,f_path=c.f_path),class_="ui-btn")}
                %else:
-                ${h.link_to(_('edit on branch:?'), '#', class_="ui-btn disabled tooltip", title=_('Editing files allowed only when on branch head revision'))}
+                ${h.link_to(_('Edit on branch:?'), '#', class_="ui-btn disabled tooltip", title=_('Editing files allowed only when on branch head revision'))}
                % endif
               % endif
             </div>
@@ -52,7 +52,7 @@
               ${h.pygmentize(c.file,linenos=True,anchorlinenos=True,lineanchors='L',cssclass="code-highlight")}
             %endif
         %else:
-            ${_('File is too big to display')} ${h.link_to(_('show as raw'),
+            ${_('File is too big to display')} ${h.link_to(_('Show as raw'),
             h.url('files_raw_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path))}
         %endif
      %endif
diff --git a/rhodecode/templates/forks/forks_data.html b/rhodecode/templates/forks/forks_data.html
--- a/rhodecode/templates/forks/forks_data.html
+++ b/rhodecode/templates/forks/forks_data.html
@@ -14,9 +14,9 @@
                 <div style="padding:5px 3px 3px 42px;">${f.description}</div>
             </div>
             <div style="clear:both;padding-top: 10px"></div>
-            <div class="follower_date">${_('forked')} -
+            <div class="follower_date">${_('Forked')} -
                 <span class="tooltip" title="${h.tooltip(h.fmt_date(f.created_on))}"> ${h.age(f.created_on)}</span>
-                <a title="${_('compare fork with %s' % c.repo_name)}"
+                <a title="${_('Compare fork with %s' % c.repo_name)}"
                     href="${h.url('compare_url',repo_name=c.repo_name,org_ref_type='branch',org_ref='default',other_repo=f.repo_name,other_ref_type='branch',other_ref='default')}"
                     class="ui-btn small">${_('Compare fork')}</a>
             </div>
diff --git a/rhodecode/templates/pullrequests/pullrequest_show.html b/rhodecode/templates/pullrequests/pullrequest_show.html
--- a/rhodecode/templates/pullrequests/pullrequest_show.html
+++ b/rhodecode/templates/pullrequests/pullrequest_show.html
@@ -56,7 +56,7 @@
             % if len(c.pull_request_pending_reviewers) > 0:
                 <div class="tooltip" title="${h.tooltip(','.join([x.username for x in c.pull_request_pending_reviewers]))}">${ungettext('%d reviewer', '%d reviewers',len(c.pull_request_pending_reviewers)) % len(c.pull_request_pending_reviewers)}</div>
             %else:
-                <div>${_('pull request was reviewed by all reviewers')}</div>
+                <div>${_('Pull request was reviewed by all reviewers')}</div>
             %endif
           </div>
          </div>
@@ -128,7 +128,7 @@
                 %endfor
               </div>
               % if c.limited_diff:
-                <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}" onclick="return confirm('${_("confirm to show potentially huge diff")}')">${_('Show full diff')}</a></h5>
+                <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}" onclick="return confirm('${_("Showing a huge diff might take some time and resources")}')">${_('Show full diff')}</a></h5>
               % endif
           </div>
       </div>
@@ -192,7 +192,7 @@
       ${diff_block.diff_block_simple([c.changes[fid]])}
     %endfor
     % if c.limited_diff:
-      <h4>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}" onclick="return confirm('${_("confirm to show potentially huge diff")}')">${_('Show full diff')}</a></h4>
+      <h4>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}" onclick="return confirm('${_("Showing a huge diff might take some time and resources")}')">${_('Show full diff')}</a></h4>
     % endif
 
 
diff --git a/rhodecode/templates/shortlog/shortlog_data.html b/rhodecode/templates/shortlog/shortlog_data.html
--- a/rhodecode/templates/shortlog/shortlog_data.html
+++ b/rhodecode/templates/shortlog/shortlog_data.html
@@ -2,12 +2,12 @@
 %if c.repo_changesets:
 <table class="table_disp">
     <tr>
-        <th class="left">${_('revision')}</th>
-        <th class="left">${_('commit message')}</th>
-        <th class="left">${_('age')}</th>
-        <th class="left">${_('author')}</th>
-        <th class="left">${_('branch')}</th>
-        <th class="left">${_('tags')}</th>
+        <th class="left">${_('Revision')}</th>
+        <th class="left">${_('Commit message')}</th>
+        <th class="left">${_('Age')}</th>
+        <th class="left">${_('Author')}</th>
+        <th class="left">${_('Branch')}</th>
+        <th class="left">${_('Tags')}</th>
     </tr>
 %for cnt,cs in enumerate(c.repo_changesets):
     <tr class="parity${cnt%2}">
@@ -75,7 +75,7 @@
 <h4>${_('Add or upload files directly via RhodeCode')}</h4>
 <div style="margin: 20px 30px;">
   <div id="add_node_id" class="add_node">
-      <a class="ui-btn" href="${h.url('files_add_home',repo_name=c.repo_name,revision=0,f_path='')}">${_('add new file')}</a>
+      <a class="ui-btn" href="${h.url('files_add_home',repo_name=c.repo_name,revision=0,f_path='')}">${_('Add new file')}</a>
   </div>
 </div>
 %endif
diff --git a/rhodecode/templates/summary/summary.html b/rhodecode/templates/summary/summary.html
--- a/rhodecode/templates/summary/summary.html
+++ b/rhodecode/templates/summary/summary.html
@@ -13,8 +13,8 @@
 </%def>
 
 <%def name="head_extra()">
-<link href="${h.url('atom_feed_home',repo_name=c.dbrepo.repo_name,api_key=c.rhodecode_user.api_key)}" rel="alternate" title="${_('repo %s ATOM feed') % c.repo_name}" type="application/atom+xml" />
-<link href="${h.url('rss_feed_home',repo_name=c.dbrepo.repo_name,api_key=c.rhodecode_user.api_key)}" rel="alternate" title="${_('repo %s RSS feed') % c.repo_name}" type="application/rss+xml" />
+<link href="${h.url('atom_feed_home',repo_name=c.dbrepo.repo_name,api_key=c.rhodecode_user.api_key)}" rel="alternate" title="${_('%s ATOM feed') % c.repo_name}" type="application/atom+xml" />
+<link href="${h.url('rss_feed_home',repo_name=c.dbrepo.repo_name,api_key=c.rhodecode_user.api_key)}" rel="alternate" title="${_('%s RSS feed') % c.repo_name}" type="application/rss+xml" />
 </%def>
 
 <%def name="main()">
@@ -59,9 +59,9 @@
 
                  ##PUBLIC/PRIVATE
                  %if c.dbrepo.private:
-                    <img style="margin-bottom:2px" class="icon" title="${_('private repository')}" alt="${_('private repository')}" src="${h.url('/images/icons/lock.png')}"/>
+                    <img style="margin-bottom:2px" class="icon" title="${_('Private repository')}" alt="${_('Private repository')}" src="${h.url('/images/icons/lock.png')}"/>
                  %else:
-                    <img style="margin-bottom:2px" class="icon" title="${_('public repository')}" alt="${_('public repository')}" src="${h.url('/images/icons/lock_open.png')}"/>
+                    <img style="margin-bottom:2px" class="icon" title="${_('Public repository')}" alt="${_('Public repository')}" src="${h.url('/images/icons/lock_open.png')}"/>
                  %endif
 
                   ##REPO NAME
@@ -70,7 +70,7 @@
                   ##FORK
                   %if c.dbrepo.fork:
                     <div style="margin-top:5px;clear:both">
-                    <a href="${h.url('summary_home',repo_name=c.dbrepo.fork.repo_name)}"><img class="icon" alt="${_('public')}" title="${_('Fork of')} ${c.dbrepo.fork.repo_name}" src="${h.url('/images/icons/arrow_divide.png')}"/>
+                    <a href="${h.url('summary_home',repo_name=c.dbrepo.fork.repo_name)}"><img class="icon" alt="${_('Public')}" title="${_('Fork of')} ${c.dbrepo.fork.repo_name}" src="${h.url('/images/icons/arrow_divide.png')}"/>
                         ${_('Fork of')} ${c.dbrepo.fork.repo_name}
                     </a>
                     </div>
@@ -78,7 +78,7 @@
                   ##REMOTE
                   %if c.dbrepo.clone_uri:
                     <div style="margin-top:5px;clear:both">
-                    <a href="${h.url(str(h.hide_credentials(c.dbrepo.clone_uri)))}"><img class="icon" alt="${_('remote clone')}" title="${_('Clone from')} ${h.hide_credentials(c.dbrepo.clone_uri)}" src="${h.url('/images/icons/connect.png')}"/>
+                    <a href="${h.url(str(h.hide_credentials(c.dbrepo.clone_uri)))}"><img class="icon" alt="${_('Remote clone')}" title="${_('Clone from')} ${h.hide_credentials(c.dbrepo.clone_uri)}" src="${h.url('/images/icons/connect.png')}"/>
                         ${_('Clone from')} ${h.hide_credentials(c.dbrepo.clone_uri)}
                     </a>
                     </div>
@@ -386,7 +386,7 @@ for (var i=0;i<data.length;i++){
         lnk = document.createElement('a');
 
         lnk.href='#';
-        lnk.innerHTML = "${_('show more')}";
+        lnk.innerHTML = "${_('Show more')}";
         lnk.id='code_stats_show_more';
         td.appendChild(lnk);
 
@@ -677,7 +677,6 @@ function SummaryPlot(from,to,dataset,ove
                 var changed_suffix = " ${_('files changed')} ";
                 var removed_suffix = " ${_('files removed')} ";
 
-
                 if(nr_commits == 1){nr_commits_suffix = " ${_('commit')} ";}
                 if(added==1){added_suffix=" ${_('file added')} ";}
                 if(changed==1){changed_suffix=" ${_('file changed')} ";}
diff --git a/rhodecode/templates/switch_to_list.html b/rhodecode/templates/switch_to_list.html
--- a/rhodecode/templates/switch_to_list.html
+++ b/rhodecode/templates/switch_to_list.html
@@ -1,6 +1,6 @@
 ## -*- coding: utf-8 -*-
 <li>
-    ${h.link_to('%s (%s)' % (_('branches'),len(c.rhodecode_repo.branches.values()),),h.url('branches_home',repo_name=c.repo_name),class_='branches childs')}
+    ${h.link_to('%s (%s)' % (_('Branches'),len(c.rhodecode_repo.branches.values()),),h.url('branches_home',repo_name=c.repo_name),class_='branches childs')}
     <ul>
     %if c.rhodecode_repo.branches.values():
         %for cnt,branch in enumerate(c.rhodecode_repo.branches.items()):
@@ -12,7 +12,7 @@
     </ul>
 </li>
 <li>
-    ${h.link_to('%s (%s)' % (_('tags'),len(c.rhodecode_repo.tags.values()),),h.url('tags_home',repo_name=c.repo_name),class_='tags childs')}
+    ${h.link_to('%s (%s)' % (_('Tags'),len(c.rhodecode_repo.tags.values()),),h.url('tags_home',repo_name=c.repo_name),class_='tags childs')}
     <ul>
     %if c.rhodecode_repo.tags.values():
         %for cnt,tag in enumerate(c.rhodecode_repo.tags.items()):
@@ -25,7 +25,7 @@
 </li>
 %if c.rhodecode_repo.alias == 'hg':
 <li>
-    ${h.link_to('%s (%s)' % (_('bookmarks'),len(c.rhodecode_repo.bookmarks.values()),),h.url('bookmarks_home',repo_name=c.repo_name),class_='bookmarks childs')}
+    ${h.link_to('%s (%s)' % (_('Bookmarks'),len(c.rhodecode_repo.bookmarks.values()),),h.url('bookmarks_home',repo_name=c.repo_name),class_='bookmarks childs')}
     <ul>
     %if c.rhodecode_repo.bookmarks.values():
         %for cnt,book in enumerate(c.rhodecode_repo.bookmarks.items()):
diff --git a/rhodecode/tests/functional/test_files.py b/rhodecode/tests/functional/test_files.py
--- a/rhodecode/tests/functional/test_files.py
+++ b/rhodecode/tests/functional/test_files.py
@@ -57,7 +57,7 @@ class TestFilesController(TestController
                                     revision='97e8b885c04894463c51898e14387d80c30ed1ee',
                                     f_path='/'))
 
-        response.mustcontain("""<span style="text-transform: uppercase;"><a href="#">branch: git</a></span>""")
+        response.mustcontain("""<span style="text-transform: uppercase;"><a href="#">Branch: git</a></span>""")
 
     def test_index_paging(self):
         self.log_user()
@@ -89,7 +89,7 @@ Improved test to clone into uniq reposit
 removed extra unicode conversion in diff.</div>
 """)
 
-        response.mustcontain("""<span style="text-transform: uppercase;"><a href="#">branch: default</a></span>""")
+        response.mustcontain("""<span style="text-transform: uppercase;"><a href="#">Branch: default</a></span>""")
 
     def test_file_source_history(self):
         self.log_user()
@@ -156,7 +156,7 @@ removed extra unicode conversion in diff
                                     f_path='vcs/nodes.py',
                                     annotate=True))
 
-        response.mustcontain("""<span style="text-transform: uppercase;"><a href="#">branch: default</a></span>""")
+        response.mustcontain("""<span style="text-transform: uppercase;"><a href="#">Branch: default</a></span>""")
 
     def test_file_annotation_history(self):
         self.log_user()
diff --git a/rhodecode/tests/functional/test_home.py b/rhodecode/tests/functional/test_home.py
--- a/rhodecode/tests/functional/test_home.py
+++ b/rhodecode/tests/functional/test_home.py
@@ -22,8 +22,8 @@ class TestHomeController(TestController)
         response.mustcontain("""<img class="icon" title="Mercurial repository" """
                         """alt="Mercurial repository" src="/images/icons/hg"""
                         """icon.png"/>""")
-        response.mustcontain("""<img class="icon" title="public repository" """
-                        """alt="public repository" src="/images/icons/lock_"""
+        response.mustcontain("""<img class="icon" title="Public repository" """
+                        """alt="Public repository" src="/images/icons/lock_"""
                         """open.png"/>""")
 
         response.mustcontain(
diff --git a/rhodecode/tests/functional/test_summary.py b/rhodecode/tests/functional/test_summary.py
--- a/rhodecode/tests/functional/test_summary.py
+++ b/rhodecode/tests/functional/test_summary.py
@@ -25,7 +25,7 @@ class TestSummaryController(TestControll
         )
         response.mustcontain(
             """<img style="margin-bottom:2px" class="icon" """
-            """title="public repository" alt="public """
+            """title="Public repository" alt="Public """
             """repository" src="/images/icons/lock_open.png"/>"""
         )
 
@@ -64,7 +64,7 @@ class TestSummaryController(TestControll
         )
         response.mustcontain(
             """<img style="margin-bottom:2px" class="icon" """
-            """title="public repository" alt="public """
+            """title="Public repository" alt="Public """
             """repository" src="/images/icons/lock_open.png"/>"""
         )
 
@@ -84,7 +84,7 @@ class TestSummaryController(TestControll
                         """title="Mercurial repository" alt="Mercurial """
                         """repository" src="/images/icons/hgicon.png"/>""")
         response.mustcontain("""<img style="margin-bottom:2px" class="icon" """
-                        """title="public repository" alt="public """
+                        """title="Public repository" alt="Public """
                         """repository" src="/images/icons/lock_open.png"/>""")
 
     def test_index_by_repo_having_id_path_in_name_hg(self):
@@ -112,7 +112,7 @@ class TestSummaryController(TestControll
                         """title="Git repository" alt="Git """
                         """repository" src="/images/icons/giticon.png"/>""")
         response.mustcontain("""<img style="margin-bottom:2px" class="icon" """
-                        """title="public repository" alt="public """
+                        """title="Public repository" alt="Public """
                         """repository" src="/images/icons/lock_open.png"/>""")
 
     def _enable_stats(self):