# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1431473270 -7200
# Node ID 86b1f3cfe83636dd6f0be0c7c604f7e8f6d47bdd
# Parent  5c6cc20d224b8d2005360109149091a5efbfde6b
spelling: fix title casing on various translated strings

Primarily captions on other not-just-text and data.

diff -r 5c6cc20d224b -r 86b1f3cfe836 kallithea/controllers/admin/gists.py
--- a/kallithea/controllers/admin/gists.py	Wed May 13 01:27:50 2015 +0200
+++ b/kallithea/controllers/admin/gists.py	Wed May 13 01:27:50 2015 +0200
@@ -56,7 +56,7 @@
 
     def __load_defaults(self, extra_values=None):
         c.lifetime_values = [
-            (str(-1), _('forever')),
+            (str(-1), _('Forever')),
             (str(5), _('5 minutes')),
             (str(60), _('1 hour')),
             (str(60 * 24), _('1 day')),
@@ -230,7 +230,7 @@
             log.error(traceback.format_exc())
             raise HTTPNotFound()
 
-        self.__load_defaults(extra_values=('0', _('unmodified')))
+        self.__load_defaults(extra_values=('0', _('Unmodified')))
         rendered = render('admin/gists/edit.html')
 
         if request.POST:
diff -r 5c6cc20d224b -r 86b1f3cfe836 kallithea/controllers/admin/my_account.py
--- a/kallithea/controllers/admin/my_account.py	Wed May 13 01:27:50 2015 +0200
+++ b/kallithea/controllers/admin/my_account.py	Wed May 13 01:27:50 2015 +0200
@@ -235,7 +235,7 @@
         self.__load_data()
         show_expired = True
         c.lifetime_values = [
-            (str(-1), _('forever')),
+            (str(-1), _('Forever')),
             (str(5), _('5 minutes')),
             (str(60), _('1 hour')),
             (str(60 * 24), _('1 day')),
diff -r 5c6cc20d224b -r 86b1f3cfe836 kallithea/controllers/admin/users.py
--- a/kallithea/controllers/admin/users.py	Wed May 13 01:27:50 2015 +0200
+++ b/kallithea/controllers/admin/users.py	Wed May 13 01:27:50 2015 +0200
@@ -285,7 +285,7 @@
         c.active = 'api_keys'
         show_expired = True
         c.lifetime_values = [
-            (str(-1), _('forever')),
+            (str(-1), _('Forever')),
             (str(5), _('5 minutes')),
             (str(60), _('1 hour')),
             (str(60 * 24), _('1 day')),
diff -r 5c6cc20d224b -r 86b1f3cfe836 kallithea/controllers/changeset.py
--- a/kallithea/controllers/changeset.py	Wed May 13 01:27:50 2015 +0200
+++ b/kallithea/controllers/changeset.py	Wed May 13 01:27:50 2015 +0200
@@ -166,7 +166,7 @@
     if ig_ws:
         params[ig_ws_key] += [ig_ws_val]
 
-    lbl = _('increase diff context to %(num)s lines') % {'num': ln_ctx}
+    lbl = _('Increase diff context to %(num)s lines') % {'num': ln_ctx}
 
     params['anchor'] = fileid
     icon = h.literal('<i class="icon-sort"></i>')
diff -r 5c6cc20d224b -r 86b1f3cfe836 kallithea/controllers/journal.py
--- a/kallithea/controllers/journal.py	Wed May 13 01:27:50 2015 +0200
+++ b/kallithea/controllers/journal.py	Wed May 13 01:27:50 2015 +0200
@@ -108,11 +108,11 @@
         journal = self._get_journal_data(repos)
         if public:
             _link = h.canonical_url('public_journal_atom')
-            _desc = '%s %s %s' % (c.site_name, _('public journal'),
+            _desc = '%s %s %s' % (c.site_name, _('Public Journal'),
                                   'atom feed')
         else:
             _link = h.canonical_url('journal_atom')
-            _desc = '%s %s %s' % (c.site_name, _('journal'), 'atom feed')
+            _desc = '%s %s %s' % (c.site_name, _('Journal'), 'atom feed')
 
         feed = Atom1Feed(title=_desc,
                          link=_link,
@@ -150,11 +150,11 @@
         journal = self._get_journal_data(repos)
         if public:
             _link = h.canonical_url('public_journal_atom')
-            _desc = '%s %s %s' % (c.site_name, _('public journal'),
+            _desc = '%s %s %s' % (c.site_name, _('Public Journal'),
                                   'rss feed')
         else:
             _link = h.canonical_url('journal_atom')
-            _desc = '%s %s %s' % (c.site_name, _('journal'), 'rss feed')
+            _desc = '%s %s %s' % (c.site_name, _('Journal'), 'rss feed')
 
         feed = Rss201rev2Feed(title=_desc,
                          link=_link,
diff -r 5c6cc20d224b -r 86b1f3cfe836 kallithea/controllers/login.py
--- a/kallithea/controllers/login.py	Wed May 13 01:27:50 2015 +0200
+++ b/kallithea/controllers/login.py	Wed May 13 01:27:50 2015 +0200
@@ -185,7 +185,7 @@
                                       remoteip=self.ip_addr)
                     if c.captcha_active and not response.is_valid:
                         _value = form_result
-                        _msg = _('bad captcha')
+                        _msg = _('Bad captcha')
                         error_dict = {'recaptcha_field': _msg}
                         raise formencode.Invalid(_msg, _value, None,
                                                  error_dict=error_dict)
@@ -231,7 +231,7 @@
                                       remoteip=self.ip_addr)
                     if c.captcha_active and not response.is_valid:
                         _value = form_result
-                        _msg = _('bad captcha')
+                        _msg = _('Bad captcha')
                         error_dict = {'recaptcha_field': _msg}
                         raise formencode.Invalid(_msg, _value, None,
                                                  error_dict=error_dict)
diff -r 5c6cc20d224b -r 86b1f3cfe836 kallithea/lib/helpers.py
--- a/kallithea/lib/helpers.py	Wed May 13 01:27:50 2015 +0200
+++ b/kallithea/lib/helpers.py	Wed May 13 01:27:50 2015 +0200
@@ -679,7 +679,7 @@
                 url('changeset_home', repo_name=repo_name,
                     revision=_rev
                 ),
-                _('compare view')
+                _('Compare view')
             )
         )
 
@@ -724,7 +724,7 @@
     def get_fork_name():
         repo_name = action_params
         _url = url('summary_home', repo_name=repo_name)
-        return _('fork name %s') % link_to(action_params, _url)
+        return _('Fork name %s') % link_to(action_params, _url)
 
     def get_user_name():
         user_name = action_params
diff -r 5c6cc20d224b -r 86b1f3cfe836 kallithea/model/db.py
--- a/kallithea/model/db.py	Wed May 13 01:27:50 2015 +0200
+++ b/kallithea/model/db.py	Wed May 13 01:27:50 2015 +0200
@@ -1498,7 +1498,7 @@
 
         repo_groups = []
         if show_empty_group:
-            repo_groups = [('-1', u'-- %s --' % _('top level'))]
+            repo_groups = [('-1', u'-- %s --' % _('Top level'))]
 
         repo_groups.extend([cls._generate_choice(x) for x in groups])
 
diff -r 5c6cc20d224b -r 86b1f3cfe836 kallithea/templates/admin/my_account/my_account_emails.html
--- a/kallithea/templates/admin/my_account/my_account_emails.html	Wed May 13 01:27:50 2015 +0200
+++ b/kallithea/templates/admin/my_account/my_account_emails.html	Wed May 13 01:27:50 2015 +0200
@@ -16,7 +16,7 @@
                 ${h.form(url('my_account_emails'),method='delete')}
                     ${h.hidden('del_email_id',em.email_id)}
                     <i class="icon-minus-circled" style="color:#FF4444"></i>
-                    ${h.submit('remove_',_('delete'),id="remove_email_%s" % em.email_id,
+                    ${h.submit('remove_',_('Delete'),id="remove_email_%s" % em.email_id,
                     class_="action_button", onclick="return  confirm('"+_('Confirm to delete this email: %s') % em.email+"');")}
                 ${h.end_form()}
             </td>
diff -r 5c6cc20d224b -r 86b1f3cfe836 kallithea/templates/admin/permissions/permissions_ips.html
--- a/kallithea/templates/admin/permissions/permissions_ips.html	Wed May 13 01:27:50 2015 +0200
+++ b/kallithea/templates/admin/permissions/permissions_ips.html	Wed May 13 01:27:50 2015 +0200
@@ -9,7 +9,7 @@
                 ${h.form(url('edit_user_ips', id=c.user.user_id),method='delete')}
                     ${h.hidden('del_ip_id',ip.ip_id)}
                     ${h.hidden('default_user', 'True')}
-                    <i class="icon-minus-circled" style="color:#FF4444"></i> ${h.submit('remove_',_('delete'),id="remove_ip_%s" % ip.ip_id,
+                    <i class="icon-minus-circled" style="color:#FF4444"></i> ${h.submit('remove_',_('Delete'),id="remove_ip_%s" % ip.ip_id,
                     class_="action_button", onclick="return confirm('"+_('Confirm to delete this IP address: %s') % ip.ip_addr+"');")}
                 ${h.end_form()}
               </td>
diff -r 5c6cc20d224b -r 86b1f3cfe836 kallithea/templates/admin/repo_groups/repo_group_edit_perms.html
--- a/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html	Wed May 13 01:27:50 2015 +0200
+++ b/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html	Wed May 13 01:27:50 2015 +0200
@@ -25,7 +25,7 @@
                             %if h.HasPermissionAny('hg.admin')() and r2p.user.username != 'default':
                              <a href="${h.url('edit_user',id=r2p.user.user_id)}">${r2p.user.username}</a>
                             %else:
-                             ${r2p.user.username if r2p.user.username != 'default' else _('default')}
+                             ${r2p.user.username if r2p.user.username != 'default' else _('Default')}
                             %endif
                         </td>
                         <td>
@@ -42,7 +42,7 @@
                         <td>${h.radio('u_perm_%s' % r2p.user.username,'group.admin', disabled="disabled")}</td>
                         <td style="white-space: nowrap;">
                             ${h.gravatar(r2p.user.email, cls="perm-gravatar", size=14)}
-                            ${r2p.user.username if r2p.user.username != 'default' else _('default')}
+                            ${r2p.user.username if r2p.user.username != 'default' else _('Default')}
                         </td>
                         <td><i class="icon-user"></i> ${_('Delegated Admin')}</td>
                         %endif
diff -r 5c6cc20d224b -r 86b1f3cfe836 kallithea/templates/admin/repos/repo_edit_fields.html
--- a/kallithea/templates/admin/repos/repo_edit_fields.html	Wed May 13 01:27:50 2015 +0200
+++ b/kallithea/templates/admin/repos/repo_edit_fields.html	Wed May 13 01:27:50 2015 +0200
@@ -15,7 +15,7 @@
             <td>
               ${h.form(url('delete_repo_fields', repo_name=c.repo_info.repo_name, field_id=field.repo_field_id),method='delete')}
                   <i class="icon-minus-circled" style="color:#FF4444"></i>
-                  ${h.submit('remove_%s' % field.repo_field_id, _('delete'), id="remove_field_%s" % field.repo_field_id,
+                  ${h.submit('remove_%s' % field.repo_field_id, _('Delete'), id="remove_field_%s" % field.repo_field_id,
                   class_="action_button", onclick="return confirm('"+_('Confirm to delete this field: %s') % field.field_key+"');")}
               ${h.end_form()}
             </td>
diff -r 5c6cc20d224b -r 86b1f3cfe836 kallithea/templates/admin/repos/repo_edit_permissions.html
--- a/kallithea/templates/admin/repos/repo_edit_permissions.html	Wed May 13 01:27:50 2015 +0200
+++ b/kallithea/templates/admin/repos/repo_edit_permissions.html	Wed May 13 01:27:50 2015 +0200
@@ -34,7 +34,7 @@
                             %if h.HasPermissionAny('hg.admin')() and r2p.user.username != 'default':
                              <a href="${h.url('edit_user',id=r2p.user.user_id)}">${r2p.user.username}</a>
                             %else:
-                             ${r2p.user.username if r2p.user.username != 'default' else _('default')}
+                             ${r2p.user.username if r2p.user.username != 'default' else _('Default')}
                             %endif
                         </td>
                         <td>
diff -r 5c6cc20d224b -r 86b1f3cfe836 kallithea/templates/admin/settings/settings_system.html
--- a/kallithea/templates/admin/settings/settings_system.html	Wed May 13 01:27:50 2015 +0200
+++ b/kallithea/templates/admin/settings/settings_system.html	Wed May 13 01:27:50 2015 +0200
@@ -1,7 +1,7 @@
 <dl class="dl-horizontal">
 <%
  elems = [
-    (_('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'))), ''),
+    (_('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, ''),
diff -r 5c6cc20d224b -r 86b1f3cfe836 kallithea/templates/admin/user_groups/user_group_edit_perms.html
--- a/kallithea/templates/admin/user_groups/user_group_edit_perms.html	Wed May 13 01:27:50 2015 +0200
+++ b/kallithea/templates/admin/user_groups/user_group_edit_perms.html	Wed May 13 01:27:50 2015 +0200
@@ -25,7 +25,7 @@
                             %if h.HasPermissionAny('hg.admin')() and r2p.user.username != 'default':
                              <a href="${h.url('edit_user',id=r2p.user.user_id)}">${r2p.user.username}</a>
                             %else:
-                             ${r2p.user.username if r2p.user.username != 'default' else _('default')}
+                             ${r2p.user.username if r2p.user.username != 'default' else _('Default')}
                             %endif
                         </td>
                         <td>
@@ -42,7 +42,7 @@
                         <td>${h.radio('u_perm_%s' % r2p.user.username,'usergroup.admin', disabled="disabled")}</td>
                         <td style="white-space: nowrap;">
                             ${h.gravatar(r2p.user.email, cls="perm-gravatar", size=14)}
-                            ${r2p.user.username if r2p.user.username != 'default' else _('default')}
+                            ${r2p.user.username if r2p.user.username != 'default' else _('Default')}
                         </td>
                         <td><i class="icon-user"></i> ${_('Delegated Admin')}</td>
                         %endif
diff -r 5c6cc20d224b -r 86b1f3cfe836 kallithea/templates/admin/users/user_edit_emails.html
--- a/kallithea/templates/admin/users/user_edit_emails.html	Wed May 13 01:27:50 2015 +0200
+++ b/kallithea/templates/admin/users/user_edit_emails.html	Wed May 13 01:27:50 2015 +0200
@@ -16,7 +16,7 @@
                 ${h.form(url('edit_user_emails', id=c.user.user_id),method='delete')}
                     ${h.hidden('del_email_id',em.email_id)}
                     <i class="icon-minus-circled" style="color:#FF4444"></i>
-                    ${h.submit('remove_',_('delete'),id="remove_email_%s" % em.email_id,
+                    ${h.submit('remove_',_('Delete'),id="remove_email_%s" % em.email_id,
                     class_="action_button", onclick="return  confirm('"+_('Confirm to delete this email: %s') % em.email+"');")}
                 ${h.end_form()}
             </td>
diff -r 5c6cc20d224b -r 86b1f3cfe836 kallithea/templates/admin/users/user_edit_ips.html
--- a/kallithea/templates/admin/users/user_edit_ips.html	Wed May 13 01:27:50 2015 +0200
+++ b/kallithea/templates/admin/users/user_edit_ips.html	Wed May 13 01:27:50 2015 +0200
@@ -19,7 +19,7 @@
                 ${h.form(url('edit_user_ips', id=c.user.user_id),method='delete')}
                     ${h.hidden('del_ip_id',ip.ip_id)}
                     <i class="icon-minus-circled" style="color:#FF4444"></i>
-                    ${h.submit('remove_',_('delete'),id="remove_ip_%s" % ip.ip_id,
+                    ${h.submit('remove_',_('Delete'),id="remove_ip_%s" % ip.ip_id,
                     class_="action_button", onclick="return  confirm('"+_('Confirm to delete this IP address: %s') % ip.ip_addr+"');")}
                 ${h.end_form()}
             </td>
diff -r 5c6cc20d224b -r 86b1f3cfe836 kallithea/templates/data_table/_dt_elements.html
--- a/kallithea/templates/data_table/_dt_elements.html	Wed May 13 01:27:50 2015 +0200
+++ b/kallithea/templates/data_table/_dt_elements.html	Wed May 13 01:27:50 2015 +0200
@@ -120,13 +120,13 @@
   <div>
     <div style="float:left; margin-right:5px;" class="grid_edit">
       <a href="${h.url('edit_repo',repo_name=repo_name)}" title="${_('Edit')}">
-        <i class="icon-pencil"></i> ${h.submit('edit_%s' % repo_name,_('edit'),class_="action_button")}
+        <i class="icon-pencil"></i> ${h.submit('edit_%s' % repo_name,_('Edit'),class_="action_button")}
       </a>
     </div>
     <div style="float:left" class="grid_delete">
       ${h.form(h.url('repo', repo_name=repo_name),method='delete')}
         <i class="icon-minus-circled" style="color:#FF4444"></i>
-        ${h.submit('remove_%s' % repo_name,_('delete'),class_="action_button",
+        ${h.submit('remove_%s' % repo_name,_('Delete'),class_="action_button",
         onclick="return confirm('"+_('Confirm to delete this repository: %s') % repo_name+"');")}
       ${h.end_form()}
     </div>
@@ -148,13 +148,13 @@
 <%def name="user_actions(user_id, username)">
  <div style="float:left" class="grid_edit">
    <a href="${h.url('edit_user',id=user_id)}" title="${_('Edit')}">
-     <i class="icon-pencil"></i> ${h.submit('edit_%s' % username,_('edit'),class_="action_button")}
+     <i class="icon-pencil"></i> ${h.submit('edit_%s' % username,_('Edit'),class_="action_button")}
    </a>
  </div>
  <div style="float:left" class="grid_delete">
   ${h.form(h.url('delete_user', id=user_id),method='delete')}
     <i class="icon-minus-circled" style="color:#FF4444"></i>
-    ${h.submit('remove_',_('delete'),id="remove_user_%s" % user_id, class_="action_button",
+    ${h.submit('remove_',_('Delete'),id="remove_user_%s" % user_id, class_="action_button",
     onclick="return confirm('"+_('Confirm to delete this user: %s') % username+"');")}
   ${h.end_form()}
  </div>
@@ -164,13 +164,13 @@
  <div style="float:left" class="grid_edit">
     <a href="${h.url('edit_users_group', id=user_group_id)}" title="${_('Edit')}">
     <i class="icon-pencil"></i>
-     ${h.submit('edit_%s' % user_group_name,_('edit'),class_="action_button", id_="submit_user_group_edit")}
+     ${h.submit('edit_%s' % user_group_name,_('Edit'),class_="action_button", id_="submit_user_group_edit")}
     </a>
  </div>
  <div style="float:left" class="grid_delete">
     ${h.form(h.url('users_group', id=user_group_id),method='delete')}
       <i class="icon-minus-circled" style="color:#FF4444"></i>
-      ${h.submit('remove_',_('delete'),id="remove_group_%s" % user_group_id, class_="action_button",
+      ${h.submit('remove_',_('Delete'),id="remove_group_%s" % user_group_id, class_="action_button",
       onclick="return confirm('"+_('Confirm to delete this user group: %s') % user_group_name+"');")}
     ${h.end_form()}
  </div>
@@ -180,13 +180,13 @@
  <div style="float:left" class="grid_edit">
     <a href="${h.url('edit_repo_group',group_name=repo_group_name)}" title="${_('Edit')}">
     <i class="icon-pencil"></i>
-     ${h.submit('edit_%s' % repo_group_name, _('edit'),class_="action_button")}
+     ${h.submit('edit_%s' % repo_group_name, _('Edit'),class_="action_button")}
     </a>
  </div>
  <div style="float:left" class="grid_delete">
     ${h.form(h.url('repos_group', group_name=repo_group_name),method='delete')}
         <i class="icon-minus-circled" style="color:#FF4444"></i>
-        ${h.submit('remove_%s' % repo_group_name,_('delete'),class_="action_button",
+        ${h.submit('remove_%s' % repo_group_name,_('Delete'),class_="action_button",
         onclick="return confirm('"+ungettext('Confirm to delete this group: %s with %s repository','Confirm to delete this group: %s with %s repositories',gr_count) % (repo_group_name, gr_count)+"');")}
     ${h.end_form()}
  </div>
diff -r 5c6cc20d224b -r 86b1f3cfe836 kallithea/tests/functional/test_admin_users.py
--- a/kallithea/tests/functional/test_admin_users.py	Wed May 13 01:27:50 2015 +0200
+++ b/kallithea/tests/functional/test_admin_users.py	Wed May 13 01:27:50 2015 +0200
@@ -438,7 +438,7 @@
         user = User.get_by_username(TEST_USER_REGULAR_LOGIN)
         response = self.app.get(url('edit_user_api_keys', id=user.user_id))
         response.mustcontain(user.api_key)
-        response.mustcontain('expires: never')
+        response.mustcontain('Expires: Never')
 
     @parameterized.expand([
         ('forever', -1),
@@ -490,7 +490,7 @@
         api_key = user.api_key
         response = self.app.get(url('edit_user_api_keys', id=user_id))
         response.mustcontain(api_key)
-        response.mustcontain('expires: never')
+        response.mustcontain('Expires: Never')
 
         response = self.app.post(url('edit_user_api_keys', id=user_id),
                  {'_method': 'delete', 'del_api_key_builtin': api_key, '_authentication_token': self.authentication_token()})
diff -r 5c6cc20d224b -r 86b1f3cfe836 kallithea/tests/functional/test_my_account.py
--- a/kallithea/tests/functional/test_my_account.py	Wed May 13 01:27:50 2015 +0200
+++ b/kallithea/tests/functional/test_my_account.py	Wed May 13 01:27:50 2015 +0200
@@ -189,7 +189,7 @@
         user = User.get(usr['user_id'])
         response = self.app.get(url('my_account_api_keys'))
         response.mustcontain(user.api_key)
-        response.mustcontain('expires: never')
+        response.mustcontain('Expires: Never')
 
     @parameterized.expand([
         ('forever', -1),
@@ -237,7 +237,7 @@
         api_key = user.api_key
         response = self.app.get(url('my_account_api_keys'))
         response.mustcontain(api_key)
-        response.mustcontain('expires: never')
+        response.mustcontain('Expires: Never')
 
         response = self.app.post(url('my_account_api_keys'),
                  {'_method': 'delete', 'del_api_key_builtin': api_key, '_authentication_token': self.authentication_token()})