kallithea Changeset - 38e418408c58

Changeset - 38e418408c58

Parent rev.

Child rev.

[Not reviewed]

default

0 18 0

Søren Løvborg - 9 years ago 2016-07-28 15:38:30
sorenl@unity3d.com

18 files changed with 28 insertions and 28 deletions:

kallithea/controllers/login.py

kallithea/i18n/be/LC_MESSAGES/kallithea.po

kallithea/i18n/cs/LC_MESSAGES/kallithea.po

kallithea/i18n/de/LC_MESSAGES/kallithea.po

kallithea/i18n/el/LC_MESSAGES/kallithea.po

kallithea/i18n/es/LC_MESSAGES/kallithea.po

kallithea/i18n/fr/LC_MESSAGES/kallithea.po

kallithea/i18n/hu/LC_MESSAGES/kallithea.po

kallithea/i18n/ja/LC_MESSAGES/kallithea.po

kallithea/i18n/kallithea.pot

kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po

kallithea/i18n/pl/LC_MESSAGES/kallithea.po

kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po

kallithea/i18n/ru/LC_MESSAGES/kallithea.po

kallithea/i18n/sk/LC_MESSAGES/kallithea.po

kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po

kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po

kallithea/tests/functional/test_login.py

0 comments (0 inline, 0 general)

kallithea/controllers/login.py

➞

Show inline comments

@@ @@ -102,97 +102,97 @@ class LoginController(BaseController): @@
                     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)

kallithea/i18n/be/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -252,98 +252,98 @@ msgstr "Групы" @@
 #: 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/i18n/cs/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -246,97 +246,97 @@ msgstr "Skupiny" @@
 #: 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"

kallithea/i18n/de/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -253,98 +253,98 @@ msgstr "Gruppen" @@
 #: 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

kallithea/i18n/el/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -259,98 +259,98 @@ msgstr "Ομάδες" @@
 #: 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/i18n/es/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -249,98 +249,98 @@ msgstr "Grupos" @@
 #: 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"

kallithea/i18n/fr/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -255,98 +255,98 @@ msgstr "Groupes" @@
 #: 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/i18n/hu/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -245,97 +245,97 @@ msgstr "" @@
 #: 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"

kallithea/i18n/ja/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -252,98 +252,98 @@ msgstr "グループ" @@
 #: 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/i18n/kallithea.pot

➞

Show inline comments

@@ @@ -240,97 +240,97 @@ msgstr "" @@
 #: 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"

kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -246,97 +246,97 @@ msgstr "" @@
 #: 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"

kallithea/i18n/pl/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -257,98 +257,98 @@ msgstr "" @@
 #: 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

kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -251,98 +251,98 @@ msgstr "" @@
 #: 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

kallithea/i18n/ru/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -261,98 +261,98 @@ msgstr "Группы" @@
 #: 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/i18n/sk/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -246,97 +246,97 @@ msgstr "Skupiny" @@
 #: 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"

kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -248,98 +248,98 @@ msgstr "组" @@
 #: 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/i18n/zh_TW/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -245,97 +245,97 @@ msgstr "" @@
 #: 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/tests/functional/test_login.py

➞

Show inline comments

@@ @@ -282,97 +282,97 @@ class TestLoginController(TestController @@
                                              '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, })

0 comments (0 inline, 0 general)