Changeset - 38e418408c58
kallithea/controllers/login.py
Show inline comments
 
@@ -54,193 +54,193 @@ class LoginController(BaseController):
 

	
 
    def __before__(self):
 
        super(LoginController, self).__before__()
 

	
 
    def _validate_came_from(self, came_from,
 
            _re=re.compile(r"/(?!/)[-!#$%&'()*+,./:;=?@_~0-9A-Za-z]*$")):
 
        """Return True if came_from is valid and can and should be used.
 

	
 
        Determines if a URI reference is valid and relative to the origin;
 
        or in RFC 3986 terms, whether it matches this production:
 

	
 
          origin-relative-ref = path-absolute [ "?" query ] [ "#" fragment ]
 

	
 
        with the exception that '%' escapes are not validated and '#' is
 
        allowed inside the fragment part.
 
        """
 
        return _re.match(came_from) is not None
 

	
 
    def index(self):
 
        c.came_from = safe_str(request.GET.get('came_from', ''))
 
        if c.came_from:
 
            if not self._validate_came_from(c.came_from):
 
                log.error('Invalid came_from (not server-relative): %r', c.came_from)
 
                raise HTTPBadRequest()
 
        else:
 
            c.came_from = url('home')
 

	
 
        ip_allowed = AuthUser.check_ip_allowed(self.authuser, self.ip_addr)
 

	
 
        # redirect if already logged in
 
        if self.authuser.is_authenticated and ip_allowed:
 
            raise HTTPFound(location=c.came_from)
 

	
 
        if request.POST:
 
            # import Login Form validator class
 
            login_form = LoginForm()
 
            try:
 
                c.form_result = login_form.to_python(dict(request.POST))
 
                # form checks for username/password, now we're authenticated
 
                username = c.form_result['username']
 
                user = User.get_by_username_or_email(username, case_insensitive=True)
 
            except formencode.Invalid as errors:
 
                defaults = errors.value
 
                # remove password from filling in form again
 
                defaults.pop('password', None)
 
                return htmlfill.render(
 
                    render('/login.html'),
 
                    defaults=errors.value,
 
                    errors=errors.error_dict or {},
 
                    prefix_error=False,
 
                    encoding="UTF-8",
 
                    force_defaults=False)
 
            except UserCreationError as e:
 
                # container auth or other auth functions that create users on
 
                # the fly can throw this exception signaling that there's issue
 
                # with user creation, explanation should be provided in
 
                # Exception itself
 
                h.flash(e, 'error')
 
            else:
 
                log_in_user(user, c.form_result['remember'],
 
                    is_external_auth=False)
 
                raise HTTPFound(location=c.came_from)
 

	
 
        return render('/login.html')
 

	
 
    @HasPermissionAnyDecorator('hg.admin', 'hg.register.auto_activate',
 
                               'hg.register.manual_activate')
 
    def register(self):
 
        c.auto_active = 'hg.register.auto_activate' in User.get_default_user() \
 
            .AuthUser.permissions['global']
 

	
 
        settings = Setting.get_app_settings()
 
        captcha_private_key = settings.get('captcha_private_key')
 
        c.captcha_active = bool(captcha_private_key)
 
        c.captcha_public_key = settings.get('captcha_public_key')
 

	
 
        if request.POST:
 
            register_form = RegisterForm()()
 
            try:
 
                form_result = register_form.to_python(dict(request.POST))
 
                form_result['active'] = c.auto_active
 

	
 
                if c.captcha_active:
 
                    from kallithea.lib.recaptcha import submit
 
                    response = submit(request.POST.get('recaptcha_challenge_field'),
 
                                      request.POST.get('recaptcha_response_field'),
 
                                      private_key=captcha_private_key,
 
                                      remoteip=self.ip_addr)
 
                    if c.captcha_active and not response.is_valid:
 
                        _value = form_result
 
                        _msg = _('Bad captcha')
 
                        error_dict = {'recaptcha_field': _msg}
 
                        raise formencode.Invalid(_msg, _value, None,
 
                                                 error_dict=error_dict)
 

	
 
                UserModel().create_registration(form_result)
 
                h.flash(_('You have successfully registered into Kallithea'),
 
                h.flash(_('You have successfully registered with %s') % (c.site_name or 'Kallithea'),
 
                        category='success')
 
                Session().commit()
 
                raise HTTPFound(location=url('login_home'))
 

	
 
            except formencode.Invalid as errors:
 
                return htmlfill.render(
 
                    render('/register.html'),
 
                    defaults=errors.value,
 
                    errors=errors.error_dict or {},
 
                    prefix_error=False,
 
                    encoding="UTF-8",
 
                    force_defaults=False)
 
            except UserCreationError as e:
 
                # container auth or other auth functions that create users on
 
                # the fly can throw this exception signaling that there's issue
 
                # with user creation, explanation should be provided in
 
                # Exception itself
 
                h.flash(e, 'error')
 

	
 
        return render('/register.html')
 

	
 
    def password_reset(self):
 
        settings = Setting.get_app_settings()
 
        captcha_private_key = settings.get('captcha_private_key')
 
        c.captcha_active = bool(captcha_private_key)
 
        c.captcha_public_key = settings.get('captcha_public_key')
 

	
 
        if request.POST:
 
            password_reset_form = PasswordResetRequestForm()()
 
            try:
 
                form_result = password_reset_form.to_python(dict(request.POST))
 
                if c.captcha_active:
 
                    from kallithea.lib.recaptcha import submit
 
                    response = submit(request.POST.get('recaptcha_challenge_field'),
 
                                      request.POST.get('recaptcha_response_field'),
 
                                      private_key=captcha_private_key,
 
                                      remoteip=self.ip_addr)
 
                    if c.captcha_active and not response.is_valid:
 
                        _value = form_result
 
                        _msg = _('Bad captcha')
 
                        error_dict = {'recaptcha_field': _msg}
 
                        raise formencode.Invalid(_msg, _value, None,
 
                                                 error_dict=error_dict)
 
                redirect_link = UserModel().send_reset_password_email(form_result)
 
                h.flash(_('A password reset confirmation code has been sent'),
 
                            category='success')
 
                raise HTTPFound(location=redirect_link)
 

	
 
            except formencode.Invalid as errors:
 
                return htmlfill.render(
 
                    render('/password_reset.html'),
 
                    defaults=errors.value,
 
                    errors=errors.error_dict or {},
 
                    prefix_error=False,
 
                    encoding="UTF-8",
 
                    force_defaults=False)
 

	
 
        return render('/password_reset.html')
 

	
 
    def password_reset_confirmation(self):
 
        # This controller handles both GET and POST requests, though we
 
        # only ever perform the actual password change on POST (since
 
        # GET requests are not allowed to have side effects, and do not
 
        # receive automatic CSRF protection).
 

	
 
        # The template needs the email address outside of the form.
 
        c.email = request.params.get('email')
 

	
 
        if not request.POST:
 
            return htmlfill.render(
 
                render('/password_reset_confirmation.html'),
 
                defaults=dict(request.params),
 
                encoding='UTF-8')
 

	
 
        form = PasswordResetConfirmationForm()()
 
        try:
 
            form_result = form.to_python(dict(request.POST))
 
        except formencode.Invalid as errors:
 
            return htmlfill.render(
 
                render('/password_reset_confirmation.html'),
 
                defaults=errors.value,
 
                errors=errors.error_dict or {},
 
                prefix_error=False,
 
                encoding='UTF-8')
 

	
 
        if not UserModel().verify_reset_password_token(
 
            form_result['email'],
 
            form_result['timestamp'],
 
            form_result['token'],
 
        ):
 
            return htmlfill.render(
 
                render('/password_reset_confirmation.html'),
 
                defaults=form_result,
 
                errors={'token': _('Invalid password reset token')},
 
                prefix_error=False,
 
                encoding='UTF-8')
kallithea/i18n/be/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -204,194 +204,194 @@ msgstr ""
 

	
 
#: kallithea/controllers/files.py:528
 
msgid "Downloads disabled"
 
msgstr "Магчымасць спампоўваць адключаная"
 

	
 
#: kallithea/controllers/files.py:539
 
#, python-format
 
msgid "Unknown revision %s"
 
msgstr "Невядомая рэвізія %s"
 

	
 
#: kallithea/controllers/files.py:541
 
msgid "Empty repository"
 
msgstr "Пусты рэпазітар"
 

	
 
#: kallithea/controllers/files.py:543
 
msgid "Unknown archive type"
 
msgstr "Невядомы тып архіва"
 

	
 
#: kallithea/controllers/files.py:773
 
#: kallithea/templates/changeset/changeset_range.html:9
 
#: kallithea/templates/email_templates/pull_request.html:15
 
#: kallithea/templates/pullrequests/pullrequest.html:97
 
msgid "Changesets"
 
msgstr "Набор змен"
 

	
 
#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:175
 
#: kallithea/model/scm.py:716 kallithea/templates/switch_to_list.html:3
 
#: kallithea/templates/branches/branches.html:10
 
msgid "Branches"
 
msgstr "Галіны"
 

	
 
#: kallithea/controllers/files.py:775 kallithea/controllers/pullrequests.py:176
 
#: kallithea/model/scm.py:727 kallithea/templates/switch_to_list.html:25
 
#: kallithea/templates/tags/tags.html:10
 
msgid "Tags"
 
msgstr "Тэгі"
 

	
 
#: kallithea/controllers/forks.py:186
 
#, python-format
 
msgid "An error occurred during repository forking %s"
 
msgstr "Памылка падчас стварэння форка рэпазітара %s"
 

	
 
#: kallithea/controllers/home.py:84
 
msgid "Groups"
 
msgstr "Групы"
 

	
 
#: kallithea/controllers/home.py:94
 
#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106
 
#: kallithea/templates/admin/repos/repo_add.html:12
 
#: kallithea/templates/admin/repos/repo_add.html:16
 
#: kallithea/templates/admin/repos/repos.html:9
 
#: kallithea/templates/admin/users/user_edit_advanced.html:6
 
#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77
 
#: kallithea/templates/base/base.html:124
 
#: kallithea/templates/base/base.html:479
 
#: kallithea/templates/base/base.html:653
 
msgid "Repositories"
 
msgstr "Рэпазітары"
 

	
 
#: kallithea/controllers/home.py:139
 
#: kallithea/templates/files/files_add.html:32
 
#: kallithea/templates/files/files_delete.html:23
 
#: kallithea/templates/files/files_edit.html:32
 
msgid "Branch"
 
msgstr "Галіна"
 

	
 
#: kallithea/controllers/home.py:145 kallithea/templates/switch_to_list.html:16
 
msgid "Closed Branches"
 
msgstr "Зачыненыя галіны"
 

	
 
#: kallithea/controllers/home.py:151
 
msgid "Tag"
 
msgstr "Тэгі"
 

	
 
#: kallithea/controllers/home.py:157
 
msgid "Bookmark"
 
msgstr "Закладкі"
 

	
 
#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153
 
#: kallithea/templates/journal/public_journal.html:4
 
#: kallithea/templates/journal/public_journal.html:21
 
msgid "Public Journal"
 
msgstr "Публічны журнал"
 

	
 
#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157
 
#: kallithea/templates/base/base.html:306
 
#: kallithea/templates/journal/journal.html:4
 
#: kallithea/templates/journal/journal.html:12
 
msgid "Journal"
 
msgstr "Журнал"
 

	
 
#: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190
 
msgid "Bad captcha"
 
msgstr "Няслушная капча"
 

	
 
#: kallithea/controllers/login.py:150
 
msgid "You have successfully registered into Kallithea"
 
msgstr "Рэгістрацыя ў Kallithea прайшла паспяхова"
 
msgid "You have successfully registered with %s"
 
msgstr "Рэгістрацыя ў %s прайшла паспяхова"
 

	
 
#: kallithea/controllers/login.py:195
 
msgid "A password reset confirmation code has been sent"
 
msgstr "Код для скідання пароля адпраўлены"
 

	
 
#: kallithea/controllers/login.py:244
 
msgid "Invalid password reset token"
 
msgstr "Няслушны код скідання пароля"
 

	
 
#: kallithea/controllers/login.py:249
 
#: kallithea/controllers/admin/my_account.py:167
 
msgid "Successfully updated password"
 
msgstr "Пароль абноўлены"
 

	
 
#: kallithea/controllers/pullrequests.py:123
 
#, python-format
 
msgid "%s (closed)"
 
msgstr "%s (зачынена)"
 

	
 
#: kallithea/controllers/pullrequests.py:151
 
#: kallithea/templates/changeset/changeset.html:12
 
#: kallithea/templates/email_templates/changeset_comment.html:17
 
msgid "Changeset"
 
msgstr "Змены"
 

	
 
#: kallithea/controllers/pullrequests.py:172
 
msgid "Special"
 
msgstr "Адмысловы"
 

	
 
#: kallithea/controllers/pullrequests.py:173
 
msgid "Peer branches"
 
msgstr "Галіны ўдзельніка"
 

	
 
#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:722
 
#: kallithea/templates/switch_to_list.html:38
 
#: kallithea/templates/bookmarks/bookmarks.html:10
 
msgid "Bookmarks"
 
msgstr "Закладкі"
 

	
 
#: kallithea/controllers/pullrequests.py:312
 
#, python-format
 
msgid "Error creating pull request: %s"
 
msgstr "Памылка пры стварэнні pull-запыту: %s"
 

	
 
#: kallithea/controllers/pullrequests.py:358
 
#: kallithea/controllers/pullrequests.py:505
 
msgid "No description"
 
msgstr "Няма апісання"
 

	
 
#: kallithea/controllers/pullrequests.py:365
 
msgid "Successfully opened new pull request"
 
msgstr "Pull-запыт створаны паспяхова"
 

	
 
#: kallithea/controllers/pullrequests.py:368
 
#: kallithea/controllers/pullrequests.py:455
 
#: kallithea/controllers/pullrequests.py:512
 
#, python-format
 
msgid "Invalid reviewer \"%s\" specified"
 
msgstr "Няслушны рэцэнзент \"%s\""
 

	
 
#: kallithea/controllers/pullrequests.py:371
 
#: kallithea/controllers/pullrequests.py:458
 
msgid "Error occurred while creating pull request"
 
msgstr "Адбылася памылка пры стварэнні pull-запыту"
 

	
 
#: kallithea/controllers/pullrequests.py:403
 
msgid "Missing changesets since the previous pull request:"
 
msgstr "Адсутныя рэвізіі адносна папярэдняга pull-запыту:"
 

	
 
#: kallithea/controllers/pullrequests.py:410
 
#, python-format
 
msgid "New changesets on %s %s since the previous pull request:"
 
msgstr "Новыя рэвізіі на %s %s адносна папярэдняга pull-запыту:"
 

	
 
#: kallithea/controllers/pullrequests.py:417
 
msgid "Ancestor didn't change - show diff since previous version:"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:424
 
#, python-format
 
msgid ""
 
"This pull request is based on another %s revision and there is no simple "
 
"diff."
 
msgstr "Гэты pull-запыт заснаваны на іншай рэвізіі %s, просты diff немагчымы."
 

	
 
#: kallithea/controllers/pullrequests.py:426
 
#, python-format
 
msgid "No changes found on %s %s since previous version."
 
msgstr "Няма змен на %s %s адносна папярэдняй версіі."
 

	
 
#: kallithea/controllers/pullrequests.py:464
 
#, python-format
 
msgid "Closed, replaced by %s ."
 
msgstr "Зачынены, заменены %s."
 

	
 
#: kallithea/controllers/pullrequests.py:472
kallithea/i18n/cs/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -198,193 +198,193 @@ msgstr ""
 

	
 
#: kallithea/controllers/files.py:528
 
msgid "Downloads disabled"
 
msgstr "Stahování vypnuto"
 

	
 
#: kallithea/controllers/files.py:539
 
#, python-format
 
msgid "Unknown revision %s"
 
msgstr "Neznámá revize %s"
 

	
 
#: kallithea/controllers/files.py:541
 
msgid "Empty repository"
 
msgstr "Prázdný repozitář"
 

	
 
#: kallithea/controllers/files.py:543
 
msgid "Unknown archive type"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:773
 
#: kallithea/templates/changeset/changeset_range.html:9
 
#: kallithea/templates/email_templates/pull_request.html:15
 
#: kallithea/templates/pullrequests/pullrequest.html:97
 
msgid "Changesets"
 
msgstr "Změny"
 

	
 
#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:175
 
#: kallithea/model/scm.py:716 kallithea/templates/switch_to_list.html:3
 
#: kallithea/templates/branches/branches.html:10
 
msgid "Branches"
 
msgstr "Větve"
 

	
 
#: kallithea/controllers/files.py:775 kallithea/controllers/pullrequests.py:176
 
#: kallithea/model/scm.py:727 kallithea/templates/switch_to_list.html:25
 
#: kallithea/templates/tags/tags.html:10
 
msgid "Tags"
 
msgstr "Tagy"
 

	
 
#: kallithea/controllers/forks.py:186
 
#, python-format
 
msgid "An error occurred during repository forking %s"
 
msgstr ""
 

	
 
#: kallithea/controllers/home.py:84
 
msgid "Groups"
 
msgstr "Skupiny"
 

	
 
#: kallithea/controllers/home.py:94
 
#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106
 
#: kallithea/templates/admin/repos/repo_add.html:12
 
#: kallithea/templates/admin/repos/repo_add.html:16
 
#: kallithea/templates/admin/repos/repos.html:9
 
#: kallithea/templates/admin/users/user_edit_advanced.html:6
 
#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77
 
#: kallithea/templates/base/base.html:124
 
#: kallithea/templates/base/base.html:479
 
#: kallithea/templates/base/base.html:653
 
msgid "Repositories"
 
msgstr "Repozitáře"
 

	
 
#: kallithea/controllers/home.py:139
 
#: kallithea/templates/files/files_add.html:32
 
#: kallithea/templates/files/files_delete.html:23
 
#: kallithea/templates/files/files_edit.html:32
 
msgid "Branch"
 
msgstr "Větev"
 

	
 
#: kallithea/controllers/home.py:145 kallithea/templates/switch_to_list.html:16
 
msgid "Closed Branches"
 
msgstr ""
 

	
 
#: kallithea/controllers/home.py:151
 
msgid "Tag"
 
msgstr "Tag"
 

	
 
#: kallithea/controllers/home.py:157
 
msgid "Bookmark"
 
msgstr "Záložka"
 

	
 
#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153
 
#: kallithea/templates/journal/public_journal.html:4
 
#: kallithea/templates/journal/public_journal.html:21
 
msgid "Public Journal"
 
msgstr ""
 

	
 
#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157
 
#: kallithea/templates/base/base.html:306
 
#: kallithea/templates/journal/journal.html:4
 
#: kallithea/templates/journal/journal.html:12
 
msgid "Journal"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190
 
msgid "Bad captcha"
 
msgstr "Špatná captcha"
 

	
 
#: kallithea/controllers/login.py:150
 
msgid "You have successfully registered into Kallithea"
 
msgid "You have successfully registered with %s"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:195
 
msgid "A password reset confirmation code has been sent"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:244
 
msgid "Invalid password reset token"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:249
 
#: kallithea/controllers/admin/my_account.py:167
 
msgid "Successfully updated password"
 
msgstr "Úspěšně aktualizované heslo"
 

	
 
#: kallithea/controllers/pullrequests.py:123
 
#, python-format
 
msgid "%s (closed)"
 
msgstr "%s (zavřené)"
 

	
 
#: kallithea/controllers/pullrequests.py:151
 
#: kallithea/templates/changeset/changeset.html:12
 
#: kallithea/templates/email_templates/changeset_comment.html:17
 
msgid "Changeset"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:172
 
msgid "Special"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:173
 
msgid "Peer branches"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:722
 
#: kallithea/templates/switch_to_list.html:38
 
#: kallithea/templates/bookmarks/bookmarks.html:10
 
msgid "Bookmarks"
 
msgstr "Záložky"
 

	
 
#: kallithea/controllers/pullrequests.py:312
 
#, python-format
 
msgid "Error creating pull request: %s"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:358
 
#: kallithea/controllers/pullrequests.py:505
 
msgid "No description"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:365
 
msgid "Successfully opened new pull request"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:368
 
#: kallithea/controllers/pullrequests.py:455
 
#: kallithea/controllers/pullrequests.py:512
 
#, python-format
 
msgid "Invalid reviewer \"%s\" specified"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:371
 
#: kallithea/controllers/pullrequests.py:458
 
msgid "Error occurred while creating pull request"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:403
 
msgid "Missing changesets since the previous pull request:"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:410
 
#, python-format
 
msgid "New changesets on %s %s since the previous pull request:"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:417
 
msgid "Ancestor didn't change - show diff since previous version:"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:424
 
#, python-format
 
msgid ""
 
"This pull request is based on another %s revision and there is no simple "
 
"diff."
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:426
 
#, python-format
 
msgid "No changes found on %s %s since previous version."
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:464
 
#, python-format
 
msgid "Closed, replaced by %s ."
 
msgstr ""
 

	
kallithea/i18n/de/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -205,194 +205,194 @@ msgstr "Der Ort muss ein relativer Pfad 
 

	
 
#: kallithea/controllers/files.py:528
 
msgid "Downloads disabled"
 
msgstr "Downloads gesperrt"
 

	
 
#: kallithea/controllers/files.py:539
 
#, python-format
 
msgid "Unknown revision %s"
 
msgstr "Unbekannte Revision %s"
 

	
 
#: kallithea/controllers/files.py:541
 
msgid "Empty repository"
 
msgstr "Leeres Repository"
 

	
 
#: kallithea/controllers/files.py:543
 
msgid "Unknown archive type"
 
msgstr "Unbekannter Archivtyp"
 

	
 
#: kallithea/controllers/files.py:773
 
#: kallithea/templates/changeset/changeset_range.html:9
 
#: kallithea/templates/email_templates/pull_request.html:15
 
#: kallithea/templates/pullrequests/pullrequest.html:97
 
msgid "Changesets"
 
msgstr "Änderungssätze"
 

	
 
#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:175
 
#: kallithea/model/scm.py:716 kallithea/templates/switch_to_list.html:3
 
#: kallithea/templates/branches/branches.html:10
 
msgid "Branches"
 
msgstr "Entwicklungszweige"
 

	
 
#: kallithea/controllers/files.py:775 kallithea/controllers/pullrequests.py:176
 
#: kallithea/model/scm.py:727 kallithea/templates/switch_to_list.html:25
 
#: kallithea/templates/tags/tags.html:10
 
msgid "Tags"
 
msgstr "Tags"
 

	
 
#: kallithea/controllers/forks.py:186
 
#, python-format
 
msgid "An error occurred during repository forking %s"
 
msgstr "Während des Forkens des Repositorys trat ein Fehler auf: %s"
 

	
 
#: kallithea/controllers/home.py:84
 
msgid "Groups"
 
msgstr "Gruppen"
 

	
 
#: kallithea/controllers/home.py:94
 
#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106
 
#: kallithea/templates/admin/repos/repo_add.html:12
 
#: kallithea/templates/admin/repos/repo_add.html:16
 
#: kallithea/templates/admin/repos/repos.html:9
 
#: kallithea/templates/admin/users/user_edit_advanced.html:6
 
#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77
 
#: kallithea/templates/base/base.html:124
 
#: kallithea/templates/base/base.html:479
 
#: kallithea/templates/base/base.html:653
 
msgid "Repositories"
 
msgstr "Repositories"
 

	
 
#: kallithea/controllers/home.py:139
 
#: kallithea/templates/files/files_add.html:32
 
#: kallithea/templates/files/files_delete.html:23
 
#: kallithea/templates/files/files_edit.html:32
 
msgid "Branch"
 
msgstr "Zweig"
 

	
 
#: kallithea/controllers/home.py:145 kallithea/templates/switch_to_list.html:16
 
msgid "Closed Branches"
 
msgstr "Geschlossene Branches"
 

	
 
#: kallithea/controllers/home.py:151
 
msgid "Tag"
 
msgstr "Marke"
 

	
 
#: kallithea/controllers/home.py:157
 
msgid "Bookmark"
 
msgstr "Lesezeichen"
 

	
 
#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153
 
#: kallithea/templates/journal/public_journal.html:4
 
#: kallithea/templates/journal/public_journal.html:21
 
msgid "Public Journal"
 
msgstr "Öffentliches Logbuch"
 

	
 
#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157
 
#: kallithea/templates/base/base.html:306
 
#: kallithea/templates/journal/journal.html:4
 
#: kallithea/templates/journal/journal.html:12
 
msgid "Journal"
 
msgstr "Logbuch"
 

	
 
#: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190
 
msgid "Bad captcha"
 
msgstr "Falsches Captcha"
 

	
 
#: kallithea/controllers/login.py:150
 
msgid "You have successfully registered into Kallithea"
 
msgstr "Sie haben sich erfolgreich bei Kallithea registriert"
 
msgid "You have successfully registered with %s"
 
msgstr "Sie haben sich erfolgreich bei %s registriert"
 

	
 
#: kallithea/controllers/login.py:195
 
#, fuzzy
 
msgid "A password reset confirmation code has been sent"
 
msgstr "Ihr Link um das Passwort zurückzusetzen wurde versendet"
 

	
 
#: kallithea/controllers/login.py:244
 
#, fuzzy
 
msgid "Invalid password reset token"
 
msgstr "Link zum Zurücksetzen des Passworts"
 

	
 
#: kallithea/controllers/login.py:249
 
#: kallithea/controllers/admin/my_account.py:167
 
msgid "Successfully updated password"
 
msgstr "Erfolgreich Kennwort geändert"
 

	
 
#: kallithea/controllers/pullrequests.py:123
 
#, python-format
 
msgid "%s (closed)"
 
msgstr "%s (geschlossen)"
 

	
 
#: kallithea/controllers/pullrequests.py:151
 
#: kallithea/templates/changeset/changeset.html:12
 
#: kallithea/templates/email_templates/changeset_comment.html:17
 
msgid "Changeset"
 
msgstr "Änderungssatz"
 

	
 
#: kallithea/controllers/pullrequests.py:172
 
msgid "Special"
 
msgstr "Spezial"
 

	
 
#: kallithea/controllers/pullrequests.py:173
 
msgid "Peer branches"
 
msgstr "Branches anderer"
 

	
 
#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:722
 
#: kallithea/templates/switch_to_list.html:38
 
#: kallithea/templates/bookmarks/bookmarks.html:10
 
msgid "Bookmarks"
 
msgstr "Lesezeichen"
 

	
 
#: kallithea/controllers/pullrequests.py:312
 
#, python-format
 
msgid "Error creating pull request: %s"
 
msgstr "Fehler beim Erstellen des Pull-Requests: %s"
 

	
 
#: kallithea/controllers/pullrequests.py:358
 
#: kallithea/controllers/pullrequests.py:505
 
msgid "No description"
 
msgstr "Keine Beschreibung"
 

	
 
#: kallithea/controllers/pullrequests.py:365
 
msgid "Successfully opened new pull request"
 
msgstr "Es wurde erfolgreich ein neuer Pullrequest eröffnet"
 

	
 
#: kallithea/controllers/pullrequests.py:368
 
#: kallithea/controllers/pullrequests.py:455
 
#: kallithea/controllers/pullrequests.py:512
 
#, python-format
 
msgid "Invalid reviewer \"%s\" specified"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:371
 
#: kallithea/controllers/pullrequests.py:458
 
msgid "Error occurred while creating pull request"
 
msgstr "Während des Erstellens des Pull Requests trat ein Fehler auf"
 

	
 
#: kallithea/controllers/pullrequests.py:403
 
msgid "Missing changesets since the previous pull request:"
 
msgstr "Fehlende Changesets seit letztem Pull Request:"
 

	
 
#: kallithea/controllers/pullrequests.py:410
 
#, python-format
 
msgid "New changesets on %s %s since the previous pull request:"
 
msgstr "Neue Changesets in %s %s seit dem letzten Pull Request:"
 

	
 
#: kallithea/controllers/pullrequests.py:417
 
msgid "Ancestor didn't change - show diff since previous version:"
 
msgstr "Vorgänger unverändert - zeige Diff zu lezter Version:"
 

	
 
#: kallithea/controllers/pullrequests.py:424
 
#, python-format
 
msgid ""
 
"This pull request is based on another %s revision and there is no simple "
 
"diff."
 
msgstr ""
 
"Dieser Pull Request basiert auf einer anderen %s Revision. Daher ist kein"
 
" Simple Diff verfügbar."
 

	
 
#: kallithea/controllers/pullrequests.py:426
 
#, python-format
 
msgid "No changes found on %s %s since previous version."
 
msgstr "Keine Änderungen seit der letzten Version gefunden in %s %s."
 

	
 
#: kallithea/controllers/pullrequests.py:464
 
#, python-format
kallithea/i18n/el/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -211,194 +211,194 @@ msgstr ""
 

	
 
#: kallithea/controllers/files.py:528
 
msgid "Downloads disabled"
 
msgstr "Οι μεταφορτώσεις απενεργοποιήθηκαν"
 

	
 
#: kallithea/controllers/files.py:539
 
#, python-format
 
msgid "Unknown revision %s"
 
msgstr "Άγνωστη αναθεώρηση %s"
 

	
 
#: kallithea/controllers/files.py:541
 
msgid "Empty repository"
 
msgstr "Άδειο αποθετήριο"
 

	
 
#: kallithea/controllers/files.py:543
 
msgid "Unknown archive type"
 
msgstr "Άγνωστος τύπος αρχειοθέτησης"
 

	
 
#: kallithea/controllers/files.py:773
 
#: kallithea/templates/changeset/changeset_range.html:9
 
#: kallithea/templates/email_templates/pull_request.html:15
 
#: kallithea/templates/pullrequests/pullrequest.html:97
 
msgid "Changesets"
 
msgstr "Σετ αλλαγών"
 

	
 
#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:175
 
#: kallithea/model/scm.py:716 kallithea/templates/switch_to_list.html:3
 
#: kallithea/templates/branches/branches.html:10
 
msgid "Branches"
 
msgstr "Κλάδοι"
 

	
 
#: kallithea/controllers/files.py:775 kallithea/controllers/pullrequests.py:176
 
#: kallithea/model/scm.py:727 kallithea/templates/switch_to_list.html:25
 
#: kallithea/templates/tags/tags.html:10
 
msgid "Tags"
 
msgstr "Ετικέτες"
 

	
 
#: kallithea/controllers/forks.py:186
 
#, python-format
 
msgid "An error occurred during repository forking %s"
 
msgstr "Συνέβει ένα λάθος κατά την διακλάδωση του αποθετηρίου %s"
 

	
 
#: kallithea/controllers/home.py:84
 
msgid "Groups"
 
msgstr "Ομάδες"
 

	
 
#: kallithea/controllers/home.py:94
 
#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106
 
#: kallithea/templates/admin/repos/repo_add.html:12
 
#: kallithea/templates/admin/repos/repo_add.html:16
 
#: kallithea/templates/admin/repos/repos.html:9
 
#: kallithea/templates/admin/users/user_edit_advanced.html:6
 
#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77
 
#: kallithea/templates/base/base.html:124
 
#: kallithea/templates/base/base.html:479
 
#: kallithea/templates/base/base.html:653
 
msgid "Repositories"
 
msgstr "Αποθετήρια"
 

	
 
#: kallithea/controllers/home.py:139
 
#: kallithea/templates/files/files_add.html:32
 
#: kallithea/templates/files/files_delete.html:23
 
#: kallithea/templates/files/files_edit.html:32
 
msgid "Branch"
 
msgstr "Κλάδος"
 

	
 
#: kallithea/controllers/home.py:145 kallithea/templates/switch_to_list.html:16
 
msgid "Closed Branches"
 
msgstr ""
 

	
 
#: kallithea/controllers/home.py:151
 
msgid "Tag"
 
msgstr "Ετικέτα"
 

	
 
#: kallithea/controllers/home.py:157
 
msgid "Bookmark"
 
msgstr "Σελιδοδείκτης"
 

	
 
#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153
 
#: kallithea/templates/journal/public_journal.html:4
 
#: kallithea/templates/journal/public_journal.html:21
 
msgid "Public Journal"
 
msgstr "Δημόσιο Ημερολόγιο"
 

	
 
#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157
 
#: kallithea/templates/base/base.html:306
 
#: kallithea/templates/journal/journal.html:4
 
#: kallithea/templates/journal/journal.html:12
 
msgid "Journal"
 
msgstr "Ημερολόγιο"
 

	
 
#: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190
 
msgid "Bad captcha"
 
msgstr "Λάθος captcha"
 

	
 
#: kallithea/controllers/login.py:150
 
msgid "You have successfully registered into Kallithea"
 
msgstr "Εγγραφήκατε επιτυχώς στο Kallithea"
 
msgid "You have successfully registered with %s"
 
msgstr "Εγγραφήκατε επιτυχώς στο %s"
 

	
 
#: kallithea/controllers/login.py:195
 
msgid "A password reset confirmation code has been sent"
 
msgstr "Στάλθηκε ένας κωδικός επιβεβαίωσης επαναφοράς του συνθηματικού"
 

	
 
#: kallithea/controllers/login.py:244
 
msgid "Invalid password reset token"
 
msgstr "Άκυρο τεκμήριο (token) επαναφοράς του συνθηματικού"
 

	
 
#: kallithea/controllers/login.py:249
 
#: kallithea/controllers/admin/my_account.py:167
 
msgid "Successfully updated password"
 
msgstr "Το συνθηματικό ενημερώθηκε επιτυχώς"
 

	
 
#: kallithea/controllers/pullrequests.py:123
 
#, python-format
 
msgid "%s (closed)"
 
msgstr "%s (κλειστό)"
 

	
 
#: kallithea/controllers/pullrequests.py:151
 
#: kallithea/templates/changeset/changeset.html:12
 
#: kallithea/templates/email_templates/changeset_comment.html:17
 
msgid "Changeset"
 
msgstr "Σετ αλλαγών"
 

	
 
#: kallithea/controllers/pullrequests.py:172
 
msgid "Special"
 
msgstr "Ειδικός"
 

	
 
#: kallithea/controllers/pullrequests.py:173
 
msgid "Peer branches"
 
msgstr "Ομότιμοι κλάδοι"
 

	
 
#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:722
 
#: kallithea/templates/switch_to_list.html:38
 
#: kallithea/templates/bookmarks/bookmarks.html:10
 
msgid "Bookmarks"
 
msgstr "Σελιδοδείκτες"
 

	
 
#: kallithea/controllers/pullrequests.py:312
 
#, python-format
 
msgid "Error creating pull request: %s"
 
msgstr "Λάθος στη δημιουργία αιτήματος έλξης - pull request: %s"
 

	
 
#: kallithea/controllers/pullrequests.py:358
 
#: kallithea/controllers/pullrequests.py:505
 
msgid "No description"
 
msgstr "Χωρίς περιγραφή"
 

	
 
#: kallithea/controllers/pullrequests.py:365
 
msgid "Successfully opened new pull request"
 
msgstr "Ένα νέο αίτημα έλξης (pull request) δημιουργήθηκε επιτυχώς"
 

	
 
#: kallithea/controllers/pullrequests.py:368
 
#: kallithea/controllers/pullrequests.py:455
 
#: kallithea/controllers/pullrequests.py:512
 
#, python-format
 
msgid "Invalid reviewer \"%s\" specified"
 
msgstr "Καθορίστηκε άκυρος σχολιαστής \"%s\""
 

	
 
#: kallithea/controllers/pullrequests.py:371
 
#: kallithea/controllers/pullrequests.py:458
 
msgid "Error occurred while creating pull request"
 
msgstr "Λάθος κατά τη δημιουργία αιτήματος έλξης (pull request)"
 

	
 
#: kallithea/controllers/pullrequests.py:403
 
msgid "Missing changesets since the previous pull request:"
 
msgstr "Ελλιπή σετ αλλαγών από την προηγούμενη αίτηση έλξης:"
 

	
 
#: kallithea/controllers/pullrequests.py:410
 
#, python-format
 
msgid "New changesets on %s %s since the previous pull request:"
 
msgstr "Καινούρια σετ αλλαγών στα %s %s από την προηγούμενη αίτηση έλξης:"
 

	
 
#: kallithea/controllers/pullrequests.py:417
 
msgid "Ancestor didn't change - show diff since previous version:"
 
msgstr "Το γονικό δεν άλλαξε - εμφάνισε τις διαφορές από την προηγούμενη έκδοση:"
 

	
 
#: kallithea/controllers/pullrequests.py:424
 
#, python-format
 
msgid ""
 
"This pull request is based on another %s revision and there is no simple "
 
"diff."
 
msgstr ""
 
"Αυτή η αίτηση έλξης είναι βασισμένη σε μία άλλη %s αναθεώρηση και δεν "
 
"υπάρχει ένα απλό diff."
 

	
 
#: kallithea/controllers/pullrequests.py:426
 
#, python-format
 
msgid "No changes found on %s %s since previous version."
 
msgstr "Δεν βρέθηκαν αλλαγές στο %s %s από την προηγούμενη έκδοση."
 

	
 
#: kallithea/controllers/pullrequests.py:464
 
#, python-format
 
msgid "Closed, replaced by %s ."
 
msgstr "Κλειστό, αντικαταστάθηκε από %s."
kallithea/i18n/es/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -201,194 +201,194 @@ msgstr "La ruta debe ser relativa y no d
 

	
 
#: kallithea/controllers/files.py:527
 
msgid "Downloads disabled"
 
msgstr "Descargas deshabilitadas"
 

	
 
#: kallithea/controllers/files.py:538
 
#, python-format
 
msgid "Unknown revision %s"
 
msgstr "Revisión desconocida %s"
 

	
 
#: kallithea/controllers/files.py:540
 
msgid "Empty repository"
 
msgstr "Repositorio vacío"
 

	
 
#: kallithea/controllers/files.py:542
 
msgid "Unknown archive type"
 
msgstr "Tipo de archivo desconocido"
 

	
 
#: kallithea/controllers/files.py:772
 
#: kallithea/templates/changeset/changeset_range.html:9
 
#: kallithea/templates/email_templates/pull_request.html:15
 
#: kallithea/templates/pullrequests/pullrequest.html:97
 
msgid "Changesets"
 
msgstr "Cambios"
 

	
 
#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:175
 
#: kallithea/model/scm.py:820 kallithea/templates/switch_to_list.html:3
 
#: kallithea/templates/branches/branches.html:10
 
msgid "Branches"
 
msgstr "Ramas"
 

	
 
#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:176
 
#: kallithea/model/scm.py:831 kallithea/templates/switch_to_list.html:25
 
#: kallithea/templates/tags/tags.html:10
 
msgid "Tags"
 
msgstr "Etiquetas"
 

	
 
#: kallithea/controllers/forks.py:186
 
#, python-format
 
msgid "An error occurred during repository forking %s"
 
msgstr "Ocurrió un error mientras se bifurcaba el repositorio %s"
 

	
 
#: kallithea/controllers/home.py:84
 
msgid "Groups"
 
msgstr "Grupos"
 

	
 
#: kallithea/controllers/home.py:89
 
#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106
 
#: kallithea/templates/admin/repos/repo_add.html:12
 
#: kallithea/templates/admin/repos/repo_add.html:16
 
#: kallithea/templates/admin/repos/repos.html:9
 
#: kallithea/templates/admin/users/user_edit_advanced.html:6
 
#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77
 
#: kallithea/templates/base/base.html:124
 
#: kallithea/templates/base/base.html:479
 
#: kallithea/templates/base/base.html:653
 
msgid "Repositories"
 
msgstr "Repositorios"
 

	
 
#: kallithea/controllers/home.py:130
 
#: kallithea/templates/files/files_add.html:32
 
#: kallithea/templates/files/files_delete.html:23
 
#: kallithea/templates/files/files_edit.html:32
 
msgid "Branch"
 
msgstr "Rama"
 

	
 
#: kallithea/controllers/home.py:136 kallithea/templates/switch_to_list.html:16
 
msgid "Closed Branches"
 
msgstr "Ramas cerradas"
 

	
 
#: kallithea/controllers/home.py:142
 
msgid "Tag"
 
msgstr "Etiqueta"
 

	
 
#: kallithea/controllers/home.py:148
 
msgid "Bookmark"
 
msgstr "Marcador"
 

	
 
#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153
 
#: kallithea/templates/journal/public_journal.html:4
 
#: kallithea/templates/journal/public_journal.html:21
 
msgid "Public Journal"
 
msgstr "Registro público"
 

	
 
#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157
 
#: kallithea/templates/base/base.html:306
 
#: kallithea/templates/journal/journal.html:4
 
#: kallithea/templates/journal/journal.html:12
 
msgid "Journal"
 
msgstr "Registro"
 

	
 
#: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190
 
msgid "Bad captcha"
 
msgstr "CAPTCHA erróneo"
 

	
 
#: kallithea/controllers/login.py:150
 
msgid "You have successfully registered into Kallithea"
 
msgstr "El registro en Kallithea se ha efectuado correctamente"
 
msgid "You have successfully registered with %s"
 
msgstr "El registro en %s se ha efectuado correctamente"
 

	
 
#: kallithea/controllers/login.py:195
 
msgid "A password reset confirmation code has been sent"
 
msgstr "Se ha enviado una confirmación de restauración de contraseña"
 

	
 
#: kallithea/controllers/login.py:244
 
msgid "Invalid password reset token"
 
msgstr "Señal de restauración de contraseña inválida"
 

	
 
#: kallithea/controllers/login.py:249
 
#: kallithea/controllers/admin/my_account.py:167
 
msgid "Successfully updated password"
 
msgstr "Contraseña actualizada correctamente"
 

	
 
#: kallithea/controllers/pullrequests.py:123
 
#, python-format
 
msgid "%s (closed)"
 
msgstr "%s (cerrado)"
 

	
 
#: kallithea/controllers/pullrequests.py:151
 
#: kallithea/templates/changeset/changeset.html:12
 
#: kallithea/templates/email_templates/changeset_comment.html:17
 
msgid "Changeset"
 
msgstr "Cambio"
 

	
 
#: kallithea/controllers/pullrequests.py:172
 
msgid "Special"
 
msgstr "Especial"
 

	
 
#: kallithea/controllers/pullrequests.py:173
 
#, fuzzy
 
msgid "Peer branches"
 
msgstr "Ramas de los pares"
 

	
 
#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:826
 
#: kallithea/templates/switch_to_list.html:38
 
#: kallithea/templates/bookmarks/bookmarks.html:10
 
msgid "Bookmarks"
 
msgstr "Marcadores"
 

	
 
#: kallithea/controllers/pullrequests.py:309
 
#, python-format
 
msgid "Error creating pull request: %s"
 
msgstr "Error al crear la petición de pull: %s"
 

	
 
#: kallithea/controllers/pullrequests.py:355
 
#: kallithea/controllers/pullrequests.py:502
 
msgid "No description"
 
msgstr "No hay descripción"
 

	
 
#: kallithea/controllers/pullrequests.py:362
 
msgid "Successfully opened new pull request"
 
msgstr "La petición de pull se ha creado correctamente"
 

	
 
#: kallithea/controllers/pullrequests.py:365
 
#: kallithea/controllers/pullrequests.py:452
 
#: kallithea/controllers/pullrequests.py:509
 
#, python-format
 
msgid "Invalid reviewer \"%s\" specified"
 
msgstr "El validador \"%s\" no es correcto"
 

	
 
#: kallithea/controllers/pullrequests.py:368
 
#: kallithea/controllers/pullrequests.py:455
 
msgid "Error occurred while creating pull request"
 
msgstr "Ocurrió un error al crear la petición de pull"
 

	
 
#: kallithea/controllers/pullrequests.py:400
 
msgid "Missing changesets since the previous pull request:"
 
msgstr "Cambios que faltan desde la ultima petición de pull:"
 

	
 
#: kallithea/controllers/pullrequests.py:407
 
#, fuzzy, python-format
 
msgid "New changesets on %s %s since the previous pull request:"
 
msgstr "Cambios nuevos en %s %s desde la ultima petición pull:"
 

	
 
#: kallithea/controllers/pullrequests.py:414
 
msgid "Ancestor didn't change - show diff since previous version:"
 
msgstr ""
 
"El ascendente no ha cambiado - ver diferencias desde la versión anterior:"
 

	
 
#: kallithea/controllers/pullrequests.py:421
 
#, python-format
 
msgid "This pull request is based on another %s revision and there is no simple diff."
 
msgstr ""
 
"La petición de pull está basada en otra %s revisión y no hay un diff simple."
 

	
 
#: kallithea/controllers/pullrequests.py:423
 
#, python-format
 
msgid "No changes found on %s %s since previous version."
 
msgstr "No se encontró ningún cambio en %s %s desde la versión anterior."
 

	
 
#: kallithea/controllers/pullrequests.py:461
 
#, python-format
 
msgid "Closed, replaced by %s ."
 
msgstr "Cerrado, reemplazado por %s."
 

	
kallithea/i18n/fr/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -207,194 +207,194 @@ msgstr ""
 

	
 
#: kallithea/controllers/files.py:528
 
msgid "Downloads disabled"
 
msgstr "Les téléchargements sont désactivés"
 

	
 
#: kallithea/controllers/files.py:539
 
#, python-format
 
msgid "Unknown revision %s"
 
msgstr "Révision %s inconnue"
 

	
 
#: kallithea/controllers/files.py:541
 
msgid "Empty repository"
 
msgstr "Dépôt vide"
 

	
 
#: kallithea/controllers/files.py:543
 
msgid "Unknown archive type"
 
msgstr "Type d’archive inconnu"
 

	
 
#: kallithea/controllers/files.py:773
 
#: kallithea/templates/changeset/changeset_range.html:9
 
#: kallithea/templates/email_templates/pull_request.html:15
 
#: kallithea/templates/pullrequests/pullrequest.html:97
 
msgid "Changesets"
 
msgstr "Changesets"
 

	
 
#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:175
 
#: kallithea/model/scm.py:716 kallithea/templates/switch_to_list.html:3
 
#: kallithea/templates/branches/branches.html:10
 
msgid "Branches"
 
msgstr "Branches"
 

	
 
#: kallithea/controllers/files.py:775 kallithea/controllers/pullrequests.py:176
 
#: kallithea/model/scm.py:727 kallithea/templates/switch_to_list.html:25
 
#: kallithea/templates/tags/tags.html:10
 
msgid "Tags"
 
msgstr "Tags"
 

	
 
#: kallithea/controllers/forks.py:186
 
#, python-format
 
msgid "An error occurred during repository forking %s"
 
msgstr "Une erreur est survenue durant le fork du dépôt %s"
 

	
 
#: kallithea/controllers/home.py:84
 
msgid "Groups"
 
msgstr "Groupes"
 

	
 
#: kallithea/controllers/home.py:94
 
#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106
 
#: kallithea/templates/admin/repos/repo_add.html:12
 
#: kallithea/templates/admin/repos/repo_add.html:16
 
#: kallithea/templates/admin/repos/repos.html:9
 
#: kallithea/templates/admin/users/user_edit_advanced.html:6
 
#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77
 
#: kallithea/templates/base/base.html:124
 
#: kallithea/templates/base/base.html:479
 
#: kallithea/templates/base/base.html:653
 
msgid "Repositories"
 
msgstr "Dépôts"
 

	
 
#: kallithea/controllers/home.py:139
 
#: kallithea/templates/files/files_add.html:32
 
#: kallithea/templates/files/files_delete.html:23
 
#: kallithea/templates/files/files_edit.html:32
 
msgid "Branch"
 
msgstr "Branche"
 

	
 
#: kallithea/controllers/home.py:145 kallithea/templates/switch_to_list.html:16
 
msgid "Closed Branches"
 
msgstr "Branches fermées"
 

	
 
#: kallithea/controllers/home.py:151
 
msgid "Tag"
 
msgstr "Étiquette"
 

	
 
#: kallithea/controllers/home.py:157
 
msgid "Bookmark"
 
msgstr "Signet"
 

	
 
#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153
 
#: kallithea/templates/journal/public_journal.html:4
 
#: kallithea/templates/journal/public_journal.html:21
 
msgid "Public Journal"
 
msgstr "Journal public"
 

	
 
#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157
 
#: kallithea/templates/base/base.html:306
 
#: kallithea/templates/journal/journal.html:4
 
#: kallithea/templates/journal/journal.html:12
 
msgid "Journal"
 
msgstr "Historique"
 

	
 
#: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190
 
msgid "Bad captcha"
 
msgstr "Mauvais captcha"
 

	
 
#: kallithea/controllers/login.py:150
 
msgid "You have successfully registered into Kallithea"
 
msgstr "Vous vous êtes inscrits avec succès à Kallithea"
 
msgid "You have successfully registered with %s"
 
msgstr "Vous vous êtes inscrits avec succès à %s"
 

	
 
#: kallithea/controllers/login.py:195
 
msgid "A password reset confirmation code has been sent"
 
msgstr "Un lien de confirmation de réinitialisation de mot de passe a été envoyé"
 

	
 
#: kallithea/controllers/login.py:244
 
msgid "Invalid password reset token"
 
msgstr "Clé de réinitialisation de mot de passe invalide"
 

	
 
#: kallithea/controllers/login.py:249
 
#: kallithea/controllers/admin/my_account.py:167
 
msgid "Successfully updated password"
 
msgstr "Mot de passe mis à jour avec succès"
 

	
 
#: kallithea/controllers/pullrequests.py:123
 
#, python-format
 
msgid "%s (closed)"
 
msgstr "%s (fermé)"
 

	
 
#: kallithea/controllers/pullrequests.py:151
 
#: kallithea/templates/changeset/changeset.html:12
 
#: kallithea/templates/email_templates/changeset_comment.html:17
 
msgid "Changeset"
 
msgstr "Changements"
 

	
 
#: kallithea/controllers/pullrequests.py:172
 
msgid "Special"
 
msgstr "Spécial"
 

	
 
#: kallithea/controllers/pullrequests.py:173
 
msgid "Peer branches"
 
msgstr "Branches appairées"
 

	
 
#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:722
 
#: kallithea/templates/switch_to_list.html:38
 
#: kallithea/templates/bookmarks/bookmarks.html:10
 
msgid "Bookmarks"
 
msgstr "Signets"
 

	
 
#: kallithea/controllers/pullrequests.py:312
 
#, python-format
 
msgid "Error creating pull request: %s"
 
msgstr "Erreur de création de la demande de pull : %s"
 

	
 
#: kallithea/controllers/pullrequests.py:358
 
#: kallithea/controllers/pullrequests.py:505
 
msgid "No description"
 
msgstr "Aucune description"
 

	
 
#: kallithea/controllers/pullrequests.py:365
 
msgid "Successfully opened new pull request"
 
msgstr "La requête de pull a été ouverte avec succès"
 

	
 
#: kallithea/controllers/pullrequests.py:368
 
#: kallithea/controllers/pullrequests.py:455
 
#: kallithea/controllers/pullrequests.py:512
 
#, python-format
 
msgid "Invalid reviewer \"%s\" specified"
 
msgstr "Reviewer spécifié \"%s\" non valide"
 

	
 
#: kallithea/controllers/pullrequests.py:371
 
#: kallithea/controllers/pullrequests.py:458
 
msgid "Error occurred while creating pull request"
 
msgstr "Une erreur est survenue durant la création de la pull request"
 

	
 
#: kallithea/controllers/pullrequests.py:403
 
msgid "Missing changesets since the previous pull request:"
 
msgstr "Changeset manquant depuis la précédente pull request :"
 

	
 
#: kallithea/controllers/pullrequests.py:410
 
#, python-format
 
msgid "New changesets on %s %s since the previous pull request:"
 
msgstr "Nouveau changeset sur %s %s depuis la précédente pull request :"
 

	
 
#: kallithea/controllers/pullrequests.py:417
 
msgid "Ancestor didn't change - show diff since previous version:"
 
msgstr ""
 
"L'ancêtre n'a pas changé - montrer les différences avec la version "
 
"précédente :"
 

	
 
#: kallithea/controllers/pullrequests.py:424
 
#, python-format
 
msgid ""
 
"This pull request is based on another %s revision and there is no simple "
 
"diff."
 
msgstr ""
 
"Cette demande de pull est basée sur une autre révision %s et il n'y a pas"
 
" de diff simple."
 

	
 
#: kallithea/controllers/pullrequests.py:426
 
#, python-format
 
msgid "No changes found on %s %s since previous version."
 
msgstr "Aucun changement constaté sur %s %s depuis la version précédente."
 

	
 
#: kallithea/controllers/pullrequests.py:464
 
#, python-format
kallithea/i18n/hu/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -197,193 +197,193 @@ msgstr ""
 

	
 
#: kallithea/controllers/files.py:528
 
msgid "Downloads disabled"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:539
 
#, python-format
 
msgid "Unknown revision %s"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:541
 
msgid "Empty repository"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:543
 
msgid "Unknown archive type"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:773
 
#: kallithea/templates/changeset/changeset_range.html:9
 
#: kallithea/templates/email_templates/pull_request.html:15
 
#: kallithea/templates/pullrequests/pullrequest.html:97
 
msgid "Changesets"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:175
 
#: kallithea/model/scm.py:716 kallithea/templates/switch_to_list.html:3
 
#: kallithea/templates/branches/branches.html:10
 
msgid "Branches"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:775 kallithea/controllers/pullrequests.py:176
 
#: kallithea/model/scm.py:727 kallithea/templates/switch_to_list.html:25
 
#: kallithea/templates/tags/tags.html:10
 
msgid "Tags"
 
msgstr ""
 

	
 
#: kallithea/controllers/forks.py:186
 
#, python-format
 
msgid "An error occurred during repository forking %s"
 
msgstr ""
 

	
 
#: kallithea/controllers/home.py:84
 
msgid "Groups"
 
msgstr ""
 

	
 
#: kallithea/controllers/home.py:94
 
#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106
 
#: kallithea/templates/admin/repos/repo_add.html:12
 
#: kallithea/templates/admin/repos/repo_add.html:16
 
#: kallithea/templates/admin/repos/repos.html:9
 
#: kallithea/templates/admin/users/user_edit_advanced.html:6
 
#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77
 
#: kallithea/templates/base/base.html:124
 
#: kallithea/templates/base/base.html:479
 
#: kallithea/templates/base/base.html:653
 
msgid "Repositories"
 
msgstr ""
 

	
 
#: kallithea/controllers/home.py:139
 
#: kallithea/templates/files/files_add.html:32
 
#: kallithea/templates/files/files_delete.html:23
 
#: kallithea/templates/files/files_edit.html:32
 
msgid "Branch"
 
msgstr ""
 

	
 
#: kallithea/controllers/home.py:145 kallithea/templates/switch_to_list.html:16
 
msgid "Closed Branches"
 
msgstr ""
 

	
 
#: kallithea/controllers/home.py:151
 
msgid "Tag"
 
msgstr ""
 

	
 
#: kallithea/controllers/home.py:157
 
msgid "Bookmark"
 
msgstr ""
 

	
 
#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153
 
#: kallithea/templates/journal/public_journal.html:4
 
#: kallithea/templates/journal/public_journal.html:21
 
msgid "Public Journal"
 
msgstr ""
 

	
 
#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157
 
#: kallithea/templates/base/base.html:306
 
#: kallithea/templates/journal/journal.html:4
 
#: kallithea/templates/journal/journal.html:12
 
msgid "Journal"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190
 
msgid "Bad captcha"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:150
 
msgid "You have successfully registered into Kallithea"
 
msgid "You have successfully registered with %s"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:195
 
msgid "A password reset confirmation code has been sent"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:244
 
msgid "Invalid password reset token"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:249
 
#: kallithea/controllers/admin/my_account.py:167
 
msgid "Successfully updated password"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:123
 
#, python-format
 
msgid "%s (closed)"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:151
 
#: kallithea/templates/changeset/changeset.html:12
 
#: kallithea/templates/email_templates/changeset_comment.html:17
 
msgid "Changeset"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:172
 
msgid "Special"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:173
 
msgid "Peer branches"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:722
 
#: kallithea/templates/switch_to_list.html:38
 
#: kallithea/templates/bookmarks/bookmarks.html:10
 
msgid "Bookmarks"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:312
 
#, python-format
 
msgid "Error creating pull request: %s"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:358
 
#: kallithea/controllers/pullrequests.py:505
 
msgid "No description"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:365
 
msgid "Successfully opened new pull request"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:368
 
#: kallithea/controllers/pullrequests.py:455
 
#: kallithea/controllers/pullrequests.py:512
 
#, python-format
 
msgid "Invalid reviewer \"%s\" specified"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:371
 
#: kallithea/controllers/pullrequests.py:458
 
msgid "Error occurred while creating pull request"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:403
 
msgid "Missing changesets since the previous pull request:"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:410
 
#, python-format
 
msgid "New changesets on %s %s since the previous pull request:"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:417
 
msgid "Ancestor didn't change - show diff since previous version:"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:424
 
#, python-format
 
msgid ""
 
"This pull request is based on another %s revision and there is no simple "
 
"diff."
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:426
 
#, python-format
 
msgid "No changes found on %s %s since previous version."
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:464
 
#, python-format
 
msgid "Closed, replaced by %s ."
 
msgstr ""
 

	
kallithea/i18n/ja/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -204,194 +204,194 @@ msgstr "場所には相対パスかつ .. を含まないパスを入力してください"
 

	
 
#: kallithea/controllers/files.py:528
 
msgid "Downloads disabled"
 
msgstr "ダウンロードは無効化されています"
 

	
 
#: kallithea/controllers/files.py:539
 
#, python-format
 
msgid "Unknown revision %s"
 
msgstr "%s は未知のリビジョンです"
 

	
 
#: kallithea/controllers/files.py:541
 
msgid "Empty repository"
 
msgstr "空のリポジトリ"
 

	
 
#: kallithea/controllers/files.py:543
 
msgid "Unknown archive type"
 
msgstr "未知のアーカイブ種別です"
 

	
 
#: kallithea/controllers/files.py:773
 
#: kallithea/templates/changeset/changeset_range.html:9
 
#: kallithea/templates/email_templates/pull_request.html:15
 
#: kallithea/templates/pullrequests/pullrequest.html:97
 
msgid "Changesets"
 
msgstr "チェンジセット"
 

	
 
#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:175
 
#: kallithea/model/scm.py:716 kallithea/templates/switch_to_list.html:3
 
#: kallithea/templates/branches/branches.html:10
 
msgid "Branches"
 
msgstr "ブランチ"
 

	
 
#: kallithea/controllers/files.py:775 kallithea/controllers/pullrequests.py:176
 
#: kallithea/model/scm.py:727 kallithea/templates/switch_to_list.html:25
 
#: kallithea/templates/tags/tags.html:10
 
msgid "Tags"
 
msgstr "タグ"
 

	
 
#: kallithea/controllers/forks.py:186
 
#, python-format
 
msgid "An error occurred during repository forking %s"
 
msgstr "リポジトリ %s のフォーク中にエラーが発生しました"
 

	
 
#: kallithea/controllers/home.py:84
 
msgid "Groups"
 
msgstr "グループ"
 

	
 
#: kallithea/controllers/home.py:94
 
#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106
 
#: kallithea/templates/admin/repos/repo_add.html:12
 
#: kallithea/templates/admin/repos/repo_add.html:16
 
#: kallithea/templates/admin/repos/repos.html:9
 
#: kallithea/templates/admin/users/user_edit_advanced.html:6
 
#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77
 
#: kallithea/templates/base/base.html:124
 
#: kallithea/templates/base/base.html:479
 
#: kallithea/templates/base/base.html:653
 
msgid "Repositories"
 
msgstr "リポジトリ"
 

	
 
#: kallithea/controllers/home.py:139
 
#: kallithea/templates/files/files_add.html:32
 
#: kallithea/templates/files/files_delete.html:23
 
#: kallithea/templates/files/files_edit.html:32
 
msgid "Branch"
 
msgstr "ブランチ"
 

	
 
#: kallithea/controllers/home.py:145 kallithea/templates/switch_to_list.html:16
 
msgid "Closed Branches"
 
msgstr "閉鎖済みブランチ"
 

	
 
#: kallithea/controllers/home.py:151
 
msgid "Tag"
 
msgstr "タグ"
 

	
 
#: kallithea/controllers/home.py:157
 
msgid "Bookmark"
 
msgstr "ブックマーク"
 

	
 
#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153
 
#: kallithea/templates/journal/public_journal.html:4
 
#: kallithea/templates/journal/public_journal.html:21
 
msgid "Public Journal"
 
msgstr "公開ジャーナル"
 

	
 
#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157
 
#: kallithea/templates/base/base.html:306
 
#: kallithea/templates/journal/journal.html:4
 
#: kallithea/templates/journal/journal.html:12
 
msgid "Journal"
 
msgstr "ジャーナル"
 

	
 
#: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190
 
msgid "Bad captcha"
 
msgstr "キャプチャが一致しません"
 

	
 
#: kallithea/controllers/login.py:150
 
msgid "You have successfully registered into Kallithea"
 
msgstr "Kallitheaへの登録を受け付けました"
 
msgid "You have successfully registered with %s"
 
msgstr "%sへの登録を受け付けました"
 

	
 
#: kallithea/controllers/login.py:195
 
msgid "A password reset confirmation code has been sent"
 
msgstr "パスワードリセットの確認コードが送信されました"
 

	
 
#: kallithea/controllers/login.py:244
 
msgid "Invalid password reset token"
 
msgstr "無効なパスワードリセットトークン"
 

	
 
#: kallithea/controllers/login.py:249
 
#: kallithea/controllers/admin/my_account.py:167
 
msgid "Successfully updated password"
 
msgstr "パスワードを更新しました"
 

	
 
#: kallithea/controllers/pullrequests.py:123
 
#, python-format
 
msgid "%s (closed)"
 
msgstr "%s (閉鎖済み)"
 

	
 
#: kallithea/controllers/pullrequests.py:151
 
#: kallithea/templates/changeset/changeset.html:12
 
#: kallithea/templates/email_templates/changeset_comment.html:17
 
msgid "Changeset"
 
msgstr "チェンジセット"
 

	
 
#: kallithea/controllers/pullrequests.py:172
 
msgid "Special"
 
msgstr "スペシャル"
 

	
 
#: kallithea/controllers/pullrequests.py:173
 
msgid "Peer branches"
 
msgstr "相手のブランチ"
 

	
 
#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:722
 
#: kallithea/templates/switch_to_list.html:38
 
#: kallithea/templates/bookmarks/bookmarks.html:10
 
msgid "Bookmarks"
 
msgstr "ブックマーク"
 

	
 
#: kallithea/controllers/pullrequests.py:312
 
#, python-format
 
msgid "Error creating pull request: %s"
 
msgstr "プルリクエスト作成中にエラーが発生しました: %s"
 

	
 
#: kallithea/controllers/pullrequests.py:358
 
#: kallithea/controllers/pullrequests.py:505
 
msgid "No description"
 
msgstr "説明がありません"
 

	
 
#: kallithea/controllers/pullrequests.py:365
 
msgid "Successfully opened new pull request"
 
msgstr "新しいプルリクエストの作成に成功しました"
 

	
 
#: kallithea/controllers/pullrequests.py:368
 
#: kallithea/controllers/pullrequests.py:455
 
#: kallithea/controllers/pullrequests.py:512
 
#, python-format
 
msgid "Invalid reviewer \"%s\" specified"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:371
 
#: kallithea/controllers/pullrequests.py:458
 
msgid "Error occurred while creating pull request"
 
msgstr "プルリクエストの作成中にエラーが発生しました"
 

	
 
#: kallithea/controllers/pullrequests.py:403
 
msgid "Missing changesets since the previous pull request:"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:410
 
#, python-format
 
msgid "New changesets on %s %s since the previous pull request:"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:417
 
msgid "Ancestor didn't change - show diff since previous version:"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:424
 
#, python-format
 
msgid ""
 
"This pull request is based on another %s revision and there is no simple "
 
"diff."
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:426
 
#, python-format
 
msgid "No changes found on %s %s since previous version."
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:464
 
#, python-format
 
msgid "Closed, replaced by %s ."
 
msgstr "%s で置き換えられたのでクローズします。"
 

	
 
#: kallithea/controllers/pullrequests.py:472
kallithea/i18n/kallithea.pot
Show inline comments
 
@@ -192,193 +192,193 @@ msgstr ""
 

	
 
#: kallithea/controllers/files.py:528
 
msgid "Downloads disabled"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:539
 
#, python-format
 
msgid "Unknown revision %s"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:541
 
msgid "Empty repository"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:543
 
msgid "Unknown archive type"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:773
 
#: kallithea/templates/changeset/changeset_range.html:9
 
#: kallithea/templates/email_templates/pull_request.html:15
 
#: kallithea/templates/pullrequests/pullrequest.html:97
 
msgid "Changesets"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:175
 
#: kallithea/model/scm.py:716 kallithea/templates/switch_to_list.html:3
 
#: kallithea/templates/branches/branches.html:10
 
msgid "Branches"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:775 kallithea/controllers/pullrequests.py:176
 
#: kallithea/model/scm.py:727 kallithea/templates/switch_to_list.html:25
 
#: kallithea/templates/tags/tags.html:10
 
msgid "Tags"
 
msgstr ""
 

	
 
#: kallithea/controllers/forks.py:186
 
#, python-format
 
msgid "An error occurred during repository forking %s"
 
msgstr ""
 

	
 
#: kallithea/controllers/home.py:84
 
msgid "Groups"
 
msgstr ""
 

	
 
#: kallithea/controllers/home.py:94
 
#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106
 
#: kallithea/templates/admin/repos/repo_add.html:12
 
#: kallithea/templates/admin/repos/repo_add.html:16
 
#: kallithea/templates/admin/repos/repos.html:9
 
#: kallithea/templates/admin/users/user_edit_advanced.html:6
 
#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77
 
#: kallithea/templates/base/base.html:124
 
#: kallithea/templates/base/base.html:479
 
#: kallithea/templates/base/base.html:653
 
msgid "Repositories"
 
msgstr ""
 

	
 
#: kallithea/controllers/home.py:139
 
#: kallithea/templates/files/files_add.html:32
 
#: kallithea/templates/files/files_delete.html:23
 
#: kallithea/templates/files/files_edit.html:32
 
msgid "Branch"
 
msgstr ""
 

	
 
#: kallithea/controllers/home.py:145 kallithea/templates/switch_to_list.html:16
 
msgid "Closed Branches"
 
msgstr ""
 

	
 
#: kallithea/controllers/home.py:151
 
msgid "Tag"
 
msgstr ""
 

	
 
#: kallithea/controllers/home.py:157
 
msgid "Bookmark"
 
msgstr ""
 

	
 
#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153
 
#: kallithea/templates/journal/public_journal.html:4
 
#: kallithea/templates/journal/public_journal.html:21
 
msgid "Public Journal"
 
msgstr ""
 

	
 
#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157
 
#: kallithea/templates/base/base.html:306
 
#: kallithea/templates/journal/journal.html:4
 
#: kallithea/templates/journal/journal.html:12
 
msgid "Journal"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190
 
msgid "Bad captcha"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:150
 
msgid "You have successfully registered into Kallithea"
 
msgid "You have successfully registered with %s"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:195
 
msgid "A password reset confirmation code has been sent"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:244
 
msgid "Invalid password reset token"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:249
 
#: kallithea/controllers/admin/my_account.py:167
 
msgid "Successfully updated password"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:123
 
#, python-format
 
msgid "%s (closed)"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:151
 
#: kallithea/templates/changeset/changeset.html:12
 
#: kallithea/templates/email_templates/changeset_comment.html:17
 
msgid "Changeset"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:172
 
msgid "Special"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:173
 
msgid "Peer branches"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:722
 
#: kallithea/templates/switch_to_list.html:38
 
#: kallithea/templates/bookmarks/bookmarks.html:10
 
msgid "Bookmarks"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:312
 
#, python-format
 
msgid "Error creating pull request: %s"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:358
 
#: kallithea/controllers/pullrequests.py:505
 
msgid "No description"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:365
 
msgid "Successfully opened new pull request"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:368
 
#: kallithea/controllers/pullrequests.py:455
 
#: kallithea/controllers/pullrequests.py:512
 
#, python-format
 
msgid "Invalid reviewer \"%s\" specified"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:371
 
#: kallithea/controllers/pullrequests.py:458
 
msgid "Error occurred while creating pull request"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:403
 
msgid "Missing changesets since the previous pull request:"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:410
 
#, python-format
 
msgid "New changesets on %s %s since the previous pull request:"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:417
 
msgid "Ancestor didn't change - show diff since previous version:"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:424
 
#, python-format
 
msgid "This pull request is based on another %s revision and there is no simple diff."
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:426
 
#, python-format
 
msgid "No changes found on %s %s since previous version."
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:464
 
#, python-format
 
msgid "Closed, replaced by %s ."
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:472
 
msgid "Pull request update created"
kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -198,193 +198,193 @@ msgstr ""
 

	
 
#: kallithea/controllers/files.py:528
 
msgid "Downloads disabled"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:539
 
#, python-format
 
msgid "Unknown revision %s"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:541
 
msgid "Empty repository"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:543
 
msgid "Unknown archive type"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:773
 
#: kallithea/templates/changeset/changeset_range.html:9
 
#: kallithea/templates/email_templates/pull_request.html:15
 
#: kallithea/templates/pullrequests/pullrequest.html:97
 
msgid "Changesets"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:175
 
#: kallithea/model/scm.py:716 kallithea/templates/switch_to_list.html:3
 
#: kallithea/templates/branches/branches.html:10
 
msgid "Branches"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:775 kallithea/controllers/pullrequests.py:176
 
#: kallithea/model/scm.py:727 kallithea/templates/switch_to_list.html:25
 
#: kallithea/templates/tags/tags.html:10
 
msgid "Tags"
 
msgstr ""
 

	
 
#: kallithea/controllers/forks.py:186
 
#, python-format
 
msgid "An error occurred during repository forking %s"
 
msgstr ""
 

	
 
#: kallithea/controllers/home.py:84
 
msgid "Groups"
 
msgstr ""
 

	
 
#: kallithea/controllers/home.py:94
 
#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106
 
#: kallithea/templates/admin/repos/repo_add.html:12
 
#: kallithea/templates/admin/repos/repo_add.html:16
 
#: kallithea/templates/admin/repos/repos.html:9
 
#: kallithea/templates/admin/users/user_edit_advanced.html:6
 
#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77
 
#: kallithea/templates/base/base.html:124
 
#: kallithea/templates/base/base.html:479
 
#: kallithea/templates/base/base.html:653
 
msgid "Repositories"
 
msgstr ""
 

	
 
#: kallithea/controllers/home.py:139
 
#: kallithea/templates/files/files_add.html:32
 
#: kallithea/templates/files/files_delete.html:23
 
#: kallithea/templates/files/files_edit.html:32
 
msgid "Branch"
 
msgstr ""
 

	
 
#: kallithea/controllers/home.py:145 kallithea/templates/switch_to_list.html:16
 
msgid "Closed Branches"
 
msgstr ""
 

	
 
#: kallithea/controllers/home.py:151
 
msgid "Tag"
 
msgstr ""
 

	
 
#: kallithea/controllers/home.py:157
 
msgid "Bookmark"
 
msgstr ""
 

	
 
#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153
 
#: kallithea/templates/journal/public_journal.html:4
 
#: kallithea/templates/journal/public_journal.html:21
 
msgid "Public Journal"
 
msgstr ""
 

	
 
#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157
 
#: kallithea/templates/base/base.html:306
 
#: kallithea/templates/journal/journal.html:4
 
#: kallithea/templates/journal/journal.html:12
 
msgid "Journal"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190
 
msgid "Bad captcha"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:150
 
msgid "You have successfully registered into Kallithea"
 
msgid "You have successfully registered with %s"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:195
 
msgid "A password reset confirmation code has been sent"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:244
 
msgid "Invalid password reset token"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:249
 
#: kallithea/controllers/admin/my_account.py:167
 
msgid "Successfully updated password"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:123
 
#, fuzzy, python-format
 
msgid "%s (closed)"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:151
 
#: kallithea/templates/changeset/changeset.html:12
 
#: kallithea/templates/email_templates/changeset_comment.html:17
 
msgid "Changeset"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:172
 
msgid "Special"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:173
 
msgid "Peer branches"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:722
 
#: kallithea/templates/switch_to_list.html:38
 
#: kallithea/templates/bookmarks/bookmarks.html:10
 
msgid "Bookmarks"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:312
 
#, python-format
 
msgid "Error creating pull request: %s"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:358
 
#: kallithea/controllers/pullrequests.py:505
 
msgid "No description"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:365
 
msgid "Successfully opened new pull request"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:368
 
#: kallithea/controllers/pullrequests.py:455
 
#: kallithea/controllers/pullrequests.py:512
 
#, python-format
 
msgid "Invalid reviewer \"%s\" specified"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:371
 
#: kallithea/controllers/pullrequests.py:458
 
msgid "Error occurred while creating pull request"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:403
 
msgid "Missing changesets since the previous pull request:"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:410
 
#, python-format
 
msgid "New changesets on %s %s since the previous pull request:"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:417
 
msgid "Ancestor didn't change - show diff since previous version:"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:424
 
#, python-format
 
msgid ""
 
"This pull request is based on another %s revision and there is no simple "
 
"diff."
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:426
 
#, python-format
 
msgid "No changes found on %s %s since previous version."
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:464
 
#, python-format
 
msgid "Closed, replaced by %s ."
 
msgstr ""
 

	
kallithea/i18n/pl/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -209,194 +209,194 @@ msgstr "Lokalizacja musi być ścieżką względną i nie może zawierać .. ścieżki"
 

	
 
#: kallithea/controllers/files.py:528
 
msgid "Downloads disabled"
 
msgstr "Pobieranie wyłączone"
 

	
 
#: kallithea/controllers/files.py:539
 
#, python-format
 
msgid "Unknown revision %s"
 
msgstr "Nieznana wersja %s"
 

	
 
#: kallithea/controllers/files.py:541
 
msgid "Empty repository"
 
msgstr "Puste repozytorium"
 

	
 
#: kallithea/controllers/files.py:543
 
msgid "Unknown archive type"
 
msgstr "Nieznany typ archiwum"
 

	
 
#: kallithea/controllers/files.py:773
 
#: kallithea/templates/changeset/changeset_range.html:9
 
#: kallithea/templates/email_templates/pull_request.html:15
 
#: kallithea/templates/pullrequests/pullrequest.html:97
 
msgid "Changesets"
 
msgstr "Różnice"
 

	
 
#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:175
 
#: kallithea/model/scm.py:716 kallithea/templates/switch_to_list.html:3
 
#: kallithea/templates/branches/branches.html:10
 
msgid "Branches"
 
msgstr "Gałęzie"
 

	
 
#: kallithea/controllers/files.py:775 kallithea/controllers/pullrequests.py:176
 
#: kallithea/model/scm.py:727 kallithea/templates/switch_to_list.html:25
 
#: kallithea/templates/tags/tags.html:10
 
msgid "Tags"
 
msgstr "Etykiety"
 

	
 
#: kallithea/controllers/forks.py:186
 
#, python-format
 
msgid "An error occurred during repository forking %s"
 
msgstr "Wystąpił błąd podczas rozgałęzienia %s repozytorium"
 

	
 
#: kallithea/controllers/home.py:84
 
msgid "Groups"
 
msgstr ""
 

	
 
#: kallithea/controllers/home.py:94
 
#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106
 
#: kallithea/templates/admin/repos/repo_add.html:12
 
#: kallithea/templates/admin/repos/repo_add.html:16
 
#: kallithea/templates/admin/repos/repos.html:9
 
#: kallithea/templates/admin/users/user_edit_advanced.html:6
 
#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77
 
#: kallithea/templates/base/base.html:124
 
#: kallithea/templates/base/base.html:479
 
#: kallithea/templates/base/base.html:653
 
msgid "Repositories"
 
msgstr "Repozytoria"
 

	
 
#: kallithea/controllers/home.py:139
 
#: kallithea/templates/files/files_add.html:32
 
#: kallithea/templates/files/files_delete.html:23
 
#: kallithea/templates/files/files_edit.html:32
 
msgid "Branch"
 
msgstr "gałąź"
 

	
 
#: kallithea/controllers/home.py:145 kallithea/templates/switch_to_list.html:16
 
msgid "Closed Branches"
 
msgstr "Zamknięte Gałęzie"
 

	
 
#: kallithea/controllers/home.py:151
 
msgid "Tag"
 
msgstr "Tag"
 

	
 
#: kallithea/controllers/home.py:157
 
msgid "Bookmark"
 
msgstr "Bookmark"
 

	
 
#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153
 
#: kallithea/templates/journal/public_journal.html:4
 
#: kallithea/templates/journal/public_journal.html:21
 
msgid "Public Journal"
 
msgstr "Dziennik Publiczny"
 

	
 
#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157
 
#: kallithea/templates/base/base.html:306
 
#: kallithea/templates/journal/journal.html:4
 
#: kallithea/templates/journal/journal.html:12
 
msgid "Journal"
 
msgstr "Dziennik"
 

	
 
#: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190
 
msgid "Bad captcha"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:150
 
msgid "You have successfully registered into Kallithea"
 
msgstr "Udało Ci się zarejestrować na stronie"
 
msgid "You have successfully registered with %s"
 
msgstr "Udało Ci się zarejestrować w %s"
 

	
 
#: kallithea/controllers/login.py:195
 
#, fuzzy
 
msgid "A password reset confirmation code has been sent"
 
msgstr "Twój link zresetowania hasła został wysłany"
 

	
 
#: kallithea/controllers/login.py:244
 
#, fuzzy
 
msgid "Invalid password reset token"
 
msgstr "łącze resetowania hasła"
 

	
 
#: kallithea/controllers/login.py:249
 
#: kallithea/controllers/admin/my_account.py:167
 
msgid "Successfully updated password"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:123
 
#, python-format
 
msgid "%s (closed)"
 
msgstr "%s (zamknięty)"
 

	
 
#: kallithea/controllers/pullrequests.py:151
 
#: kallithea/templates/changeset/changeset.html:12
 
#: kallithea/templates/email_templates/changeset_comment.html:17
 
msgid "Changeset"
 
msgstr "Grupy zmian"
 

	
 
#: kallithea/controllers/pullrequests.py:172
 
msgid "Special"
 
msgstr "Specjalne"
 

	
 
#: kallithea/controllers/pullrequests.py:173
 
msgid "Peer branches"
 
msgstr "gałęzie"
 

	
 
#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:722
 
#: kallithea/templates/switch_to_list.html:38
 
#: kallithea/templates/bookmarks/bookmarks.html:10
 
msgid "Bookmarks"
 
msgstr "Zakładki"
 

	
 
#: kallithea/controllers/pullrequests.py:312
 
#, python-format
 
msgid "Error creating pull request: %s"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:358
 
#: kallithea/controllers/pullrequests.py:505
 
msgid "No description"
 
msgstr "Brak opisu"
 

	
 
#: kallithea/controllers/pullrequests.py:365
 
msgid "Successfully opened new pull request"
 
msgstr "Prośba o wykonanie połączenia gałęzi została wykonana prawidłowo"
 

	
 
#: kallithea/controllers/pullrequests.py:368
 
#: kallithea/controllers/pullrequests.py:455
 
#: kallithea/controllers/pullrequests.py:512
 
#, python-format
 
msgid "Invalid reviewer \"%s\" specified"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:371
 
#: kallithea/controllers/pullrequests.py:458
 
msgid "Error occurred while creating pull request"
 
msgstr "Wystąpił błąd podczas prośby o połączenie gałęzi"
 

	
 
#: kallithea/controllers/pullrequests.py:403
 
msgid "Missing changesets since the previous pull request:"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:410
 
#, python-format
 
msgid "New changesets on %s %s since the previous pull request:"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:417
 
msgid "Ancestor didn't change - show diff since previous version:"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:424
 
#, python-format
 
msgid ""
 
"This pull request is based on another %s revision and there is no simple "
 
"diff."
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:426
 
#, python-format
 
msgid "No changes found on %s %s since previous version."
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:464
 
#, python-format
 
msgid "Closed, replaced by %s ."
 
msgstr ""
kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -203,194 +203,194 @@ msgstr "O caminho deve ser relativo e não pode conter .."
 

	
 
#: kallithea/controllers/files.py:528
 
msgid "Downloads disabled"
 
msgstr "Downloads desabilitados"
 

	
 
#: kallithea/controllers/files.py:539
 
#, python-format
 
msgid "Unknown revision %s"
 
msgstr "Revisão desconhecida %s"
 

	
 
#: kallithea/controllers/files.py:541
 
msgid "Empty repository"
 
msgstr "Repositório vazio"
 

	
 
#: kallithea/controllers/files.py:543
 
msgid "Unknown archive type"
 
msgstr "Tipo de arquivo desconhecido"
 

	
 
#: kallithea/controllers/files.py:773
 
#: kallithea/templates/changeset/changeset_range.html:9
 
#: kallithea/templates/email_templates/pull_request.html:15
 
#: kallithea/templates/pullrequests/pullrequest.html:97
 
msgid "Changesets"
 
msgstr "Conjuntos de mudanças"
 

	
 
#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:175
 
#: kallithea/model/scm.py:716 kallithea/templates/switch_to_list.html:3
 
#: kallithea/templates/branches/branches.html:10
 
msgid "Branches"
 
msgstr "Ramos"
 

	
 
#: kallithea/controllers/files.py:775 kallithea/controllers/pullrequests.py:176
 
#: kallithea/model/scm.py:727 kallithea/templates/switch_to_list.html:25
 
#: kallithea/templates/tags/tags.html:10
 
msgid "Tags"
 
msgstr "Etiquetas"
 

	
 
#: kallithea/controllers/forks.py:186
 
#, python-format
 
msgid "An error occurred during repository forking %s"
 
msgstr "Ocorreu um erro ao bifurcar o repositório %s"
 

	
 
#: kallithea/controllers/home.py:84
 
msgid "Groups"
 
msgstr ""
 

	
 
#: kallithea/controllers/home.py:94
 
#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106
 
#: kallithea/templates/admin/repos/repo_add.html:12
 
#: kallithea/templates/admin/repos/repo_add.html:16
 
#: kallithea/templates/admin/repos/repos.html:9
 
#: kallithea/templates/admin/users/user_edit_advanced.html:6
 
#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77
 
#: kallithea/templates/base/base.html:124
 
#: kallithea/templates/base/base.html:479
 
#: kallithea/templates/base/base.html:653
 
msgid "Repositories"
 
msgstr "Repositórios"
 

	
 
#: kallithea/controllers/home.py:139
 
#: kallithea/templates/files/files_add.html:32
 
#: kallithea/templates/files/files_delete.html:23
 
#: kallithea/templates/files/files_edit.html:32
 
msgid "Branch"
 
msgstr "Ramo"
 

	
 
#: kallithea/controllers/home.py:145 kallithea/templates/switch_to_list.html:16
 
msgid "Closed Branches"
 
msgstr "Ramos Fechados"
 

	
 
#: kallithea/controllers/home.py:151
 
msgid "Tag"
 
msgstr ""
 

	
 
#: kallithea/controllers/home.py:157
 
msgid "Bookmark"
 
msgstr ""
 

	
 
#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153
 
#: kallithea/templates/journal/public_journal.html:4
 
#: kallithea/templates/journal/public_journal.html:21
 
msgid "Public Journal"
 
msgstr "Diário Público"
 

	
 
#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157
 
#: kallithea/templates/base/base.html:306
 
#: kallithea/templates/journal/journal.html:4
 
#: kallithea/templates/journal/journal.html:12
 
msgid "Journal"
 
msgstr "Diário"
 

	
 
#: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190
 
msgid "Bad captcha"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:150
 
msgid "You have successfully registered into Kallithea"
 
msgstr "Você foi registrado no Kallithea com sucesso"
 
msgid "You have successfully registered with %s"
 
msgstr "Você foi registrado no %s com sucesso"
 

	
 
#: kallithea/controllers/login.py:195
 
#, fuzzy
 
msgid "A password reset confirmation code has been sent"
 
msgstr "Seu link de reinicialização de senha foi enviado"
 

	
 
#: kallithea/controllers/login.py:244
 
#, fuzzy
 
msgid "Invalid password reset token"
 
msgstr "Link para trocar senha"
 

	
 
#: kallithea/controllers/login.py:249
 
#: kallithea/controllers/admin/my_account.py:167
 
msgid "Successfully updated password"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:123
 
#, fuzzy, python-format
 
msgid "%s (closed)"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:151
 
#: kallithea/templates/changeset/changeset.html:12
 
#: kallithea/templates/email_templates/changeset_comment.html:17
 
msgid "Changeset"
 
msgstr "Conjunto de Mudanças"
 

	
 
#: kallithea/controllers/pullrequests.py:172
 
msgid "Special"
 
msgstr "Especial"
 

	
 
#: kallithea/controllers/pullrequests.py:173
 
msgid "Peer branches"
 
msgstr "Ramos pares"
 

	
 
#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:722
 
#: kallithea/templates/switch_to_list.html:38
 
#: kallithea/templates/bookmarks/bookmarks.html:10
 
msgid "Bookmarks"
 
msgstr "Marcadores"
 

	
 
#: kallithea/controllers/pullrequests.py:312
 
#, python-format
 
msgid "Error creating pull request: %s"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:358
 
#: kallithea/controllers/pullrequests.py:505
 
#, fuzzy
 
msgid "No description"
 
msgstr "Descrição"
 

	
 
#: kallithea/controllers/pullrequests.py:365
 
msgid "Successfully opened new pull request"
 
msgstr "Novo pull request criado com sucesso"
 

	
 
#: kallithea/controllers/pullrequests.py:368
 
#: kallithea/controllers/pullrequests.py:455
 
#: kallithea/controllers/pullrequests.py:512
 
#, python-format
 
msgid "Invalid reviewer \"%s\" specified"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:371
 
#: kallithea/controllers/pullrequests.py:458
 
#, fuzzy
 
msgid "Error occurred while creating pull request"
 
msgstr "Ocorreu um erro durante o envio do pull request"
 

	
 
#: kallithea/controllers/pullrequests.py:403
 
msgid "Missing changesets since the previous pull request:"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:410
 
#, python-format
 
msgid "New changesets on %s %s since the previous pull request:"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:417
 
msgid "Ancestor didn't change - show diff since previous version:"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:424
 
#, python-format
 
msgid ""
 
"This pull request is based on another %s revision and there is no simple "
 
"diff."
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:426
 
#, python-format
 
msgid "No changes found on %s %s since previous version."
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:464
 
#, python-format
kallithea/i18n/ru/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -213,194 +213,194 @@ msgstr ""
 

	
 
#: kallithea/controllers/files.py:528
 
msgid "Downloads disabled"
 
msgstr "Возможность скачивать отключена"
 

	
 
#: kallithea/controllers/files.py:539
 
#, python-format
 
msgid "Unknown revision %s"
 
msgstr "Неизвестная ревизия %s"
 

	
 
#: kallithea/controllers/files.py:541
 
msgid "Empty repository"
 
msgstr "Пустой репозиторий"
 

	
 
#: kallithea/controllers/files.py:543
 
msgid "Unknown archive type"
 
msgstr "Неизвестный тип архива"
 

	
 
#: kallithea/controllers/files.py:773
 
#: kallithea/templates/changeset/changeset_range.html:9
 
#: kallithea/templates/email_templates/pull_request.html:15
 
#: kallithea/templates/pullrequests/pullrequest.html:97
 
msgid "Changesets"
 
msgstr "Набор изменений"
 

	
 
#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:175
 
#: kallithea/model/scm.py:716 kallithea/templates/switch_to_list.html:3
 
#: kallithea/templates/branches/branches.html:10
 
msgid "Branches"
 
msgstr "Ветки"
 

	
 
#: kallithea/controllers/files.py:775 kallithea/controllers/pullrequests.py:176
 
#: kallithea/model/scm.py:727 kallithea/templates/switch_to_list.html:25
 
#: kallithea/templates/tags/tags.html:10
 
msgid "Tags"
 
msgstr "Метки"
 

	
 
#: kallithea/controllers/forks.py:186
 
#, python-format
 
msgid "An error occurred during repository forking %s"
 
msgstr "Произошла ошибка во время создания форка репозитория %s"
 

	
 
#: kallithea/controllers/home.py:84
 
msgid "Groups"
 
msgstr "Группы"
 

	
 
#: kallithea/controllers/home.py:94
 
#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106
 
#: kallithea/templates/admin/repos/repo_add.html:12
 
#: kallithea/templates/admin/repos/repo_add.html:16
 
#: kallithea/templates/admin/repos/repos.html:9
 
#: kallithea/templates/admin/users/user_edit_advanced.html:6
 
#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77
 
#: kallithea/templates/base/base.html:124
 
#: kallithea/templates/base/base.html:479
 
#: kallithea/templates/base/base.html:653
 
msgid "Repositories"
 
msgstr "Репозитории"
 

	
 
#: kallithea/controllers/home.py:139
 
#: kallithea/templates/files/files_add.html:32
 
#: kallithea/templates/files/files_delete.html:23
 
#: kallithea/templates/files/files_edit.html:32
 
msgid "Branch"
 
msgstr "Ветка"
 

	
 
#: kallithea/controllers/home.py:145 kallithea/templates/switch_to_list.html:16
 
msgid "Closed Branches"
 
msgstr "Закрытые ветки"
 

	
 
#: kallithea/controllers/home.py:151
 
msgid "Tag"
 
msgstr "Тэги"
 

	
 
#: kallithea/controllers/home.py:157
 
msgid "Bookmark"
 
msgstr "Закладки"
 

	
 
#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153
 
#: kallithea/templates/journal/public_journal.html:4
 
#: kallithea/templates/journal/public_journal.html:21
 
msgid "Public Journal"
 
msgstr "Публичный журнал"
 

	
 
#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157
 
#: kallithea/templates/base/base.html:306
 
#: kallithea/templates/journal/journal.html:4
 
#: kallithea/templates/journal/journal.html:12
 
msgid "Journal"
 
msgstr "Журнал"
 

	
 
#: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190
 
msgid "Bad captcha"
 
msgstr "Неверная капча"
 

	
 
#: kallithea/controllers/login.py:150
 
msgid "You have successfully registered into Kallithea"
 
msgstr "Регистрация в Kallithea прошла успешно"
 
msgid "You have successfully registered with %s"
 
msgstr "Регистрация в %s прошла успешно"
 

	
 
#: kallithea/controllers/login.py:195
 
msgid "A password reset confirmation code has been sent"
 
msgstr "Код для сброса пароля отправлен"
 

	
 
#: kallithea/controllers/login.py:244
 
msgid "Invalid password reset token"
 
msgstr "Неверный код для сброса пароля"
 

	
 
#: kallithea/controllers/login.py:249
 
#: kallithea/controllers/admin/my_account.py:167
 
msgid "Successfully updated password"
 
msgstr "Пароль обновлён"
 

	
 
#: kallithea/controllers/pullrequests.py:123
 
#, python-format
 
msgid "%s (closed)"
 
msgstr "%s (закрыта)"
 

	
 
#: kallithea/controllers/pullrequests.py:151
 
#: kallithea/templates/changeset/changeset.html:12
 
#: kallithea/templates/email_templates/changeset_comment.html:17
 
msgid "Changeset"
 
msgstr "Изменения"
 

	
 
#: kallithea/controllers/pullrequests.py:172
 
msgid "Special"
 
msgstr "Специальный"
 

	
 
#: kallithea/controllers/pullrequests.py:173
 
msgid "Peer branches"
 
msgstr "Ветки участника"
 

	
 
#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:722
 
#: kallithea/templates/switch_to_list.html:38
 
#: kallithea/templates/bookmarks/bookmarks.html:10
 
msgid "Bookmarks"
 
msgstr "Закладки"
 

	
 
#: kallithea/controllers/pullrequests.py:312
 
#, python-format
 
msgid "Error creating pull request: %s"
 
msgstr "Ошибка при создании pull-запроса: %s"
 

	
 
#: kallithea/controllers/pullrequests.py:358
 
#: kallithea/controllers/pullrequests.py:505
 
msgid "No description"
 
msgstr "Нет описания"
 

	
 
#: kallithea/controllers/pullrequests.py:365
 
msgid "Successfully opened new pull request"
 
msgstr "Pull-запрос создан успешно"
 

	
 
#: kallithea/controllers/pullrequests.py:368
 
#: kallithea/controllers/pullrequests.py:455
 
#: kallithea/controllers/pullrequests.py:512
 
#, python-format
 
msgid "Invalid reviewer \"%s\" specified"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:371
 
#: kallithea/controllers/pullrequests.py:458
 
msgid "Error occurred while creating pull request"
 
msgstr "Произошла ошибка при создании pull-запроса"
 

	
 
#: kallithea/controllers/pullrequests.py:403
 
msgid "Missing changesets since the previous pull request:"
 
msgstr "Отсутствующие ревизии относительно предыдущего pull-запроса:"
 

	
 
#: kallithea/controllers/pullrequests.py:410
 
#, python-format
 
msgid "New changesets on %s %s since the previous pull request:"
 
msgstr "Новые ревизии на %s %s относительно предыдущего pull-запроса"
 

	
 
#: kallithea/controllers/pullrequests.py:417
 
msgid "Ancestor didn't change - show diff since previous version:"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:424
 
#, python-format
 
msgid ""
 
"This pull request is based on another %s revision and there is no simple "
 
"diff."
 
msgstr "Этот pull-запрос основан на другой ревизии %s, простой diff невозможен"
 

	
 
#: kallithea/controllers/pullrequests.py:426
 
#, python-format
 
msgid "No changes found on %s %s since previous version."
 
msgstr "Нет изменений на %s %s относительно предыдущей версии."
 

	
 
#: kallithea/controllers/pullrequests.py:464
 
#, python-format
 
msgid "Closed, replaced by %s ."
 
msgstr "Закрыт, замещён %s ."
 

	
 
#: kallithea/controllers/pullrequests.py:472
kallithea/i18n/sk/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -198,193 +198,193 @@ msgstr ""
 
#: kallithea/controllers/files.py:528
 
msgid "Downloads disabled"
 
msgstr "Sťahovanie vypnuté"
 

	
 
#: kallithea/controllers/files.py:539
 
#, python-format
 
msgid "Unknown revision %s"
 
msgstr "Neznáma revízia %s"
 

	
 
#: kallithea/controllers/files.py:541
 
msgid "Empty repository"
 
msgstr "Prázdny repozitár"
 

	
 
#: kallithea/controllers/files.py:543
 
msgid "Unknown archive type"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:773
 
#: kallithea/templates/changeset/changeset_range.html:9
 
#: kallithea/templates/email_templates/pull_request.html:15
 
#: kallithea/templates/pullrequests/pullrequest.html:97
 
msgid "Changesets"
 
msgstr "Zmeny"
 

	
 
#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:175
 
#: kallithea/model/scm.py:716 kallithea/templates/switch_to_list.html:3
 
#: kallithea/templates/branches/branches.html:10
 
msgid "Branches"
 
msgstr "Vetvy"
 

	
 
#: kallithea/controllers/files.py:775 kallithea/controllers/pullrequests.py:176
 
#: kallithea/model/scm.py:727 kallithea/templates/switch_to_list.html:25
 
#: kallithea/templates/tags/tags.html:10
 
msgid "Tags"
 
msgstr "Tagy"
 

	
 
#: kallithea/controllers/forks.py:186
 
#, python-format
 
msgid "An error occurred during repository forking %s"
 
msgstr ""
 

	
 
#: kallithea/controllers/home.py:84
 
msgid "Groups"
 
msgstr "Skupiny"
 

	
 
#: kallithea/controllers/home.py:94
 
#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106
 
#: kallithea/templates/admin/repos/repo_add.html:12
 
#: kallithea/templates/admin/repos/repo_add.html:16
 
#: kallithea/templates/admin/repos/repos.html:9
 
#: kallithea/templates/admin/users/user_edit_advanced.html:6
 
#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77
 
#: kallithea/templates/base/base.html:124
 
#: kallithea/templates/base/base.html:479
 
#: kallithea/templates/base/base.html:653
 
msgid "Repositories"
 
msgstr "Repozitáre"
 

	
 
#: kallithea/controllers/home.py:139
 
#: kallithea/templates/files/files_add.html:32
 
#: kallithea/templates/files/files_delete.html:23
 
#: kallithea/templates/files/files_edit.html:32
 
msgid "Branch"
 
msgstr "Vetva"
 

	
 
#: kallithea/controllers/home.py:145 kallithea/templates/switch_to_list.html:16
 
msgid "Closed Branches"
 
msgstr ""
 

	
 
#: kallithea/controllers/home.py:151
 
msgid "Tag"
 
msgstr ""
 

	
 
#: kallithea/controllers/home.py:157
 
msgid "Bookmark"
 
msgstr "Záložka"
 

	
 
#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153
 
#: kallithea/templates/journal/public_journal.html:4
 
#: kallithea/templates/journal/public_journal.html:21
 
msgid "Public Journal"
 
msgstr ""
 

	
 
#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157
 
#: kallithea/templates/base/base.html:306
 
#: kallithea/templates/journal/journal.html:4
 
#: kallithea/templates/journal/journal.html:12
 
msgid "Journal"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190
 
#, fuzzy
 
msgid "Bad captcha"
 
msgstr "zlá captcha"
 

	
 
#: kallithea/controllers/login.py:150
 
msgid "You have successfully registered into Kallithea"
 
msgid "You have successfully registered with %s"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:195
 
msgid "A password reset confirmation code has been sent"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:244
 
msgid "Invalid password reset token"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:249
 
#: kallithea/controllers/admin/my_account.py:167
 
msgid "Successfully updated password"
 
msgstr "Úspešne aktualizované heslo"
 

	
 
#: kallithea/controllers/pullrequests.py:123
 
#, python-format
 
msgid "%s (closed)"
 
msgstr "%s (zatvorené)"
 

	
 
#: kallithea/controllers/pullrequests.py:151
 
#: kallithea/templates/changeset/changeset.html:12
 
#: kallithea/templates/email_templates/changeset_comment.html:17
 
msgid "Changeset"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:172
 
msgid "Special"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:173
 
msgid "Peer branches"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:722
 
#: kallithea/templates/switch_to_list.html:38
 
#: kallithea/templates/bookmarks/bookmarks.html:10
 
msgid "Bookmarks"
 
msgstr "Záložky"
 

	
 
#: kallithea/controllers/pullrequests.py:312
 
#, python-format
 
msgid "Error creating pull request: %s"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:358
 
#: kallithea/controllers/pullrequests.py:505
 
msgid "No description"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:365
 
msgid "Successfully opened new pull request"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:368
 
#: kallithea/controllers/pullrequests.py:455
 
#: kallithea/controllers/pullrequests.py:512
 
#, python-format
 
msgid "Invalid reviewer \"%s\" specified"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:371
 
#: kallithea/controllers/pullrequests.py:458
 
msgid "Error occurred while creating pull request"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:403
 
msgid "Missing changesets since the previous pull request:"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:410
 
#, python-format
 
msgid "New changesets on %s %s since the previous pull request:"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:417
 
msgid "Ancestor didn't change - show diff since previous version:"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:424
 
#, python-format
 
msgid ""
 
"This pull request is based on another %s revision and there is no simple "
 
"diff."
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:426
 
#, python-format
 
msgid "No changes found on %s %s since previous version."
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:464
 
#, python-format
 
msgid "Closed, replaced by %s ."
 
msgstr ""
 

	
kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -200,194 +200,194 @@ msgstr ""
 

	
 
#: kallithea/controllers/files.py:528
 
msgid "Downloads disabled"
 
msgstr "下载已禁用"
 

	
 
#: kallithea/controllers/files.py:539
 
#, python-format
 
msgid "Unknown revision %s"
 
msgstr "未知版本%s"
 

	
 
#: kallithea/controllers/files.py:541
 
msgid "Empty repository"
 
msgstr "空版本库"
 

	
 
#: kallithea/controllers/files.py:543
 
msgid "Unknown archive type"
 
msgstr "未知包类型"
 

	
 
#: kallithea/controllers/files.py:773
 
#: kallithea/templates/changeset/changeset_range.html:9
 
#: kallithea/templates/email_templates/pull_request.html:15
 
#: kallithea/templates/pullrequests/pullrequest.html:97
 
msgid "Changesets"
 
msgstr "修订集"
 

	
 
#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:175
 
#: kallithea/model/scm.py:716 kallithea/templates/switch_to_list.html:3
 
#: kallithea/templates/branches/branches.html:10
 
msgid "Branches"
 
msgstr "分支"
 

	
 
#: kallithea/controllers/files.py:775 kallithea/controllers/pullrequests.py:176
 
#: kallithea/model/scm.py:727 kallithea/templates/switch_to_list.html:25
 
#: kallithea/templates/tags/tags.html:10
 
msgid "Tags"
 
msgstr "标签"
 

	
 
#: kallithea/controllers/forks.py:186
 
#, python-format
 
msgid "An error occurred during repository forking %s"
 
msgstr "在复刻版本库%s的时候发生错误"
 

	
 
#: kallithea/controllers/home.py:84
 
msgid "Groups"
 
msgstr "组"
 

	
 
#: kallithea/controllers/home.py:94
 
#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106
 
#: kallithea/templates/admin/repos/repo_add.html:12
 
#: kallithea/templates/admin/repos/repo_add.html:16
 
#: kallithea/templates/admin/repos/repos.html:9
 
#: kallithea/templates/admin/users/user_edit_advanced.html:6
 
#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77
 
#: kallithea/templates/base/base.html:124
 
#: kallithea/templates/base/base.html:479
 
#: kallithea/templates/base/base.html:653
 
msgid "Repositories"
 
msgstr "版本库"
 

	
 
#: kallithea/controllers/home.py:139
 
#: kallithea/templates/files/files_add.html:32
 
#: kallithea/templates/files/files_delete.html:23
 
#: kallithea/templates/files/files_edit.html:32
 
msgid "Branch"
 
msgstr "分支"
 

	
 
#: kallithea/controllers/home.py:145 kallithea/templates/switch_to_list.html:16
 
msgid "Closed Branches"
 
msgstr "已关闭分支"
 

	
 
#: kallithea/controllers/home.py:151
 
msgid "Tag"
 
msgstr "标签"
 

	
 
#: kallithea/controllers/home.py:157
 
msgid "Bookmark"
 
msgstr "书签"
 

	
 
#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153
 
#: kallithea/templates/journal/public_journal.html:4
 
#: kallithea/templates/journal/public_journal.html:21
 
msgid "Public Journal"
 
msgstr "公共日志"
 

	
 
#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157
 
#: kallithea/templates/base/base.html:306
 
#: kallithea/templates/journal/journal.html:4
 
#: kallithea/templates/journal/journal.html:12
 
msgid "Journal"
 
msgstr "日志"
 

	
 
#: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190
 
msgid "Bad captcha"
 
msgstr "验证码错误"
 

	
 
#: kallithea/controllers/login.py:150
 
msgid "You have successfully registered into Kallithea"
 
msgstr "您已成功注册 Kallithea"
 
msgid "You have successfully registered with %s"
 
msgstr "您已成功注册 %s"
 

	
 
#: kallithea/controllers/login.py:195
 
msgid "A password reset confirmation code has been sent"
 
msgstr "密码重置确认码已经发送"
 

	
 
#: kallithea/controllers/login.py:244
 
msgid "Invalid password reset token"
 
msgstr "无效的密码重置令牌"
 

	
 
#: kallithea/controllers/login.py:249
 
#: kallithea/controllers/admin/my_account.py:167
 
msgid "Successfully updated password"
 
msgstr "成功更新密码"
 

	
 
#: kallithea/controllers/pullrequests.py:123
 
#, python-format
 
msgid "%s (closed)"
 
msgstr "%s (已关闭)"
 

	
 
#: kallithea/controllers/pullrequests.py:151
 
#: kallithea/templates/changeset/changeset.html:12
 
#: kallithea/templates/email_templates/changeset_comment.html:17
 
msgid "Changeset"
 
msgstr "修订集"
 

	
 
#: kallithea/controllers/pullrequests.py:172
 
msgid "Special"
 
msgstr "特殊"
 

	
 
#: kallithea/controllers/pullrequests.py:173
 
msgid "Peer branches"
 
msgstr "同等分支"
 

	
 
#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:722
 
#: kallithea/templates/switch_to_list.html:38
 
#: kallithea/templates/bookmarks/bookmarks.html:10
 
msgid "Bookmarks"
 
msgstr "书签"
 

	
 
#: kallithea/controllers/pullrequests.py:312
 
#, python-format
 
msgid "Error creating pull request: %s"
 
msgstr "创建拉取请求出错:%s"
 

	
 
#: kallithea/controllers/pullrequests.py:358
 
#: kallithea/controllers/pullrequests.py:505
 
msgid "No description"
 
msgstr "无描述"
 

	
 
#: kallithea/controllers/pullrequests.py:365
 
msgid "Successfully opened new pull request"
 
msgstr "成功提交拉取请求"
 

	
 
#: kallithea/controllers/pullrequests.py:368
 
#: kallithea/controllers/pullrequests.py:455
 
#: kallithea/controllers/pullrequests.py:512
 
#, python-format
 
msgid "Invalid reviewer \"%s\" specified"
 
msgstr "指定的审核者 \"%s\" 无效"
 

	
 
#: kallithea/controllers/pullrequests.py:371
 
#: kallithea/controllers/pullrequests.py:458
 
msgid "Error occurred while creating pull request"
 
msgstr "创建拉取请求时发生错误"
 

	
 
#: kallithea/controllers/pullrequests.py:403
 
msgid "Missing changesets since the previous pull request:"
 
msgstr "缺少上次拉取请求之后的修订集:"
 

	
 
#: kallithea/controllers/pullrequests.py:410
 
#, python-format
 
msgid "New changesets on %s %s since the previous pull request:"
 
msgstr "在上次拉取请求之后,在 %s %s 上的新修订集:"
 

	
 
#: kallithea/controllers/pullrequests.py:417
 
msgid "Ancestor didn't change - show diff since previous version:"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:424
 
#, python-format
 
msgid ""
 
"This pull request is based on another %s revision and there is no simple "
 
"diff."
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:426
 
#, python-format
 
msgid "No changes found on %s %s since previous version."
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:464
 
#, python-format
 
msgid "Closed, replaced by %s ."
 
msgstr "已关闭,被 %s 替换。"
 

	
 
#: kallithea/controllers/pullrequests.py:472
kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -197,193 +197,193 @@ msgstr ""
 

	
 
#: kallithea/controllers/files.py:528
 
msgid "Downloads disabled"
 
msgstr ""
 

	
 
#: kallithea/controllers/files.py:539
 
#, python-format
 
msgid "Unknown revision %s"
 
msgstr "未知修訂 %s"
 

	
 
#: kallithea/controllers/files.py:541
 
msgid "Empty repository"
 
msgstr "空的版本庫"
 

	
 
#: kallithea/controllers/files.py:543
 
msgid "Unknown archive type"
 
msgstr "未知的存檔類型"
 

	
 
#: kallithea/controllers/files.py:773
 
#: kallithea/templates/changeset/changeset_range.html:9
 
#: kallithea/templates/email_templates/pull_request.html:15
 
#: kallithea/templates/pullrequests/pullrequest.html:97
 
msgid "Changesets"
 
msgstr "變更"
 

	
 
#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:175
 
#: kallithea/model/scm.py:716 kallithea/templates/switch_to_list.html:3
 
#: kallithea/templates/branches/branches.html:10
 
msgid "Branches"
 
msgstr "分支"
 

	
 
#: kallithea/controllers/files.py:775 kallithea/controllers/pullrequests.py:176
 
#: kallithea/model/scm.py:727 kallithea/templates/switch_to_list.html:25
 
#: kallithea/templates/tags/tags.html:10
 
msgid "Tags"
 
msgstr "標籤"
 

	
 
#: kallithea/controllers/forks.py:186
 
#, python-format
 
msgid "An error occurred during repository forking %s"
 
msgstr ""
 

	
 
#: kallithea/controllers/home.py:84
 
msgid "Groups"
 
msgstr ""
 

	
 
#: kallithea/controllers/home.py:94
 
#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106
 
#: kallithea/templates/admin/repos/repo_add.html:12
 
#: kallithea/templates/admin/repos/repo_add.html:16
 
#: kallithea/templates/admin/repos/repos.html:9
 
#: kallithea/templates/admin/users/user_edit_advanced.html:6
 
#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77
 
#: kallithea/templates/base/base.html:124
 
#: kallithea/templates/base/base.html:479
 
#: kallithea/templates/base/base.html:653
 
msgid "Repositories"
 
msgstr "版本庫"
 

	
 
#: kallithea/controllers/home.py:139
 
#: kallithea/templates/files/files_add.html:32
 
#: kallithea/templates/files/files_delete.html:23
 
#: kallithea/templates/files/files_edit.html:32
 
msgid "Branch"
 
msgstr ""
 

	
 
#: kallithea/controllers/home.py:145 kallithea/templates/switch_to_list.html:16
 
msgid "Closed Branches"
 
msgstr ""
 

	
 
#: kallithea/controllers/home.py:151
 
msgid "Tag"
 
msgstr ""
 

	
 
#: kallithea/controllers/home.py:157
 
msgid "Bookmark"
 
msgstr ""
 

	
 
#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153
 
#: kallithea/templates/journal/public_journal.html:4
 
#: kallithea/templates/journal/public_journal.html:21
 
msgid "Public Journal"
 
msgstr "開放日誌"
 

	
 
#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157
 
#: kallithea/templates/base/base.html:306
 
#: kallithea/templates/journal/journal.html:4
 
#: kallithea/templates/journal/journal.html:12
 
msgid "Journal"
 
msgstr "日誌"
 

	
 
#: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190
 
msgid "Bad captcha"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:150
 
msgid "You have successfully registered into Kallithea"
 
msgid "You have successfully registered with %s"
 
msgstr ""
 

	
 
#: kallithea/controllers/login.py:195
 
#, fuzzy
 
msgid "A password reset confirmation code has been sent"
 
msgstr "您的密碼重設連結已寄出"
 

	
 
#: kallithea/controllers/login.py:244
 
#, fuzzy
 
msgid "Invalid password reset token"
 
msgstr "您的密碼重設連結已寄出"
 

	
 
#: kallithea/controllers/login.py:249
 
#: kallithea/controllers/admin/my_account.py:167
 
msgid "Successfully updated password"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:123
 
#, python-format
 
msgid "%s (closed)"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:151
 
#: kallithea/templates/changeset/changeset.html:12
 
#: kallithea/templates/email_templates/changeset_comment.html:17
 
msgid "Changeset"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:172
 
msgid "Special"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:173
 
msgid "Peer branches"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:722
 
#: kallithea/templates/switch_to_list.html:38
 
#: kallithea/templates/bookmarks/bookmarks.html:10
 
msgid "Bookmarks"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:312
 
#, python-format
 
msgid "Error creating pull request: %s"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:358
 
#: kallithea/controllers/pullrequests.py:505
 
#, fuzzy
 
msgid "No description"
 
msgstr "描述"
 

	
 
#: kallithea/controllers/pullrequests.py:365
 
msgid "Successfully opened new pull request"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:368
 
#: kallithea/controllers/pullrequests.py:455
 
#: kallithea/controllers/pullrequests.py:512
 
#, python-format
 
msgid "Invalid reviewer \"%s\" specified"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:371
 
#: kallithea/controllers/pullrequests.py:458
 
msgid "Error occurred while creating pull request"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:403
 
msgid "Missing changesets since the previous pull request:"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:410
 
#, python-format
 
msgid "New changesets on %s %s since the previous pull request:"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:417
 
msgid "Ancestor didn't change - show diff since previous version:"
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:424
 
#, python-format
 
msgid ""
 
"This pull request is based on another %s revision and there is no simple "
 
"diff."
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:426
 
#, python-format
 
msgid "No changes found on %s %s since previous version."
 
msgstr ""
 

	
 
#: kallithea/controllers/pullrequests.py:464
 
#, python-format
kallithea/tests/functional/test_login.py
Show inline comments
 
@@ -234,193 +234,193 @@ class TestLoginController(TestController
 

	
 
        msg = validators.UniqSystemEmail()()._messages['email_taken']
 
        response.mustcontain(msg)
 

	
 
    def test_register_err_same_email_case_sensitive(self):
 
        response = self.app.post(url(controller='login', action='register'),
 
                                            {'username': 'test_admin_1',
 
                                             'password': 'test12',
 
                                             'password_confirmation': 'test12',
 
                                             'email': TEST_USER_ADMIN_EMAIL.title(),
 
                                             'firstname': 'test',
 
                                             'lastname': 'test'})
 
        msg = validators.UniqSystemEmail()()._messages['email_taken']
 
        response.mustcontain(msg)
 

	
 
    def test_register_err_wrong_data(self):
 
        response = self.app.post(url(controller='login', action='register'),
 
                                            {'username': 'xs',
 
                                             'password': 'test',
 
                                             'password_confirmation': 'test',
 
                                             'email': 'goodmailm',
 
                                             'firstname': 'test',
 
                                             'lastname': 'test'})
 
        assert response.status == '200 OK'
 
        response.mustcontain('An email address must contain a single @')
 
        response.mustcontain('Enter a value 6 characters long or more')
 

	
 
    def test_register_err_username(self):
 
        response = self.app.post(url(controller='login', action='register'),
 
                                            {'username': 'error user',
 
                                             'password': 'test12',
 
                                             'password_confirmation': 'test12',
 
                                             'email': 'goodmailm',
 
                                             'firstname': 'test',
 
                                             'lastname': 'test'})
 

	
 
        response.mustcontain('An email address must contain a single @')
 
        response.mustcontain('Username may only contain '
 
                'alphanumeric characters underscores, '
 
                'periods or dashes and must begin with an '
 
                'alphanumeric character')
 

	
 
    def test_register_err_case_sensitive(self):
 
        usr = TEST_USER_ADMIN_LOGIN.title()
 
        response = self.app.post(url(controller='login', action='register'),
 
                                            {'username': usr,
 
                                             'password': 'test12',
 
                                             'password_confirmation': 'test12',
 
                                             'email': 'goodmailm',
 
                                             'firstname': 'test',
 
                                             'lastname': 'test'})
 

	
 
        response.mustcontain('An email address must contain a single @')
 
        msg = validators.ValidUsername()._messages['username_exists']
 
        msg = h.html_escape(msg % {'username': usr})
 
        response.mustcontain(msg)
 

	
 
    def test_register_special_chars(self):
 
        response = self.app.post(url(controller='login', action='register'),
 
                                        {'username': 'xxxaxn',
 
                                         'password': 'ąćźżąśśśś',
 
                                         'password_confirmation': 'ąćźżąśśśś',
 
                                         'email': 'goodmailm@test.plx',
 
                                         'firstname': 'test',
 
                                         'lastname': 'test'})
 

	
 
        msg = validators.ValidPassword()._messages['invalid_password']
 
        response.mustcontain(msg)
 

	
 
    def test_register_password_mismatch(self):
 
        response = self.app.post(url(controller='login', action='register'),
 
                                            {'username': 'xs',
 
                                             'password': '123qwe',
 
                                             'password_confirmation': 'qwe123',
 
                                             'email': 'goodmailm@test.plxa',
 
                                             'firstname': 'test',
 
                                             'lastname': 'test'})
 
        msg = validators.ValidPasswordsMatch('password', 'password_confirmation')._messages['password_mismatch']
 
        response.mustcontain(msg)
 

	
 
    def test_register_ok(self):
 
        username = 'test_regular4'
 
        password = 'qweqwe'
 
        email = 'user4@example.com'
 
        name = 'testname'
 
        lastname = 'testlastname'
 

	
 
        response = self.app.post(url(controller='login', action='register'),
 
                                            {'username': username,
 
                                             'password': password,
 
                                             'password_confirmation': password,
 
                                             'email': email,
 
                                             'firstname': name,
 
                                             'lastname': lastname,
 
                                             'admin': True})  # This should be overridden
 
        assert response.status == '302 Found'
 
        self.checkSessionFlash(response, 'You have successfully registered into Kallithea')
 
        self.checkSessionFlash(response, 'You have successfully registered with Kallithea')
 

	
 
        ret = Session().query(User).filter(User.username == 'test_regular4').one()
 
        assert ret.username == username
 
        assert check_password(password, ret.password) == True
 
        assert ret.email == email
 
        assert ret.name == name
 
        assert ret.lastname == lastname
 
        assert ret.api_key != None
 
        assert ret.admin == False
 

	
 
    #==========================================================================
 
    # PASSWORD RESET
 
    #==========================================================================
 

	
 
    def test_forgot_password_wrong_mail(self):
 
        bad_email = 'username%wrongmail.org'
 
        response = self.app.post(
 
                        url(controller='login', action='password_reset'),
 
                            {'email': bad_email, }
 
        )
 

	
 
        response.mustcontain('An email address must contain a single @')
 

	
 
    def test_forgot_password(self):
 
        response = self.app.get(url(controller='login',
 
                                    action='password_reset'))
 
        assert response.status == '200 OK'
 

	
 
        username = 'test_password_reset_1'
 
        password = 'qweqwe'
 
        email = 'username@example.com'
 
        name = u'passwd'
 
        lastname = u'reset'
 
        timestamp = int(time.time())
 

	
 
        new = User()
 
        new.username = username
 
        new.password = password
 
        new.email = email
 
        new.name = name
 
        new.lastname = lastname
 
        new.api_key = generate_api_key()
 
        Session().add(new)
 
        Session().commit()
 

	
 
        response = self.app.post(url(controller='login',
 
                                     action='password_reset'),
 
                                 {'email': email, })
 

	
 
        self.checkSessionFlash(response, 'A password reset confirmation code has been sent')
 

	
 
        response = response.follow()
 

	
 
        # BAD TOKEN
 

	
 
        token = "bad"
 

	
 
        response = self.app.post(url(controller='login',
 
                                     action='password_reset_confirmation'),
 
                                 {'email': email,
 
                                  'timestamp': timestamp,
 
                                  'password': "p@ssw0rd",
 
                                  'password_confirm': "p@ssw0rd",
 
                                  'token': token,
 
                                 })
 
        assert response.status == '200 OK'
 
        response.mustcontain('Invalid password reset token')
 

	
 
        # GOOD TOKEN
 

	
 
        # TODO: The token should ideally be taken from the mail sent
 
        # above, instead of being recalculated.
 

	
 
        token = UserModel().get_reset_password_token(
 
            User.get_by_username(username), timestamp, self.authentication_token())
 

	
 
        response = self.app.get(url(controller='login',
 
                                    action='password_reset_confirmation',
 
                                    email=email,
 
                                    timestamp=timestamp,
 
                                    token=token))
 
        assert response.status == '200 OK'
 
        response.mustcontain("You are about to set a new password for the email address %s" % email)
 

	
 
        response = self.app.post(url(controller='login',
 
                                     action='password_reset_confirmation'),
 
                                 {'email': email,
 
                                  'timestamp': timestamp,
 
                                  'password': "p@ssw0rd",
 
                                  'password_confirm': "p@ssw0rd",
 
                                  'token': token,
 
                                 })
 
        assert response.status == '302 Found'
 
        self.checkSessionFlash(response, 'Successfully updated password')
 

	
 
        response = response.follow()
0 comments (0 inline, 0 general)