kallithea Changeset - 7409cfc1e961

Changeset - 7409cfc1e961

Parent rev.

Child rev.

[Not reviewed]

default

0 17 0

Andrew Shadura - 10 years ago 2015-05-26 13:55:06
andrew@shadura.me

spelling: IP address, IPv4, IPv6

17 files changed with 62 insertions and 62 deletions:

kallithea/controllers/admin/users.py

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

0 comments (0 inline, 0 general)

kallithea/controllers/admin/users.py

➞

Show inline comments

@@ @@ -476,13 +476,13 @@ class UsersController(BaseController): @@
         ip = request.POST.get('new_ip')
         user_model = UserModel()
         try:
             user_model.add_extra_ip(id, ip)
             Session().commit()
-            h.flash(_("Added ip %s to user whitelist") % ip, category='success')
+            h.flash(_("Added IP address %s to user whitelist") % ip, category='success')
         except formencode.Invalid, error:
             msg = error.error_dict['ip']
             h.flash(msg, category='error')
         except Exception:
             log.error(traceback.format_exc())
             h.flash(_('An error occurred during ip saving'),

kallithea/i18n/be/LC_MESSAGES/kallithea.po

➞

Show inline comments

 #: kallithea/controllers/admin/users.py:454
 msgid "You can't edit this user"
 msgstr "Вы не можаце рэдагаваць дадзенага карыстача"
 #: kallithea/controllers/admin/users.py:482
 #, python-format
-msgid "Added ip %s to user whitelist"
+msgid "Added IP address %s to user whitelist"
 msgstr "Дададзены IP %s у белы спіс карыстача"
 #: kallithea/controllers/admin/users.py:488
 msgid "An error occurred during ip saving"
 msgstr "Адбылася памылка пры захаванні IP"
 #: kallithea/controllers/admin/users.py:502
-msgid "Removed ip address from user whitelist"
+msgid "Removed IP address from user whitelist"
 msgstr "Выдалены IP %s з белага спісу карыстача"
 #: kallithea/lib/auth.py:745
 #, python-format
 msgid "IP %s not allowed"
 msgstr "IP %s заблакаваны"
@@ @@ -2038,14 +2038,14 @@ msgstr "" @@
 #: kallithea/model/validators.py:785
 #, python-format
 msgid "Revisions %(revs)s are already part of pull request or have set status"
 msgstr "Рэвізіі %(revs)s ужо ўключаны ў pull-request ці маюць усталяваны статус"
 #: kallithea/model/validators.py:817
 msgid "Please enter a valid IPv4 or IpV6 address"
 msgstr "Калі ласка, увядзіце існы IPv4 ці IpV6 адрас"
 msgid "Please enter a valid IPv4 or IPv6 address"
 msgstr "Калі ласка, увядзіце існы IPv4 ці IPv6 адрас"
 #: kallithea/model/validators.py:818
 #, python-format
 msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
 msgstr ""
 "Значэнне маскі падсеткі павінна быць у межах ад 0 да 32 (%(bits)r - няслушна)"
 #: kallithea/templates/admin/users/user_edit_ips.html:30
 msgid "All IP addresses are allowed."
 msgstr "Дазволены любыя IP-адрасы."
 #: kallithea/templates/admin/permissions/permissions_ips.html:32
 #: kallithea/templates/admin/users/user_edit_ips.html:42
-msgid "New ip address"
+msgid "New IP address"
 msgstr "Новы IP-адрас"
 #: kallithea/templates/admin/permissions/permissions_perms.html:1
 msgid "Default User Permissions Overview"
 msgstr "Агляд мае рацыю карыстачоў па змаўчанні"

kallithea/i18n/cs/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -995,21 +995,21 @@ msgstr "" @@
 #: kallithea/controllers/admin/users.py:454
 msgid "You can't edit this user"
 msgstr ""
 #: kallithea/controllers/admin/users.py:482
 #, python-format
-msgid "Added ip %s to user whitelist"
+msgid "Added IP address %s to user whitelist"
 msgstr ""
 #: kallithea/controllers/admin/users.py:488
 msgid "An error occurred during ip saving"
 msgstr ""
 #: kallithea/controllers/admin/users.py:502
-msgid "Removed ip address from user whitelist"
+msgid "Removed IP address from user whitelist"
 msgstr ""
 #: kallithea/lib/auth.py:745
 #, python-format
 msgid "IP %s not allowed"
 msgstr ""
@@ @@ -2002,13 +2002,13 @@ 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
-msgid "Please enter a valid IPv4 or IpV6 address"
+msgid "Please enter a valid IPv4 or IPv6 address"
 msgstr ""
 #: kallithea/model/validators.py:818
 #, python-format
 msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
 msgstr ""
@@ @@ -3067,13 +3067,13 @@ msgstr "" @@
 #: kallithea/templates/admin/users/user_edit_ips.html:30
 msgid "All IP addresses are allowed."
 msgstr ""
 #: kallithea/templates/admin/permissions/permissions_ips.html:32
 #: kallithea/templates/admin/users/user_edit_ips.html:42
-msgid "New ip address"
+msgid "New IP address"
 msgstr ""
 #: kallithea/templates/admin/permissions/permissions_perms.html:1
 msgid "Default User Permissions Overview"
 msgstr ""

kallithea/i18n/de/LC_MESSAGES/kallithea.po

➞

Show inline comments

 #: kallithea/controllers/admin/users.py:454
 msgid "You can't edit this user"
 msgstr "Sie können diesen Benutzer nicht editieren"
 #: kallithea/controllers/admin/users.py:482
 #, python-format
-msgid "Added ip %s to user whitelist"
+msgid "Added IP address %s to user whitelist"
 msgstr "Die IP-Adresse %s wurde zur Nutzerwhitelist hinzugefügt"
 #: kallithea/controllers/admin/users.py:488
 msgid "An error occurred during ip saving"
 msgstr "Während des Speicherns der IP-Adresse ist ein Fehler aufgetreten"
 #: kallithea/controllers/admin/users.py:502
-msgid "Removed ip address from user whitelist"
+msgid "Removed IP address from user whitelist"
 msgstr "IP-Adresse wurde von der Nutzerwhitelist entfernt"
 #: kallithea/lib/auth.py:745
 #, python-format
 msgid "IP %s not allowed"
 msgstr "IP-Adresse %s ist nicht erlaubt"
@@ @@ -2064,13 +2064,13 @@ msgstr "" @@
 msgid "Revisions %(revs)s are already part of pull request or have set status"
 msgstr ""
 "Die Revisionen %(revs)s sind bereits Bestandteil des Pull Requests oder "
 "haben den Status"
 #: kallithea/model/validators.py:817
-msgid "Please enter a valid IPv4 or IpV6 address"
+msgid "Please enter a valid IPv4 or IPv6 address"
 msgstr "Bitte eine gültige IPv4- oder IPv6-Adresse angeben"
 #: kallithea/model/validators.py:818
 #, python-format
 msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
 msgstr ""
@@ @@ -3150,13 +3150,13 @@ msgstr "" @@
 #: kallithea/templates/admin/users/user_edit_ips.html:30
 msgid "All IP addresses are allowed."
 msgstr ""
 #: kallithea/templates/admin/permissions/permissions_ips.html:32
 #: kallithea/templates/admin/users/user_edit_ips.html:42
-msgid "New ip address"
+msgid "New IP address"
 msgstr "Neue IP-Adresse"
 #: kallithea/templates/admin/permissions/permissions_perms.html:1
 msgid "Default User Permissions Overview"
 msgstr "Übersicht der Standardbenutzerrechte"

kallithea/i18n/fr/LC_MESSAGES/kallithea.po

➞

Show inline comments

 #: kallithea/controllers/admin/users.py:454
 msgid "You can't edit this user"
 msgstr "Vous ne pouvez pas éditer cet utilisateur"
 #: kallithea/controllers/admin/users.py:482
 #, python-format
-msgid "Added ip %s to user whitelist"
+msgid "Added IP address %s to user whitelist"
 msgstr "L'adresse IP %s a été ajoutée à la liste blanche"
 #: kallithea/controllers/admin/users.py:488
 msgid "An error occurred during ip saving"
 msgstr "Une erreur est survenue durant la sauvegarde d'IP"
 #: kallithea/controllers/admin/users.py:502
-msgid "Removed ip address from user whitelist"
+msgid "Removed IP address from user whitelist"
 msgstr "L'adresse IP a été supprimée de la liste blanche"
 #: kallithea/lib/auth.py:745
 #, python-format
 msgid "IP %s not allowed"
 msgstr "IP %s non autorisée"
@@ @@ -2056,13 +2056,13 @@ msgstr "" @@
 msgid "Revisions %(revs)s are already part of pull request or have set status"
 msgstr ""
 "Les révisions %(revs)s font déjà partie de la requête de pull ou on des "
 "statuts définis"
 #: kallithea/model/validators.py:817
-msgid "Please enter a valid IPv4 or IpV6 address"
+msgid "Please enter a valid IPv4 or IPv6 address"
 msgstr "Veuillez entrer une adresse IPv4 ou IPv6 valide"
 #: kallithea/model/validators.py:818
 #, python-format
 msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
 msgstr "La taille du réseau (bits) doit être entre 0 et 32 (et non %(bits)r)"
 #, fuzzy
 msgid "All IP addresses are allowed."
 msgstr "Toutes les adresses IP sont autorisées"
 #: kallithea/templates/admin/permissions/permissions_ips.html:32
 #: kallithea/templates/admin/users/user_edit_ips.html:42
-msgid "New ip address"
+msgid "New IP address"
 msgstr "Nouvelle adresse IP"
 #: kallithea/templates/admin/permissions/permissions_perms.html:1
 #, fuzzy
 msgid "Default User Permissions Overview"
 msgstr "Vue d'ensemble des permissions utilisateur par défaut"

kallithea/i18n/hu/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -994,21 +994,21 @@ msgstr "" @@
 #: kallithea/controllers/admin/users.py:454
 msgid "You can't edit this user"
 msgstr ""
 #: kallithea/controllers/admin/users.py:482
 #, python-format
-msgid "Added ip %s to user whitelist"
+msgid "Added IP address %s to user whitelist"
 msgstr ""
 #: kallithea/controllers/admin/users.py:488
 msgid "An error occurred during ip saving"
 msgstr ""
 #: kallithea/controllers/admin/users.py:502
-msgid "Removed ip address from user whitelist"
+msgid "Removed IP address from user whitelist"
 msgstr ""
 #: kallithea/lib/auth.py:745
 #, python-format
 msgid "IP %s not allowed"
 msgstr ""
@@ @@ -1995,13 +1995,13 @@ 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
-msgid "Please enter a valid IPv4 or IpV6 address"
+msgid "Please enter a valid IPv4 or IPv6 address"
 msgstr ""
 #: kallithea/model/validators.py:818
 #, python-format
 msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
 msgstr ""
@@ @@ -3056,13 +3056,13 @@ msgstr "" @@
 #: kallithea/templates/admin/users/user_edit_ips.html:30
 msgid "All IP addresses are allowed."
 msgstr ""
 #: kallithea/templates/admin/permissions/permissions_ips.html:32
 #: kallithea/templates/admin/users/user_edit_ips.html:42
-msgid "New ip address"
+msgid "New IP address"
 msgstr ""
 #: kallithea/templates/admin/permissions/permissions_perms.html:1
 msgid "Default User Permissions Overview"
 msgstr ""

kallithea/i18n/ja/LC_MESSAGES/kallithea.po

➞

Show inline comments

 #: kallithea/controllers/admin/users.py:454
 msgid "You can't edit this user"
 msgstr "このユーザーは編集できません"
 #: kallithea/controllers/admin/users.py:482
 #, python-format
-msgid "Added ip %s to user whitelist"
+msgid "Added IP address %s to user whitelist"
 msgstr "ユーザーホワイトリストにIP %s を追加しました"
 #: kallithea/controllers/admin/users.py:488
 msgid "An error occurred during ip saving"
 msgstr "IPアドレスの保存中にエラーが発生しました"
 #: kallithea/controllers/admin/users.py:502
-msgid "Removed ip address from user whitelist"
+msgid "Removed IP address from user whitelist"
 msgstr "ユーザーホワイトリストからIPアドレスを削除しました"
 #: kallithea/lib/auth.py:745
 #, python-format
 msgid "IP %s not allowed"
 msgstr "IPアドレス %s は許可されません"
 #: 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/model/validators.py:817
-msgid "Please enter a valid IPv4 or IpV6 address"
+msgid "Please enter a valid IPv4 or IPv6 address"
 msgstr "有効なIPv4かIPv6のアドレスを入力してください"
 #: kallithea/model/validators.py:818
 #, python-format
 msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
 msgstr "ネットワークサイズ (bits) は0-32の範囲にする必要があります ( %(bits)r は不正です)"
 #, fuzzy
 msgid "All IP addresses are allowed."
 msgstr "すべてのIPアドレスが許可されています"
 #: kallithea/templates/admin/permissions/permissions_ips.html:32
 #: kallithea/templates/admin/users/user_edit_ips.html:42
-msgid "New ip address"
+msgid "New IP address"
 msgstr "新しいIPアドレス"
 #: kallithea/templates/admin/permissions/permissions_perms.html:1
 #, fuzzy
 msgid "Default User Permissions Overview"
 msgstr "デフォルトのユーザー権限の概要"

kallithea/i18n/kallithea.pot

➞

Show inline comments

@@ @@ -980,21 +980,21 @@ msgstr "" @@
 #: kallithea/controllers/admin/users.py:454
 msgid "You can't edit this user"
 msgstr ""
 #: kallithea/controllers/admin/users.py:482
 #, python-format
-msgid "Added ip %s to user whitelist"
+msgid "Added IP address %s to user whitelist"
 msgstr ""
 #: kallithea/controllers/admin/users.py:488
 msgid "An error occurred during ip saving"
 msgstr ""
 #: kallithea/controllers/admin/users.py:502
-msgid "Removed ip address from user whitelist"
+msgid "Removed IP address from user whitelist"
 msgstr ""
 #: kallithea/lib/auth.py:745
 #, python-format
 msgid "IP %s not allowed"
 msgstr ""
@@ @@ -1960,13 +1960,13 @@ 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
-msgid "Please enter a valid IPv4 or IpV6 address"
+msgid "Please enter a valid IPv4 or IPv6 address"
 msgstr ""
 #: kallithea/model/validators.py:818
 #, python-format
 msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
 msgstr ""
@@ @@ -2998,13 +2998,13 @@ msgstr "" @@
 #: kallithea/templates/admin/users/user_edit_ips.html:30
 msgid "All IP addresses are allowed."
 msgstr ""
 #: kallithea/templates/admin/permissions/permissions_ips.html:32
 #: kallithea/templates/admin/users/user_edit_ips.html:42
-msgid "New ip address"
+msgid "New IP address"
 msgstr ""
 #: kallithea/templates/admin/permissions/permissions_perms.html:1
 msgid "Default User Permissions Overview"
 msgstr ""

kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -997,21 +997,21 @@ msgstr "" @@
 #: kallithea/controllers/admin/users.py:454
 msgid "You can't edit this user"
 msgstr ""
 #: kallithea/controllers/admin/users.py:482
 #, python-format
-msgid "Added ip %s to user whitelist"
+msgid "Added IP address %s to user whitelist"
 msgstr ""
 #: kallithea/controllers/admin/users.py:488
 msgid "An error occurred during ip saving"
 msgstr ""
 #: kallithea/controllers/admin/users.py:502
-msgid "Removed ip address from user whitelist"
+msgid "Removed IP address from user whitelist"
 msgstr ""
 #: kallithea/lib/auth.py:745
 #, python-format
 msgid "IP %s not allowed"
 msgstr ""
@@ @@ -1998,13 +1998,13 @@ 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
-msgid "Please enter a valid IPv4 or IpV6 address"
+msgid "Please enter a valid IPv4 or IPv6 address"
 msgstr ""
 #: kallithea/model/validators.py:818
 #, python-format
 msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
 msgstr ""
@@ @@ -3059,13 +3059,13 @@ msgstr "" @@
 #: kallithea/templates/admin/users/user_edit_ips.html:30
 msgid "All IP addresses are allowed."
 msgstr ""
 #: kallithea/templates/admin/permissions/permissions_ips.html:32
 #: kallithea/templates/admin/users/user_edit_ips.html:42
-msgid "New ip address"
+msgid "New IP address"
 msgstr ""
 #: kallithea/templates/admin/permissions/permissions_perms.html:1
 msgid "Default User Permissions Overview"
 msgstr ""

kallithea/i18n/pl/LC_MESSAGES/kallithea.po

➞

Show inline comments

 #: kallithea/controllers/admin/users.py:454
 msgid "You can't edit this user"
 msgstr "Nie możesz edytować tego użytkownika"
 #: kallithea/controllers/admin/users.py:482
 #, python-format
-msgid "Added ip %s to user whitelist"
+msgid "Added IP address %s to user whitelist"
 msgstr "Dodano ip %s do listy dozwolonych adresów użytkownia"
 #: kallithea/controllers/admin/users.py:488
 msgid "An error occurred during ip saving"
 msgstr "Wystąpił błąd podczas zapisywania e-maila"
 #: kallithea/controllers/admin/users.py:502
-msgid "Removed ip address from user whitelist"
+msgid "Removed IP address from user whitelist"
 msgstr "Usunięto adres ip z listy dozwolonych adresów dla użytkownika"
 #: kallithea/lib/auth.py:745
 #, python-format
 msgid "IP %s not allowed"
 msgstr "Obserwatorzy %s"
@@ @@ -2043,13 +2043,13 @@ msgstr "" @@
 #: kallithea/model/validators.py:785
 #, python-format
 msgid "Revisions %(revs)s are already part of pull request or have set status"
 msgstr "Rewizja  %(revs)s jest już częścią  nowej gałęzi więc określ jego status"
 #: kallithea/model/validators.py:817
-msgid "Please enter a valid IPv4 or IpV6 address"
+msgid "Please enter a valid IPv4 or IPv6 address"
 msgstr "Proszę podać poprawny adres IPv4 lub IPv6"
 #: kallithea/model/validators.py:818
 #, python-format
 msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
 msgstr "Rozmiar sieci (bits) może mieścić się w zakresie od 0-32 (nie %(bits)r)"
@@ @@ -3135,13 +3135,13 @@ msgstr "Potwierdź, aby usunąć to ip: %s" @@
 #, fuzzy
 msgid "All IP addresses are allowed."
 msgstr "Wszystkie adresy IP są dozwolone"
 #: kallithea/templates/admin/permissions/permissions_ips.html:32
 #: kallithea/templates/admin/users/user_edit_ips.html:42
-msgid "New ip address"
+msgid "New IP address"
 msgstr "Nowy adres ip"
 #: kallithea/templates/admin/permissions/permissions_perms.html:1
 #, fuzzy
 msgid "Default User Permissions Overview"
 msgstr "Domyślne uprawnienia"

kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -1007,21 +1007,21 @@ msgstr "Ocorreu um erro ao excluir o usuário" @@
 #: kallithea/controllers/admin/users.py:454
 msgid "You can't edit this user"
 msgstr "Você não pode editar esse usuário"
 #: kallithea/controllers/admin/users.py:482
 #, python-format
-msgid "Added ip %s to user whitelist"
+msgid "Added IP address %s to user whitelist"
 msgstr ""
 #: kallithea/controllers/admin/users.py:488
 msgid "An error occurred during ip saving"
 msgstr "Ocorreu um erro durante o salvamento do IP"
 #: kallithea/controllers/admin/users.py:502
-msgid "Removed ip address from user whitelist"
+msgid "Removed IP address from user whitelist"
 msgstr ""
 #: kallithea/lib/auth.py:745
 #, python-format
 msgid "IP %s not allowed"
 msgstr "IP %s não permitido"
@@ @@ -2035,13 +2035,13 @@ msgstr "" @@
 msgid "Revisions %(revs)s are already part of pull request or have set status"
 msgstr ""
 "As revisões %(revs)s já fazem parte de um pull request ou já setaram o "
 "estado"
 #: kallithea/model/validators.py:817
-msgid "Please enter a valid IPv4 or IpV6 address"
+msgid "Please enter a valid IPv4 or IPv6 address"
 msgstr "Por favor, forneça um endereço válido IPv4 ou IPv6"
 #: kallithea/model/validators.py:818
 #, python-format
 msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
 msgstr "O tamanho da rede (bits) deve estar no intervalo 0-32 (não %(bits)r)"
@@ @@ -3123,13 +3123,13 @@ msgstr "Confirme para excluir este IP: % @@
 #, fuzzy
 msgid "All IP addresses are allowed."
 msgstr "Todos os endereços IP são permitidos"
 #: kallithea/templates/admin/permissions/permissions_ips.html:32
 #: kallithea/templates/admin/users/user_edit_ips.html:42
-msgid "New ip address"
+msgid "New IP address"
 msgstr "Novo endereço IP"
 #: kallithea/templates/admin/permissions/permissions_perms.html:1
 #, fuzzy
 msgid "Default User Permissions Overview"
 msgstr "Permissões padrão"

kallithea/i18n/ru/LC_MESSAGES/kallithea.po

➞

Show inline comments

 #: kallithea/controllers/admin/users.py:454
 msgid "You can't edit this user"
 msgstr "Вы не можете редактировать данного пользователя"
 #: kallithea/controllers/admin/users.py:482
 #, python-format
-msgid "Added ip %s to user whitelist"
+msgid "Added IP address %s to user whitelist"
 msgstr "Добавлен IP %s в белый список пользователя"
 #: kallithea/controllers/admin/users.py:488
 msgid "An error occurred during ip saving"
 msgstr "Произошла ошибка при сохранении IP"
 #: kallithea/controllers/admin/users.py:502
-msgid "Removed ip address from user whitelist"
+msgid "Removed IP address from user whitelist"
 msgstr "Удален IP %s из белого списка пользователя"
 #: kallithea/lib/auth.py:745
 #, python-format
 msgid "IP %s not allowed"
 msgstr "IP %s заблокирован"
@@ @@ -2051,14 +2051,14 @@ msgstr "" @@
 msgid "Revisions %(revs)s are already part of pull request or have set status"
 msgstr ""
 "Ревизии %(revs)s уже включены в pull-request или имеют установленный "
 "статус"
 #: kallithea/model/validators.py:817
 msgid "Please enter a valid IPv4 or IpV6 address"
 msgstr "Пожалуйста, введите существующий IPv4 или IpV6 адре"
 msgid "Please enter a valid IPv4 or IPv6 address"
 msgstr "Пожалуйста, введите существующий IPv4 или IPv6 адре"
 #: kallithea/model/validators.py:818
 #, python-format
 msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
 msgstr ""
 "Значение маски подсети должно быть в пределах от 0 до 32 (%(bits)r - "
@@ @@ -3127,13 +3127,13 @@ msgstr "Подтвердите удаление IP %s" @@
 #: kallithea/templates/admin/users/user_edit_ips.html:30
 msgid "All IP addresses are allowed."
 msgstr "Разрешены любые IP-адреса"
 #: kallithea/templates/admin/permissions/permissions_ips.html:32
 #: kallithea/templates/admin/users/user_edit_ips.html:42
-msgid "New ip address"
+msgid "New IP address"
 msgstr "Новый IP-адрес"
 #: kallithea/templates/admin/permissions/permissions_perms.html:1
 msgid "Default User Permissions Overview"
 msgstr "Обзор прав пользователей по умолчанию"

kallithea/i18n/sk/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -994,21 +994,21 @@ msgstr "" @@
 #: kallithea/controllers/admin/users.py:454
 msgid "You can't edit this user"
 msgstr ""
 #: kallithea/controllers/admin/users.py:482
 #, python-format
-msgid "Added ip %s to user whitelist"
+msgid "Added IP address %s to user whitelist"
 msgstr ""
 #: kallithea/controllers/admin/users.py:488
 msgid "An error occurred during ip saving"
 msgstr ""
 #: kallithea/controllers/admin/users.py:502
-msgid "Removed ip address from user whitelist"
+msgid "Removed IP address from user whitelist"
 msgstr ""
 #: kallithea/lib/auth.py:745
 #, python-format
 msgid "IP %s not allowed"
 msgstr ""
@@ @@ -2001,13 +2001,13 @@ 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
-msgid "Please enter a valid IPv4 or IpV6 address"
+msgid "Please enter a valid IPv4 or IPv6 address"
 msgstr ""
 #: kallithea/model/validators.py:818
 #, python-format
 msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
 msgstr ""
@@ @@ -3064,13 +3064,13 @@ msgstr "" @@
 #: kallithea/templates/admin/users/user_edit_ips.html:30
 msgid "All IP addresses are allowed."
 msgstr ""
 #: kallithea/templates/admin/permissions/permissions_ips.html:32
 #: kallithea/templates/admin/users/user_edit_ips.html:42
-msgid "New ip address"
+msgid "New IP address"
 msgstr ""
 #: kallithea/templates/admin/permissions/permissions_perms.html:1
 msgid "Default User Permissions Overview"
 msgstr ""

kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -1003,21 +1003,21 @@ msgstr "删除用户时发生错误" @@
 #: kallithea/controllers/admin/users.py:454
 msgid "You can't edit this user"
 msgstr "无法编辑该用户"
 #: kallithea/controllers/admin/users.py:482
 #, python-format
-msgid "Added ip %s to user whitelist"
+msgid "Added IP address %s to user whitelist"
 msgstr ""
 #: kallithea/controllers/admin/users.py:488
 msgid "An error occurred during ip saving"
 msgstr ""
 #: kallithea/controllers/admin/users.py:502
-msgid "Removed ip address from user whitelist"
+msgid "Removed IP address from user whitelist"
 msgstr ""
 #: kallithea/lib/auth.py:745
 #, python-format
 msgid "IP %s not allowed"
 msgstr ""
 #: 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/model/validators.py:817
-msgid "Please enter a valid IPv4 or IpV6 address"
+msgid "Please enter a valid IPv4 or IPv6 address"
 msgstr ""
 #: kallithea/model/validators.py:818
 #, python-format
 msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
 msgstr ""
@@ @@ -3074,13 +3074,13 @@ msgstr "" @@
 #: kallithea/templates/admin/users/user_edit_ips.html:30
 msgid "All IP addresses are allowed."
 msgstr ""
 #: kallithea/templates/admin/permissions/permissions_ips.html:32
 #: kallithea/templates/admin/users/user_edit_ips.html:42
-msgid "New ip address"
+msgid "New IP address"
 msgstr ""
 #: kallithea/templates/admin/permissions/permissions_perms.html:1
 #, fuzzy
 msgid "Default User Permissions Overview"
 msgstr "默认权限"

kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -995,21 +995,21 @@ msgstr "" @@
 #: kallithea/controllers/admin/users.py:454
 msgid "You can't edit this user"
 msgstr "您無法編輯這位使用者"
 #: kallithea/controllers/admin/users.py:482
 #, python-format
-msgid "Added ip %s to user whitelist"
+msgid "Added IP address %s to user whitelist"
 msgstr ""
 #: kallithea/controllers/admin/users.py:488
 msgid "An error occurred during ip saving"
 msgstr ""
 #: kallithea/controllers/admin/users.py:502
-msgid "Removed ip address from user whitelist"
+msgid "Removed IP address from user whitelist"
 msgstr ""
 #: kallithea/lib/auth.py:745
 #, python-format
 msgid "IP %s not allowed"
 msgstr ""
@@ @@ -1992,13 +1992,13 @@ 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
-msgid "Please enter a valid IPv4 or IpV6 address"
+msgid "Please enter a valid IPv4 or IPv6 address"
 msgstr ""
 #: kallithea/model/validators.py:818
 #, python-format
 msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
 msgstr ""
@@ @@ -3062,13 +3062,13 @@ msgstr "" @@
 #: kallithea/templates/admin/users/user_edit_ips.html:30
 msgid "All IP addresses are allowed."
 msgstr ""
 #: kallithea/templates/admin/permissions/permissions_ips.html:32
 #: kallithea/templates/admin/users/user_edit_ips.html:42
-msgid "New ip address"
+msgid "New IP address"
 msgstr ""
 #: kallithea/templates/admin/permissions/permissions_perms.html:1
 #, fuzzy
 msgid "Default User Permissions Overview"
 msgstr "預設權限"

kallithea/model/validators.py

➞

Show inline comments

@@ @@ -811,13 +811,13 @@ def NotReviewedRevisions(repo_id): @@
     return _validator
 def ValidIp():
     class _validator(CIDR):
         messages = dict(
-            badFormat=_('Please enter a valid IPv4 or IpV6 address'),
+            badFormat=_('Please enter a valid IPv4 or IPv6 address'),
             illegalBits=_('The network size (bits) must be within the range'
                 ' of 0-32 (not %(bits)r)')
+        )
         def to_python(self, value, state):
             v = super(_validator, self).to_python(value, state)
@@ @@ -833,13 +833,13 @@ def ValidIp(): @@
                     v += '/128'
             return v
         def validate_python(self, value, state):
             try:
                 addr = value.strip()
-                #this raises an ValueError if address is not IpV4 or IpV6
+                #this raises an ValueError if address is not IPv4 or IPv6
                 ipaddr.IPNetwork(address=addr)
             except ValueError:
                 raise formencode.Invalid(self.message('badFormat', state),
                                          value, state)
     return _validator

kallithea/tests/functional/test_admin_users.py

➞

Show inline comments

@@ @@ -392,13 +392,13 @@ class TestAdminUsersController(TestContr @@
         user_id = user.user_id
         response = self.app.put(url('edit_user_ips', id=user_id),
                                 params=dict(new_ip=ip, _authentication_token=self.authentication_token()))
         if failure:
-            self.checkSessionFlash(response, 'Please enter a valid IPv4 or IpV6 address')
+            self.checkSessionFlash(response, 'Please enter a valid IPv4 or IPv6 address')
             response = self.app.get(url('edit_user_ips', id=user_id))
             response.mustcontain(no=[ip])
             response.mustcontain(no=[ip_range])
         else:
             response = self.app.get(url('edit_user_ips', id=user_id))

0 comments (0 inline, 0 general)