Mercurial > kallithea

changeset 5150:7409cfc1e961

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
spelling: IP address, IPv4, IPv6
author Andrew Shadura <andrew@shadura.me>
date Tue, 26 May 2015 13:55:06 +0200
parents 35120990752f
children df5b6fc6c518
files 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
diffstat 17 files changed, 62 insertions(+), 62 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/controllers/admin/users.py	Thu May 21 15:52:30 2015 -0400
+++ b/kallithea/controllers/admin/users.py	Tue May 26 13:55:06 2015 +0200
@@ -479,7 +479,7 @@
         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')
--- a/kallithea/i18n/be/LC_MESSAGES/kallithea.po	Thu May 21 15:52:30 2015 -0400
+++ b/kallithea/i18n/be/LC_MESSAGES/kallithea.po	Tue May 26 13:55:06 2015 +0200
@@ -1007,7 +1007,7 @@
 
 #: 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
@@ -1015,7 +1015,7 @@
 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
@@ -2041,8 +2041,8 @@
 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
@@ -3117,7 +3117,7 @@
 
 #: 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
--- a/kallithea/i18n/cs/LC_MESSAGES/kallithea.po	Thu May 21 15:52:30 2015 -0400
+++ b/kallithea/i18n/cs/LC_MESSAGES/kallithea.po	Tue May 26 13:55:06 2015 +0200
@@ -998,7 +998,7 @@
 
 #: 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
@@ -1006,7 +1006,7 @@
 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
@@ -2005,7 +2005,7 @@
 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
@@ -3070,7 +3070,7 @@
 
 #: 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
--- a/kallithea/i18n/de/LC_MESSAGES/kallithea.po	Thu May 21 15:52:30 2015 -0400
+++ b/kallithea/i18n/de/LC_MESSAGES/kallithea.po	Tue May 26 13:55:06 2015 +0200
@@ -1024,7 +1024,7 @@
 
 #: 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
@@ -1032,7 +1032,7 @@
 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
@@ -2067,7 +2067,7 @@
 "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
@@ -3153,7 +3153,7 @@
 
 #: 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
--- a/kallithea/i18n/fr/LC_MESSAGES/kallithea.po	Thu May 21 15:52:30 2015 -0400
+++ b/kallithea/i18n/fr/LC_MESSAGES/kallithea.po	Tue May 26 13:55:06 2015 +0200
@@ -1025,7 +1025,7 @@
 
 #: 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
@@ -1033,7 +1033,7 @@
 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
@@ -2059,7 +2059,7 @@
 "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
@@ -3137,7 +3137,7 @@
 
 #: 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
--- a/kallithea/i18n/hu/LC_MESSAGES/kallithea.po	Thu May 21 15:52:30 2015 -0400
+++ b/kallithea/i18n/hu/LC_MESSAGES/kallithea.po	Tue May 26 13:55:06 2015 +0200
@@ -997,7 +997,7 @@
 
 #: 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
@@ -1005,7 +1005,7 @@
 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
@@ -1998,7 +1998,7 @@
 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
@@ -3059,7 +3059,7 @@
 
 #: 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
--- a/kallithea/i18n/ja/LC_MESSAGES/kallithea.po	Thu May 21 15:52:30 2015 -0400
+++ b/kallithea/i18n/ja/LC_MESSAGES/kallithea.po	Tue May 26 13:55:06 2015 +0200
@@ -1009,7 +1009,7 @@
 
 #: 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
@@ -1017,7 +1017,7 @@
 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
@@ -2011,7 +2011,7 @@
 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
@@ -3092,7 +3092,7 @@
 
 #: 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
--- a/kallithea/i18n/kallithea.pot	Thu May 21 15:52:30 2015 -0400
+++ b/kallithea/i18n/kallithea.pot	Tue May 26 13:55:06 2015 +0200
@@ -983,7 +983,7 @@
 
 #: 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
@@ -991,7 +991,7 @@
 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
@@ -1963,7 +1963,7 @@
 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
@@ -3001,7 +3001,7 @@
 
 #: 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
--- a/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po	Thu May 21 15:52:30 2015 -0400
+++ b/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po	Tue May 26 13:55:06 2015 +0200
@@ -1000,7 +1000,7 @@
 
 #: 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
@@ -1008,7 +1008,7 @@
 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
@@ -2001,7 +2001,7 @@
 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
@@ -3062,7 +3062,7 @@
 
 #: 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
--- a/kallithea/i18n/pl/LC_MESSAGES/kallithea.po	Thu May 21 15:52:30 2015 -0400
+++ b/kallithea/i18n/pl/LC_MESSAGES/kallithea.po	Tue May 26 13:55:06 2015 +0200
@@ -1014,7 +1014,7 @@
 
 #: 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
@@ -1022,7 +1022,7 @@
 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
@@ -2046,7 +2046,7 @@
 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
@@ -3138,7 +3138,7 @@
 
 #: 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
--- a/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po	Thu May 21 15:52:30 2015 -0400
+++ b/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po	Tue May 26 13:55:06 2015 +0200
@@ -1010,7 +1010,7 @@
 
 #: 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
@@ -1018,7 +1018,7 @@
 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
@@ -2038,7 +2038,7 @@
 "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
@@ -3126,7 +3126,7 @@
 
 #: 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
--- a/kallithea/i18n/ru/LC_MESSAGES/kallithea.po	Thu May 21 15:52:30 2015 -0400
+++ b/kallithea/i18n/ru/LC_MESSAGES/kallithea.po	Tue May 26 13:55:06 2015 +0200
@@ -1019,7 +1019,7 @@
 
 #: 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
@@ -1027,7 +1027,7 @@
 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
@@ -2054,8 +2054,8 @@
 "статус"
 
 #: 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
@@ -3130,7 +3130,7 @@
 
 #: 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
--- a/kallithea/i18n/sk/LC_MESSAGES/kallithea.po	Thu May 21 15:52:30 2015 -0400
+++ b/kallithea/i18n/sk/LC_MESSAGES/kallithea.po	Tue May 26 13:55:06 2015 +0200
@@ -997,7 +997,7 @@
 
 #: 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
@@ -1005,7 +1005,7 @@
 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
@@ -2004,7 +2004,7 @@
 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
@@ -3067,7 +3067,7 @@
 
 #: 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
--- a/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po	Thu May 21 15:52:30 2015 -0400
+++ b/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po	Tue May 26 13:55:06 2015 +0200
@@ -1006,7 +1006,7 @@
 
 #: 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
@@ -1014,7 +1014,7 @@
 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
@@ -2004,7 +2004,7 @@
 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
@@ -3077,7 +3077,7 @@
 
 #: 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
--- a/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po	Thu May 21 15:52:30 2015 -0400
+++ b/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po	Tue May 26 13:55:06 2015 +0200
@@ -998,7 +998,7 @@
 
 #: 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
@@ -1006,7 +1006,7 @@
 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
@@ -1995,7 +1995,7 @@
 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
@@ -3065,7 +3065,7 @@
 
 #: 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
--- a/kallithea/model/validators.py	Thu May 21 15:52:30 2015 -0400
+++ b/kallithea/model/validators.py	Tue May 26 13:55:06 2015 +0200
@@ -814,7 +814,7 @@
 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)')
         )
@@ -836,7 +836,7 @@
         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),
--- a/kallithea/tests/functional/test_admin_users.py	Thu May 21 15:52:30 2015 -0400
+++ b/kallithea/tests/functional/test_admin_users.py	Tue May 26 13:55:06 2015 +0200
@@ -395,7 +395,7 @@
                                 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])