--- a/kallithea/controllers/admin/users.py	Sat Aug 08 12:03:43 2015 +0300
+++ b/kallithea/controllers/admin/users.py	Sat Aug 08 12:08:56 2015 +0300
@@ -464,7 +464,7 @@
             h.flash(msg, category='error')
         except Exception:
             log.error(traceback.format_exc())
-            h.flash(_('An error occurred during ip saving'),
+            h.flash(_('An error occurred while adding IP address'),
                     category='error')
 
         if 'default_user' in request.POST:

--- a/kallithea/i18n/be/LC_MESSAGES/kallithea.po	Sat Aug 08 12:03:43 2015 +0300
+++ b/kallithea/i18n/be/LC_MESSAGES/kallithea.po	Sat Aug 08 12:08:56 2015 +0300
@@ -560,17 +560,17 @@
 
 #: kallithea/controllers/admin/my_account.py:254
 #: kallithea/controllers/admin/users.py:314
-msgid "Api key successfully created"
+msgid "API key successfully created"
 msgstr "API-ключ паспяхова створаны"
 
 #: kallithea/controllers/admin/my_account.py:266
 #: kallithea/controllers/admin/users.py:330
-msgid "Api key successfully reset"
+msgid "API key successfully reset"
 msgstr "API-ключ паспяхова скінуты"
 
 #: kallithea/controllers/admin/my_account.py:270
 #: kallithea/controllers/admin/users.py:334
-msgid "Api key successfully deleted"
+msgid "API key successfully deleted"
 msgstr "API-ключ паспяхова выдалены"
 
 #: kallithea/controllers/admin/permissions.py:63
@@ -1011,7 +1011,7 @@
 msgstr "Дададзены IP %s у белы спіс карыстача"
 
 #: kallithea/controllers/admin/users.py:488
-msgid "An error occurred during ip saving"
+msgid "An error occurred while adding IP address"
 msgstr "Адбылася памылка пры захаванні IP"
 
 #: kallithea/controllers/admin/users.py:502

--- a/kallithea/i18n/cs/LC_MESSAGES/kallithea.po	Sat Aug 08 12:03:43 2015 +0300
+++ b/kallithea/i18n/cs/LC_MESSAGES/kallithea.po	Sat Aug 08 12:08:56 2015 +0300
@@ -553,17 +553,17 @@
 
 #: kallithea/controllers/admin/my_account.py:254
 #: kallithea/controllers/admin/users.py:314
-msgid "Api key successfully created"
+msgid "API key successfully created"
 msgstr ""
 
 #: kallithea/controllers/admin/my_account.py:266
 #: kallithea/controllers/admin/users.py:330
-msgid "Api key successfully reset"
+msgid "API key successfully reset"
 msgstr ""
 
 #: kallithea/controllers/admin/my_account.py:270
 #: kallithea/controllers/admin/users.py:334
-msgid "Api key successfully deleted"
+msgid "API key successfully deleted"
 msgstr ""
 
 #: kallithea/controllers/admin/permissions.py:63
@@ -1002,7 +1002,7 @@
 msgstr ""
 
 #: kallithea/controllers/admin/users.py:488
-msgid "An error occurred during ip saving"
+msgid "An error occurred while adding IP address"
 msgstr ""
 
 #: kallithea/controllers/admin/users.py:502

--- a/kallithea/i18n/de/LC_MESSAGES/kallithea.po	Sat Aug 08 12:03:43 2015 +0300
+++ b/kallithea/i18n/de/LC_MESSAGES/kallithea.po	Sat Aug 08 12:08:56 2015 +0300
@@ -568,17 +568,17 @@
 
 #: kallithea/controllers/admin/my_account.py:254
 #: kallithea/controllers/admin/users.py:314
-msgid "Api key successfully created"
+msgid "API key successfully created"
 msgstr "API Key wurde erfolgreich erstellt"
 
 #: kallithea/controllers/admin/my_account.py:266
 #: kallithea/controllers/admin/users.py:330
-msgid "Api key successfully reset"
+msgid "API key successfully reset"
 msgstr "API-Schlüssel erfolgreich zurückgesetzt"
 
 #: kallithea/controllers/admin/my_account.py:270
 #: kallithea/controllers/admin/users.py:334
-msgid "Api key successfully deleted"
+msgid "API key successfully deleted"
 msgstr "API-Schlüssel erfolgreich gelöscht"
 
 #: kallithea/controllers/admin/permissions.py:63
@@ -1028,7 +1028,7 @@
 msgstr "Die IP-Adresse %s wurde zur Nutzerwhitelist hinzugefügt"
 
 #: kallithea/controllers/admin/users.py:488
-msgid "An error occurred during ip saving"
+msgid "An error occurred while adding IP address"
 msgstr "Während des Speicherns der IP-Adresse ist ein Fehler aufgetreten"
 
 #: kallithea/controllers/admin/users.py:502

--- a/kallithea/i18n/fr/LC_MESSAGES/kallithea.po	Sat Aug 08 12:03:43 2015 +0300
+++ b/kallithea/i18n/fr/LC_MESSAGES/kallithea.po	Sat Aug 08 12:08:56 2015 +0300
@@ -579,17 +579,17 @@
 
 #: kallithea/controllers/admin/my_account.py:254
 #: kallithea/controllers/admin/users.py:314
-msgid "Api key successfully created"
+msgid "API key successfully created"
 msgstr "Clé d'API créée avec succès"
 
 #: kallithea/controllers/admin/my_account.py:266
 #: kallithea/controllers/admin/users.py:330
-msgid "Api key successfully reset"
+msgid "API key successfully reset"
 msgstr "Clé d'API remise à zéro avec succès"
 
 #: kallithea/controllers/admin/my_account.py:270
 #: kallithea/controllers/admin/users.py:334
-msgid "Api key successfully deleted"
+msgid "API key successfully deleted"
 msgstr "Clé d'API supprimée avec succès"
 
 #: kallithea/controllers/admin/permissions.py:63
@@ -1036,7 +1036,7 @@
 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"
+msgid "An error occurred while adding IP address"
 msgstr "Une erreur est survenue durant la sauvegarde d'IP"
 
 #: kallithea/controllers/admin/users.py:502

--- a/kallithea/i18n/hu/LC_MESSAGES/kallithea.po	Sat Aug 08 12:03:43 2015 +0300
+++ b/kallithea/i18n/hu/LC_MESSAGES/kallithea.po	Sat Aug 08 12:08:56 2015 +0300
@@ -552,17 +552,17 @@
 
 #: kallithea/controllers/admin/my_account.py:254
 #: kallithea/controllers/admin/users.py:314
-msgid "Api key successfully created"
+msgid "API key successfully created"
 msgstr ""
 
 #: kallithea/controllers/admin/my_account.py:266
 #: kallithea/controllers/admin/users.py:330
-msgid "Api key successfully reset"
+msgid "API key successfully reset"
 msgstr ""
 
 #: kallithea/controllers/admin/my_account.py:270
 #: kallithea/controllers/admin/users.py:334
-msgid "Api key successfully deleted"
+msgid "API key successfully deleted"
 msgstr ""
 
 #: kallithea/controllers/admin/permissions.py:63
@@ -1001,7 +1001,7 @@
 msgstr ""
 
 #: kallithea/controllers/admin/users.py:488
-msgid "An error occurred during ip saving"
+msgid "An error occurred while adding IP address"
 msgstr ""
 
 #: kallithea/controllers/admin/users.py:502

--- a/kallithea/i18n/ja/LC_MESSAGES/kallithea.po	Sat Aug 08 12:03:43 2015 +0300
+++ b/kallithea/i18n/ja/LC_MESSAGES/kallithea.po	Sat Aug 08 12:08:56 2015 +0300
@@ -564,17 +564,17 @@
 
 #: kallithea/controllers/admin/my_account.py:254
 #: kallithea/controllers/admin/users.py:314
-msgid "Api key successfully created"
+msgid "API key successfully created"
 msgstr "APIキーの作成に成功しました"
 
 #: kallithea/controllers/admin/my_account.py:266
 #: kallithea/controllers/admin/users.py:330
-msgid "Api key successfully reset"
+msgid "API key successfully reset"
 msgstr "APIキーのリセットに成功しました"
 
 #: kallithea/controllers/admin/my_account.py:270
 #: kallithea/controllers/admin/users.py:334
-msgid "Api key successfully deleted"
+msgid "API key successfully deleted"
 msgstr "APIキーの削除に成功しました"
 
 #: kallithea/controllers/admin/permissions.py:63
@@ -1013,7 +1013,7 @@
 msgstr "ユーザーホワイトリストにIP %s を追加しました"
 
 #: kallithea/controllers/admin/users.py:488
-msgid "An error occurred during ip saving"
+msgid "An error occurred while adding IP address"
 msgstr "IPアドレスの保存中にエラーが発生しました"
 
 #: kallithea/controllers/admin/users.py:502

--- a/kallithea/i18n/kallithea.pot	Sat Aug 08 12:03:43 2015 +0300
+++ b/kallithea/i18n/kallithea.pot	Sat Aug 08 12:08:56 2015 +0300
@@ -1007,7 +1007,7 @@
 msgstr ""
 
 #: kallithea/controllers/admin/users.py:471
-msgid "An error occurred during ip saving"
+msgid "An error occurred while adding IP address"
 msgstr ""
 
 #: kallithea/controllers/admin/users.py:485

--- a/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po	Sat Aug 08 12:03:43 2015 +0300
+++ b/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po	Sat Aug 08 12:08:56 2015 +0300
@@ -555,17 +555,17 @@
 
 #: kallithea/controllers/admin/my_account.py:254
 #: kallithea/controllers/admin/users.py:314
-msgid "Api key successfully created"
+msgid "API key successfully created"
 msgstr ""
 
 #: kallithea/controllers/admin/my_account.py:266
 #: kallithea/controllers/admin/users.py:330
-msgid "Api key successfully reset"
+msgid "API key successfully reset"
 msgstr ""
 
 #: kallithea/controllers/admin/my_account.py:270
 #: kallithea/controllers/admin/users.py:334
-msgid "Api key successfully deleted"
+msgid "API key successfully deleted"
 msgstr ""
 
 #: kallithea/controllers/admin/permissions.py:63
@@ -1004,7 +1004,7 @@
 msgstr ""
 
 #: kallithea/controllers/admin/users.py:488
-msgid "An error occurred during ip saving"
+msgid "An error occurred while adding IP address"
 msgstr ""
 
 #: kallithea/controllers/admin/users.py:502

--- a/kallithea/i18n/pl/LC_MESSAGES/kallithea.po	Sat Aug 08 12:03:43 2015 +0300
+++ b/kallithea/i18n/pl/LC_MESSAGES/kallithea.po	Sat Aug 08 12:08:56 2015 +0300
@@ -567,17 +567,17 @@
 
 #: kallithea/controllers/admin/my_account.py:254
 #: kallithea/controllers/admin/users.py:314
-msgid "Api key successfully created"
+msgid "API key successfully created"
 msgstr ""
 
 #: kallithea/controllers/admin/my_account.py:266
 #: kallithea/controllers/admin/users.py:330
-msgid "Api key successfully reset"
+msgid "API key successfully reset"
 msgstr ""
 
 #: kallithea/controllers/admin/my_account.py:270
 #: kallithea/controllers/admin/users.py:334
-msgid "Api key successfully deleted"
+msgid "API key successfully deleted"
 msgstr ""
 
 #: kallithea/controllers/admin/permissions.py:63
@@ -1018,7 +1018,7 @@
 msgstr "Dodano ip %s do listy dozwolonych adresów użytkownia"
 
 #: kallithea/controllers/admin/users.py:488
-msgid "An error occurred during ip saving"
+msgid "An error occurred while adding IP address"
 msgstr "Wystąpił błąd podczas zapisywania e-maila"
 
 #: kallithea/controllers/admin/users.py:502

--- a/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po	Sat Aug 08 12:03:43 2015 +0300
+++ b/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po	Sat Aug 08 12:08:56 2015 +0300
@@ -565,17 +565,17 @@
 
 #: kallithea/controllers/admin/my_account.py:254
 #: kallithea/controllers/admin/users.py:314
-msgid "Api key successfully created"
+msgid "API key successfully created"
 msgstr ""
 
 #: kallithea/controllers/admin/my_account.py:266
 #: kallithea/controllers/admin/users.py:330
-msgid "Api key successfully reset"
+msgid "API key successfully reset"
 msgstr ""
 
 #: kallithea/controllers/admin/my_account.py:270
 #: kallithea/controllers/admin/users.py:334
-msgid "Api key successfully deleted"
+msgid "API key successfully deleted"
 msgstr ""
 
 #: kallithea/controllers/admin/permissions.py:63
@@ -1014,7 +1014,7 @@
 msgstr ""
 
 #: kallithea/controllers/admin/users.py:488
-msgid "An error occurred during ip saving"
+msgid "An error occurred while adding IP address"
 msgstr "Ocorreu um erro durante o salvamento do IP"
 
 #: kallithea/controllers/admin/users.py:502

--- a/kallithea/i18n/ru/LC_MESSAGES/kallithea.po	Sat Aug 08 12:03:43 2015 +0300
+++ b/kallithea/i18n/ru/LC_MESSAGES/kallithea.po	Sat Aug 08 12:08:56 2015 +0300
@@ -572,17 +572,17 @@
 
 #: kallithea/controllers/admin/my_account.py:254
 #: kallithea/controllers/admin/users.py:314
-msgid "Api key successfully created"
+msgid "API key successfully created"
 msgstr "API-ключ успешно создан"
 
 #: kallithea/controllers/admin/my_account.py:266
 #: kallithea/controllers/admin/users.py:330
-msgid "Api key successfully reset"
+msgid "API key successfully reset"
 msgstr "API-ключ успешно сброшен"
 
 #: kallithea/controllers/admin/my_account.py:270
 #: kallithea/controllers/admin/users.py:334
-msgid "Api key successfully deleted"
+msgid "API key successfully deleted"
 msgstr "API-ключ успешно удалён"
 
 #: kallithea/controllers/admin/permissions.py:63
@@ -1023,7 +1023,7 @@
 msgstr "Добавлен IP %s в белый список пользователя"
 
 #: kallithea/controllers/admin/users.py:488
-msgid "An error occurred during ip saving"
+msgid "An error occurred while adding IP address"
 msgstr "Произошла ошибка при сохранении IP"
 
 #: kallithea/controllers/admin/users.py:502

--- a/kallithea/i18n/sk/LC_MESSAGES/kallithea.po	Sat Aug 08 12:03:43 2015 +0300
+++ b/kallithea/i18n/sk/LC_MESSAGES/kallithea.po	Sat Aug 08 12:08:56 2015 +0300
@@ -552,17 +552,17 @@
 
 #: kallithea/controllers/admin/my_account.py:254
 #: kallithea/controllers/admin/users.py:314
-msgid "Api key successfully created"
+msgid "API key successfully created"
 msgstr ""
 
 #: kallithea/controllers/admin/my_account.py:266
 #: kallithea/controllers/admin/users.py:330
-msgid "Api key successfully reset"
+msgid "API key successfully reset"
 msgstr ""
 
 #: kallithea/controllers/admin/my_account.py:270
 #: kallithea/controllers/admin/users.py:334
-msgid "Api key successfully deleted"
+msgid "API key successfully deleted"
 msgstr ""
 
 #: kallithea/controllers/admin/permissions.py:63
@@ -1001,7 +1001,7 @@
 msgstr ""
 
 #: kallithea/controllers/admin/users.py:488
-msgid "An error occurred during ip saving"
+msgid "An error occurred while adding IP address"
 msgstr ""
 
 #: kallithea/controllers/admin/users.py:502

--- a/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po	Sat Aug 08 12:03:43 2015 +0300
+++ b/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po	Sat Aug 08 12:08:56 2015 +0300
@@ -561,17 +561,17 @@
 
 #: kallithea/controllers/admin/my_account.py:254
 #: kallithea/controllers/admin/users.py:314
-msgid "Api key successfully created"
+msgid "API key successfully created"
 msgstr ""
 
 #: kallithea/controllers/admin/my_account.py:266
 #: kallithea/controllers/admin/users.py:330
-msgid "Api key successfully reset"
+msgid "API key successfully reset"
 msgstr ""
 
 #: kallithea/controllers/admin/my_account.py:270
 #: kallithea/controllers/admin/users.py:334
-msgid "Api key successfully deleted"
+msgid "API key successfully deleted"
 msgstr ""
 
 #: kallithea/controllers/admin/permissions.py:63
@@ -1010,7 +1010,7 @@
 msgstr ""
 
 #: kallithea/controllers/admin/users.py:488
-msgid "An error occurred during ip saving"
+msgid "An error occurred while adding IP address"
 msgstr ""
 
 #: kallithea/controllers/admin/users.py:502

--- a/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po	Sat Aug 08 12:03:43 2015 +0300
+++ b/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po	Sat Aug 08 12:08:56 2015 +0300
@@ -553,17 +553,17 @@
 
 #: kallithea/controllers/admin/my_account.py:254
 #: kallithea/controllers/admin/users.py:314
-msgid "Api key successfully created"
+msgid "API key successfully created"
 msgstr ""
 
 #: kallithea/controllers/admin/my_account.py:266
 #: kallithea/controllers/admin/users.py:330
-msgid "Api key successfully reset"
+msgid "API key successfully reset"
 msgstr ""
 
 #: kallithea/controllers/admin/my_account.py:270
 #: kallithea/controllers/admin/users.py:334
-msgid "Api key successfully deleted"
+msgid "API key successfully deleted"
 msgstr ""
 
 #: kallithea/controllers/admin/permissions.py:63
@@ -1002,7 +1002,7 @@
 msgstr ""
 
 #: kallithea/controllers/admin/users.py:488
-msgid "An error occurred during ip saving"
+msgid "An error occurred while adding IP address"
 msgstr ""
 
 #: kallithea/controllers/admin/users.py:502