[PATCH] spelling: IP address, IPv4, IPv6
Andrew Shadura
andrew at shadura.me
Tue May 26 07:55:11 EDT 2015
# HG changeset patch
# User Andrew Shadura <andrew at shadura.me>
# Date 1432641306 -7200
# Tue May 26 13:55:06 2015 +0200
# Node ID 86d6bfb6ca037549192e5217ce84c799210b57dd
# Parent c142eac083a2239e1ccf1cc4a5c5712b0559541c
spelling: IP address, IPv4, IPv6
diff --git a/kallithea/controllers/admin/users.py b/kallithea/controllers/admin/users.py
--- a/kallithea/controllers/admin/users.py
+++ b/kallithea/controllers/admin/users.py
@@ -479,7 +479,7 @@ class UsersController(BaseController):
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')
diff --git a/kallithea/i18n/be/LC_MESSAGES/kallithea.po b/kallithea/i18n/be/LC_MESSAGES/kallithea.po
--- a/kallithea/i18n/be/LC_MESSAGES/kallithea.po
+++ b/kallithea/i18n/be/LC_MESSAGES/kallithea.po
@@ -1007,7 +1007,7 @@ 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
@@ -1015,7 +1015,7 @@ msgid "An error occurred during ip savin
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 @@ msgid "Revisions %(revs)s are already pa
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 @@ 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
diff --git a/kallithea/i18n/cs/LC_MESSAGES/kallithea.po b/kallithea/i18n/cs/LC_MESSAGES/kallithea.po
--- a/kallithea/i18n/cs/LC_MESSAGES/kallithea.po
+++ b/kallithea/i18n/cs/LC_MESSAGES/kallithea.po
@@ -998,7 +998,7 @@ 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
@@ -1006,7 +1006,7 @@ msgid "An error occurred during ip savin
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 @@ msgid "Revisions %(revs)s are already pa
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 @@ 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
diff --git a/kallithea/i18n/de/LC_MESSAGES/kallithea.po b/kallithea/i18n/de/LC_MESSAGES/kallithea.po
--- a/kallithea/i18n/de/LC_MESSAGES/kallithea.po
+++ b/kallithea/i18n/de/LC_MESSAGES/kallithea.po
@@ -1024,7 +1024,7 @@ msgstr "Sie können diesen Benutzer nich
#: 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 @@ msgid "An error occurred during ip savin
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 @@ msgstr ""
"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 @@ 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
diff --git a/kallithea/i18n/fr/LC_MESSAGES/kallithea.po b/kallithea/i18n/fr/LC_MESSAGES/kallithea.po
--- a/kallithea/i18n/fr/LC_MESSAGES/kallithea.po
+++ b/kallithea/i18n/fr/LC_MESSAGES/kallithea.po
@@ -1025,7 +1025,7 @@ msgstr "Vous ne pouvez pas éditer cet u
#: 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 @@ msgid "An error occurred during ip savin
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 @@ msgstr ""
"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 @@ msgstr "Toutes les adresses IP sont auto
#: 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
diff --git a/kallithea/i18n/hu/LC_MESSAGES/kallithea.po b/kallithea/i18n/hu/LC_MESSAGES/kallithea.po
--- a/kallithea/i18n/hu/LC_MESSAGES/kallithea.po
+++ b/kallithea/i18n/hu/LC_MESSAGES/kallithea.po
@@ -997,7 +997,7 @@ 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
@@ -1005,7 +1005,7 @@ msgid "An error occurred during ip savin
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 @@ msgid "Revisions %(revs)s are already pa
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 @@ 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
diff --git a/kallithea/i18n/ja/LC_MESSAGES/kallithea.po b/kallithea/i18n/ja/LC_MESSAGES/kallithea.po
--- a/kallithea/i18n/ja/LC_MESSAGES/kallithea.po
+++ b/kallithea/i18n/ja/LC_MESSAGES/kallithea.po
@@ -1009,7 +1009,7 @@ 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
@@ -1017,7 +1017,7 @@ msgid "An error occurred during ip savin
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 @@ msgid "Revisions %(revs)s are already pa
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 @@ 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
diff --git a/kallithea/i18n/kallithea.pot b/kallithea/i18n/kallithea.pot
--- a/kallithea/i18n/kallithea.pot
+++ b/kallithea/i18n/kallithea.pot
@@ -983,7 +983,7 @@ 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
@@ -991,7 +991,7 @@ msgid "An error occurred during ip savin
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 @@ msgid "Revisions %(revs)s are already pa
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 @@ 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
diff --git a/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po b/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po
--- a/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po
+++ b/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po
@@ -1000,7 +1000,7 @@ 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
@@ -1008,7 +1008,7 @@ msgid "An error occurred during ip savin
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 @@ msgid "Revisions %(revs)s are already pa
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 @@ 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
diff --git a/kallithea/i18n/pl/LC_MESSAGES/kallithea.po b/kallithea/i18n/pl/LC_MESSAGES/kallithea.po
--- a/kallithea/i18n/pl/LC_MESSAGES/kallithea.po
+++ b/kallithea/i18n/pl/LC_MESSAGES/kallithea.po
@@ -1014,7 +1014,7 @@ msgstr "Nie możesz edytowaÄ tego użyt
#: 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 @@ msgid "An error occurred during ip savin
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 @@ msgid "Revisions %(revs)s are already pa
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 @@ msgstr "Wszystkie adresy IP sÄ
dozwolon
#: 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
diff --git a/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po b/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po
--- a/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po
+++ b/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po
@@ -1010,7 +1010,7 @@ msgstr "Você não pode editar esse usuÃ
#: 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 @@ msgid "An error occurred during ip savin
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 @@ msgstr ""
"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 @@ msgstr "Todos os endereços IP são perm
#: 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
diff --git a/kallithea/i18n/ru/LC_MESSAGES/kallithea.po b/kallithea/i18n/ru/LC_MESSAGES/kallithea.po
--- a/kallithea/i18n/ru/LC_MESSAGES/kallithea.po
+++ b/kallithea/i18n/ru/LC_MESSAGES/kallithea.po
@@ -1019,7 +1019,7 @@ 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
@@ -1027,7 +1027,7 @@ msgid "An error occurred during ip savin
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 @@ msgstr ""
"ÑÑаÑÑÑ"
#: 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 @@ 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
diff --git a/kallithea/i18n/sk/LC_MESSAGES/kallithea.po b/kallithea/i18n/sk/LC_MESSAGES/kallithea.po
--- a/kallithea/i18n/sk/LC_MESSAGES/kallithea.po
+++ b/kallithea/i18n/sk/LC_MESSAGES/kallithea.po
@@ -997,7 +997,7 @@ 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
@@ -1005,7 +1005,7 @@ msgid "An error occurred during ip savin
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 @@ msgid "Revisions %(revs)s are already pa
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 @@ 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
diff --git a/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po b/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po
--- a/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po
+++ b/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po
@@ -1006,7 +1006,7 @@ 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
@@ -1014,7 +1014,7 @@ msgid "An error occurred during ip savin
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 @@ msgid "Revisions %(revs)s are already pa
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 @@ 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
diff --git a/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po b/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po
--- a/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po
+++ b/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po
@@ -998,7 +998,7 @@ 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
@@ -1006,7 +1006,7 @@ msgid "An error occurred during ip savin
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 @@ msgid "Revisions %(revs)s are already pa
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 @@ 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
diff --git a/kallithea/model/validators.py b/kallithea/model/validators.py
--- a/kallithea/model/validators.py
+++ b/kallithea/model/validators.py
@@ -816,7 +816,7 @@ def NotReviewedRevisions(repo_id):
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)')
)
@@ -838,7 +838,7 @@ def ValidIp():
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),
diff --git a/kallithea/tests/functional/test_admin_users.py b/kallithea/tests/functional/test_admin_users.py
--- a/kallithea/tests/functional/test_admin_users.py
+++ b/kallithea/tests/functional/test_admin_users.py
@@ -395,7 +395,7 @@ class TestAdminUsersController(TestContr
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])
More information about the kallithea-general
mailing list