kallithea Changeset - 2079e864ce51

Changeset - 2079e864ce51

Parent rev.

Child rev.

[Not reviewed]

default

1 25 1

Søren Løvborg - 11 years ago 2015-08-14 17:07:49
sorenl@unity3d.com

spelling: use "email" consistently

The common English spelling is "email", not "e-mail" (and was indeed
also the most common, but not only, variant in the Kallithea UI).

http://grammarist.com/style/e-mail-email/

26 files changed with 87 insertions and 87 deletions:

development.ini

docs/contributing.rst

docs/index.rst

docs/setup.rst

docs/usage/email.rst

docs/usage/general.rst

kallithea/bin/template.ini.mako

kallithea/config/deployment.ini_tmpl

kallithea/i18n/be/LC_MESSAGES/kallithea.po

kallithea/i18n/cs/LC_MESSAGES/kallithea.po

kallithea/i18n/de/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/model/validators.py

kallithea/tests/functional/test_admin_users.py

kallithea/tests/functional/test_my_account.py

test.ini

0 comments (0 inline, 0 general)

development.ini

➞

Show inline comments

@@ @@ -7,56 +7,56 @@ @@
 # set debug = true                                                             #
 # verbose and colorful logging                                                 #
 #                                                                              #
 # The %(here)s variable will be replaced with the parent directory of this file#
 ################################################################################
 ################################################################################
 [DEFAULT]
 debug = true
 pdebug = false
 ################################################################################
-## E-mail settings                                                            ##
+## Email settings                                                             ##
 ##                                                                            ##
-## Refer to the documentation ("E-mail settings") for more details.           ##
+## Refer to the documentation ("Email settings") for more details.            ##
 ##                                                                            ##
 ## It is recommended to use a valid sender address that passes access         ##
 ## validation and spam filtering in mail servers.                             ##
 ################################################################################
-## 'From' header for application e-mails. You can optionally add a name.
+## 'From' header for application emails. You can optionally add a name.
 ## Default:
 #app_email_from = Kallithea
 ## Examples:
 #app_email_from = Kallithea <kallithea-noreply@example.com>
 #app_email_from = kallithea-noreply@example.com
-## Subject prefix for application e-mails.
+## Subject prefix for application emails.
 ## A space between this prefix and the real subject is automatically added.
 ## Default:
 #email_prefix =
 ## Example:
 #email_prefix = [Kallithea]
-## Recipients for error e-mails and fallback recipients of application mails.
+## Recipients for error emails and fallback recipients of application mails.
 ## Multiple addresses can be specified, space-separated.
 ## Only addresses are allowed, do not add any name part.
 ## Default:
 #email_to =
 ## Examples:
 #email_to = admin@example.com
 #email_to = admin@example.com another_admin@example.com
-## 'From' header for error e-mails. You can optionally add a name.
+## 'From' header for error emails. You can optionally add a name.
 ## Default:
 #error_email_from = pylons@yourapp.com
 ## Examples:
 #error_email_from = Kallithea Errors <kallithea-noreply@example.com>
 #error_email_from = paste_error@example.com
 ## SMTP server settings
 ## Only smtp_server is mandatory. All other settings take the specified default
 ## values.
 #smtp_server = mail.server.com
 #smtp_username =
 #smtp_password =

docs/contributing.rst

➞

Show inline comments

@@ @@ -96,25 +96,25 @@ semantic markup with classes and ids tha @@
 We should only use inline styles in places where it really is semantic (such as
 display:none).
 JavaScript must use ';' between/after statements. Indentation 4 spaces. Inline
 multiline functions should be indented two levels - one for the () and one for
 {}. jQuery value arrays should have a leading $.
 Commit messages should have a leading short line summarizing the changes. For
 bug fixes, put "(Issue #123)" at the end of this line.
 Contributions will be accepted in most formats - such as pull requests on
 bitbucket, something hosted on your own Kallithea instance, or patches sent by
-mail to the kallithea-general mailing list.
+email to the kallithea-general mailing list.
 Make sure to test your changes both manually and with the automatic tests
 before posting.
 We care about quality and review and keeping a clean repository history. We
 might give feedback that requests polishing contributions until they are
 "perfect". We might also rebase and collapse and make minor adjustments to your
 changes when we apply them.
 We try to make sure we have consensus on the direction the project is taking.
 Everything non-sensitive should be discussed in public - preferably on the
 mailing list.  We aim at having all non-trivial changes reviewed by at least

docs/index.rst

➞

Show inline comments

@@ @@ -28,25 +28,25 @@ Kallithea Documentation @@
    :maxdepth: 1
    usage/general
    usage/vcs_support
    usage/locking
    usage/statistics
 **Administrators Guide**
 .. toctree::
    :maxdepth: 1
-   usage/e-mail
+   usage/email
    usage/performance
    usage/backup
    usage/debugging
    usage/troubleshooting
 **Develop**
 .. toctree::
    :maxdepth: 1
    contributing
    changelog

docs/setup.rst

➞

Show inline comments

@@ @@ -190,25 +190,25 @@ Here's a typical LDAP setup:: @@
  Connection Security  = LDAPS connection
  Certificate Checks   = DEMAND
  Search settings
  Base DN              = CN=users,DC=host,DC=example,DC=org
  LDAP Filter          = (&(objectClass=user)(!(objectClass=computer)))
  LDAP Search Scope    = SUBTREE
  Attribute mappings
  Login Attribute      = uid
  First Name Attribute = firstName
  Last Name Attribute  = lastName
- E-mail Attribute     = mail
+ Email Attribute      = mail
 If your user groups are placed in an Organisation Unit (OU) structure, the Search Settings configuration differs::
  Search settings
  Base DN              = DC=host,DC=example,DC=org
  LDAP Filter          = (&(memberOf=CN=your user group,OU=subunit,OU=unit,DC=host,DC=example,DC=org)(objectClass=user))
  LDAP Search Scope    = SUBTREE
 .. _enable_ldap:
 Enable LDAP : required
     Whether to use LDAP for authenticating users.
@@ @@ -355,25 +355,25 @@ will be saved there. @@
 Active Directory
 ''''''''''''''''
 Kallithea can use Microsoft Active Directory for user authentication.  This
 is done through an LDAP or LDAPS connection to Active Directory.  The
 following LDAP configuration settings are typical for using Active
 Directory ::
  Base DN              = OU=SBSUsers,OU=Users,OU=MyBusiness,DC=v3sys,DC=local
  Login Attribute      = sAMAccountName
  First Name Attribute = givenName
  Last Name Attribute  = sn
- E-mail Attribute     = mail
+ Email Attribute     = mail
 All other LDAP settings will likely be site-specific and should be
 appropriately configured.
 Authentication by container or reverse-proxy
 --------------------------------------------
 Kallithea supports delegating the authentication
 of users to its WSGI container, or to a reverse-proxy server through which all
 clients access the application.
@@ @@ -500,25 +500,25 @@ Changing default encoding @@
 By default, Kallithea uses UTF-8 encoding.
 This is configurable as ``default_encoding`` in the .ini file.
 This affects many parts in Kallithea including user names, filenames, and
 encoding of commit messages. In addition Kallithea can detect if the ``chardet``
 library is installed. If ``chardet`` is detected Kallithea will fallback to it
 when there are encode/decode errors.
 Celery configuration
 --------------------
 Kallithea can use the distributed task queue system Celery_ to run tasks like
-cloning repositories or sending mails.
+cloning repositories or sending emails.
 Kallithea will in most setups work perfectly fine out of the box (without
 Celery), executing all tasks in the web server process. Some tasks can however
 take some time to run and it can be better to run such tasks asynchronously in
 a separate process so the web server can focus on serving web requests.
 For installation and configuration of Celery, see the `Celery documentation`_.
 Note that Celery requires a message broker service like RabbitMQ_ (recommended)
 or Redis_.
 The use of Celery is configured in the Kallithea ini configuration file.
 To enable it, simply set::

docs/usage/email.rst

➞

Show inline comments

@@ file renamed from docs/usage/e-mail.rst to docs/usage/email.rst @@
 .. _email:
 ===============
 E-mail settings
 ===============
 ==============
 Email settings
 ==============
 The Kallithea configuration file has several e-mail related settings. When
 these contain correct values, Kallithea will send e-mail in the situations
 described below. If the e-mail configuration is not correct so that e-mails
 The Kallithea configuration file has several email related settings. When
 these contain correct values, Kallithea will send email in the situations
 described below. If the email configuration is not correct so that emails
 cannot be sent, all mails will show up in the log output.
-Before any e-mail can be sent, an SMTP server has to be configured using the
+Before any email can be sent, an SMTP server has to be configured using the
 configuration file setting ``smtp_server``. If required for that server, specify
 a username (``smtp_username``) and password (``smtp_password``), a non-standard
 port (``smtp_port``), encryption settings (``smtp_use_tls`` or ``smtp_use_ssl``)
 and/or specific authentication parameters (``smtp_auth``).
 Application e-mails
 -------------------
 Application emails
 ------------------
-Kallithea sends an e-mail to `users` on several occasions:
+Kallithea sends an email to `users` on several occasions:
 - when comments are given on one of their changesets
 - when comments are given on changesets they are reviewer on or on which they
   commented regardless
 - when they are invited as reviewer in pull requests
 - when they request a password reset
-Kallithea sends an e-mail to all `administrators` upon new account registration.
+Kallithea sends an email to all `administrators` upon new account registration.
 Administrators are users with the ``Admin`` flag set in the ``Admin->Users``
 section.
-When Kallithea wants to send an e-mail but due to an error cannot correctly
+When Kallithea wants to send an email but due to an error cannot correctly
 determine the intended recipients, the administrators and the addresses
 specified in ``email_to`` in the configuration file are used as fallback.
-Recipients will see these e-mails originating from the sender specified in the
+Recipients will see these emails originating from the sender specified in the
 ``app_email_from`` setting in the configuration file. This setting can either
-contain only an e-mail address, like `kallithea-noreply@example.com`, or both
+contain only an email address, like `kallithea-noreply@example.com`, or both
 a name and an address in the following format: `Kallithea
-<kallithea-noreply@example.com>`. The subject of these e-mails can
+<kallithea-noreply@example.com>`. The subject of these emails can
 optionally be prefixed with the value of ``email_prefix`` in the configuration
 file.
 Error e-mails
 -------------
 Error emails
 ------------
 When an exception occurs in Kallithea -- and unless interactive debugging is
 enabled using ``set debug = true`` in the ``[app:main]`` section of the
-configuration file -- an e-mail with exception details is sent by WebError_'s
+configuration file -- an email with exception details is sent by WebError_'s
 ``ErrorMiddleware`` to the addresses specified in ``email_to`` in the
 configuration file.
-Recipients will see these e-mails originating from the sender specified in the
+Recipients will see these emails originating from the sender specified in the
 ``error_email_from`` setting in the configuration file. This setting can either
-contain only an e-mail address, like `kallithea-noreply@example.com`, or both
+contain only an email address, like `kallithea-noreply@example.com`, or both
 a name and an address in the following format: `Kallithea Errors
 <kallithea-noreply@example.com>`.
 *Note:* The WebError_ package does not respect ``smtp_port`` and assumes the
 standard SMTP port (25). If you have a remote SMTP server with a different port,
 you could set up a local forwarding SMTP server on port 25.
 References
 ----------
 - `Error Middleware (Pylons documentation) <http://pylons-webframework.readthedocs.org/en/latest/debugging.html#error-middleware>`_
 - `ErrorHandler (Pylons modules documentation) <http://pylons-webframework.readthedocs.org/en/latest/modules/middleware.html#pylons.middleware.ErrorHandler>`_

docs/usage/general.rst

➞

Show inline comments

@@ @@ -88,32 +88,32 @@ Kallithea provides permanent URLs using @@
 underscore. In all Kallithea URLs, for example those for the changelog and the
 file view, a repository name can be replaced by this ``_ID`` string. Since IDs
 are always the same, moving the repository to a different group will not affect
 such URLs.
 In the example, the repository could also be accessible as::
   http://server.com/_<ID>
 The ID of a given repository can be shown from the repository ``Summary`` page,
 by selecting the ``Show by ID`` button next to ``Clone URL``.
 E-mail notifications
 --------------------
 Email notifications
 -------------------
 When the administrator correctly specified the e-mail settings in the Kallithea
 configuration file, Kallithea will send e-mails on user registration and when
 When the administrator correctly specified the email settings in the Kallithea
 configuration file, Kallithea will send emails on user registration and when
 errors occur.
-Mails are also sent for comments on changesets. In this case, an e-mail is sent
+Emails are also sent for comments on changesets. In this case, an email is sent
 to the committer of the changeset (if known to Kallithea), to all reviewers of
 the pull request (if applicable) and to all people mentioned in the comment
 using @mention notation.
 Trending source files
 ---------------------
 Trending source files are calculated based on a predefined dictionary of known
 types and extensions. If an extension is missing or you would like to scan
 custom files, it is possible to extend the ``LANGUAGES_EXTENSIONS_MAP``
 dictionary located in ``kallithea/config/conf.py`` with new types.

kallithea/bin/template.ini.mako

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%text>################################################################################</%text>
 <%text>################################################################################</%text>
 # Kallithea - config file generated with kallithea-config                      #
 <%text>################################################################################</%text>
 <%text>################################################################################</%text>
 [DEFAULT]
 debug = true
 pdebug = false
 <%text>################################################################################</%text>
-<%text>## E-mail settings                                                            ##</%text>
+<%text>## Email settings                                                             ##</%text>
 <%text>##                                                                            ##</%text>
-<%text>## Refer to the documentation ("E-mail settings") for more details.           ##</%text>
+<%text>## Refer to the documentation ("Email settings") for more details.            ##</%text>
 <%text>##                                                                            ##</%text>
 <%text>## It is recommended to use a valid sender address that passes access         ##</%text>
 <%text>## validation and spam filtering in mail servers.                             ##</%text>
 <%text>################################################################################</%text>
-<%text>## 'From' header for application e-mails. You can optionally add a name.</%text>
+<%text>## 'From' header for application emails. You can optionally add a name.</%text>
 <%text>## Default:</%text>
 #app_email_from = Kallithea
 <%text>## Examples:</%text>
 #app_email_from = Kallithea <kallithea-noreply@example.com>
 #app_email_from = kallithea-noreply@example.com
-<%text>## Subject prefix for application e-mails.</%text>
+<%text>## Subject prefix for application emails.</%text>
 <%text>## A space between this prefix and the real subject is automatically added.</%text>
 <%text>## Default:</%text>
 #email_prefix =
 <%text>## Example:</%text>
 #email_prefix = [Kallithea]
-<%text>## Recipients for error e-mails and fallback recipients of application mails.</%text>
+<%text>## Recipients for error emails and fallback recipients of application mails.</%text>
 <%text>## Multiple addresses can be specified, space-separated.</%text>
 <%text>## Only addresses are allowed, do not add any name part.</%text>
 <%text>## Default:</%text>
 #email_to =
 <%text>## Examples:</%text>
 #email_to = admin@example.com
 #email_to = admin@example.com another_admin@example.com
-<%text>## 'From' header for error e-mails. You can optionally add a name.</%text>
+<%text>## 'From' header for error emails. You can optionally add a name.</%text>
 <%text>## Default:</%text>
 #error_email_from = pylons@yourapp.com
 <%text>## Examples:</%text>
 #error_email_from = Kallithea Errors <kallithea-noreply@example.com>
 #error_email_from = paste_error@example.com
 <%text>## SMTP server settings</%text>
 <%text>## Only smtp_server is mandatory. All other settings take the specified default</%text>
 <%text>## values.</%text>
 #smtp_server = mail.server.com
 #smtp_username =
 #smtp_password =

kallithea/config/deployment.ini_tmpl

➞

Show inline comments

@@ @@ -2,56 +2,56 @@ @@
 ################################################################################
 # Kallithea - Example config                                                   #
 #                                                                              #
 # The %(here)s variable will be replaced with the parent directory of this file#
 ################################################################################
 ################################################################################
 [DEFAULT]
 debug = true
 pdebug = false
 ################################################################################
-## E-mail settings                                                            ##
+## Email settings                                                             ##
 ##                                                                            ##
-## Refer to the documentation ("E-mail settings") for more details.           ##
+## Refer to the documentation ("Email settings") for more details.            ##
 ##                                                                            ##
 ## It is recommended to use a valid sender address that passes access         ##
 ## validation and spam filtering in mail servers.                             ##
 ################################################################################
-## 'From' header for application e-mails. You can optionally add a name.
+## 'From' header for application emails. You can optionally add a name.
 ## Default:
 #app_email_from = Kallithea
 ## Examples:
 #app_email_from = Kallithea <kallithea-noreply@example.com>
 #app_email_from = kallithea-noreply@example.com
-## Subject prefix for application e-mails.
+## Subject prefix for application emails.
 ## A space between this prefix and the real subject is automatically added.
 ## Default:
 #email_prefix =
 ## Example:
 #email_prefix = [Kallithea]
-## Recipients for error e-mails and fallback recipients of application mails.
+## Recipients for error emails and fallback recipients of application mails.
 ## Multiple addresses can be specified, space-separated.
 ## Only addresses are allowed, do not add any name part.
 ## Default:
 #email_to =
 ## Examples:
 #email_to = admin@example.com
 #email_to = admin@example.com another_admin@example.com
-## 'From' header for error e-mails. You can optionally add a name.
+## 'From' header for error emails. You can optionally add a name.
 ## Default:
 #error_email_from = pylons@yourapp.com
 ## Examples:
 #error_email_from = Kallithea Errors <kallithea-noreply@example.com>
 #error_email_from = paste_error@example.com
 ## SMTP server settings
 ## Only smtp_server is mandatory. All other settings take the specified default
 ## values.
 #smtp_server = mail.server.com
 #smtp_username =
 #smtp_password =

kallithea/i18n/be/LC_MESSAGES/kallithea.po

➞

Show inline comments

 msgid "You don't have permissions to create a group in this location"
 msgstr "У Вас недастаткова прывілеяў для стварэння групы ў гэтым месцы"
 #: kallithea/model/validators.py:607
 msgid "This username or user group name is not valid"
 msgstr "Дадзенае імя карыстача ці групы карыстачоў недапушчальна"
 #: kallithea/model/validators.py:700
 msgid "This is not a valid path"
 msgstr "Гэты шлях хібны"
 #: kallithea/model/validators.py:715
-msgid "This e-mail address is already taken"
+msgid "This email address is already taken"
 msgstr "Гэты E-mail ужо заняты"
 #: kallithea/model/validators.py:735
 #, python-format
-msgid "e-mail \"%(email)s\" does not exist."
+msgid "email \"%(email)s\" does not exist."
 msgstr "\"%(email)s\" не існуе."
 #: kallithea/model/validators.py:772
 msgid ""
 "The LDAP Login attribute of the CN must be specified - this is the name of "
 "the attribute that is equivalent to \"username\""
 msgstr ""
 "Для ўваходу па LDAP павінна быць паказана значэнне атрыбута CN - гэта "
 "эквівалент імя карыстача"
 #: kallithea/model/validators.py:785
 #, python-format

kallithea/i18n/cs/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -1976,30 +1976,30 @@ msgstr "" @@
 msgid "You don't have permissions to create a group in this location"
 msgstr ""
 #: kallithea/model/validators.py:607
 msgid "This username or user group name is not valid"
 msgstr ""
 #: kallithea/model/validators.py:700
 msgid "This is not a valid path"
 msgstr ""
 #: kallithea/model/validators.py:715
-msgid "This e-mail address is already taken"
+msgid "This email address is already taken"
 msgstr ""
 #: kallithea/model/validators.py:735
 #, python-format
-msgid "e-mail \"%(email)s\" does not exist."
+msgid "email \"%(email)s\" does not exist."
 msgstr ""
 #: kallithea/model/validators.py:772
 msgid ""
 "The LDAP Login attribute of the CN must be specified - this is the name "
 "of the attribute that is equivalent to \"username\""
 msgstr ""
 #: kallithea/model/validators.py:785
 #, python-format
 msgid "Revisions %(revs)s are already part of pull request or have set status"
 msgstr ""

kallithea/i18n/de/LC_MESSAGES/kallithea.po

➞

Show inline comments

 msgid "You don't have permissions to create a group in this location"
 msgstr "Sie haben keine Berechtigung, um an diesem Ort ein Repository anzulegen"
 #: kallithea/model/validators.py:607
 msgid "This username or user group name is not valid"
 msgstr "Dieser Benutzername oder Benutzergruppenname ist nicht gültig"
 #: kallithea/model/validators.py:700
 msgid "This is not a valid path"
 msgstr "Dies ist ein Ungültiger Pfad"
 #: kallithea/model/validators.py:715
-msgid "This e-mail address is already taken"
+msgid "This email address is already taken"
 msgstr "Diese E-Mailaddresse ist bereits in Benutzung"
 #: kallithea/model/validators.py:735
 #, python-format
-msgid "e-mail \"%(email)s\" does not exist."
+msgid "email \"%(email)s\" does not exist."
 msgstr "E-MailAddresse \"%(email)s\" existiert nicht."
 #: kallithea/model/validators.py:772
 msgid ""
 "The LDAP Login attribute of the CN must be specified - this is the name "
 "of the attribute that is equivalent to \"username\""
 msgstr ""
 "Das LDAP-Login-Attribut des CN muss angeben werden - Es ist der Name des "
 "Attributes äquivalent zu \"Benutzername\""
 #: kallithea/model/validators.py:785
 #, python-format

kallithea/i18n/fr/LC_MESSAGES/kallithea.po

➞

Show inline comments

 msgid "You don't have permissions to create a group in this location"
 msgstr "Vous n'avez pas les permissions pour créer un groupe dans cet endroit"
 #: kallithea/model/validators.py:607
 msgid "This username or user group name is not valid"
 msgstr "Ce nom d'utilisateur ou nom de groupe d'utilisateurs n'est pas valide"
 #: kallithea/model/validators.py:700
 msgid "This is not a valid path"
 msgstr "Ceci n’est pas un chemin valide"
 #: kallithea/model/validators.py:715
-msgid "This e-mail address is already taken"
+msgid "This email address is already taken"
 msgstr "Cette adresse e-mail est déjà enregistrée"
 #: kallithea/model/validators.py:735
 #, python-format
-msgid "e-mail \"%(email)s\" does not exist."
+msgid "email \"%(email)s\" does not exist."
 msgstr "L’adresse e-mail « %(email)s » n’existe pas."
 #: kallithea/model/validators.py:772
 msgid ""
 "The LDAP Login attribute of the CN must be specified - this is the name "
 "of the attribute that is equivalent to \"username\""
 msgstr ""
 "L’attribut Login du CN doit être spécifié. Cet attribut correspond au nom"
 " d’utilisateur"
 #: kallithea/model/validators.py:785
 #, python-format

kallithea/i18n/hu/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -1969,30 +1969,30 @@ msgstr "" @@
 msgid "You don't have permissions to create a group in this location"
 msgstr ""
 #: kallithea/model/validators.py:607
 msgid "This username or user group name is not valid"
 msgstr ""
 #: kallithea/model/validators.py:700
 msgid "This is not a valid path"
 msgstr ""
 #: kallithea/model/validators.py:715
-msgid "This e-mail address is already taken"
+msgid "This email address is already taken"
 msgstr ""
 #: kallithea/model/validators.py:735
 #, python-format
-msgid "e-mail \"%(email)s\" does not exist."
+msgid "email \"%(email)s\" does not exist."
 msgstr ""
 #: kallithea/model/validators.py:772
 msgid ""
 "The LDAP Login attribute of the CN must be specified - this is the name "
 "of the attribute that is equivalent to \"username\""
 msgstr ""
 #: kallithea/model/validators.py:785
 #, python-format
 msgid "Revisions %(revs)s are already part of pull request or have set status"
 msgstr ""

kallithea/i18n/ja/LC_MESSAGES/kallithea.po

➞

Show inline comments

 msgid "You don't have permissions to create a group in this location"
 msgstr "この場所にグループを作成する権限がありません"
 #: kallithea/model/validators.py:607
 msgid "This username or user group name is not valid"
 msgstr "ユーザー名かユーザーグループが不正です"
 #: kallithea/model/validators.py:700
 msgid "This is not a valid path"
 msgstr "不正なパスです"
 #: kallithea/model/validators.py:715
-msgid "This e-mail address is already taken"
+msgid "This email address is already taken"
 msgstr "このメールアドレスはすでに取得されています"
 #: kallithea/model/validators.py:735
 #, python-format
-msgid "e-mail \"%(email)s\" does not exist."
+msgid "email \"%(email)s\" does not exist."
 msgstr "メールアドレス \"%(email)s\" は存在しません"
 #: kallithea/model/validators.py:772
 msgid ""
 "The LDAP Login attribute of the CN must be specified - this is the name "
 "of the attribute that is equivalent to \"username\""
 msgstr "LDAPのこのCNに対するログイン属性は必須です。 - これは \"ユーザー名\" と同じです"
 #: kallithea/model/validators.py:785
 #, python-format
 msgid "Revisions %(revs)s are already part of pull request or have set status"
 msgstr "リビジョン %(revs)s はすでにプルリクエストの一部かステータスが設定されています"

kallithea/i18n/kallithea.pot

➞

Show inline comments

@@ @@ -2078,30 +2078,30 @@ msgstr "" @@
 msgid "You don't have permissions to create a group in this location"
 msgstr ""
 #: kallithea/model/validators.py:607
 msgid "This username or user group name is not valid"
 msgstr ""
 #: kallithea/model/validators.py:700
 msgid "This is not a valid path"
 msgstr ""
 #: kallithea/model/validators.py:715
-msgid "This e-mail address is already taken"
+msgid "This email address is already taken"
 msgstr ""
 #: kallithea/model/validators.py:735
 #, python-format
-msgid "e-mail \"%(email)s\" does not exist."
+msgid "email \"%(email)s\" does not exist."
 msgstr ""
 #: kallithea/model/validators.py:772
 msgid "The LDAP Login attribute of the CN must be specified - this is the name of the attribute that is equivalent to \"username\""
 msgstr ""
 #: kallithea/model/validators.py:785
 #, python-format
 msgid "Revisions %(revs)s are already part of pull request or have set status"
 msgstr ""
 #: kallithea/model/validators.py:817

kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -1972,30 +1972,30 @@ msgstr "" @@
 msgid "You don't have permissions to create a group in this location"
 msgstr ""
 #: kallithea/model/validators.py:607
 msgid "This username or user group name is not valid"
 msgstr ""
 #: kallithea/model/validators.py:700
 msgid "This is not a valid path"
 msgstr ""
 #: kallithea/model/validators.py:715
-msgid "This e-mail address is already taken"
+msgid "This email address is already taken"
 msgstr ""
 #: kallithea/model/validators.py:735
 #, python-format
-msgid "e-mail \"%(email)s\" does not exist."
+msgid "email \"%(email)s\" does not exist."
 msgstr ""
 #: kallithea/model/validators.py:772
 msgid ""
 "The LDAP Login attribute of the CN must be specified - this is the name "
 "of the attribute that is equivalent to \"username\""
 msgstr ""
 #: kallithea/model/validators.py:785
 #, python-format
 msgid "Revisions %(revs)s are already part of pull request or have set status"
 msgstr ""

kallithea/i18n/pl/LC_MESSAGES/kallithea.po

➞

Show inline comments

 msgid "You don't have permissions to create a group in this location"
 msgstr "Nie masz uprawnień do tworzenia repozytorium w tej grupie"
 #: kallithea/model/validators.py:607
 msgid "This username or user group name is not valid"
 msgstr "Ta nazwa użytkownika lub grupy użytkowników nie jest prawidłowa"
 #: kallithea/model/validators.py:700
 msgid "This is not a valid path"
 msgstr "To nie jest prawidłowa ścieżka"
 #: kallithea/model/validators.py:715
-msgid "This e-mail address is already taken"
+msgid "This email address is already taken"
 msgstr "Ten adres e-mail jest już zajęty"
 #: kallithea/model/validators.py:735
 #, python-format
-msgid "e-mail \"%(email)s\" does not exist."
+msgid "email \"%(email)s\" does not exist."
 msgstr "e-mail \"%(email)s\" nie istnieje."
 #: kallithea/model/validators.py:772
 msgid ""
 "The LDAP Login attribute of the CN must be specified - this is the name "
 "of the attribute that is equivalent to \"username\""
 msgstr ""
 "Atrybut logowania CN do LDAP należy określić, jest to nazwa atrybutu, "
 "który jest odpowiednikiem  \"username\""
 #: kallithea/model/validators.py:785
 #, python-format

kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po

➞

Show inline comments

 msgid "You don't have permissions to create a group in this location"
 msgstr "Você não tem permissão para criar um grupo neste local"
 #: kallithea/model/validators.py:607
 msgid "This username or user group name is not valid"
 msgstr "Este nome de usuário ou de grupo de usuários não é válido"
 #: kallithea/model/validators.py:700
 msgid "This is not a valid path"
 msgstr "Esse não é um caminho válido"
 #: kallithea/model/validators.py:715
-msgid "This e-mail address is already taken"
+msgid "This email address is already taken"
 msgstr "Esse endereço de e-mail já está tomado"
 #: kallithea/model/validators.py:735
 #, python-format
-msgid "e-mail \"%(email)s\" does not exist."
+msgid "email \"%(email)s\" does not exist."
 msgstr "o e-mail \"%(email)s\" não existe."
 #: kallithea/model/validators.py:772
 msgid ""
 "The LDAP Login attribute of the CN must be specified - this is the name "
 "of the attribute that is equivalent to \"username\""
 msgstr ""
 "O atributo de login LDAP do CN deve ser especificado - isto é o nome do "
 "atributo que é equivalente ao 'nome de usuário'"
 #: kallithea/model/validators.py:785
 #, python-format

kallithea/i18n/ru/LC_MESSAGES/kallithea.po

➞

Show inline comments

 msgid "You don't have permissions to create a group in this location"
 msgstr "У Вас недостаточно привилегий для создания группы в этом месте"
 #: kallithea/model/validators.py:607
 msgid "This username or user group name is not valid"
 msgstr "Данное имя пользователя или группы пользователей недопустимо"
 #: kallithea/model/validators.py:700
 msgid "This is not a valid path"
 msgstr "Этот путь ошибочен"
 #: kallithea/model/validators.py:715
-msgid "This e-mail address is already taken"
+msgid "This email address is already taken"
 msgstr "Этот E-mail уже занят"
 #: kallithea/model/validators.py:735
 #, python-format
-msgid "e-mail \"%(email)s\" does not exist."
+msgid "email \"%(email)s\" does not exist."
 msgstr "\"%(email)s\" не существует."
 #: kallithea/model/validators.py:772
 msgid ""
 "The LDAP Login attribute of the CN must be specified - this is the name "
 "of the attribute that is equivalent to \"username\""
 msgstr ""
 "Для входа по LDAP должно быть указано значение аттрибута CN - это "
 "эквивалент имени пользователя"
 #: kallithea/model/validators.py:785
 #, python-format

kallithea/i18n/sk/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -1975,30 +1975,30 @@ msgstr "" @@
 msgid "You don't have permissions to create a group in this location"
 msgstr ""
 #: kallithea/model/validators.py:607
 msgid "This username or user group name is not valid"
 msgstr ""
 #: kallithea/model/validators.py:700
 msgid "This is not a valid path"
 msgstr ""
 #: kallithea/model/validators.py:715
-msgid "This e-mail address is already taken"
+msgid "This email address is already taken"
 msgstr ""
 #: kallithea/model/validators.py:735
 #, python-format
-msgid "e-mail \"%(email)s\" does not exist."
+msgid "email \"%(email)s\" does not exist."
 msgstr ""
 #: kallithea/model/validators.py:772
 msgid ""
 "The LDAP Login attribute of the CN must be specified - this is the name "
 "of the attribute that is equivalent to \"username\""
 msgstr ""
 #: kallithea/model/validators.py:785
 #, python-format
 msgid "Revisions %(revs)s are already part of pull request or have set status"
 msgstr ""

kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -1975,30 +1975,30 @@ msgstr "" @@
 msgid "You don't have permissions to create a group in this location"
 msgstr ""
 #: kallithea/model/validators.py:607
 msgid "This username or user group name is not valid"
 msgstr ""
 #: kallithea/model/validators.py:700
 msgid "This is not a valid path"
 msgstr "不是一个合法的路径"
 #: kallithea/model/validators.py:715
-msgid "This e-mail address is already taken"
+msgid "This email address is already taken"
 msgstr "该邮件地址已被使用"
 #: kallithea/model/validators.py:735
 #, python-format
-msgid "e-mail \"%(email)s\" does not exist."
+msgid "email \"%(email)s\" does not exist."
 msgstr "邮件地址\"%(email)s\"不存在"
 #: kallithea/model/validators.py:772
 msgid ""
 "The LDAP Login attribute of the CN must be specified - this is the name "
 "of the attribute that is equivalent to \"username\""
 msgstr "LDAP 登陆属性的 CN 必须指定 - 这个名字作为用户名"
 #: kallithea/model/validators.py:785
 #, python-format
 msgid "Revisions %(revs)s are already part of pull request or have set status"
 msgstr "修订%(revs)s已经包含在拉取请求中或者或者已经设置状态"

kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -1966,30 +1966,30 @@ msgstr "" @@
 msgid "You don't have permissions to create a group in this location"
 msgstr ""
 #: kallithea/model/validators.py:607
 msgid "This username or user group name is not valid"
 msgstr ""
 #: kallithea/model/validators.py:700
 msgid "This is not a valid path"
 msgstr "不是一個有效的路徑"
 #: kallithea/model/validators.py:715
-msgid "This e-mail address is already taken"
+msgid "This email address is already taken"
 msgstr "這個郵件位址已經使用了"
 #: kallithea/model/validators.py:735
 #, python-format
-msgid "e-mail \"%(email)s\" does not exist."
+msgid "email \"%(email)s\" does not exist."
 msgstr ""
 #: kallithea/model/validators.py:772
 msgid ""
 "The LDAP Login attribute of the CN must be specified - this is the name "
 "of the attribute that is equivalent to \"username\""
 msgstr ""
 #: kallithea/model/validators.py:785
 #, python-format
 msgid "Revisions %(revs)s are already part of pull request or have set status"
 msgstr ""

kallithea/model/validators.py

➞

Show inline comments

@@ @@ -693,45 +693,45 @@ def ValidPath(): @@
         def validate_python(self, value, state):
             if not os.path.isdir(value):
                 msg = M(self, 'invalid_path', state)
                 raise formencode.Invalid(msg, value, state,
                     error_dict=dict(paths_root_path=msg)
+                )
     return _validator
 def UniqSystemEmail(old_data={}):
     class _validator(formencode.validators.FancyValidator):
         messages = {
-            'email_taken': _('This e-mail address is already in use')
+            'email_taken': _('This email address is already in use')
+        }
         def _to_python(self, value, state):
             return value.lower()
         def validate_python(self, value, state):
             if (old_data.get('email') or '').lower() != value:
                 user = User.get_by_email(value, case_insensitive=True)
                 if user is not None:
                     msg = M(self, 'email_taken', state)
                     raise formencode.Invalid(msg, value, state,
                         error_dict=dict(email=msg)
+                    )
     return _validator
 def ValidSystemEmail():
     class _validator(formencode.validators.FancyValidator):
         messages = {
-            'non_existing_email': _('E-mail address "%(email)s" not found')
+            'non_existing_email': _('Email address "%(email)s" not found')
+        }
         def _to_python(self, value, state):
             return value.lower()
         def validate_python(self, value, state):
             user = User.get_by_email(value, case_insensitive=True)
             if user is None:
                 msg = M(self, 'non_existing_email', state, email=value)
                 raise formencode.Invalid(msg, value, state,
                     error_dict=dict(email=msg)
+                )

kallithea/tests/functional/test_admin_users.py

➞

Show inline comments

@@ @@ -559,25 +559,25 @@ class TestAdminUsersControllerForDefault @@
     # Permissions
     def test_edit_perms_default_user(self):
         self.log_user()
         user = User.get_default_user()
         response = self.app.get(url('edit_user_perms', id=user.user_id), status=404)
     def test_update_perms_default_user(self):
         self.log_user()
         user = User.get_default_user()
         response = self.app.post(url('edit_user_perms', id=user.user_id),
                  {'_method': 'put', '_authentication_token': self.authentication_token()}, status=404)
-    # E-mails
+    # Emails
     def test_edit_emails_default_user(self):
         self.log_user()
         user = User.get_default_user()
         response = self.app.get(url('edit_user_emails', id=user.user_id), status=404)
     def test_add_emails_default_user(self):
         self.log_user()
         user = User.get_default_user()
         response = self.app.post(url('edit_user_emails', id=user.user_id),
                  {'_method': 'put', '_authentication_token': self.authentication_token()}, status=404)
     def test_delete_emails_default_user(self):

kallithea/tests/functional/test_my_account.py

➞

Show inline comments

@@ @@ -42,25 +42,25 @@ class TestMyAccountController(TestContro @@
     def test_my_account_my_emails(self):
         self.log_user()
         response = self.app.get(url('my_account_emails'))
         response.mustcontain('No additional emails specified')
     def test_my_account_my_emails_add_existing_email(self):
         self.log_user()
         response = self.app.get(url('my_account_emails'))
         response.mustcontain('No additional emails specified')
         response = self.app.post(url('my_account_emails'),
                                  {'new_email': TEST_USER_REGULAR_EMAIL, '_authentication_token': self.authentication_token()})
-        self.checkSessionFlash(response, 'This e-mail address is already in use')
+        self.checkSessionFlash(response, 'This email address is already in use')
     def test_my_account_my_emails_add_mising_email_in_form(self):
         self.log_user()
         response = self.app.get(url('my_account_emails'))
         response.mustcontain('No additional emails specified')
         response = self.app.post(url('my_account_emails'),)
         self.checkSessionFlash(response, 'Please enter an email address')
     def test_my_account_my_emails_add_remove(self):
         self.log_user()
         response = self.app.get(url('my_account_emails'))
         response.mustcontain('No additional emails specified')
@@ @@ -152,25 +152,25 @@ class TestMyAccountController(TestContro @@
         new_email = TEST_USER_REGULAR_EMAIL  # already existing email
         response = self.app.post(url('my_account'),
                                 params=dict(
                                     username=TEST_USER_ADMIN_LOGIN,
                                     new_password=TEST_USER_ADMIN_PASS,
                                     password_confirmation='test122',
                                     firstname='NewName',
                                     lastname='NewLastname',
                                     email=new_email,
                                     _authentication_token=self.authentication_token())
+                                )
-        response.mustcontain('This e-mail address is already in use')
+        response.mustcontain('This email address is already in use')
     def test_my_account_update_err(self):
         self.log_user(TEST_USER_REGULAR2_LOGIN, TEST_USER_REGULAR2_PASS)
         new_email = 'newmail.pl'
         response = self.app.post(url('my_account'),
                                  params=dict(
                                             username=TEST_USER_ADMIN_LOGIN,
                                             new_password=TEST_USER_ADMIN_PASS,
                                             password_confirmation='test122',
                                             firstname='NewName',
                                             lastname='NewLastname',

test.ini

➞

Show inline comments

@@ @@ -6,56 +6,56 @@ @@
 # sqlalchemy and kallithea_test.sqlite                                         #
 # custom logging                                                               #
 #                                                                              #
 # The %(here)s variable will be replaced with the parent directory of this file#
 ################################################################################
 ################################################################################
 [DEFAULT]
 debug = true
 pdebug = false
 ################################################################################
-## E-mail settings                                                            ##
+## Email settings                                                             ##
 ##                                                                            ##
-## Refer to the documentation ("E-mail settings") for more details.           ##
+## Refer to the documentation ("Email settings") for more details.            ##
 ##                                                                            ##
 ## It is recommended to use a valid sender address that passes access         ##
 ## validation and spam filtering in mail servers.                             ##
 ################################################################################
-## 'From' header for application e-mails. You can optionally add a name.
+## 'From' header for application emails. You can optionally add a name.
 ## Default:
 #app_email_from = Kallithea
 ## Examples:
 #app_email_from = Kallithea <kallithea-noreply@example.com>
 #app_email_from = kallithea-noreply@example.com
-## Subject prefix for application e-mails.
+## Subject prefix for application emails.
 ## A space between this prefix and the real subject is automatically added.
 ## Default:
 #email_prefix =
 ## Example:
 #email_prefix = [Kallithea]
-## Recipients for error e-mails and fallback recipients of application mails.
+## Recipients for error emails and fallback recipients of application mails.
 ## Multiple addresses can be specified, space-separated.
 ## Only addresses are allowed, do not add any name part.
 ## Default:
 #email_to =
 ## Examples:
 #email_to = admin@example.com
 #email_to = admin@example.com another_admin@example.com
-## 'From' header for error e-mails. You can optionally add a name.
+## 'From' header for error emails. You can optionally add a name.
 ## Default:
 #error_email_from = pylons@yourapp.com
 ## Examples:
 #error_email_from = Kallithea Errors <kallithea-noreply@example.com>
 #error_email_from = paste_error@example.com
 ## SMTP server settings
 ## Only smtp_server is mandatory. All other settings take the specified default
 ## values.
 #smtp_server = mail.server.com
 #smtp_username =
 #smtp_password =

0 comments (0 inline, 0 general)