diff --git a/rhodecode/templates/admin/repos/repo_edit_perms.html b/rhodecode/templates/admin/repos/repo_edit_perms.html --- a/rhodecode/templates/admin/repos/repo_edit_perms.html +++ b/rhodecode/templates/admin/repos/repo_edit_perms.html @@ -27,7 +27,7 @@ ${_('private repository')} - ${r2p.user.username} + ${r2p.user.username} %else: @@ -35,7 +35,7 @@ ${h.radio('u_perm_%s' % r2p.user.username,'repository.read')} ${h.radio('u_perm_%s' % r2p.user.username,'repository.write')} ${h.radio('u_perm_%s' % r2p.user.username,'repository.admin')} - ${r2p.user.username} + ${r2p.user.username} %if r2p.user.username !='default': @@ -64,7 +64,7 @@ ${h.radio('g_perm_%s' % g2p.users_group.users_group_name,'repository.read')} ${h.radio('g_perm_%s' % g2p.users_group.users_group_name,'repository.write')} ${h.radio('g_perm_%s' % g2p.users_group.users_group_name,'repository.admin')} - ${g2p.users_group.users_group_name} + ${g2p.users_group.users_group_name} diff --git a/rhodecode/templates/admin/repos/repos.html b/rhodecode/templates/admin/repos/repos.html --- a/rhodecode/templates/admin/repos/repos.html +++ b/rhodecode/templates/admin/repos/repos.html @@ -39,18 +39,18 @@ ## TYPE OF REPO %if repo['dbrepo']['repo_type'] =='hg': - ${_('Mercurial repository')} + ${_('Mercurial repository')} %elif repo['dbrepo']['repo_type'] =='git': - ${_('Git repository')} + ${_('Git repository')} %else: %endif ## PRIVATE/PUBLIC REPO %if repo['dbrepo']['private']: - ${_('private')} + ${_('private')} %else: - ${_('public')} + ${_('public')} %endif ${h.link_to(repo['name'],h.url('edit_repo',repo_name=repo['name']))} @@ -58,7 +58,7 @@ ${_('public')} + src="${h.url("/images/icons/arrow_divide.png")}"/> %endif ${h.truncate(repo['description'],60)} 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 @@ -140,11 +140,11 @@
add + src="${h.url("/images/icons/arrow_left.png")}">
remove + src="${h.url("/images/icons/arrow_right.png")}">
${_('Available permissions')}
diff --git a/rhodecode/templates/admin/users/user_edit_my_account.html b/rhodecode/templates/admin/users/user_edit_my_account.html --- a/rhodecode/templates/admin/users/user_edit_my_account.html +++ b/rhodecode/templates/admin/users/user_edit_my_account.html @@ -120,16 +120,16 @@ %if repo['dbrepo']['repo_type'] =='hg': - ${_('Mercurial repository')} + ${_('Mercurial repository')} %elif repo['dbrepo']['repo_type'] =='git': - ${_('Git repository')} + ${_('Git repository')} %else: %endif %if repo['dbrepo']['private']: - ${_('private')} + ${_('private')} %else: - ${_('public')} + ${_('public')} %endif ${h.link_to(repo['repo'].name, h.url('summary_home',repo_name=repo['repo'].name),class_="repo_name")} @@ -137,11 +137,11 @@ ${_('public')} + src="${h.url("/images/icons/arrow_divide.png")}"/> %endif ${("r%s:%s") % (h.get_changeset_safe(repo['repo'],'tip').revision,h.short_id(h.get_changeset_safe(repo['repo'],'tip').raw_id))} - ${_('private')} + ${_('private')} ${h.form(url('repo_settings_delete', repo_name=repo['repo'].name),method='delete')} ${h.submit('remove_%s' % repo['repo'].name,'',class_="delete_icon action_button",onclick="return confirm('Confirm to delete this repository');")} 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 @@ -59,23 +59,23 @@ ${h.select('users_group_members',[x[0] for x in c.group_members],c.group_members,multiple=True,size=8,style="min-width:210px")}
${_('Remove all elements')} - remove + remove
add + src="${h.url("/images/icons/arrow_left.png")}"/>
remove + src="${h.url("/images/icons/arrow_right.png")}"/>
${_('Available members')}
${h.select('available_members',[],c.available_members,multiple=True,size=8,style="min-width:210px")}
- add + add ${_('Add all elements')}
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 @@ -135,7 +135,7 @@
  • - ${_('Products')} + ${_('Products')} @@ -143,9 +143,9 @@ %for repo in c.cached_repo_list: %if repo['dbrepo']['private']: -
  • ${_('Private repository')}${h.link_to(repo['repo'].name,h.url('summary_home',repo_name=repo['repo'].name),class_="%s" % repo['dbrepo']['repo_type'])}
  • +
  • ${_('Private repository')}${h.link_to(repo['repo'].name,h.url('summary_home',repo_name=repo['repo'].name),class_="%s" % repo['dbrepo']['repo_type'])}
  • %else: -
  • ${_('Public repository')}${h.link_to(repo['repo'].name,h.url('summary_home',repo_name=repo['repo'].name),class_="%s" % repo['dbrepo']['repo_type'])}
  • +
  • ${_('Public repository')}${h.link_to(repo['repo'].name,h.url('summary_home',repo_name=repo['repo'].name),class_="%s" % repo['dbrepo']['repo_type'])}
  • %endif %endfor @@ -154,7 +154,7 @@
  • - ${_('Summary')} + ${_('Summary')} ${_('Summary')} @@ -162,7 +162,7 @@ ##
  • ## ## - ## ${_('Shortlog')} + ## ${_('Shortlog')} ## ## ${_('Shortlog')} ## @@ -170,7 +170,7 @@
  • - ${_('Changelog')} + ${_('Changelog')} ${_('Changelog')} @@ -179,7 +179,7 @@
  • - ${_('Switch to')} + ${_('Switch to')} ${_('Switch to')} @@ -213,7 +213,7 @@
  • - ${_('Files')} + ${_('Files')} ${_('Files')} @@ -222,7 +222,7 @@
  • - ${_('Admin')} + ${_('Admin')} ${_('Options')} @@ -262,7 +262,7 @@
  • - ${_('Followers')} + ${_('Followers')} ${c.repository_followers} @@ -270,7 +270,7 @@
  • - ${_('Forks')} + ${_('Forks')} ${c.repository_forks} @@ -285,7 +285,7 @@
  • - ${_('Home')} + ${_('Home')} ${_('Home')} @@ -294,7 +294,7 @@
  • - ${_('Journal')} + ${_('Journal')} ${_('Journal')} @@ -303,7 +303,7 @@
  • - ${_('Search')} + ${_('Search')} ${_('Search')} @@ -313,7 +313,7 @@
  • - ${_('Admin')} + ${_('Admin')} ${_('Admin')} 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 @@ -68,7 +68,7 @@ %if len(cs.parents)>1:
    - ${_('merge')}merge + ${_('merge')}merge
    %endif %if cs.parents: 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 @@ -55,7 +55,7 @@ %if len(c.changeset.parents)>1:
    - ${_('merge')}merge + ${_('merge')}merge
    %endif diff --git a/rhodecode/templates/errors/error_document.html b/rhodecode/templates/errors/error_document.html --- a/rhodecode/templates/errors/error_document.html +++ b/rhodecode/templates/errors/error_document.html @@ -7,7 +7,7 @@ %if c.redirect_time: %endif - + diff --git a/rhodecode/templates/index.html b/rhodecode/templates/index.html --- a/rhodecode/templates/index.html +++ b/rhodecode/templates/index.html @@ -61,18 +61,18 @@
    ## TYPE OF REPO %if repo['dbrepo']['repo_type'] =='hg': - ${_('Mercurial repository')} + ${_('Mercurial repository')} %elif repo['dbrepo']['repo_type'] =='git': - ${_('Git repository')} + ${_('Git repository')} %else: %endif ##PRIVATE/PUBLIC %if repo['dbrepo']['private']: - ${_('private repository')} + ${_('private repository')} %else: - ${_('public repository')} + ${_('public repository')} %endif ##NAME @@ -82,7 +82,7 @@ ${_('fork')} + src="${h.url("/images/icons/arrow_divide.png")}"/> %endif
    diff --git a/rhodecode/templates/journal/journal.html b/rhodecode/templates/journal/journal.html --- a/rhodecode/templates/journal/journal.html +++ b/rhodecode/templates/journal/journal.html @@ -38,7 +38,7 @@ %for entry in c.following:
    %if entry.follows_user_id: - ${_('user')} + ${_('user')} ${entry.follows_user.full_contact} %endif @@ -50,9 +50,9 @@
    %if entry.follows_repository.private: - ${_('private repository')} + ${_('private repository')} %else: - ${_('public repository')} + ${_('public repository')} %endif ${h.link_to(entry.follows_repository.repo_name,h.url('summary_home', diff --git a/rhodecode/templates/login.html b/rhodecode/templates/login.html --- a/rhodecode/templates/login.html +++ b/rhodecode/templates/login.html @@ -4,7 +4,7 @@ ${_('Sign In')} - ${c.rhodecode_name} - + diff --git a/rhodecode/templates/password_reset.html b/rhodecode/templates/password_reset.html --- a/rhodecode/templates/password_reset.html +++ b/rhodecode/templates/password_reset.html @@ -4,7 +4,7 @@ ${_('Reset You password')} - ${c.rhodecode_name} - + diff --git a/rhodecode/templates/register.html b/rhodecode/templates/register.html --- a/rhodecode/templates/register.html +++ b/rhodecode/templates/register.html @@ -4,7 +4,7 @@ ${_('Sign Up')} - ${c.rhodecode_name} - + 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 @@ -32,16 +32,16 @@
    %if c.dbrepo.repo_type =='hg': - ${_('Mercurial repository')} + ${_('Mercurial repository')} %endif %if c.dbrepo.repo_type =='git': - ${_('Git repository')} + ${_('Git repository')} %endif %if c.dbrepo.private: - ${_('private repository')} + ${_('private repository')} %else: - ${_('public repository')} + ${_('public repository')} %endif ${c.repo.name} %if c.rhodecode_user.username != 'default': @@ -61,7 +61,7 @@ ${_('public')} + src="${h.url("/images/icons/arrow_divide.png")}"/> ${_('Fork of')} ${c.dbrepo.fork.repo_name}