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

@@ @@ -470,25 +470,25 @@ class UsersController(BaseController): @@
             force_defaults=False)
     def add_ip(self, id):
         """POST /user_ips:Add an existing item"""
         # url('user_ips', id=ID, method='put')
         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'),
                     category='error')
         if 'default_user' in request.POST:
             return redirect(url('admin_permissions_ips'))
         return redirect(url('edit_user_ips', id=id))

kallithea/i18n/be/LC_MESSAGES/kallithea.po

➞

Show inline comments

 #: kallithea/controllers/admin/users.py:259
 #: kallithea/controllers/admin/users.py:282
 #: kallithea/controllers/admin/users.py:307
 #: kallithea/controllers/admin/users.py:320
 #: kallithea/controllers/admin/users.py:344
 #: kallithea/controllers/admin/users.py:407
 #: 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 заблакаваны"
 #: kallithea/lib/auth.py:806
 msgid "You need to be a registered user to perform this action"
 msgstr "Вы павінны быць зарэгістраваным карыстачом, каб выканаць гэта дзеянне"
 #: kallithea/lib/auth.py:843
@@ @@ -2032,26 +2032,26 @@ 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 ужо ўключаны ў 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/model/validators.py:851
 msgid "Key name can only consist of letters, underscore, dash or numbers"
 msgstr ""
 "Ключавое імя можа толькі складацца з літар, знака падкрэслення, працяжнік ці "
 "лікаў"
 #: kallithea/templates/admin/users/user_edit_ips.html:23
 #, python-format
 msgid "Confirm to delete this ip: %s"
 msgstr "Пацвердзіце выдаленне IP %s"
 #: kallithea/templates/admin/permissions/permissions_ips.html:21
 #: 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/templates/admin/repo_groups/repo_group_add.html:11
 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11
 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105
 #: kallithea/templates/admin/repo_groups/repo_groups.html:10
 #: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80
 msgid "Repository Groups"

kallithea/i18n/cs/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -989,33 +989,33 @@ msgstr "" @@
 #: kallithea/controllers/admin/users.py:259
 #: kallithea/controllers/admin/users.py:282
 #: kallithea/controllers/admin/users.py:307
 #: kallithea/controllers/admin/users.py:320
 #: kallithea/controllers/admin/users.py:344
 #: kallithea/controllers/admin/users.py:407
 #: 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/lib/auth.py:806
 msgid "You need to be a registered user to perform this action"
 msgstr ""
 #: kallithea/lib/auth.py:843
@@ @@ -1996,25 +1996,25 @@ 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
-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 ""
 #: kallithea/model/validators.py:851
 msgid "Key name can only consist of letters, underscore, dash or numbers"
 msgstr ""
 #: kallithea/model/validators.py:865
@@ @@ -3061,25 +3061,25 @@ msgstr "" @@
 #: kallithea/templates/admin/users/user_edit_ips.html:23
 #, python-format
 msgid "Confirm to delete this ip: %s"
 msgstr ""
 #: kallithea/templates/admin/permissions/permissions_ips.html:21
 #: 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/templates/admin/repo_groups/repo_group_add.html:11
 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11
 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105
 #: kallithea/templates/admin/repo_groups/repo_groups.html:10
 #: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80
 msgid "Repository Groups"

kallithea/i18n/de/LC_MESSAGES/kallithea.po

➞

Show inline comments

 #: kallithea/controllers/admin/users.py:259
 #: kallithea/controllers/admin/users.py:282
 #: kallithea/controllers/admin/users.py:307
 #: kallithea/controllers/admin/users.py:320
 #: kallithea/controllers/admin/users.py:344
 #: kallithea/controllers/admin/users.py:407
 #: 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"
 #: kallithea/lib/auth.py:806
 msgid "You need to be a registered user to perform this action"
 msgstr "Sie müssen ein Registrierter Nutzer sein um diese Aktion durchzuführen"
 #: kallithea/lib/auth.py:843
@@ @@ -2058,25 +2058,25 @@ msgid "" @@
 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
 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 ""
 "Die Größe (in Bits) des Netzwerks muss im Bereich 0-32 liegen (nicht "
 "%(bits)r)"
 #: kallithea/model/validators.py:851
 msgid "Key name can only consist of letters, underscore, dash or numbers"
 msgstr ""
@@ @@ -3144,25 +3144,25 @@ msgstr "" @@
 #: kallithea/templates/admin/users/user_edit_ips.html:23
 #, python-format
 msgid "Confirm to delete this ip: %s"
 msgstr ""
 #: kallithea/templates/admin/permissions/permissions_ips.html:21
 #: 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/templates/admin/repo_groups/repo_group_add.html:11
 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11
 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105
 #: kallithea/templates/admin/repo_groups/repo_groups.html:10
 #: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80
 msgid "Repository Groups"

kallithea/i18n/fr/LC_MESSAGES/kallithea.po

➞

Show inline comments

 #: kallithea/controllers/admin/users.py:259
 #: kallithea/controllers/admin/users.py:282
 #: kallithea/controllers/admin/users.py:307
 #: kallithea/controllers/admin/users.py:320
 #: kallithea/controllers/admin/users.py:344
 #: kallithea/controllers/admin/users.py:407
 #: 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"
 #: kallithea/lib/auth.py:806
 msgid "You need to be a registered user to perform this action"
 msgstr "Vous devez être un utilisateur enregistré pour effectuer cette action"
 #: kallithea/lib/auth.py:843
@@ @@ -2050,25 +2050,25 @@ msgid "" @@
 msgstr ""
 "L’attribut Login du CN doit être spécifié. Cet attribut correspond au nom"
 " d’utilisateur"
 #: kallithea/model/validators.py:785
 #, python-format
 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)"
 #: kallithea/model/validators.py:851
 msgid "Key name can only consist of letters, underscore, dash or numbers"
 msgstr ""
 "Le nom de la clé ne peut consister que de letters, de traits d'union, de "
 "tirets ou de nombres"
 #, python-format
 msgid "Confirm to delete this ip: %s"
 msgstr "Confirmer la suppression de cette adresse IP : %s"
 #: kallithea/templates/admin/permissions/permissions_ips.html:21
 #: kallithea/templates/admin/users/user_edit_ips.html:30
 #, 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/templates/admin/repo_groups/repo_group_add.html:11
 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11
 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105
 #: kallithea/templates/admin/repo_groups/repo_groups.html:10
 #: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80

kallithea/i18n/hu/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -988,33 +988,33 @@ msgstr "" @@
 #: kallithea/controllers/admin/users.py:259
 #: kallithea/controllers/admin/users.py:282
 #: kallithea/controllers/admin/users.py:307
 #: kallithea/controllers/admin/users.py:320
 #: kallithea/controllers/admin/users.py:344
 #: kallithea/controllers/admin/users.py:407
 #: 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/lib/auth.py:806
 msgid "You need to be a registered user to perform this action"
 msgstr ""
 #: kallithea/lib/auth.py:843
@@ @@ -1989,25 +1989,25 @@ 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
-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 ""
 #: kallithea/model/validators.py:851
 msgid "Key name can only consist of letters, underscore, dash or numbers"
 msgstr ""
 #: kallithea/model/validators.py:865
@@ @@ -3050,25 +3050,25 @@ msgstr "" @@
 #: kallithea/templates/admin/users/user_edit_ips.html:23
 #, python-format
 msgid "Confirm to delete this ip: %s"
 msgstr ""
 #: kallithea/templates/admin/permissions/permissions_ips.html:21
 #: 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/templates/admin/repo_groups/repo_group_add.html:11
 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11
 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105
 #: kallithea/templates/admin/repo_groups/repo_groups.html:10
 #: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80
 msgid "Repository Groups"

kallithea/i18n/ja/LC_MESSAGES/kallithea.po

➞

Show inline comments

 #: kallithea/controllers/admin/users.py:259
 #: kallithea/controllers/admin/users.py:282
 #: kallithea/controllers/admin/users.py:307
 #: kallithea/controllers/admin/users.py:320
 #: kallithea/controllers/admin/users.py:344
 #: kallithea/controllers/admin/users.py:407
 #: 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/lib/auth.py:806
 msgid "You need to be a registered user to perform this action"
 msgstr "このアクションを実行するためには登録済みのユーザーである必要があります"
 #: kallithea/lib/auth.py:843
 #: 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/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 は不正です)"
 #: kallithea/model/validators.py:851
 msgid "Key name can only consist of letters, underscore, dash or numbers"
 msgstr "キー名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)、数字しか使えません。"
 #: kallithea/model/validators.py:865
 #, python-format
 msgid "Confirm to delete this ip: %s"
 msgstr "このIPアドレスを削除してもよろしいですか？ : %s"
 #: kallithea/templates/admin/permissions/permissions_ips.html:21
 #: kallithea/templates/admin/users/user_edit_ips.html:30
 #, 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/templates/admin/repo_groups/repo_group_add.html:11
 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11
 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105
 #: kallithea/templates/admin/repo_groups/repo_groups.html:10
 #: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80

kallithea/i18n/kallithea.pot

➞

Show inline comments

@@ @@ -974,33 +974,33 @@ msgstr "" @@
 #: kallithea/controllers/admin/users.py:259
 #: kallithea/controllers/admin/users.py:282
 #: kallithea/controllers/admin/users.py:307
 #: kallithea/controllers/admin/users.py:320
 #: kallithea/controllers/admin/users.py:344
 #: kallithea/controllers/admin/users.py:407
 #: 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/lib/auth.py:806
 msgid "You need to be a registered user to perform this action"
 msgstr ""
 #: kallithea/lib/auth.py:843
@@ @@ -1954,25 +1954,25 @@ msgid "e-mail \"%(email)s\" does not exi @@
 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
-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 ""
 #: kallithea/model/validators.py:851
 msgid "Key name can only consist of letters, underscore, dash or numbers"
 msgstr ""
 #: kallithea/model/validators.py:865
@@ @@ -2992,25 +2992,25 @@ msgstr "" @@
 #: kallithea/templates/admin/users/user_edit_ips.html:23
 #, python-format
 msgid "Confirm to delete this ip: %s"
 msgstr ""
 #: kallithea/templates/admin/permissions/permissions_ips.html:21
 #: 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/templates/admin/repo_groups/repo_group_add.html:11
 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11
 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105
 #: kallithea/templates/admin/repo_groups/repo_groups.html:10
 #: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80
 msgid "Repository Groups"

kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -991,33 +991,33 @@ msgstr "" @@
 #: kallithea/controllers/admin/users.py:259
 #: kallithea/controllers/admin/users.py:282
 #: kallithea/controllers/admin/users.py:307
 #: kallithea/controllers/admin/users.py:320
 #: kallithea/controllers/admin/users.py:344
 #: kallithea/controllers/admin/users.py:407
 #: 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/lib/auth.py:806
 msgid "You need to be a registered user to perform this action"
 msgstr ""
 #: kallithea/lib/auth.py:843
@@ @@ -1992,25 +1992,25 @@ 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
-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 ""
 #: kallithea/model/validators.py:851
 msgid "Key name can only consist of letters, underscore, dash or numbers"
 msgstr ""
 #: kallithea/model/validators.py:865
@@ @@ -3053,25 +3053,25 @@ msgstr "" @@
 #: kallithea/templates/admin/users/user_edit_ips.html:23
 #, python-format
 msgid "Confirm to delete this ip: %s"
 msgstr ""
 #: kallithea/templates/admin/permissions/permissions_ips.html:21
 #: 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/templates/admin/repo_groups/repo_group_add.html:11
 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11
 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105
 #: kallithea/templates/admin/repo_groups/repo_groups.html:10
 #: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80
 msgid "Repository Groups"

kallithea/i18n/pl/LC_MESSAGES/kallithea.po

➞

Show inline comments

 #: kallithea/controllers/admin/users.py:259
 #: kallithea/controllers/admin/users.py:282
 #: kallithea/controllers/admin/users.py:307
 #: kallithea/controllers/admin/users.py:320
 #: kallithea/controllers/admin/users.py:344
 #: kallithea/controllers/admin/users.py:407
 #: 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"
 #: kallithea/lib/auth.py:806
 msgid "You need to be a registered user to perform this action"
 msgstr "Musisz być zarejestrowanym użytkownikiem, żeby wykonać to działanie"
 #: kallithea/lib/auth.py:843
@@ @@ -2037,25 +2037,25 @@ 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
 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)"
 #: kallithea/model/validators.py:851
 msgid "Key name can only consist of letters, underscore, dash or numbers"
 msgstr ""
 "Klucz nazwy może składać się tylko z liter, podkreślenia, myślnika lub "
 "numerów"
@@ @@ -3129,25 +3129,25 @@ msgstr "" @@
 #, python-format
 msgid "Confirm to delete this ip: %s"
 msgstr "Potwierdź, aby usunąć to ip: %s"
 #: kallithea/templates/admin/permissions/permissions_ips.html:21
 #: kallithea/templates/admin/users/user_edit_ips.html:30
 #, 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/templates/admin/repo_groups/repo_group_add.html:11
 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11
 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105
 #: kallithea/templates/admin/repo_groups/repo_groups.html:10
 #: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80

kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -1001,33 +1001,33 @@ msgstr "Ocorreu um erro ao excluir o usuário" @@
 #: kallithea/controllers/admin/users.py:259
 #: kallithea/controllers/admin/users.py:282
 #: kallithea/controllers/admin/users.py:307
 #: kallithea/controllers/admin/users.py:320
 #: kallithea/controllers/admin/users.py:344
 #: kallithea/controllers/admin/users.py:407
 #: 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"
 #: kallithea/lib/auth.py:806
 msgid "You need to be a registered user to perform this action"
 msgstr "Você precisa ser um usuário registrado para realizar essa ação"
 #: kallithea/lib/auth.py:843
@@ @@ -2029,25 +2029,25 @@ msgid "" @@
 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
 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)"
 #: kallithea/model/validators.py:851
 msgid "Key name can only consist of letters, underscore, dash or numbers"
 msgstr "O nome da chave só pode conter letras, underscore, hífen ou dígitos"
 #: kallithea/model/validators.py:865
@@ @@ -3117,25 +3117,25 @@ msgstr "" @@
 #, python-format
 msgid "Confirm to delete this ip: %s"
 msgstr "Confirme para excluir este IP: %s"
 #: kallithea/templates/admin/permissions/permissions_ips.html:21
 #: kallithea/templates/admin/users/user_edit_ips.html:30
 #, 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/templates/admin/repo_groups/repo_group_add.html:11
 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11
 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105
 #: kallithea/templates/admin/repo_groups/repo_groups.html:10
 #: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80

kallithea/i18n/ru/LC_MESSAGES/kallithea.po

➞

Show inline comments

 #: kallithea/controllers/admin/users.py:259
 #: kallithea/controllers/admin/users.py:282
 #: kallithea/controllers/admin/users.py:307
 #: kallithea/controllers/admin/users.py:320
 #: kallithea/controllers/admin/users.py:344
 #: kallithea/controllers/admin/users.py:407
 #: 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 заблокирован"
 #: kallithea/lib/auth.py:806
 msgid "You need to be a registered user to perform this action"
 msgstr ""
 "Вы должны быть зарегистрированным пользователем, чтобы выполнить это "
 "действие"
@@ @@ -2045,26 +2045,26 @@ msgid "" @@
 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 уже включены в 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/model/validators.py:851
 msgid "Key name can only consist of letters, underscore, dash or numbers"
 msgstr ""
 "Ключевое имя может только состоять из букв, символа подчеркивания, тире "
 #: kallithea/templates/admin/users/user_edit_ips.html:23
 #, python-format
 msgid "Confirm to delete this ip: %s"
 msgstr "Подтвердите удаление IP %s"
 #: kallithea/templates/admin/permissions/permissions_ips.html:21
 #: 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/templates/admin/repo_groups/repo_group_add.html:11
 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11
 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105
 #: kallithea/templates/admin/repo_groups/repo_groups.html:10
 #: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80
 msgid "Repository Groups"

kallithea/i18n/sk/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -988,33 +988,33 @@ msgstr "" @@
 #: kallithea/controllers/admin/users.py:259
 #: kallithea/controllers/admin/users.py:282
 #: kallithea/controllers/admin/users.py:307
 #: kallithea/controllers/admin/users.py:320
 #: kallithea/controllers/admin/users.py:344
 #: kallithea/controllers/admin/users.py:407
 #: 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/lib/auth.py:806
 msgid "You need to be a registered user to perform this action"
 msgstr ""
 #: kallithea/lib/auth.py:843
@@ @@ -1995,25 +1995,25 @@ 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
-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 ""
 #: kallithea/model/validators.py:851
 msgid "Key name can only consist of letters, underscore, dash or numbers"
 msgstr ""
 #: kallithea/model/validators.py:865
@@ @@ -3058,25 +3058,25 @@ msgstr "" @@
 #: kallithea/templates/admin/users/user_edit_ips.html:23
 #, python-format
 msgid "Confirm to delete this ip: %s"
 msgstr ""
 #: kallithea/templates/admin/permissions/permissions_ips.html:21
 #: 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/templates/admin/repo_groups/repo_group_add.html:11
 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11
 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105
 #: kallithea/templates/admin/repo_groups/repo_groups.html:10
 #: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80
 msgid "Repository Groups"

kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -997,33 +997,33 @@ msgstr "删除用户时发生错误" @@
 #: kallithea/controllers/admin/users.py:259
 #: kallithea/controllers/admin/users.py:282
 #: kallithea/controllers/admin/users.py:307
 #: kallithea/controllers/admin/users.py:320
 #: kallithea/controllers/admin/users.py:344
 #: kallithea/controllers/admin/users.py:407
 #: 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/lib/auth.py:806
 msgid "You need to be a registered user to perform this action"
 msgstr "必须是注册用户才能进行此操作"
 #: kallithea/lib/auth.py:843
@@ @@ -1995,25 +1995,25 @@ 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/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 ""
 #: kallithea/model/validators.py:851
 msgid "Key name can only consist of letters, underscore, dash or numbers"
 msgstr ""
 #: kallithea/model/validators.py:865
@@ @@ -3068,25 +3068,25 @@ msgstr "" @@
 #: kallithea/templates/admin/users/user_edit_ips.html:23
 #, python-format
 msgid "Confirm to delete this ip: %s"
 msgstr ""
 #: kallithea/templates/admin/permissions/permissions_ips.html:21
 #: 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/templates/admin/repo_groups/repo_group_add.html:11
 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11
 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105
 #: kallithea/templates/admin/repo_groups/repo_groups.html:10
 #: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80

kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -989,33 +989,33 @@ msgstr "" @@
 #: kallithea/controllers/admin/users.py:259
 #: kallithea/controllers/admin/users.py:282
 #: kallithea/controllers/admin/users.py:307
 #: kallithea/controllers/admin/users.py:320
 #: kallithea/controllers/admin/users.py:344
 #: kallithea/controllers/admin/users.py:407
 #: 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/lib/auth.py:806
 msgid "You need to be a registered user to perform this action"
 msgstr "您必須是註冊使用者才能執行這個動作"
 #: kallithea/lib/auth.py:843
@@ @@ -1986,25 +1986,25 @@ 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
-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 ""
 #: kallithea/model/validators.py:851
 msgid "Key name can only consist of letters, underscore, dash or numbers"
 msgstr ""
 #: kallithea/model/validators.py:865
@@ @@ -3056,25 +3056,25 @@ msgstr "" @@
 #: kallithea/templates/admin/users/user_edit_ips.html:23
 #, python-format
 msgid "Confirm to delete this ip: %s"
 msgstr ""
 #: kallithea/templates/admin/permissions/permissions_ips.html:21
 #: 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/templates/admin/repo_groups/repo_group_add.html:11
 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11
 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105
 #: kallithea/templates/admin/repo_groups/repo_groups.html:10
 #: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80

kallithea/model/validators.py

➞

Show inline comments

@@ @@ -805,47 +805,47 @@ def NotReviewedRevisions(repo_id): @@
                 revs = ','.join([x[1] for x in errors])
                 msg = M(self, 'rev_already_reviewed', state, revs=revs)
                 raise formencode.Invalid(msg, value, state,
                     error_dict=dict(revisions=revs)
+                )
     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)
             v = v.strip()
             net = ipaddr.IPNetwork(address=v)
             if isinstance(net, ipaddr.IPv4Network):
                 #if IPv4 doesn't end with a mask, add /32
                 if '/' not in value:
                     v += '/32'
             if isinstance(net, ipaddr.IPv6Network):
                 #if IPv6 doesn't end with a mask, add /128
                 if '/' not in value:
                     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
 def FieldKey():
     class _validator(formencode.validators.FancyValidator):
         messages = dict(
             badFormat=_('Key name can only consist of letters, '

kallithea/tests/functional/test_admin_users.py

➞

Show inline comments

@@ @@ -386,25 +386,25 @@ class TestAdminUsersController(TestContr @@
         ('127_bad_mask', '127.0.0.1/99', '127.0.0.1 - 127.0.0.1', True),
         ('127_bad_ip', 'foobar', 'foobar', True),
     ])
     def test_add_ip(self, test_name, ip, ip_range, failure):
         self.log_user()
         user = User.get_by_username(TEST_USER_REGULAR_LOGIN)
         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))
             response.mustcontain(ip)
             response.mustcontain(ip_range)
         ## cleanup
         for del_ip in UserIpMap.query().filter(UserIpMap.user_id == user_id).all():
             Session().delete(del_ip)

0 comments (0 inline, 0 general)