Mercurial > kallithea
changeset 4527:dacdea9fda2a
Correct capitalization and improved English text in the UI
line wrap: on
line diff
--- a/development.ini Fri Sep 19 10:54:51 2014 +0200 +++ b/development.ini Fri Sep 19 14:18:56 2014 +0200 @@ -256,7 +256,7 @@ instance_id = ## alternative return HTTP header for failed authentication. Default HTTP -## response is 401 HTTPUnauthorized. Currently HG clients have troubles with +## response is 401 HTTPUnauthorized. Currently Mercurial clients have trouble with ## handling that. Set this variable to 403 to return HTTPForbidden auth_ret_code =
--- a/kallithea/bin/template.ini.mako Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/bin/template.ini.mako Fri Sep 19 14:18:56 2014 +0200 @@ -253,7 +253,7 @@ instance_id = <%text>## alternative return HTTP header for failed authentication. Default HTTP</%text> -<%text>## response is 401 HTTPUnauthorized. Currently HG clients have troubles with</%text> +<%text>## response is 401 HTTPUnauthorized. Currently Mercurial clients have trouble with</%text> <%text>## handling that. Set this variable to 403 to return HTTPForbidden</%text> auth_ret_code =
--- a/kallithea/config/deployment.ini_tmpl Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/config/deployment.ini_tmpl Fri Sep 19 14:18:56 2014 +0200 @@ -250,7 +250,7 @@ instance_id = ## alternative return HTTP header for failed authentication. Default HTTP -## response is 401 HTTPUnauthorized. Currently HG clients have troubles with +## response is 401 HTTPUnauthorized. Currently Mercurial clients have trouble with ## handling that. Set this variable to 403 to return HTTPForbidden auth_ret_code =
--- a/kallithea/controllers/search.py Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/controllers/search.py Fri Sep 19 14:18:56 2014 +0200 @@ -141,7 +141,7 @@ 'Please run whoosh indexer') except (Exception): log.error(traceback.format_exc()) - c.runtime = _('An error occurred during this search operation') + c.runtime = _('An error occurred during search operation.') # Return a rendered template return render('/search/search.html')
--- a/kallithea/lib/middleware/simplegit.py Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/lib/middleware/simplegit.py Fri Sep 19 14:18:56 2014 +0200 @@ -55,7 +55,7 @@ def is_git(environ): path_info = environ['PATH_INFO'] isgit_path = GIT_PROTO_PAT.match(path_info) - log.debug('pathinfo: %s detected as GIT %s' % ( + log.debug('pathinfo: %s detected as Git %s' % ( path_info, isgit_path is not None) ) return isgit_path @@ -200,7 +200,7 @@ try: self._handle_githooks(repo_name, action, baseui, environ) - log.info('%s action on GIT repo "%s" by "%s" from %s' % + log.info('%s action on Git repo "%s" by "%s" from %s' % (action, str_repo_name, safe_str(username), ip_addr)) app = self.__make_app(repo_name, repo_path, extras) return app(environ, start_response)
--- a/kallithea/lib/middleware/simplehg.py Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/lib/middleware/simplehg.py Fri Sep 19 14:18:56 2014 +0200 @@ -15,7 +15,7 @@ kallithea.lib.middleware.simplehg ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -SimpleHG middleware for handling mercurial protocol request +SimpleHg middleware for handling mercurial protocol request (push/clone etc.). It's implemented with basic auth function This file was forked by the Kallithea project in July 2014. @@ -60,7 +60,7 @@ else: ishg_path = False - log.debug('pathinfo: %s detected as HG %s' % ( + log.debug('pathinfo: %s detected as Mercurial %s' % ( path_info, ishg_path) ) return ishg_path @@ -202,7 +202,7 @@ self.__inject_extras(repo_path, baseui, extras) try: - log.info('%s action on HG repo "%s" by "%s" from %s' % + log.info('%s action on Mercurial repo "%s" by "%s" from %s' % (action, str_repo_name, safe_str(username), ip_addr)) app = self.__make_app(repo_path, baseui, extras) return app(environ, start_response)
--- a/kallithea/lib/utils.py Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/lib/utils.py Fri Sep 19 14:18:56 2014 +0200 @@ -825,7 +825,7 @@ to_old_git = True if 'git' in BACKENDS: - log.debug('GIT executable: "%s" version detected: %s' + log.debug('Git executable: "%s" version detected: %s' % (settings.GIT_EXECUTABLE_PATH, stdout)) if stderr: log.warning('Unable to detect git version, org error was: %r' % stderr)
--- a/kallithea/public/css/style.css Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/public/css/style.css Fri Sep 19 14:18:56 2014 +0200 @@ -4840,6 +4840,7 @@ padding: 10px 10px 10px 0px; font-size: 16px; font-weight: bold; + text-transform: capitalize; } #perms .perm_tag {
--- a/kallithea/public/js/base.js Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/public/js/base.js Fri Sep 19 14:18:56 2014 +0200 @@ -773,7 +773,7 @@ $tr = $tr.next(); } $tr.find('.add-comment').remove(); - var label = TRANSLATION_MAP['Add another comment']; + var label = TRANSLATION_MAP['Add Another Comment']; var $html_el = $('<div class="add-comment"><span class="btn btn-mini">{0}</span></div>'.format(label)); $html_el.click(function(e) { injectInlineForm($line_tr); @@ -2168,11 +2168,11 @@ var $target = $('#' + $button.attr('target')); if($target.hasClass('hidden')){ $target.removeClass('hidden'); - $button.html("↑ {0} ↑".format(_TM['Collapse diff'])); + $button.html("↑ {0} ↑".format(_TM['Collapse Diff'])); } else if(!$target.hasClass('hidden')){ $target.addClass('hidden'); - $button.html("↓ {0} ↓".format(_TM['Expand diff'])); + $button.html("↓ {0} ↓".format(_TM['Expand Diff'])); } }); });
--- a/kallithea/templates/admin/admin.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/admin.html Fri Sep 19 14:18:56 2014 +0200 @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Admin journal')} + ${_('Admin Journal')} %if c.site_name: · ${c.site_name} %endif @@ -12,8 +12,8 @@ <form id="filter_form"> <input class="q_filter_box ${'' if c.search_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.search_term or _('journal filter...')}"/> <span class="tooltip" title="${h.tooltip(h.journal_filter_help())}">?</span> - <input type='submit' value="${_('filter')}" class="btn btn-mini" style="padding:0px 2px 0px 2px;margin:0px"/> - ${_('Admin journal')} - ${ungettext('%s entry', '%s entries', c.users_log.item_count) % (c.users_log.item_count)} + <input type='submit' value="${_('Filter')}" class="btn btn-mini" style="padding:0px 2px 0px 2px;margin:0px"/> + ${_('Admin Journal')} - ${ungettext('%s Entry', '%s Entries', c.users_log.item_count) % (c.users_log.item_count)} </form> ${h.end_form()} </%def>
--- a/kallithea/templates/admin/defaults/defaults.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/defaults/defaults.html Fri Sep 19 14:18:56 2014 +0200 @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Repositories defaults')} + ${_('Repository Defaults')} %if c.site_name: · ${c.site_name} %endif @@ -25,7 +25,7 @@ ${self.breadcrumbs()} </div> - <h3>${_('Repositories defaults')}</h3> + <h3>${_('Repository Defaults')}</h3> ${h.form(url('default', id='defaults'),method='put')} <div class="form">
--- a/kallithea/templates/admin/gists/index.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/gists/index.html Fri Sep 19 14:18:56 2014 +0200 @@ -3,9 +3,9 @@ <%def name="title()"> %if c.show_private: - ${_('Private Gists for user %s') % c.authuser.username} + ${_('Private Gists for User %s') % c.authuser.username} %elif c.show_public: - ${_('Public Gists for user %s') % c.authuser.username} + ${_('Public Gists for User %s') % c.authuser.username} %else: ${_('Public Gists')} %endif @@ -16,9 +16,9 @@ <%def name="breadcrumbs_links()"> %if c.show_private: - ${_('Private Gists for user %s') % c.authuser.username} + ${_('Private Gists for User %s') % c.authuser.username} %elif c.show_public: - ${_('Public Gists for user %s') % c.authuser.username} + ${_('Public Gists for User %s') % c.authuser.username} %else: ${_('Public Gists')} %endif
--- a/kallithea/templates/admin/my_account/my_account.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/my_account/my_account.html Fri Sep 19 14:18:56 2014 +0200 @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('My account')} ${c.authuser.username} + ${_('My Account')} ${c.authuser.username} %if c.site_name: · ${c.site_name} %endif @@ -37,11 +37,11 @@ </li> <li class="${'active' if c.active=='profile' else ''}"><a href="${h.url('my_account')}">${_('Profile')}</a></li> <li class="${'active' if c.active=='password' else ''}"><a href="${h.url('my_account_password')}">${_('Password')}</a></li> - <li class="${'active' if c.active=='api_keys' else ''}"><a href="${h.url('my_account_api_keys')}">${_('API keys')}</a></li> + <li class="${'active' if c.active=='api_keys' else ''}"><a href="${h.url('my_account_api_keys')}">${_('API Keys')}</a></li> <li class="${'active' if c.active=='emails' else ''}"><a href="${h.url('my_account_emails')}">${_('My Emails')}</a></li> <li class="${'active' if c.active=='repos' else ''}"><a href="${h.url('my_account_repos')}">${_('My Repositories')}</a></li> <li class="${'active' if c.active=='watched' else ''}"><a href="${h.url('my_account_watched')}">${_('Watched')}</a></li> - <li class="${'active' if c.active=='perms' else ''}"><a href="${h.url('my_account_perms')}">${_('My permissions')}</a></li> + <li class="${'active' if c.active=='perms' else ''}"><a href="${h.url('my_account_perms')}">${_('My Permissions')}</a></li> </ul> </div>
--- a/kallithea/templates/admin/my_account/my_account_emails.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/my_account/my_account_emails.html Fri Sep 19 14:18:56 2014 +0200 @@ -23,7 +23,7 @@ </tr> %endfor %else: - <tr><td><div class="ip">${_('No additional emails specified')}</div></td></tr> + <tr><td><div class="ip">${_('No additional emails specified.')}</div></td></tr> %endif </table> </div>
--- a/kallithea/templates/admin/my_account/my_account_password.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/my_account/my_account_password.html Fri Sep 19 14:18:56 2014 +0200 @@ -1,4 +1,4 @@ -<div style="font-size: 20px; color: #666666; padding: 0px 0px 10px 0px">${_('Change your account password')}</div> +<div style="font-size: 20px; color: #666666; padding: 0px 0px 10px 0px">${_('Change Your Account Password')}</div> ${h.form(url('my_account_password'), method='post')} <div class="form"> <div class="fields">
--- a/kallithea/templates/admin/my_account/my_account_repos.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/my_account/my_account_repos.html Fri Sep 19 14:18:56 2014 +0200 @@ -1,4 +1,4 @@ -<div style="font-size: 20px; color: #666666; padding: 0px 0px 10px 0px">${_('Repositories you are owner of')}</div> +<div style="font-size: 20px; color: #666666; padding: 0px 0px 10px 0px">${_('Repositories You Own')}</div> <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
--- a/kallithea/templates/admin/my_account/my_account_watched.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/my_account/my_account_watched.html Fri Sep 19 14:18:56 2014 +0200 @@ -1,4 +1,4 @@ -<div style="font-size: 20px; color: #666666; padding: 0px 0px 10px 0px">${_('Repositories you are watching')}</div> +<div style="font-size: 20px; color: #666666; padding: 0px 0px 10px 0px">${_('Repositories You are Watching')}</div> <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
--- a/kallithea/templates/admin/notifications/notifications.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/notifications/notifications.html Fri Sep 19 14:18:56 2014 +0200 @@ -30,7 +30,7 @@ </div> %if c.notifications: <div style="padding:14px 18px;text-align: right;float:right"> - <span id='mark_all_read' class="btn btn-mini">${_('Mark all read')}</span> + <span id='mark_all_read' class="btn btn-mini">${_('Mark All Read')}</span> </div> %endif <div id='notification_data'>
--- a/kallithea/templates/admin/notifications/show_notification.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/notifications/show_notification.html Fri Sep 19 14:18:56 2014 +0200 @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Show notification')} ${c.authuser.username} + ${_('Show Notification')} ${c.authuser.username} %if c.site_name: · ${c.site_name} %endif @@ -11,7 +11,7 @@ <%def name="breadcrumbs_links()"> ${h.link_to(_('Notifications'),h.url('notifications'))} » - ${_('Show notification')} + ${_('Show Notification')} </%def> <%def name="page_nav()">
--- a/kallithea/templates/admin/permissions/permissions.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/permissions/permissions.html Fri Sep 19 14:18:56 2014 +0200 @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Permissions administration')} + ${_('Permissions Administration')} %if c.site_name: · ${c.site_name} %endif @@ -39,7 +39,7 @@ </div> </li> <li class="${'active' if c.active=='globals' else ''}"><a href="${h.url('admin_permissions')}">${_('Global')}</a></li> - <li class="${'active' if c.active=='ips' else ''}"><a href="${h.url('admin_permissions_ips')}">${_('IP whitelist')}</a></li> + <li class="${'active' if c.active=='ips' else ''}"><a href="${h.url('admin_permissions_ips')}">${_('IP Whitelist')}</a></li> <li class="${'active' if c.active=='perms' else ''}"><a href="${h.url('admin_permissions_perms')}">${_('Overview')}</a></li> </ul> </div>
--- a/kallithea/templates/admin/permissions/permissions_globals.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/permissions/permissions_globals.html Fri Sep 19 14:18:56 2014 +0200 @@ -10,7 +10,7 @@ <div class="checkbox"> ${h.checkbox('anonymous',True)} </div> - <span class="help-block">${h.literal(_('Allow access to Kallithea without need to log in. Anonymous users use %s user permissions' % (h.link_to('*default*',h.url('admin_permissions_perms')))))}</span> + <span class="help-block">${h.literal(_('Allow access to Kallithea without needing to log in. Anonymous users use %s user permissions.' % (h.link_to('*default*',h.url('admin_permissions_perms')))))}</span> </div> </div> <div class="field"> @@ -69,7 +69,7 @@ </div> <div class="select"> ${h.select('create_on_write','',c.repo_create_on_write_choices)} - <span class="help-block">${_('Write permission to repository groups allows creating repositories inside that group')}</span> + <span class="help-block">${_('Write permission to a repository group allows creating repositories inside that group.')}</span> </div> </div> <div class="field">
--- a/kallithea/templates/admin/permissions/permissions_ips.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/permissions/permissions_ips.html Fri Sep 19 14:18:56 2014 +0200 @@ -1,4 +1,4 @@ -<h4>${_('Default ip whitelist for all users')}</h4> +<h4>${_('Default IP Whitelist for All Users')}</h4> <div class="ips_wrap"> <table class="noborder"> @@ -18,7 +18,7 @@ </tr> %endfor %else: - <tr><td><div class="ip">${_('All IP addresses are allowed')}</div></td></tr> + <tr><td><div class="ip">${_('All IP addresses are allowed.')}</div></td></tr> %endif </table> </div>
--- a/kallithea/templates/admin/permissions/permissions_perms.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/permissions/permissions_perms.html Fri Sep 19 14:18:56 2014 +0200 @@ -1,4 +1,4 @@ -<h4>${_('Default user permissions overview')}</h4> +<h4>${_('Default User Permissions Overview')}</h4> ## permissions overview <%namespace name="p" file="/base/perms_summary.html"/>
--- a/kallithea/templates/admin/repo_groups/repo_group_add.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/repo_groups/repo_group_add.html Fri Sep 19 14:18:56 2014 +0200 @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Add repository group')} + ${_('Add Repository Group')} %if c.site_name: · ${c.site_name} %endif @@ -11,7 +11,7 @@ <%def name="breadcrumbs_links()"> ${h.link_to(_('Admin'),h.url('admin_home'))} » - ${h.link_to(_('Repository groups'),h.url('repos_groups'))} + ${h.link_to(_('Repository Groups'),h.url('repos_groups'))} » ${_('Add Repository Group')} </%def>
--- a/kallithea/templates/admin/repo_groups/repo_group_edit.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/repo_groups/repo_group_edit.html Fri Sep 19 14:18:56 2014 +0200 @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('%s Repository group settings') % c.repo_group.name} + ${_('%s Repository Group Settings') % c.repo_group.name} %if c.site_name: · ${c.site_name} %endif
--- a/kallithea/templates/admin/repo_groups/repo_groups.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/repo_groups/repo_groups.html Fri Sep 19 14:18:56 2014 +0200 @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Repository groups administration')} + ${_('Repository Groups Administration')} %if c.site_name: · ${c.site_name} %endif @@ -10,7 +10,7 @@ <%def name="breadcrumbs_links()"> <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/> - ${h.link_to(_('Admin'),h.url('admin_home'))} » <span id="repo_group_count">0</span> ${_('repository groups')} + ${h.link_to(_('Admin'),h.url('admin_home'))} » <span id="repo_group_count">0</span> ${_('Repository Groups')} </%def> @@ -48,7 +48,7 @@ var column_defs = [ {key:"group_name",label:"${_('Name')}",sortable:true, sortOptions: { sortFunction: nameSort }}, {key:"desc",label:"${_('Description')}",sortable:true}, - {key:"repos",label:"${_('Number of toplevel repositories')}",sortable:true}, + {key:"repos",label:"${_('Number of Top-level Repositories')}",sortable:true}, {key:"owner",label:"${_('Owner')}",sortable:true}, {key:"action",label:"${_('Action')}",sortable:false} ];
--- a/kallithea/templates/admin/repos/repo_add.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/repos/repo_add.html Fri Sep 19 14:18:56 2014 +0200 @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Add repository')} + ${_('Add Repository')} %if c.site_name: · ${c.site_name} %endif
--- a/kallithea/templates/admin/repos/repo_add_base.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/repos/repo_add_base.html Fri Sep 19 14:18:56 2014 +0200 @@ -42,7 +42,7 @@ </div> <div class="input"> ${h.select('repo_group',request.GET.get('parent_group'),c.repo_groups,class_="medium")} - <span class="help-block">${_('Optionaly select a group to put this repository into.')}</span> + <span class="help-block">${_('Optionally select a group to put this repository into.')}</span> </div> </div> <div id="copy_perms" class="field">
--- a/kallithea/templates/admin/repos/repo_creating.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/repos/repo_creating.html Fri Sep 19 14:18:56 2014 +0200 @@ -6,7 +6,7 @@ </%def> <%def name="title()"> - ${_('%s Creating repository') % c.repo_name} + ${_('%s Creating Repository') % c.repo_name} %if c.site_name: · ${c.site_name} %endif
--- a/kallithea/templates/admin/repos/repo_edit.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/repos/repo_edit.html Fri Sep 19 14:18:56 2014 +0200 @@ -5,7 +5,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('%s repository settings') % c.repo_info.repo_name} + ${_('%s Repository Settings') % c.repo_info.repo_name} %if c.site_name: · ${c.site_name} %endif @@ -49,7 +49,7 @@ <a href="${h.url('edit_repo_advanced', repo_name=c.repo_name)}">${_('Advanced')}</a> </li> <li class="${'active' if c.active=='fields' else ''}"> - <a href="${h.url('edit_repo_fields', repo_name=c.repo_name)}">${_('Extra fields')}</a> + <a href="${h.url('edit_repo_fields', repo_name=c.repo_name)}">${_('Extra Fields')}</a> </li> <li class="${'active' if c.active=='caches' else ''}"> <a href="${h.url('edit_repo_caches', repo_name=c.repo_name)}">${_('Caches')}</a>
--- a/kallithea/templates/admin/repos/repo_edit_advanced.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/repos/repo_edit_advanced.html Fri Sep 19 14:18:56 2014 +0200 @@ -1,4 +1,4 @@ -<h3>${_('Fork of')}</h3> +<h3>${_('Parent')}</h3> ${h.form(url('edit_repo_advanced_fork', repo_name=c.repo_info.repo_name), method='put')} <div class="form"> <div class="fields"> @@ -7,7 +7,7 @@ </div> <div class="field" style="border:none;color:#888"> <ul> - <li>${_('''Manually set this repository as a fork of another from the list''')}</li> + <li>${_('''Manually set this repository as a fork of another from the list.''')}</li> </ul> </div> </div> @@ -21,7 +21,7 @@ }) </script> -<h3>${_('Public journal visibility')}</h3> +<h3>${_('Public Journal Visibility')}</h3> ${h.form(url('edit_repo_advanced_journal', repo_name=c.repo_info.repo_name), method='put')} <div class="form"> ${h.hidden('auth_token',str(h.get_token()))} @@ -34,43 +34,43 @@ %else: <button class="btn btn-small" type="submit"> <i class="icon-plus"></i> - ${_('Add to public journal')} + ${_('Add to Public Journal')} </button> %endif </div> <div class="field" style="border:none;color:#888"> <ul> - <li>${_('All actions made on this repository will be accessible to everyone in public journal')}</li> + <li>${_('All actions done in this repository will be visible to everyone in the public journal.')}</li> </ul> </div> </div> ${h.end_form()} -<h3>${_('Change locking')}</h3> +<h3>${_('Change Locking')}</h3> ${h.form(url('edit_repo_advanced_locking', repo_name=c.repo_info.repo_name), method='put')} <div class="form"> <div class="fields"> %if c.repo_info.locked[0]: ${h.hidden('set_unlock', '1')} <button class="btn btn-small" type="submit" - onclick="return confirm('${_('Confirm to unlock repository')}');"> + onclick="return confirm('${_('Confirm to unlock repository.')}');"> <i class="icon-unlock"></i> - ${_('Unlock repository')} + ${_('Unlock Repository')} </button> ${'Locked by %s on %s' % (h.person_by_id(c.repo_info.locked[0]),h.fmt_date(h.time_to_datetime(c.repo_info.locked[1])))} %else: ${h.hidden('set_lock', '1')} <button class="btn btn-small" type="submit" - onclick="return confirm('${_('Confirm to lock repository')}');"> + onclick="return confirm('${_('Confirm to lock repository.')}');"> <i class="icon-lock"></i> - ${_('Lock repository')} + ${_('Lock Repository')} </button> ${_('Repository is not locked')} %endif </div> <div class="field" style="border:none;color:#888"> <ul> - <li>${_('Force locking on repository. Works only when anonymous access is disabled. Trigering a pull locks repository by user who pulled, only the same user can unlock by doing a push')} + <li>${_('Force locking on the repository. Works only when anonymous access is disabled. Triggering a pull locks the repository. The user who is pulling locks the repository; only the user who pulled and locked it can unlock it by doing a push.')} </li> </ul> </div> @@ -82,16 +82,16 @@ <button class="btn btn-small btn-danger" type="submit" onclick="return confirm('${_('Confirm to delete this repository: %s') % c.repo_name}');"> <i class="icon-remove-sign"></i> - ${_('Delete this repository')} + ${_('Delete this Repository')} </button> %if c.repo_info.forks.count(): - ${ungettext('this repository has %s fork', 'this repository has %s forks', c.repo_info.forks.count()) % c.repo_info.forks.count()} + ${ungettext('This repository has %s fork', 'This repository has %s forks', c.repo_info.forks.count()) % c.repo_info.forks.count()} <input type="radio" name="forks" value="detach_forks" checked="checked"/> <label for="forks">${_('Detach forks')}</label> <input type="radio" name="forks" value="delete_forks" /> <label for="forks">${_('Delete forks')}</label> %endif <div class="field" style="border:none;color:#888"> <ul> - <li>${_('This repository will be renamed in a special way in order to be unaccesible for Kallithea and VCS systems. If you need to fully delete it from file system please do it manually')}</li> + <li>${_('The deleted repository will be moved away and hidden until the administrator expires it. The administrator can both permanently delete it or restore it.')}</li> </ul> </div> ${h.end_form()}
--- a/kallithea/templates/admin/repos/repo_edit_caches.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/repos/repo_edit_caches.html Fri Sep 19 14:18:56 2014 +0200 @@ -1,15 +1,15 @@ ${h.form(url('edit_repo_caches', repo_name=c.repo_name), method='put')} <div class="form"> <div class="fields"> - ${h.submit('reset_cache_%s' % c.repo_info.repo_name,_('Invalidate repository cache'),class_="btn btn-small",onclick="return confirm('"+_('Confirm to invalidate repository cache')+"');")} + ${h.submit('reset_cache_%s' % c.repo_info.repo_name,_('Invalidate Repository Cache'),class_="btn btn-small",onclick="return confirm('"+_('Confirm to invalidate repository cache.')+"');")} <div class="field" style="border:none;color:#888"> <ul> - <li>${_('Manually invalidate cache for this repository. On first access repository will be cached again')} + <li>${_('Manually invalidate cache for this repository. On first access, the repository will be cached again.')} </li> </ul> </div> <div class="field" style="border:none;"> - ${_('List of cached values')} + ${_('List of Cached Values')} <table> <tr> <th>${_('Prefix')}</th>
--- a/kallithea/templates/admin/repos/repo_edit_fields.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/repos/repo_edit_fields.html Fri Sep 19 14:18:56 2014 +0200 @@ -63,6 +63,6 @@ ${h.end_form()} %else: <div style="font-size: 20px"> - ${_('Extra fields are disabled')} + ${_('Extra fields are disabled.')} </div> %endif
--- a/kallithea/templates/admin/repos/repo_edit_fork.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/repos/repo_edit_fork.html Fri Sep 19 14:18:56 2014 +0200 @@ -6,7 +6,7 @@ </div> <div class="field" style="border:none;color:#888"> <ul> - <li>${_('''Manually set this repository as a fork of another from the list''')}</li> + <li>${_('''Manually set this repository as a fork of another from the list.''')}</li> </ul> </div> </div>
--- a/kallithea/templates/admin/repos/repo_edit_remote.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/repos/repo_edit_remote.html Fri Sep 19 14:18:56 2014 +0200 @@ -5,12 +5,12 @@ ${h.form(url('edit_repo_remote', repo_name=c.repo_name), method='put')} <div class="form"> <div class="fields"> - ${h.submit('remote_pull_%s' % c.repo_info.repo_name,_('Pull changes from remote location'),class_="btn btn-small",onclick="return confirm('"+_('Confirm to pull changes from remote side')+"');")} + ${h.submit('remote_pull_%s' % c.repo_info.repo_name,_('Pull Changes from Remote Location'),class_="btn btn-small",onclick="return confirm('"+_('Confirm to pull changes from remote side.')+"');")} </div> </div> ${h.end_form()} %else: <div style="font-size: 20px"> - ${_('This repository does not have any remote url set')} + ${_('This repository does not have a remote url set.')} </div> %endif
--- a/kallithea/templates/admin/repos/repo_edit_settings.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/repos/repo_edit_settings.html Fri Sep 19 14:18:56 2014 +0200 @@ -8,11 +8,11 @@ </div> <div class="input"> ${h.text('repo_name',class_="medium")} - <span class="help-block">${_('Non-changeable id')}: `_${c.repo_info.repo_id}` <span><a id="show_more_clone_id" href="#">${_('what is that ?')}</a></span></span> + <span class="help-block">${_('Non-changeable id')}: `_${c.repo_info.repo_id}` <span><a id="show_more_clone_id" href="#">${_('What is that?')}</a></span></span> <span id="clone_id" class="help-block" style="display: none"> ${_('URL by id')}: `${c.repo_info.clone_url(with_id=True)}` </br> ${_('''In case this repository is renamed or moved into another group the repository url changes. - Using above url guarantees that this repository will allways be accessible under such url. + Using the above url guarantees that this repository will allways be accessible under such url. Usefull for CI systems, or any other cases that you need to hardcode the url into 3rd party service.''')}</span> </div> </div> @@ -43,7 +43,7 @@ </div> <div class="input"> ${h.select('repo_group','',c.repo_groups,class_="medium")} - <span class="help-block">${_('Optional select a group to put this repository into.')}</span> + <span class="help-block">${_('Optionally select a group to put this repository into.')}</span> </div> </div> <div class="field">
--- a/kallithea/templates/admin/repos/repo_edit_statistics.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/repos/repo_edit_statistics.html Fri Sep 19 14:18:56 2014 +0200 @@ -7,7 +7,7 @@ <li>${_('Processed progress')}: ${c.stats_percentage}%</li> </ul> </div> - ${h.submit('reset_stats_%s' % c.repo_info.repo_name,_('Reset statistics'),class_="btn btn-small",onclick="return confirm('"+_('Confirm to remove current statistics')+"');")} + ${h.submit('reset_stats_%s' % c.repo_info.repo_name,_('Reset Statistics'),class_="btn btn-small",onclick="return confirm('"+_('Confirm to remove current statistics.')+"');")} </div> </div> ${h.end_form()}
--- a/kallithea/templates/admin/repos/repos.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/repos/repos.html Fri Sep 19 14:18:56 2014 +0200 @@ -2,14 +2,14 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Repositories administration')} + ${_('Repositories Administration')} %if c.site_name: · ${c.site_name} %endif </%def> <%def name="breadcrumbs_links()"> - <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/> ${h.link_to(_('Admin'),h.url('admin_home'))} » <span id="repo_count">0</span> ${_('repositories')} + <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/> ${h.link_to(_('Admin'),h.url('admin_home'))} » <span id="repo_count">0</span> ${_('Repositories')} </%def> <%def name="page_nav()"> ${self.menu('admin')}
--- a/kallithea/templates/admin/settings/settings.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/settings/settings.html Fri Sep 19 14:18:56 2014 +0200 @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Settings administration')} + ${_('Settings Administration')} %if c.site_name: · ${c.site_name} %endif @@ -38,12 +38,12 @@ </div> </li> <li class="${'active' if c.active=='vcs' else ''}"><a href="${h.url('admin_settings')}">${_('VCS')}</a></li> - <li class="${'active' if c.active=='mapping' else ''}"><a href="${h.url('admin_settings_mapping')}">${_('Remap and rescan')}</a></li> + <li class="${'active' if c.active=='mapping' else ''}"><a href="${h.url('admin_settings_mapping')}">${_('Remap and Rescan')}</a></li> <li class="${'active' if c.active=='global' else ''}"><a href="${h.url('admin_settings_global')}">${_('Global')}</a></li> <li class="${'active' if c.active=='visual' else ''}"><a href="${h.url('admin_settings_visual')}">${_('Visual')}</a></li> <li class="${'active' if c.active=='email' else ''}"><a href="${h.url('admin_settings_email')}">${_('Email')}</a></li> <li class="${'active' if c.active=='hooks' else ''}"><a href="${h.url('admin_settings_hooks')}">${_('Hooks')}</a></li> - <li class="${'active' if c.active=='search' else ''}"><a href="${h.url('admin_settings_search')}">${_('Full text search')}</a></li> + <li class="${'active' if c.active=='search' else ''}"><a href="${h.url('admin_settings_search')}">${_('Full Text Search')}</a></li> <li class="${'active' if c.active=='system' else ''}"><a href="${h.url('admin_settings_system')}">${_('System Info')}</a></li> </ul> </div>
--- a/kallithea/templates/admin/settings/settings_global.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/settings/settings_global.html Fri Sep 19 14:18:56 2014 +0200 @@ -48,12 +48,12 @@ </div> <div class="input"> ${h.text('captcha_private_key',size=60)} - <span class="help-block">${_('Private key for reCaptcha system. Setting this value will enable captcha on registration')}</span> + <span class="help-block">${_('Private key for reCaptcha system. Setting this value will enable captcha on registration.')}</span> </div> </div> <div class="buttons"> - ${h.submit('save',_('Save settings'),class_="btn")} + ${h.submit('save',_('Save Settings'),class_="btn")} ${h.reset('reset',_('Reset'),class_="btn")} </div> </div>
--- a/kallithea/templates/admin/settings/settings_hooks.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/settings/settings_hooks.html Fri Sep 19 14:18:56 2014 +0200 @@ -1,4 +1,4 @@ -<h4>${_('Built in Mercurial hooks - read only')}</h4> +<h4>${_('Built-in Mercurial Hooks (Read-Only)')}</h4> <div class="form"> <div class="fields"> % for hook in c.hooks: @@ -16,7 +16,7 @@ </div> % if c.visual.allow_custom_hooks_settings: -<h4>${_('Custom hooks')}</h4> +<h4>${_('Custom Hooks')}</h4> ${h.form(url('admin_settings_hooks'), method='post')} <div class="form"> <div class="fields">
--- a/kallithea/templates/admin/settings/settings_mapping.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/settings/settings_mapping.html Fri Sep 19 14:18:56 2014 +0200 @@ -10,19 +10,19 @@ ${h.checkbox('destroy',True)} <label for="destroy">${_('Destroy old data')}</label> </div> - <span class="help-block">${_('In case a repository was deleted from filesystem and it still exists in the database check this option to scan obsolete data in database and remove it.')}</span> + <span class="help-block">${_('Check this option to remove references to repositories that no longer exist in on the filesystem.')}</span> <div class="checkbox"> ${h.checkbox('invalidate',True)} <label for="invalidate"> ${_('Invalidate cache for all repositories')}</label> </div> - <span class="help-block">${_('Each cache data for repositories will be cleaned with this option selected. Use this to reload data and clear cache keys.')}</span> + <span class="help-block">${_('Check this to reload data and clear cache keys for all repositories.')}</span> <div class="checkbox"> ${h.checkbox('hooks',True)} - <label for="hooks"> ${_('Install GIT hooks')} </label> + <label for="hooks"> ${_('Install Git hooks')} </label> </div> - <span class="help-block">${_('Verify if Kallitheas GIT hooks are installed for each repository. Current hooks will be updated to latest version')}</span> + <span class="help-block">${_("Verify if Kallithea's Git hooks are installed for each repository. Current hooks will be updated to the latest version.")}</span> </div> </div>
--- a/kallithea/templates/admin/settings/settings_search.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/settings/settings_search.html Fri Sep 19 14:18:56 2014 +0200 @@ -12,7 +12,7 @@ <label for="full_index">${_('Build from scratch')}</label> </div> - <span class="help-block">${_('This option completely reindex all the files within Kallithea for proper fulltext search capabilities.')}</span> + <span class="help-block">${_('This option completely reindexes all of the repositories for proper fulltext search capabilities.')}</span> </div> </div>
--- a/kallithea/templates/admin/settings/settings_system.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/settings/settings_system.html Fri Sep 19 14:18:56 2014 +0200 @@ -4,8 +4,8 @@ (_('Kallithea version'), h.literal('%s <b><span style="color:#036185; text-decoration: underline;cursor: pointer" id="check_for_update" >%s</span></b>' % (c.kallithea_version, _('check for updates'))), ''), (_('Python version'), c.py_version, ''), (_('Platform'), c.platform, ''), - (_('GIT version'), c.git_version, ''), - (_('GIT path'), c.ini.get('git_path'), ''), + (_('Git version'), c.git_version, ''), + (_('Git path'), c.ini.get('git_path'), ''), (_('Upgrade info endpoint'), h.literal('%s <br/><span style="color:#999999">%s.</span>' % (c.update_url, _('Note: please make sure this server can access this url'))), '') ] %> @@ -19,7 +19,7 @@ %endfor </dl> -<h4>${_('Python packages')}</h4> +<h4>${_('Python Packages')}</h4> <table class="table" style="margin:0px 0px 0px 0px"> <colgroup> <col style="width:180px">
--- a/kallithea/templates/admin/settings/settings_vcs.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/settings/settings_vcs.html Fri Sep 19 14:18:56 2014 +0200 @@ -10,7 +10,7 @@ ${h.checkbox('web_push_ssl', 'True')} <label for="web_push_ssl">${_('Require SSL for vcs operations')}</label> </div> - <span class="help-block">${_('Activate to set Kallithea to require SSL for pushing or pulling. If SSL certificate is missing it will return a HTTP Error 406: Not Acceptable.')}</span> + <span class="help-block">${_('Activate to require SSL both pushing and pulling. If SSL certificate is missing, it will return a HTTP Error 406: Not Acceptable.')}</span> </div> </div> @@ -39,7 +39,7 @@ </div> <div class="field"> <div class="label label-checkbox"> - <label>${_('Mercurial Extensions')}:</label> + <label>${_('Mercurial extensions')}:</label> </div> <div class="checkboxes"> <div class="checkbox"> @@ -50,18 +50,18 @@ ${h.checkbox('extensions_hgsubversion','True')} <label for="extensions_hgsubversion">${_('Enable hgsubversion extension')}</label> </div> - <span class="help-block">${_('Requires hgsubversion library to be installed. Allows cloning remote SVN repositories and migrates them to Mercurial type.')}</span> + <span class="help-block">${_('Requires hgsubversion library to be installed. Enables cloning of remote Subversion repositories while converting them to Mercurial.')}</span> ##<div class="checkbox"> ## ${h.checkbox('extensions_hggit','True')} ## <label for="extensions_hggit">${_('Enable hg-git extension')}</label> ##</div> - ##<span class="help-block">${_('Requires hg-git library to be installed. Allows cloning remote git repositories and migrates them to Mercurial type.')}</span> + ##<span class="help-block">${_('Requires hg-git library to be installed. Enables cloning of remote Git repositories while converting them to Mercurial.')}</span> </div> </div> %if c.visual.allow_repo_location_change: <div class="field"> <div class="label"> - <label for="paths_root_path">${_('Repositories location')}:</label> + <label for="paths_root_path">${_('Location of repositories')}:</label> </div> <div class="input"> ${h.text('paths_root_path',size=60,readonly="readonly", class_="disabled")} @@ -69,7 +69,7 @@ title="${h.tooltip(_('Click to unlock. You must restart Kallithea in order to make this setting take effect.'))}"> <div class="btn btn-small"><i id="path_unlock_icon" class="icon-lock"></i></div> </span> - <span class="help-block">${_('Filesystem location where repositories should be stored. After changing this value a restart and rescan of the repository folder are required.')}</span> + <span class="help-block">${_('Filesystem location where repositories are stored. After changing this value, a restart and rescan of the repository folder are both required.')}</span> </div> </div> %else: @@ -77,7 +77,7 @@ ${h.hidden('paths_root_path',size=30,readonly="readonly", class_="disabled")} %endif <div class="buttons"> - ${h.submit('save',_('Save settings'),class_="btn")} + ${h.submit('save',_('Save Settings'),class_="btn")} ${h.reset('reset',_('Reset'),class_="btn")} </div> </div>
--- a/kallithea/templates/admin/settings/settings_visual.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/settings/settings_visual.html Fri Sep 19 14:18:56 2014 +0200 @@ -27,8 +27,8 @@ <div class="field"> <div class="input"> ${h.text('gravatar_url', size=80)} - <span class="help-block">${_('''Gravatar url allows you to use other avatar server application. - Following variables of the URL will be replaced accordingly. + <span class="help-block">${_('''Gravatar url allows you to use another avatar server application. + The following variables of the url will be replaced accordingly. {scheme} 'http' or 'https' sent from running Kallithea server, {email} user email, {md5email} md5 hash of the user email (like at gravatar.com), @@ -39,7 +39,8 @@ <div class="field"> <div class="input"> ${h.text('clone_uri_tmpl', size=80)} - <span class="help-block">${_('''Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars: + <span class="help-block">${_('''Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}'. + The following variables are available: {scheme} 'http' or 'https' sent from running Kallithea server, {user} current user username, {netloc} network location/server host of running Kallithea server, @@ -82,7 +83,7 @@ ${h.checkbox('show_private_icon','True')} <label for="show_private_icon">${_('Show private repo icon on repositories')}</label> </div> - <span class="help-block">${_('Show public/private icons next to repositories names.')}</span> + <span class="help-block">${_('Show public/private icons next to repository names.')}</span> </div> </div> @@ -107,12 +108,12 @@ <li>[see => URI] <span class="metatag" tag="see">see => <a href="#">URI</a> </span></li> </ul> </div> - <span class="help-block">${_('Parses meta tags from repository description field and turns them into colored tags.')}</span> + <span class="help-block">${_('Parses meta tags from the repository description field and turns them into colored tags.')}</span> </div> </div> <div class="buttons"> - ${h.submit('save',_('Save settings'),class_="btn")} + ${h.submit('save',_('Save Settings'),class_="btn")} ${h.reset('reset',_('Reset'),class_="btn")} </div>
--- a/kallithea/templates/admin/user_groups/user_group_add.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/user_groups/user_group_add.html Fri Sep 19 14:18:56 2014 +0200 @@ -10,7 +10,7 @@ <%def name="breadcrumbs_links()"> ${h.link_to(_('Admin'),h.url('admin_home'))} » - ${h.link_to(_('User groups'),h.url('users_groups'))} + ${h.link_to(_('User Groups'),h.url('users_groups'))} » ${_('Add User Group')} </%def>
--- a/kallithea/templates/admin/user_groups/user_groups.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/user_groups/user_groups.html Fri Sep 19 14:18:56 2014 +0200 @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('User groups administration')} + ${_('User Groups Administration')} %if c.site_name: · ${c.site_name} %endif
--- a/kallithea/templates/admin/users/user_edit.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/users/user_edit.html Fri Sep 19 14:18:56 2014 +0200 @@ -40,11 +40,11 @@ </div> </li> <li class="${'active' if c.active=='profile' else ''}"><a href="${h.url('edit_user', id=c.user.user_id)}">${_('Profile')}</a></li> - <li class="${'active' if c.active=='api_keys' else ''}"><a href="${h.url('edit_user_api_keys', id=c.user.user_id)}">${_('API keys')}</a></li> + <li class="${'active' if c.active=='api_keys' else ''}"><a href="${h.url('edit_user_api_keys', id=c.user.user_id)}">${_('API Keys')}</a></li> <li class="${'active' if c.active=='advanced' else ''}"><a href="${h.url('edit_user_advanced', id=c.user.user_id)}">${_('Advanced')}</a></li> - <li class="${'active' if c.active=='perms' else ''}"><a href="${h.url('edit_user_perms', id=c.user.user_id)}">${_('Default permissions')}</a></li> + <li class="${'active' if c.active=='perms' else ''}"><a href="${h.url('edit_user_perms', id=c.user.user_id)}">${_('Default Permissions')}</a></li> <li class="${'active' if c.active=='emails' else ''}"><a href="${h.url('edit_user_emails', id=c.user.user_id)}">${_('Emails')}</a></li> - <li class="${'active' if c.active=='ips' else ''}"><a href="${h.url('edit_user_ips', id=c.user.user_id)}">${_('Ip whitelist')}</a></li> + <li class="${'active' if c.active=='ips' else ''}"><a href="${h.url('edit_user_ips', id=c.user.user_id)}">${_('IP Whitelist')}</a></li> </ul> </div>
--- a/kallithea/templates/admin/users/user_edit_emails.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/users/user_edit_emails.html Fri Sep 19 14:18:56 2014 +0200 @@ -23,7 +23,7 @@ </tr> %endfor %else: - <tr><td><div class="ip">${_('No additional emails specified')}</div></td></tr> + <tr><td><div class="ip">${_('No additional emails specified.')}</div></td></tr> %endif </table> </div>
--- a/kallithea/templates/admin/users/user_edit_ips.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/users/user_edit_ips.html Fri Sep 19 14:18:56 2014 +0200 @@ -27,7 +27,7 @@ %endfor %endif %if not c.default_user_ip_map and not c.user_ip_map: - <tr><td><div class="ip">${_('All IP addresses are allowed')}</div></td></tr> + <tr><td><div class="ip">${_('All IP addresses are allowed.')}</div></td></tr> %endif </table> </div>
--- a/kallithea/templates/admin/users/users.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/admin/users/users.html Fri Sep 19 14:18:56 2014 +0200 @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Users administration')} + ${_('Users Administration')} %if c.site_name: · ${c.site_name} %endif @@ -10,7 +10,7 @@ <%def name="breadcrumbs_links()"> <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/> - ${h.link_to(_('Admin'),h.url('admin_home'))} » <span id="user_count">0</span> ${_('users')} + ${h.link_to(_('Admin'),h.url('admin_home'))} » <span id="user_count">0</span> ${_('Users')} </%def> <%def name="page_nav()"> @@ -51,12 +51,12 @@ var column_defs = [ {key:"gravatar",label:"",sortable:false}, {key:"username",label:"${_('Username')}",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:"firstname",label:"${_('First Name')}",sortable:true}, + {key:"lastname",label:"${_('Last Name')}",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:"extern_type",label:"${_('Auth type')}",sortable:true}, + {key:"extern_type",label:"${_('Auth Type')}",sortable:true}, {key:"action",label:"${_('Action')}",sortable:false} ]; var counter = YUD.get('user_count');
--- a/kallithea/templates/base/base.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/base/base.html Fri Sep 19 14:18:56 2014 +0200 @@ -71,11 +71,11 @@ <%def name="admin_menu()"> <ul class="admin_menu"> - <li><a href="${h.url('admin_home')}"><i class="icon-book"></i> ${_('Admin journal')}</a></li> + <li><a href="${h.url('admin_home')}"><i class="icon-book"></i> ${_('Admin Journal')}</a></li> <li><a href="${h.url('repos')}"><i class="icon-archive"></i> ${_('Repositories')}</a></li> - <li><a href="${h.url('repos_groups')}"><i class="icon-folder-close"></i> ${_('Repository groups')}</a></li> + <li><a href="${h.url('repos_groups')}"><i class="icon-folder-close"></i> ${_('Repository Groups')}</a></li> <li><a href="${h.url('users')}"><i class="icon-user"></i> ${_('Users')}</a></li> - <li><a href="${h.url('users_groups')}"><i class="icon-group"></i> ${_('User groups')}</a></li> + <li><a href="${h.url('users_groups')}"><i class="icon-group"></i> ${_('User Groups')}</a></li> <li><a href="${h.url('admin_permissions')}"><i class="icon-ban-circle"></i> ${_('Permissions')}</a></li> <li><a href="${h.url('auth_home')}"><i class="icon-key"></i> ${_('Authentication')}</a></li> <li><a href="${h.url('defaults')}"><i class="icon-wrench"></i> ${_('Defaults')}</a></li> @@ -92,10 +92,10 @@ <li><a href="${h.url('repos')}"><i class="icon-archive"></i> ${_('Repositories')}</a></li> %endif %if repository_groups: - <li><a href="${h.url('repos_groups')}"><i class="icon-folder-close"></i> ${_('Repository groups')}</a></li> + <li><a href="${h.url('repos_groups')}"><i class="icon-folder-close"></i> ${_('Repository Groups')}</a></li> %endif %if user_groups: - <li><a href="${h.url('users_groups')}"><i class="icon-group"></i> ${_('User groups')}</a></li> + <li><a href="${h.url('users_groups')}"><i class="icon-group"></i> ${_('User Groups')}</a></li> %endif </ul> </%def> @@ -134,7 +134,7 @@ ${h.repo_link(c.db_repo.groups_and_repo)} %if current == 'createfork': - - ${_('Create fork')} + - ${_('Create Fork')} %endif </h2> <!-- @@ -170,7 +170,7 @@ %endif %if c.db_repo.fork: <li><a href="${h.url('compare_url',repo_name=c.db_repo.fork.repo_name,org_ref_type=c.db_repo.landing_rev[0],org_ref_name=c.db_repo.landing_rev[1], other_repo=c.repo_name,other_ref_type='branch' if request.GET.get('branch') else c.db_repo.landing_rev[0],other_ref_name=request.GET.get('branch') or c.db_repo.landing_rev[1], merge=1)}"> - <i class="icon-loop"></i> ${_('Compare fork')}</a></li> + <i class="icon-loop"></i> ${_('Compare Fork')}</a></li> %endif <li><a href="${h.url('compare_home',repo_name=c.repo_name)}"><i class="icon-loop"></i> ${_('Compare')}</a></li> @@ -252,11 +252,11 @@ <i class="icon-file-2"></i> ${_('Gists')} </a> <ul class="admin_menu"> - <li><a href="${h.url('new_gist', public=1)}"><i class="icon-file-alt"></i> ${_('Create new gist')}</a></li> - <li><a href="${h.url('gists')}"><i class="icon-copy"></i> ${_('All public gists')}</a></li> + <li><a href="${h.url('new_gist', public=1)}"><i class="icon-file-alt"></i> ${_('Create New Gist')}</a></li> + <li><a href="${h.url('gists')}"><i class="icon-copy"></i> ${_('All Public Gists')}</a></li> %if c.authuser.username != 'default': - <li><a href="${h.url('gists', public=1)}"><i class="icon-copy"></i> ${_('My public gists')}</a></li> - <li><a href="${h.url('gists', private=1)}"><i class="icon-file-text"></i> ${_('My private gists')}</a></li> + <li><a href="${h.url('gists', public=1)}"><i class="icon-copy"></i> ${_('My Public Gists')}</a></li> + <li><a href="${h.url('gists', private=1)}"><i class="icon-file-text"></i> ${_('My Private Gists')}</a></li> %endif </ul> </li> @@ -304,14 +304,14 @@ <span class="menu_link_notifications">${c.unread_notifications}</span> %endif %else: - <span>${_('Not logged in')}</span> + <span>${_('Not Logged In')}</span> %endif </a> <div class="user-menu"> <div id="quick_login"> %if c.authuser.username == 'default' or c.authuser.user_id is None: - <h4>${_('Login to your account')}</h4> + <h4>${_('Login to Your Account')}</h4> ${h.form(h.url('login_home',came_from=h.url.current()))} <div class="form"> <div class="fields"> @@ -356,7 +356,7 @@ <div class="links_right"> <ol class="links"> <li><a href="${h.url('notifications')}">${_('Notifications')}: ${c.unread_notifications}</a></li> - <li>${h.link_to(_(u'My account'),h.url('my_account'))}</li> + <li>${h.link_to(_(u'My Account'),h.url('my_account'))}</li> <li class="logout">${h.link_to(_(u'Log Out'),h.url('logout_home'))}</li> </ol> </div>
--- a/kallithea/templates/base/root.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/base/root.html Fri Sep 19 14:18:56 2014 +0200 @@ -27,7 +27,7 @@ <script type="text/javascript"> //JS translations map var TRANSLATION_MAP = { - 'Add another comment':'${_("Add another comment")}', + 'Add Another Comment':'${_("Add Another Comment")}', 'Stop following this repository':"${_('Stop following this repository')}", 'Start following this repository':"${_('Start following this repository')}", 'Group':"${_('Group')}", @@ -36,13 +36,13 @@ 'loading ...':"${_('loading ...')}", 'Search truncated': "${_('Search truncated')}", 'No matching files': "${_('No matching files')}", - 'Open new pull request': "${_('Open new pull request')}", - 'Open new pull request for selected changesets': "${_('Open new pull request for selected changesets')}", - 'Show selected changesets __S → __E': "${h.literal(_('Show selected changesets __S → __E'))}", - 'Show selected changeset __S': "${_('Show selected changeset __S')}", - 'Selection link': "${_('Selection link')}", - 'Collapse diff': "${_('Collapse diff')}", - 'Expand diff': "${_('Expand diff')}", + 'Open New Pull Request': "${_('Open New Pull Request')}", + 'Open New Pull Request for Selected Changesets': "${_('Open New Pull Request for Selected Changesets')}", + 'Show Selected Changesets __S → __E': "${h.literal(_('Show Selected Changesets __S → __E'))}", + 'Show Selected Changeset __S': "${_('Show Selected Changeset __S')}", + 'Selection Link': "${_('Selection Link')}", + 'Collapse Diff': "${_('Collapse Diff')}", + 'Expand Diff': "${_('Expand Diff')}", 'Failed to revoke permission': "${_('Failed to revoke permission')}", 'Confirm to revoke permission for {0}: {1} ?': "${_('confirm to revoke permission for {0}: {1} ?')}", 'enabled': "${_('enabled')}",
--- a/kallithea/templates/changelog/changelog.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/changelog/changelog.html Fri Sep 19 14:18:56 2014 +0200 @@ -186,9 +186,9 @@ } else { YUD.setStyle('open_new_pr','display',''); if(checked_checkboxes.length>0){ - YUD.get('open_new_pr').innerHTML = _TM['Open new pull request for selected changesets']; + YUD.get('open_new_pr').innerHTML = _TM['Open New Pull Request for Selected Changesets']; }else{ - YUD.get('open_new_pr').innerHTML = _TM['Open new pull request']; + YUD.get('open_new_pr').innerHTML = _TM['Open New Pull Request']; } } } @@ -200,8 +200,8 @@ 'revision': rev_start+'...'+rev_end}); var link = (rev_start == rev_end) - ? _TM['Show selected changeset __S'] - : _TM['Show selected changesets __S → __E']; + ? _TM['Show Selected Changeset __S'] + : _TM['Show Selected Changesets __S → __E']; link = link.replace('__S',rev_start.substr(0,6)); link = link.replace('__E',rev_end.substr(0,6));
--- a/kallithea/templates/changelog/changelog_summary_data.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/changelog/changelog_summary_data.html Fri Sep 19 14:18:56 2014 +0200 @@ -3,7 +3,7 @@ <table class="table_disp"> <tr> <th class="left">${_('Revision')}</th> - <th class="left">${_('Commit message')}</th> + <th class="left">${_('Commit Message')}</th> <th class="left">${_('Age')}</th> <th class="left">${_('Author')}</th> <th class="left">${_('Refs')}</th>
--- a/kallithea/templates/changeset/diff_block.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/changeset/diff_block.html Fri Sep 19 14:18:56 2014 +0200 @@ -5,7 +5,7 @@ ## <%def name="diff_block(change)"> <div class="diff-collapse"> - <span target="${'diff-container-%s' % (id(change))}" class="diff-collapse-button">↑ ${_('Collapse diff')} ↑</span> + <span target="${'diff-container-%s' % (id(change))}" class="diff-collapse-button">↑ ${_('Collapse Diff')} ↑</span> </div> <div class="diff-container" id="${'diff-container-%s' % (id(change))}"> %for FID,(cs1, cs2, change, path, diff, stats) in change.iteritems():
--- a/kallithea/templates/compare/compare_diff.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/compare/compare_diff.html Fri Sep 19 14:18:56 2014 +0200 @@ -13,7 +13,7 @@ </%def> <%def name="breadcrumbs_links()"> - ${_('Compare revisions')} + ${_('Compare Revisions')} </%def> <%def name="page_nav()"> @@ -42,7 +42,7 @@ %if c.compare_home: <div id="changeset_compare_view_content"> - <div style="color:#999;font-size: 18px">${_('Compare revisions, branches, bookmarks or tags.')}</div> + <div style="color:#999;font-size: 18px">${_('Compare revisions, branches, bookmarks, or tags.')}</div> </div> %else: <div id="changeset_compare_view_content">
--- a/kallithea/templates/files/files_add.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/files/files_add.html Fri Sep 19 14:18:56 2014 +0200 @@ -22,7 +22,7 @@ </%def> <%def name="breadcrumbs_links()"> - ${_('Add new file')} @ ${h.show_id(c.cs)} + ${_('Add New File')} @ ${h.show_id(c.cs)} </%def> <%def name="main()"> @@ -61,11 +61,11 @@ <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: left;padding-top: 5px"> - ${h.submit('commit',_('Commit changes'),class_="btn btn-small btn-success")} + ${h.submit('commit',_('Commit Changes'),class_="btn btn-small btn-success")} ${h.reset('reset',_('Reset'),class_="btn btn-small")} </div> ${h.end_form()}
--- a/kallithea/templates/files/files_browser.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/files/files_browser.html Fri Sep 19 14:18:56 2014 +0200 @@ -42,8 +42,8 @@ <th>${_('Size')}</th> <th>${_('Mimetype')}</th> <th>${_('Last Revision')}</th> - <th>${_('Last modified')}</th> - <th>${_('Last committer')}</th> + <th>${_('Last Modified')}</th> + <th>${_('Last Committer')}</th> </tr> </thead>
--- a/kallithea/templates/files/files_delete.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/files/files_delete.html Fri Sep 19 14:18:56 2014 +0200 @@ -49,11 +49,11 @@ <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: left;padding-top: 5px"> - ${h.submit('commit',_('Commit changes'),class_="btn btn-small btn-success")} + ${h.submit('commit',_('Commit Changes'),class_="btn btn-small btn-success")} ${h.reset('reset',_('Reset'),class_="btn btn-small")} </div> ${h.end_form()}
--- a/kallithea/templates/files/files_edit.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/files/files_edit.html Fri Sep 19 14:18:56 2014 +0200 @@ -68,7 +68,7 @@ <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"> - ${h.submit('commit',_('Commit changes'),class_="btn btn-small btn-success")} + ${h.submit('commit',_('Commit Changes'),class_="btn btn-small btn-success")} ${h.reset('reset',_('Reset'),class_="btn btn-small")} </div> ${h.end_form()}
--- a/kallithea/templates/forks/fork.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/forks/fork.html Fri Sep 19 14:18:56 2014 +0200 @@ -52,7 +52,7 @@ </div> <div class="input"> ${h.select('repo_group','',c.repo_groups,class_="medium")} - <span class="help-block">${_('Optionaly select a group to put this repository into.')}</span> + <span class="help-block">${_('Optionally select a group to put this repository into.')}</span> </div> </div> @@ -62,7 +62,7 @@ </div> <div class="input"> ${h.select('landing_rev','',c.landing_revs,class_="medium")} - <span class="help-block">${_('Default revision for files page, downloads, whoosh and readme')}</span> + <span class="help-block">${_('Default revision for files page, downloads, whoosh, and readme.')}</span> </div> </div>
--- a/kallithea/templates/forks/forks_data.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/forks/forks_data.html Fri Sep 19 14:18:56 2014 +0200 @@ -18,7 +18,7 @@ <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)}" href="${h.url('compare_url',repo_name=c.repo_name, org_ref_type=c.db_repo.landing_rev[0],org_ref_name=c.db_repo.landing_rev[1],other_repo=f.repo_name,other_ref_type=c.db_repo.landing_rev[0],other_ref_name=c.db_repo.landing_rev[1], merge=1)}" - class="btn btn-small"><i class="icon-loop"></i> ${_('Compare fork')}</a> + class="btn btn-small"><i class="icon-loop"></i> ${_('Compare Fork')}</a> </div> <div style="border-bottom: 1px solid #DDD;margin:10px 0px 10px 0px"></div> </div>
--- a/kallithea/templates/journal/journal.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/journal/journal.html Fri Sep 19 14:18:56 2014 +0200 @@ -11,8 +11,8 @@ <form id="filter_form"> <input class="q_filter_box ${'' if c.search_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.search_term or _('quick filter...')}"/> <span class="tooltip" title="${h.tooltip(h.journal_filter_help())}">?</span> - <input type='submit' value="${_('filter')}" class="btn btn-small" style="padding:0px 2px 0px 2px;margin:0px"/> - ${_('journal')} - ${ungettext('%s entry', '%s entries', c.journal_pager.item_count) % (c.journal_pager.item_count)} + <input type='submit' value="${_('Filter')}" class="btn btn-small" style="padding:0px 2px 0px 2px;margin:0px"/> + ${_('Journal')} - ${ungettext('%s Entry', '%s Entries', c.journal_pager.item_count) % (c.journal_pager.item_count)} </form> ${h.end_form()} </h5> @@ -54,7 +54,7 @@ <a id="show_watched" href="#watched"><i class="icon-eye-open"></i> ${_('Watched')}</a> </li> <li id="show_my_li"> - <a id="show_my" href="#my"><i class="icon-archive"></i> ${_('My repos')}</a> + <a id="show_my" href="#my"><i class="icon-archive"></i> ${_('My Repos')}</a> </li> </ul> </div>
--- a/kallithea/templates/password_reset.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/password_reset.html Fri Sep 19 14:18:56 2014 +0200 @@ -28,9 +28,9 @@ <%include file="/base/flash_msg.html"/> <div class="title withlogo"> %if c.site_name: - <h5>${_('Reset your Password to %s') % c.site_name}</h5> + <h5>${_('Reset Your Password to %s') % c.site_name}</h5> %else: - <h5>${_('Reset your Password')}</h5> + <h5>${_('Reset Your Password')}</h5> %endif </div> <div class="inner"> @@ -62,8 +62,8 @@ <div class="buttons"> <div class="nohighlight"> - ${h.submit('send',_('Send password reset email'),class_="btn")} - <div class="activation_msg">${_('Password reset link will be send to matching email address')}</div> + ${h.submit('send',_('Send Password Reset Email'),class_="btn")} + <div class="activation_msg">${_('Password reset link will be sent to the email address matching your username.')}</div> </div> </div> </div>
--- a/kallithea/templates/pullrequests/pullrequest.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/pullrequests/pullrequest.html Fri Sep 19 14:18:56 2014 +0200 @@ -1,11 +1,11 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${c.repo_name} ${_('New pull request')} + ${c.repo_name} ${_('New Pull Request')} </%def> <%def name="breadcrumbs_links()"> - ${_('New pull request')} + ${_('New Pull Request')} </%def> <%def name="page_nav()"> @@ -94,7 +94,7 @@ ## Reviewers <div style="float:left; border-left:1px dashed #eee"> - <div class="pr-details-title">${_('Pull request reviewers')}</div> + <div class="pr-details-title">${_('Pull Request Reviewers')}</div> <div id="reviewers" style="padding:0px 0px 0px 15px"> ## members goes here ! <div>
--- a/kallithea/templates/pullrequests/pullrequest_show.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/pullrequests/pullrequest_show.html Fri Sep 19 14:18:56 2014 +0200 @@ -196,7 +196,7 @@ </div> %if c.available and not c.pull_request.is_closed(): <div class="buttons"> - ${h.submit('copy_update',_('Create pull request update'),class_="btn btn-small")} + ${h.submit('copy_update',_('Create Pull Request Update'),class_="btn btn-small")} </div> %endif </div> @@ -206,7 +206,7 @@ </div> ## REVIEWERS <div style="float:left; border-left:1px dashed #eee"> - <div class="pr-details-title">${_('Pull request reviewers')}</div> + <div class="pr-details-title">${_('Pull Request Reviewers')}</div> <div id="reviewers" style="padding:0px 0px 5px 10px"> ## members goes here ! <div> @@ -251,7 +251,7 @@ <div class="table" style="float:left;clear:none"> <div class="diffblock"> <div style="padding:5px"> - ${_('Compare view')} + ${_('Compare View')} </div> </div> <div id="changeset_compare_view_content">
--- a/kallithea/templates/pullrequests/pullrequest_show_all.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/pullrequests/pullrequest_show_all.html Fri Sep 19 14:18:56 2014 +0200 @@ -9,9 +9,9 @@ <%def name="breadcrumbs_links()"> %if c.from_: - ${_('Pull requests from %s') % c.repo_name} + ${_("Pull Requests from %s'") % c.repo_name} %else: - ${_('Pull requests to %s') % c.repo_name} + ${_("Pull Requests to '%s'") % c.repo_name} %endif </%def> @@ -30,14 +30,14 @@ <li> %if c.authuser.username != 'default': <span> - <a id="open_new_pr" class="btn btn-small btn-success" href="${h.url('pullrequest_home',repo_name=c.repo_name)}"><i class="icon-plus"></i> ${_('Open new pull request')}</a> + <a id="open_new_pr" class="btn btn-small btn-success" href="${h.url('pullrequest_home',repo_name=c.repo_name)}"><i class="icon-plus"></i> ${_('Open New Pull Request')}</a> </span> %endif <span> %if c.from_: - <a class="btn btn-small" href="${h.url('pullrequest_show_all',repo_name=c.repo_name,closed=c.closed)}"><i class="icon-loop-2"></i> ${_('Show pull requests to %s') % c.repo_name}</a> + <a class="btn btn-small" href="${h.url('pullrequest_show_all',repo_name=c.repo_name,closed=c.closed)}"><i class="icon-loop-2"></i> ${_('Show Pull Requests to %s') % c.repo_name}</a> %else: - <a class="btn btn-small" href="${h.url('pullrequest_show_all',repo_name=c.repo_name,closed=c.closed,from_=1)}"><i class="icon-loop-2"></i> ${_('Show pull requests from %s') % c.repo_name}</a> + <a class="btn btn-small" href="${h.url('pullrequest_show_all',repo_name=c.repo_name,closed=c.closed,from_=1)}"><i class="icon-loop-2"></i> ${_("Show Pull Requests from '%s'") % c.repo_name}</a> %endif </span> </li> @@ -47,9 +47,9 @@ <div style="margin: 0 20px"> <div> %if c.closed: - ${h.link_to(_('Hide closed pull requests'), h.url('pullrequest_show_all',repo_name=c.repo_name,from_=c.from_))} + ${h.link_to(_('Hide closed pull requests (only show open pull requests)'), h.url('pullrequest_show_all',repo_name=c.repo_name,from_=c.from_))} %else: - ${h.link_to(_('Show closed pull requests too'), h.url('pullrequest_show_all',repo_name=c.repo_name,from_=c.from_,closed=1))} + ${h.link_to(_('Show closed pull requests (in addition to open pull requests)'), h.url('pullrequest_show_all',repo_name=c.repo_name,from_=c.from_,closed=1))} %endif </div> </div>
--- a/kallithea/templates/pullrequests/pullrequest_show_my_data.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/pullrequests/pullrequest_show_my_data.html Fri Sep 19 14:18:56 2014 +0200 @@ -1,5 +1,5 @@ -${h.checkbox('show_closed',checked="checked" if c.show_closed else "", label=_('Show closed pull requests too'))} -<div class="pullrequests_section_head">${_('Opened by me')}</div> +${h.checkbox('show_closed',checked="checked" if c.show_closed else "", label=_('Show closed pull requests (in addition to open pull requests)'))} +<div class="pullrequests_section_head">${_('Pull Requests Created by Me')}</div> <ul> %if c.my_pull_requests: %for pull_request in c.my_pull_requests: @@ -13,7 +13,7 @@ <a href="${pull_request.url()}"> ${pull_request.title or _("(no title)")} </a> - ${_('opened on %s from') % (h.fmt_date(pull_request.created_on))} + ${_('created on %s from') % (h.fmt_date(pull_request.created_on))} <% org_ref_name=pull_request.org_ref.rsplit(':', 2)[-2] %> <a href="${h.url('summary_home', repo_name=pull_request.org_repo.repo_name, anchor=org_ref_name)}"> ${pull_request.org_repo.repo_name}#${org_ref_name} @@ -32,7 +32,7 @@ %endif </ul> -<div class="pullrequests_section_head" style="clear:both">${_('I participate in')}</div> +<div class="pullrequests_section_head" style="clear:both">${_('Pull Requests I Participate In')}</div> <ul> %if c.participate_in_pull_requests: %for pull_request in c.participate_in_pull_requests: @@ -51,7 +51,7 @@ <a href="${h.url('summary_home', repo_name=pull_request.org_repo.repo_name, anchor=org_ref_name)}"> ${pull_request.org_repo.repo_name}#${org_ref_name} </a> - ${_('opened on %s') % (h.fmt_date(pull_request.created_on))} + ${_('created on %s') % (h.fmt_date(pull_request.created_on))} %if pull_request.is_closed(): (${_('Closed')}) %endif
--- a/kallithea/templates/register.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/register.html Fri Sep 19 14:18:56 2014 +0200 @@ -107,9 +107,9 @@ <div class="nohighlight"> ${h.submit('sign_up',_('Sign Up'),class_="btn")} %if c.auto_active: - <div class="activation_msg">${_('Your account will be activated right after registration')}</div> + <div class="activation_msg">${_('Registered accounts are ready to use and need no further action.')}</div> %else: - <div class="activation_msg">${_('Your account must wait for activation by administrator')}</div> + <div class="activation_msg">${_('Please wait for an administrator to activate your account.')}</div> %endif </div> </div>
--- a/kallithea/templates/search/search.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/search/search.html Fri Sep 19 14:18:56 2014 +0200 @@ -5,7 +5,7 @@ %if c.repo_name: ${_('%s Search') % c.repo_name} %else: - ${_('Search in all repositories')} + ${_('Search in All Repositories')} %endif %if c.site_name: · ${c.site_name} @@ -16,7 +16,7 @@ %if c.repo_name: ${_('Search')} %else: - ${_('Search in all repositories')} + ${_('Search in All Repositories')} %endif %if c.cur_query: » @@ -50,7 +50,7 @@ <div class="fields"> <div class="field field-first field-noborder"> <div class="label"> - <label for="q">${_('Search term')}</label> + <label for="q">${_('Search term')}:</label> </div> <div class="input">${h.text('q',c.cur_query,class_="small")} <div class="button highlight"> @@ -62,7 +62,7 @@ <div class="field"> <div class="label"> - <label for="type">${_('Search in')}</label> + <label for="type">${_('Search in')}:</label> </div> <div class="select"> ${h.select('type',c.cur_type,[('content',_('File contents')),
--- a/kallithea/templates/summary/summary.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/summary/summary.html Fri Sep 19 14:18:56 2014 +0200 @@ -190,9 +190,9 @@ <div class="title"> <div class="breadcrumbs"> %if c.repo_changesets: - ${h.link_to(_('Latest changes'),h.url('changelog_home',repo_name=c.repo_name))} + ${h.link_to(_('Latest Changes'),h.url('changelog_home',repo_name=c.repo_name))} %else: - ${_('Quick start')} + ${_('Quick Start')} %endif </div> </div>
--- a/kallithea/templates/tags/tags.html Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/templates/tags/tags.html Fri Sep 19 14:18:56 2014 +0200 @@ -26,7 +26,7 @@ </div> <!-- end box / title --> %if c.repo_tags: - <div class="info_box" id="compare_tags" style="clear: both;padding: 10px 19px;text-align: right;"><a href="#" class="btn btn-small">${_('Compare tags')}</a></div> + <div class="info_box" id="compare_tags" style="clear: both;padding: 10px 19px;text-align: right;"><a href="#" class="btn btn-small">${_('Compare Tags')}</a></div> %endif <div class="table"> <%include file='tags_data.html'/>
--- a/kallithea/tests/functional/test_admin.py Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/tests/functional/test_admin.py Fri Sep 19 14:18:56 2014 +0200 @@ -52,7 +52,7 @@ def test_index(self): self.log_user() response = self.app.get(url(controller='admin/admin', action='index')) - response.mustcontain('Admin journal') + response.mustcontain('Admin Journal') def test_filter_all_entries(self): self.log_user()
--- a/kallithea/tests/functional/test_files.py Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/tests/functional/test_files.py Fri Sep 19 14:18:56 2014 +0200 @@ -315,7 +315,7 @@ ) response.mustcontain("vcs/web/simplevcs/views/repository.py") - #HG - ADD FILE + # Hg - ADD FILE def test_add_file_view_hg(self): self.log_user() response = self.app.get(url('files_add_home', @@ -388,7 +388,7 @@ finally: fixture.destroy_repo(repo.repo_name) - ##GIT - ADD FILE + # Git - add file def test_add_file_view_git(self): self.log_user() response = self.app.get(url('files_add_home', @@ -460,7 +460,7 @@ finally: fixture.destroy_repo(repo.repo_name) - #HG - EDIT + # Hg - EDIT def test_edit_file_view_hg(self): self.log_user() response = self.app.get(url('files_edit_home', @@ -531,7 +531,7 @@ finally: fixture.destroy_repo(repo.repo_name) - #GIT - EDIT + # Git - edit def test_edit_file_view_git(self): self.log_user() response = self.app.get(url('files_edit_home', @@ -602,7 +602,7 @@ finally: fixture.destroy_repo(repo.repo_name) - # HG - delete + # Hg - delete def test_delete_file_view_hg(self): self.log_user() response = self.app.get(url('files_delete_home', @@ -672,7 +672,7 @@ finally: fixture.destroy_repo(repo.repo_name) - # GIT - delete + # Git - delete def test_delete_file_view_git(self): self.log_user() response = self.app.get(url('files_delete_home',
--- a/kallithea/tests/functional/test_login.py Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/tests/functional/test_login.py Fri Sep 19 14:18:56 2014 +0200 @@ -59,7 +59,7 @@ response = response.follow() self.assertEqual(response.status, '200 OK') - response.mustcontain('Users administration') + response.mustcontain('Users Administration') @parameterized.expand([ ('data:text/html,<script>window.alert("xss")</script>',),
--- a/kallithea/tests/functional/test_search.py Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/tests/functional/test_search.py Fri Sep 19 14:18:56 2014 +0200 @@ -92,9 +92,9 @@ 'type': 'commit'}) response.mustcontain('2 results') - #HG + # Hg response.mustcontain('3803844fdbd3b711175fc3da9bdacfcd6d29a6fb') - #GIT + # Git response.mustcontain('ff7ca51e58c505fec0dd2491de52c622bb7a806b') def test_search_author(self):
--- a/kallithea/tests/other/test_vcs_operations.py Fri Sep 19 10:54:51 2014 +0200 +++ b/kallithea/tests/other/test_vcs_operations.py Fri Sep 19 14:18:56 2014 +0200 @@ -155,7 +155,7 @@ def _check_proper_git_push(stdout, stderr): - #WTF GIT stderr is output ?! + #WTF Git stderr is output ?! assert 'fatal' not in stderr assert 'rejected' not in stderr assert 'Pushing to' in stderr @@ -427,7 +427,7 @@ err = 'Repository `%s` locked by user `%s`' % (GIT_REPO, TEST_USER_ADMIN_LOGIN) assert err in stderr - #TODO: fix this somehow later on GIT, GIT is stupid and even if we throw + #TODO: fix this somehow later on Git, Git is stupid and even if we throw #back 423 to it, it makes ANOTHER request and we fail there with 405 :/ msg = ("""abort: HTTP Error 423: Repository `%s` locked by user `%s`""" @@ -459,7 +459,7 @@ r = Repository.get_by_repo_name(HG_REPO) assert r.locked == [None, None] - #TODO: fix me ! somehow during tests hooks don't get called on GIT + #TODO: fix me ! somehow during tests hooks don't get called on Git def test_push_unlocks_repository_git(self): # enable locking r = Repository.get_by_repo_name(GIT_REPO)
--- a/production.ini Fri Sep 19 10:54:51 2014 +0200 +++ b/production.ini Fri Sep 19 14:18:56 2014 +0200 @@ -254,7 +254,7 @@ instance_id = ## alternative return HTTP header for failed authentication. Default HTTP -## response is 401 HTTPUnauthorized. Currently HG clients have troubles with +## response is 401 HTTPUnauthorized. Currently Mercurial clients have trouble with ## handling that. Set this variable to 403 to return HTTPForbidden auth_ret_code =
--- a/test.ini Fri Sep 19 10:54:51 2014 +0200 +++ b/test.ini Fri Sep 19 14:18:56 2014 +0200 @@ -256,7 +256,7 @@ instance_id = ## alternative return HTTP header for failed authentication. Default HTTP -## response is 401 HTTPUnauthorized. Currently HG clients have troubles with +## response is 401 HTTPUnauthorized. Currently Mercurial clients have trouble with ## handling that. Set this variable to 403 to return HTTPForbidden auth_ret_code =