diff --git a/abonapp/locale/ru/LC_MESSAGES/django.po b/abonapp/locale/ru/LC_MESSAGES/django.po
index ea1578e..e8625dc 100644
--- a/abonapp/locale/ru/LC_MESSAGES/django.po
+++ b/abonapp/locale/ru/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-04-24 23:27+0300\n"
+"POT-Creation-Date: 2018-08-09 14:20+0300\n"
 "Last-Translator: Dmitry Novikov nerosketch@gmail.com\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
@@ -17,1058 +17,991 @@ msgstr ""
 "%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
 "%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: abonapp/forms.py:53 abonapp/forms.py:56
+#: forms.py:49 forms.py:52
 msgid "login"
 msgstr "Логин"
 
-#: abonapp/forms.py:60 abonapp/templates/abonapp/addAbon.html:43
+#: forms.py:56
 msgid "Password"
 msgstr "Пароль"
 
-#: abonapp/forms.py:64 abonapp/forms.py:163 abonapp/models.py:93
-#: abonapp/models.py:139
-msgid "Ip Address"
-msgstr "IP Адрес"
-
-#: abonapp/forms.py:71 abonapp/forms.py:162
-#: abonapp/templates/abonapp/peoples.html:40
+#: forms.py:67 forms.py:141 templates/abonapp/peoples.html:36
 msgid "fio"
 msgstr "ФИО"
 
-#: abonapp/forms.py:75 abonapp/forms.py:144
+#: forms.py:71 forms.py:123
 msgid "telephone placeholder"
 msgstr "+[7,8,9,3] и 10,11 цифр"
 
-#: abonapp/forms.py:161
+#: forms.py:140
 msgid "profile username"
 msgstr "Логин"
 
-#: abonapp/forms.py:164 abonapp/models.py:140
-#: abonapp/templates/abonapp/addInvoice.html:40
-#: abonapp/templates/abonapp/debtors.html:22
-#: abonapp/templates/abonapp/invoiceForPayment.html:23
-#: abonapp/templates/abonapp/log.html:20
-#: abonapp/templates/abonapp/payHistory.html:12
-#: abonapp/templates/abonapp/task_log.html:10
+#: forms.py:143 forms.py:172 models.py:98 templates/abonapp/addInvoice.html:40
+#: templates/abonapp/debtors.html:25
+#: templates/abonapp/invoiceForPayment.html:26 templates/abonapp/log.html:23
+#: templates/abonapp/payHistory.html:12 templates/abonapp/task_log.html:10
 msgid "Comment"
 msgstr "Комментарий"
 
-#: abonapp/forms.py:165 abonapp/models.py:83 abonapp/models.py:141
-#: abonapp/templates/abonapp/peoples.html:46
+#: forms.py:144 models.py:82 models.py:99 templates/abonapp/peoples.html:42
 msgid "Street"
 msgstr "Улица"
 
-#: abonapp/forms.py:166 abonapp/models.py:142
+#: forms.py:145 models.py:100
 msgid "House"
 msgstr "Дом"
 
-#: abonapp/forms.py:167
+#: forms.py:146
 msgid "birth day"
 msgstr "День рождения"
 
-#: abonapp/forms.py:168
+#: forms.py:147
 msgid "Is active"
 msgstr "Активен"
 
-#: abonapp/forms.py:169 abonapp/models.py:401
-#: abonapp/templates/abonapp/modal_add_phone.html:10
-#: abonapp/templates/abonapp/modal_additional_telephones.html:13
-#: abonapp/templates/abonapp/modal_phonebook.html:10
-#: abonapp/templates/abonapp/peoples.html:56
+#: forms.py:148 models.py:364 templates/abonapp/modal_add_phone.html:10
+#: templates/abonapp/modal_additional_telephones.html:13
+#: templates/abonapp/modal_phonebook.html:10 templates/abonapp/peoples.html:52
 msgid "Telephone"
 msgstr "Телефон"
 
-#: abonapp/forms.py:170
+#: forms.py:149
 msgid "Service title"
 msgstr "Название тарифа"
 
-#: abonapp/forms.py:171 abonapp/templates/abonapp/peoples.html:60
+#: forms.py:150 templates/abonapp/peoples.html:56
 msgid "Balance"
 msgstr "Балланс"
 
-#: abonapp/forms.py:172 abonapp/templates/abonapp/editAbon.html:134
-#: abonapp/templates/abonapp/editAbon.html:145
+#: forms.py:151 templates/abonapp/editAbon.html:135
+#: templates/abonapp/editAbon.html:146
 msgid "Device"
 msgstr "Устройство"
 
-#: abonapp/forms.py:173 abonapp/templates/abonapp/editAbon.html:164
+#: forms.py:152 templates/abonapp/editAbon.html:166
 msgid "Device port"
 msgstr "Порт устройства"
 
-#: abonapp/forms.py:174
+#: forms.py:153
 msgid "Is dynamic ip"
 msgstr "Динамический ip"
 
-#: abonapp/forms.py:178
+#: forms.py:157
 msgid "Fields"
 msgstr "Поля"
 
-#: abonapp/models.py:35
+#: forms.py:171
+msgid "Amount of money"
+msgstr "Количество денег"
+
+#: models.py:34
 msgid "Can view subscriber logs"
 msgstr "Может видеть логи абонента"
 
-#: abonapp/models.py:67
+#: models.py:66
 msgid "finish service perm"
 msgstr "Снятие со счёта средств"
 
-#: abonapp/models.py:69
+#: models.py:68
 msgid "Abon service"
 msgstr "Услуга абонента"
 
-#: abonapp/models.py:70
+#: models.py:69
 msgid "Abon services"
 msgstr "Услуги абонентов"
 
-#: abonapp/models.py:84 abonapp/templates/abonapp/peoples.html:158
+#: models.py:83 templates/abonapp/peoples.html:153
 msgid "Streets"
 msgstr "Улицы"
 
-#: abonapp/models.py:90
-msgid "Digital field"
-msgstr "Цифровое поле"
-
-#: abonapp/models.py:91
-msgid "Text field"
-msgstr "Текстовое поле"
-
-#: abonapp/models.py:92
-msgid "Floating field"
-msgstr "Дробное с плавающей точкой"
-
-#: abonapp/models.py:118
-msgid "Double invalid value"
-msgstr "Введите число с плавающей запятой"
-
-#: abonapp/models.py:137 abonapp/templates/abonapp/modal_addstreet.html:21
+#: models.py:94 templates/abonapp/modal_addstreet.html:21
 msgid "User group"
 msgstr "Группа"
 
-#: abonapp/models.py:149
+#: models.py:96 templates/abonapp/editAbon.html:202
+msgid "Ip addresses"
+msgstr "IP Адреса"
+
+#: models.py:106
 msgid "Donkey"
 msgstr "Ослик"
 
-#: abonapp/models.py:150
+#: models.py:107
 msgid "Fire"
 msgstr "Огонь"
 
-#: abonapp/models.py:151
+#: models.py:108
 msgid "Ok"
 msgstr ""
 
-#: abonapp/models.py:152
+#: models.py:109
 msgid "King"
 msgstr "Король"
 
-#: abonapp/models.py:153
+#: models.py:110
 msgid "TV"
 msgstr "Теле"
 
-#: abonapp/models.py:154
+#: models.py:111
 msgid "Smile"
 msgstr "Улыбка"
 
-#: abonapp/models.py:155
+#: models.py:112
 msgid "Dollar"
 msgstr "Доллар"
 
-#: abonapp/models.py:156 abonapp/templates/abonapp/peoples.html:57
-#: abonapp/templates/abonapp/service.html:16
-#: abonapp/templates/abonapp/service.html:75
+#: models.py:113 templates/abonapp/peoples.html:53
+#: templates/abonapp/service.html:16 templates/abonapp/service.html:75
 msgid "Service"
 msgstr "Услуга"
 
-#: abonapp/models.py:157
+#: models.py:114
 msgid "Marker"
 msgstr "Маркер"
 
-#: abonapp/models.py:179
+#: models.py:136
 msgid "Buy service perm"
 msgstr "Покупка тарифа абоненту"
 
-#: abonapp/models.py:180
+#: models.py:137
 msgid "Can view passport"
 msgstr "Может просматривать паспортные данные"
 
-#: abonapp/models.py:181
+#: models.py:138
 msgid "fill account"
 msgstr "Пополнение счёта"
 
-#: abonapp/models.py:182
+#: models.py:139
 msgid "Can ping"
 msgstr "Может пинговать"
 
-#: abonapp/models.py:186
+#: models.py:141
 msgid "Abon"
 msgstr "Абонент"
 
-#: abonapp/models.py:187
+#: models.py:142
 msgid "Abons"
 msgstr "Абоненты"
 
-#: abonapp/models.py:207
+#: models.py:162
 msgid "User that is no staff can not buy admin services"
 msgstr ""
 "Этот пользователь не является сотрудником и не может назначать "
 "административные услуги"
 
-#: abonapp/models.py:212
+#: models.py:167
 msgid "That service already activated"
 msgstr "Эта услуга уже подключена"
 
-#: abonapp/models.py:215
+#: models.py:170
 msgid "Service already activated"
 msgstr "Услуга уже подключена"
 
-#: abonapp/models.py:219
+#: models.py:174
 msgid "not enough money"
 msgstr "Не хватает денег на счету"
 
-#: abonapp/models.py:234
+#: models.py:190
 msgid "Buy service default log"
 msgstr "Покупка тарифного плана через админку"
 
-#: abonapp/models.py:276
-msgid "Ip address already exist"
-msgstr "Такой ip уже у кого-то есть"
+#: models.py:233
+msgid "Account has no one ips"
+msgstr "Учётная запись не имеет ни одного ip адреса"
 
-#: abonapp/models.py:295
+#: models.py:257
 msgid "Pasport serial"
 msgstr "Серия пас."
 
-#: abonapp/models.py:296
+#: models.py:258
 msgid "Pasport number"
 msgstr "Номер пас."
 
-#: abonapp/models.py:297
+#: models.py:259
 msgid "Distributor"
 msgstr "Кем выдан"
 
-#: abonapp/models.py:303 abonapp/models.py:304
+#: models.py:265 models.py:266
 msgid "Passport Info"
 msgstr "Паспортные данные"
 
-#: abonapp/models.py:333
+#: models.py:296
 msgid "Can view invoice for payment"
 msgstr "Может видеть назначенные платежи"
 
-#: abonapp/models.py:335
+#: models.py:298
 msgid "Debt"
 msgstr "Квитанция (долг)"
 
-#: abonapp/models.py:336 abonapp/templates/abonapp/invoiceForPayment.html:10
-#: abonapp/templates/abonapp/payHistory.html:48
+#: models.py:299 templates/abonapp/invoiceForPayment.html:10
+#: templates/abonapp/payHistory.html:48
 msgid "Debts"
 msgstr "Квитанции (долги)"
 
-#: abonapp/models.py:358
+#: models.py:321
 msgid "Trade point"
 msgstr "Терминал"
 
-#: abonapp/models.py:359
+#: models.py:322
 msgid "Receipt number"
 msgstr "Номер пас."
 
-#: abonapp/models.py:414
+#: models.py:379
 msgid "Can view additional telephones"
 msgstr "Может видеть дополнительные телефоны"
 
-#: abonapp/models.py:416
+#: models.py:381
 msgid "Additional telephone"
 msgstr "Дополнительный телефон"
 
-#: abonapp/models.py:417 abonapp/templates/abonapp/editAbon.html:28
-#: abonapp/templates/abonapp/modal_additional_telephones.html:4
+#: models.py:382 templates/abonapp/editAbon.html:28
+#: templates/abonapp/modal_additional_telephones.html:4
 msgid "Additional telephones"
 msgstr "Дополнительные телефоны"
 
-#: abonapp/models.py:421 abonapp/templates/abonapp/service.html:122
+#: models.py:386 templates/abonapp/service.html:122
 msgid "Periodic pay"
 msgstr "Периодический платёж"
 
-#: abonapp/models.py:422
+#: models.py:387
 msgid "Last pay time"
 msgstr "Последний платёж"
 
-#: abonapp/models.py:423 abonapp/templates/abonapp/service.html:131
+#: models.py:388 templates/abonapp/service.html:131
 msgid "Next time to pay"
 msgstr "Следующий платёж"
 
-#: abonapp/models.py:424
+#: models.py:389
 msgid "Account"
 msgstr "Учётная запись"
 
-#: abonapp/models.py:438
+#: models.py:403
 #, python-format
 msgid "Charge for \"%(service)s\""
 msgstr "Плата за \"%(service)s\""
 
-#: abonapp/templates/abonapp/abon_confirm_delete.html:5
+#: templates/abonapp/abon_confirm_delete.html:9
 msgid "Remove subscriber"
 msgstr "Удаление абонента"
 
-#: abonapp/templates/abonapp/abon_confirm_delete.html:10
-msgid "Are you sure about them?"
-msgstr "Вы уверены в этом?"
-
-#: abonapp/templates/abonapp/abon_confirm_delete.html:13
-#: abonapp/templates/abonapp/editAbon.html:214
-#: abonapp/templates/abonapp/modal_additional_telephones.html:23
-msgid "Delete"
-msgstr "Удалить"
-
-#: abonapp/templates/abonapp/addAbon.html:8
-#: abonapp/templates/abonapp/addInvoice.html:7
-#: abonapp/templates/abonapp/buy_tariff.html:7
-#: abonapp/templates/abonapp/debtors.html:8
-#: abonapp/templates/abonapp/group_list.html:7
-#: abonapp/templates/abonapp/group_list.html:10
-#: abonapp/templates/abonapp/group_list.html:39
-#: abonapp/templates/abonapp/group_tariffs.html:7
-#: abonapp/templates/abonapp/invoiceForPayment.html:7
-#: abonapp/templates/abonapp/log.html:7
-#: abonapp/templates/abonapp/peoples.html:8
-#: abonapp/templates/abonapp/peoples.html:143
-#: abonapp/templates/abonapp/service.html:103
-#: abonapp/templates/abonapp/service.html:111
+#: templates/abonapp/addAbon.html:8 templates/abonapp/addInvoice.html:7
+#: templates/abonapp/buy_tariff.html:7 templates/abonapp/debtors.html:7
+#: templates/abonapp/group_list.html:8 templates/abonapp/group_list.html:13
+#: templates/abonapp/group_list.html:42 templates/abonapp/group_tariffs.html:7
+#: templates/abonapp/invoiceForPayment.html:7 templates/abonapp/log.html:7
+#: templates/abonapp/peoples.html:8 templates/abonapp/peoples.html:138
+#: templates/abonapp/service.html:103 templates/abonapp/service.html:111
 msgid "User groups"
 msgstr "Группы абонентов"
 
-#: abonapp/templates/abonapp/addAbon.html:10
-#: abonapp/templates/abonapp/addAbon.html:17
-#: abonapp/templates/abonapp/peoples.html:127
-#: abonapp/templates/abonapp/peoples.html:140
+#: templates/abonapp/addAbon.html:10 templates/abonapp/addAbon.html:17
+#: templates/abonapp/peoples.html:122 templates/abonapp/peoples.html:135
 msgid "Add abon"
 msgstr "Добавить абонента"
 
-#: abonapp/templates/abonapp/addAbon.html:58
-#: abonapp/templates/abonapp/addInvoice.html:46
-#: abonapp/templates/abonapp/buy_tariff.html:71
-#: abonapp/templates/abonapp/editAbon.html:77
-#: abonapp/templates/abonapp/editAbon.html:188
-#: abonapp/templates/abonapp/editAbon.html:233
-#: abonapp/templates/abonapp/group_tariffs.html:29
-#: abonapp/templates/abonapp/modal_dev.html:31
-#: abonapp/templates/abonapp/modal_editstreet.html:30
-#: abonapp/templates/abonapp/modal_user_markers.html:28
-#: abonapp/templates/abonapp/passport_view.html:36
+#: templates/abonapp/addAbon.html:59 templates/abonapp/addInvoice.html:46
+#: templates/abonapp/buy_tariff.html:74 templates/abonapp/editAbon.html:78
+#: templates/abonapp/editAbon.html:190 templates/abonapp/group_tariffs.html:32
+#: templates/abonapp/modal_dev.html:31
+#: templates/abonapp/modal_editstreet.html:30
+#: templates/abonapp/modal_user_markers.html:28
+#: templates/abonapp/passport_view.html:36
 msgid "Save"
 msgstr "Сохранить"
 
-#: abonapp/templates/abonapp/addAbon.html:61
-#: abonapp/templates/abonapp/addInvoice.html:49
-#: abonapp/templates/abonapp/buy_tariff.html:74
-#: abonapp/templates/abonapp/group_tariffs.html:29
-#: abonapp/templates/abonapp/modal_abonamount.html:24
-#: abonapp/templates/abonapp/modal_add_phone.html:30
-#: abonapp/templates/abonapp/modal_addstreet.html:33
-#: abonapp/templates/abonapp/modal_dev.html:34
-#: abonapp/templates/abonapp/modal_editstreet.html:33
-#: abonapp/templates/abonapp/modal_extra_field.html:40
-#: abonapp/templates/abonapp/modal_periodic_pay.html:31
+#: templates/abonapp/addAbon.html:62 templates/abonapp/addInvoice.html:49
+#: templates/abonapp/buy_tariff.html:77 templates/abonapp/group_tariffs.html:32
+#: templates/abonapp/modal_abonamount.html:18
+#: templates/abonapp/modal_add_lease.html:19
+#: templates/abonapp/modal_add_phone.html:30
+#: templates/abonapp/modal_addstreet.html:33
+#: templates/abonapp/modal_dev.html:34
+#: templates/abonapp/modal_editstreet.html:33
+#: templates/abonapp/modal_periodic_pay.html:31
 msgid "Reset"
 msgstr "Сбросить"
 
-#: abonapp/templates/abonapp/addInvoice.html:10
-#: abonapp/templates/abonapp/invoiceForPayment.html:61
+#: templates/abonapp/addInvoice.html:10
+#: templates/abonapp/invoiceForPayment.html:64
 msgid "Add debt"
 msgstr "Добавить квитанцию"
 
-#: abonapp/templates/abonapp/addInvoice.html:17
+#: templates/abonapp/addInvoice.html:17
 msgid "Add receipt for"
 msgstr "Добавьте платёж на оплату для"
 
-#: abonapp/templates/abonapp/addInvoice.html:25
-#: abonapp/templates/abonapp/debtors.html:21
+#: templates/abonapp/addInvoice.html:25 templates/abonapp/debtors.html:24
 msgid "Sum of pay"
 msgstr "Сумма для платежа"
 
-#: abonapp/templates/abonapp/addInvoice.html:36
-#: abonapp/templates/abonapp/invoiceForPayment.html:20
+#: templates/abonapp/addInvoice.html:36
+#: templates/abonapp/invoiceForPayment.html:23
 msgid "Pay status"
 msgstr "Статус оплаты"
 
-#: abonapp/templates/abonapp/buy_tariff.html:10
-#: abonapp/templates/abonapp/buy_tariff.html:26
-#: abonapp/templates/abonapp/service.html:74
+#: templates/abonapp/buy_tariff.html:10 templates/abonapp/buy_tariff.html:14
+#: templates/abonapp/buy_tariff.html:29 templates/abonapp/service.html:74
 msgid "Pick a service"
 msgstr "Заказать услугу"
 
-#: abonapp/templates/abonapp/buy_tariff.html:17
+#: templates/abonapp/buy_tariff.html:20
 msgid "Pick a service for"
 msgstr "Купить новую услугу (заказать тариф) для"
 
-#: abonapp/templates/abonapp/buy_tariff.html:18
-#: abonapp/templates/abonapp/debtors.html:20
-#: abonapp/templates/abonapp/log.html:19
-#: abonapp/templates/abonapp/peoples.html:27
+#: templates/abonapp/buy_tariff.html:21 templates/abonapp/debtors.html:23
+#: templates/abonapp/log.html:22 templates/abonapp/peoples.html:29
 msgid "Sub"
 msgstr "Абонент"
 
-#: abonapp/templates/abonapp/buy_tariff.html:36
-#: abonapp/templates/abonapp/group_tariffs.html:24
-#: abonapp/templates/abonapp/service.html:31
-#: abonapp/templates/abonapp/service.html:96
+#: templates/abonapp/buy_tariff.html:39 templates/abonapp/group_tariffs.html:27
+#: templates/abonapp/service.html:31 templates/abonapp/service.html:96
 msgid "currency"
 msgstr "руб"
 
-#: abonapp/templates/abonapp/buy_tariff.html:61
-#: abonapp/templates/abonapp/service.html:102
+#: templates/abonapp/buy_tariff.html:64 templates/abonapp/service.html:102
 msgid "This group has no services"
 msgstr "У этой группы нет услуг"
 
-#: abonapp/templates/abonapp/buy_tariff.html:63
+#: templates/abonapp/buy_tariff.html:66
 msgid "Attach serices to groups"
 msgstr "Привязать услуги к группам"
 
-#: abonapp/templates/abonapp/charts.html:9
+#: templates/abonapp/charts.html:9
 #, python-format
 msgid "Graph of use by %(wantdate_d)s"
 msgstr "График использования за %(wantdate_d)s"
 
-#: abonapp/templates/abonapp/charts.html:44
+#: templates/abonapp/charts.html:44
 msgid "Static info was Not found"
 msgstr "Статистика не найдена"
 
-#: abonapp/templates/abonapp/charts.html:49
+#: templates/abonapp/charts.html:49
 msgid "Show graph by date"
 msgstr "Показать график по дате"
 
-#: abonapp/templates/abonapp/charts.html:52
+#: templates/abonapp/charts.html:52
 msgid "Choose a date"
 msgstr "Выберите дату"
 
-#: abonapp/templates/abonapp/debtors.html:9
+#: templates/abonapp/debtors.html:8
 msgid "Debtors"
 msgstr "Должники"
 
-#: abonapp/templates/abonapp/debtors.html:14
+#: templates/abonapp/debtors.html:13
 msgid "People with debts"
 msgstr "Народ, у которого есть неоплаченные услуги"
 
-#: abonapp/templates/abonapp/debtors.html:23
-#: abonapp/templates/abonapp/invoiceForPayment.html:24
-#: abonapp/templates/abonapp/task_log.html:13
+#: templates/abonapp/debtors.html:26
+#: templates/abonapp/invoiceForPayment.html:27
+#: templates/abonapp/task_log.html:13
 msgid "Date of make"
 msgstr "Дата создания"
 
-#: abonapp/templates/abonapp/debtors.html:24
-#: abonapp/templates/abonapp/log.html:22
-#: abonapp/templates/abonapp/task_log.html:8
+#: templates/abonapp/debtors.html:27 templates/abonapp/log.html:25
+#: templates/abonapp/task_log.html:8
 msgid "Author"
 msgstr "Автор"
 
-#: abonapp/templates/abonapp/debtors.html:42
+#: templates/abonapp/debtors.html:45
 msgid "Debts not found"
 msgstr "Нет должников"
 
-#: abonapp/templates/abonapp/dial_log.html:8
+#: templates/abonapp/dial_log.html:8
 msgid "Play"
 msgstr "Слушать"
 
-#: abonapp/templates/abonapp/dial_log.html:9
+#: templates/abonapp/dial_log.html:9
 msgid "calldate"
 msgstr "дата звонка"
 
-#: abonapp/templates/abonapp/dial_log.html:10
+#: templates/abonapp/dial_log.html:10
 msgid "src"
 msgstr "кто"
 
-#: abonapp/templates/abonapp/dial_log.html:11
+#: templates/abonapp/dial_log.html:11
 msgid "dst"
 msgstr "куда"
 
-#: abonapp/templates/abonapp/dial_log.html:12
+#: templates/abonapp/dial_log.html:12
 msgid "duration"
 msgstr "прод."
 
-#: abonapp/templates/abonapp/dial_log.html:13
+#: templates/abonapp/dial_log.html:13
 msgid "start"
 msgstr "начало"
 
-#: abonapp/templates/abonapp/dial_log.html:14
+#: templates/abonapp/dial_log.html:14
 msgid "answer"
 msgstr "ответ"
 
-#: abonapp/templates/abonapp/dial_log.html:15
+#: templates/abonapp/dial_log.html:15
 msgid "end"
 msgstr "конец"
 
-#: abonapp/templates/abonapp/dial_log.html:16
+#: templates/abonapp/dial_log.html:16
 msgid "disposition"
 msgstr "состояние"
 
-#: abonapp/templates/abonapp/dial_log.html:38
+#: templates/abonapp/dial_log.html:38
 msgid "Calls was not found"
 msgstr "Звонки не найдены"
 
-#: abonapp/templates/abonapp/editAbon.html:10
+#: templates/abonapp/editAbon.html:10
 msgid "Change subscriber"
 msgstr "Изменение абонента"
 
-#: abonapp/templates/abonapp/editAbon.html:25
+#: templates/abonapp/editAbon.html:25
 msgid "Call to"
 msgstr "Позвонить"
 
-#: abonapp/templates/abonapp/editAbon.html:32
-#: abonapp/templates/abonapp/modal_add_phone.html:5
+#: templates/abonapp/editAbon.html:32 templates/abonapp/modal_add_phone.html:5
 msgid "Add telephone"
 msgstr "Добавить номер телефона"
 
-#: abonapp/templates/abonapp/editAbon.html:42
-msgid "Reset ip"
-msgstr "Сбросить ip"
-
-#: abonapp/templates/abonapp/editAbon.html:85
-#: abonapp/templates/abonapp/editAbon.html:87
-#: abonapp/templates/abonapp/editAbon.html:92
+#: templates/abonapp/editAbon.html:86 templates/abonapp/editAbon.html:88
+#: templates/abonapp/editAbon.html:93
 msgid "Add new task"
 msgstr "Добавить задачу"
 
-#: abonapp/templates/abonapp/editAbon.html:90
-#: abonapp/templates/abonapp/editAbon.html:102
-#: abonapp/templates/abonapp/editAbon.html:117
-#: abonapp/templates/abonapp/payHistory.html:43
+#: templates/abonapp/editAbon.html:91 templates/abonapp/editAbon.html:103
+#: templates/abonapp/editAbon.html:118 templates/abonapp/payHistory.html:43
 msgid "Permission denied"
 msgstr "Доступ запрещён"
 
-#: abonapp/templates/abonapp/editAbon.html:108
+#: templates/abonapp/editAbon.html:109
 msgid "No have ip"
 msgstr "Нет ip адреса"
 
-#: abonapp/templates/abonapp/editAbon.html:114
-#: abonapp/templates/abonapp/editAbon.html:118
+#: templates/abonapp/editAbon.html:115 templates/abonapp/editAbon.html:119
 msgid "Send sms"
 msgstr "Отправить смс"
 
-#: abonapp/templates/abonapp/editAbon.html:136
-#: abonapp/templates/abonapp/modal_dev.html:13
+#: templates/abonapp/editAbon.html:137 templates/abonapp/modal_dev.html:13
 msgid "Select the device"
 msgstr "Выберите устройство"
 
-#: abonapp/templates/abonapp/editAbon.html:148
+#: templates/abonapp/editAbon.html:149
 msgid "Mac Address"
 msgstr "Мак"
 
-#: abonapp/templates/abonapp/editAbon.html:148
-#: abonapp/templates/abonapp/editAbon.html:167
-#: abonapp/templates/abonapp/editAbon.html:211
-#: abonapp/templates/abonapp/peoples.html:94
-#: abonapp/templates/abonapp/peoples.html:96
+#: templates/abonapp/editAbon.html:149 templates/abonapp/editAbon.html:169
+#: templates/abonapp/peoples.html:91
 msgid "Not assigned"
 msgstr "&lt;Не назначен&gt;"
 
-#: abonapp/templates/abonapp/editAbon.html:152
+#: templates/abonapp/editAbon.html:154
 msgid "Remove clutch"
 msgstr "Удалить муфту"
 
-#: abonapp/templates/abonapp/editAbon.html:156
-#: abonapp/templates/abonapp/modal_dev.html:6
+#: templates/abonapp/editAbon.html:158 templates/abonapp/modal_dev.html:6
 msgid "Add clutch"
 msgstr "Добавить муфту"
 
-#: abonapp/templates/abonapp/editAbon.html:181
+#: templates/abonapp/editAbon.html:183
 msgid "Is dynamic network settings"
 msgstr "Динамические настройки по dhcp"
 
-#: abonapp/templates/abonapp/editAbon.html:200
-msgid "Extra fields"
-msgstr "Динамические записи"
-
-#: abonapp/templates/abonapp/editAbon.html:223 abonapp/views.py:714
-msgid "Extra field does not exist"
-msgstr "Поле не найдено"
-
-#: abonapp/templates/abonapp/editAbon.html:228
-#: abonapp/templates/abonapp/modal_extra_field.html:6
-msgid "Add extra field"
-msgstr "Добавить новое динамическое поле"
-
-#: abonapp/templates/abonapp/editAbon.html:229
-#: abonapp/templates/abonapp/modal_add_phone.html:27
-#: abonapp/templates/abonapp/modal_addstreet.html:30
-#: abonapp/templates/abonapp/modal_extra_field.html:37
-#: abonapp/templates/abonapp/modal_periodic_pay.html:28
-#: abonapp/templates/abonapp/peoples.html:139
-#: abonapp/templates/abonapp/peoples.html:167
+#: templates/abonapp/editAbon.html:208
+msgid "Free session"
+msgstr "Освободить сессию"
+
+#: templates/abonapp/editAbon.html:212
+msgid "Start session"
+msgstr "Запустить сессию"
+
+#: templates/abonapp/editAbon.html:218
+msgid "Leased by:"
+msgstr "Выделен из:"
+
+#: templates/abonapp/editAbon.html:220
+msgid "From"
+msgstr "От"
+
+#: templates/abonapp/editAbon.html:226
+msgid "Leases does not found"
+msgstr "Аренды ip не найдены"
+
+#: templates/abonapp/editAbon.html:237
+#: templates/abonapp/modal_add_lease.html:16
+#: templates/abonapp/modal_add_phone.html:27
+#: templates/abonapp/modal_addstreet.html:30
+#: templates/abonapp/modal_periodic_pay.html:28
+#: templates/abonapp/peoples.html:134 templates/abonapp/peoples.html:162
 msgid "Add"
 msgstr "Добавить"
 
-#: abonapp/templates/abonapp/editAbon.html:244
+#: templates/abonapp/editAbon.html:241
+msgid "Active networks"
+msgstr "Активные подсети"
+
+#: templates/abonapp/editAbon.html:249
 msgid "User flags"
 msgstr "Флаги абонента"
 
-#: abonapp/templates/abonapp/editAbon.html:254
-#: abonapp/templates/abonapp/peoples.html:170
+#: templates/abonapp/editAbon.html:259 templates/abonapp/peoples.html:165
 msgid "Edit"
 msgstr "Редактировать"
 
-#: abonapp/templates/abonapp/fin_report.html:7
-#: abonapp/templates/abonapp/group_list.html:65
+#: templates/abonapp/fin_report.html:7 templates/abonapp/group_list.html:68
 msgid "Fin report"
 msgstr "Финансовый отчёт"
 
-#: abonapp/templates/abonapp/fin_report.html:12
+#: templates/abonapp/fin_report.html:12
 msgid "Money by days"
 msgstr "Сумма денег за сутки"
 
-#: abonapp/templates/abonapp/fin_report.html:17
-#: abonapp/templates/abonapp/invoiceForPayment.html:22
-#: abonapp/templates/abonapp/log.html:18
-#: abonapp/templates/abonapp/payHistory.html:9
-#: abonapp/templates/abonapp/service.html:30
+#: templates/abonapp/fin_report.html:20
+#: templates/abonapp/invoiceForPayment.html:25 templates/abonapp/log.html:21
+#: templates/abonapp/payHistory.html:9 templates/abonapp/service.html:30
 msgid "Sum"
 msgstr "Сумма"
 
-#: abonapp/templates/abonapp/fin_report.html:18
-#: abonapp/templates/abonapp/log.html:21
+#: templates/abonapp/fin_report.html:21 templates/abonapp/log.html:24
 msgid "Date"
 msgstr "Время"
 
-#: abonapp/templates/abonapp/fin_report.html:29
+#: templates/abonapp/fin_report.html:32
 msgid "Pays not found"
 msgstr "Нет платежей"
 
-#: abonapp/templates/abonapp/fin_report.html:38
-#: abonapp/templates/abonapp/modal_phonebook.html:30
+#: templates/abonapp/fin_report.html:41
+#: templates/abonapp/modal_phonebook.html:30
 msgid "Export to csv"
 msgstr "Сохранить в csv"
 
-#: abonapp/templates/abonapp/group_list.html:21
+#: templates/abonapp/group_list.html:24
 msgid "Group title"
 msgstr "Название группы"
 
-#: abonapp/templates/abonapp/group_list.html:26
+#: templates/abonapp/group_list.html:29
 msgid "Number of subscribers"
 msgstr "Количество абонентов"
 
-#: abonapp/templates/abonapp/group_list.html:46
+#: templates/abonapp/group_list.html:49
 msgid "Groups was not found"
 msgstr "Ещё нет групп"
 
-#: abonapp/templates/abonapp/group_list.html:55
-#: abonapp/templates/abonapp/log.html:8
+#: templates/abonapp/group_list.html:58 templates/abonapp/log.html:8
 msgid "Subscribers actions"
 msgstr "История действий абонентов"
 
-#: abonapp/templates/abonapp/group_list.html:60
+#: templates/abonapp/group_list.html:63
 msgid "List of debtors"
 msgstr "Список должников"
 
-#: abonapp/templates/abonapp/group_tariffs.html:9
-#: abonapp/templates/abonapp/group_tariffs.html:14
+#: templates/abonapp/group_list.html:73
+msgid "Export vCards"
+msgstr "Экспорт в vCards"
+
+#: templates/abonapp/group_tariffs.html:9
+#: templates/abonapp/group_tariffs.html:14
 msgid "Belonging services for groups"
 msgstr "Принадлежность услуг к группам"
 
-#: abonapp/templates/abonapp/invoiceForPayment.html:15
+#: templates/abonapp/invoiceForPayment.html:15
 msgid "Debtor"
 msgstr "Должник"
 
-#: abonapp/templates/abonapp/invoiceForPayment.html:21
+#: templates/abonapp/invoiceForPayment.html:24
 msgid "Month"
 msgstr "Месяц"
 
-#: abonapp/templates/abonapp/invoiceForPayment.html:25
-#: abonapp/templates/abonapp/payHistory.html:10
+#: templates/abonapp/invoiceForPayment.html:28
+#: templates/abonapp/payHistory.html:10
 msgid "Date of payment"
 msgstr "Дата оплаты"
 
-#: abonapp/templates/abonapp/invoiceForPayment.html:26
-#: abonapp/templates/abonapp/payHistory.html:11
+#: templates/abonapp/invoiceForPayment.html:29
+#: templates/abonapp/payHistory.html:11
 msgid "Author of payment"
 msgstr "Назначил"
 
-#: abonapp/templates/abonapp/invoiceForPayment.html:45
+#: templates/abonapp/invoiceForPayment.html:48
 msgid "Created paid,Not yet paid"
 msgstr "Создан оплаченным,Ещё не оплачено"
 
-#: abonapp/templates/abonapp/invoiceForPayment.html:52
+#: templates/abonapp/invoiceForPayment.html:55
 msgid "Receipts not found"
 msgstr "Назначенные платежи отсутствуют"
 
-#: abonapp/templates/abonapp/log.html:13
+#: templates/abonapp/log.html:13
 msgid "History of subscriber"
 msgstr "История абонента"
 
-#: abonapp/templates/abonapp/log.html:51
+#: templates/abonapp/log.html:54
 msgid "Actions not found"
 msgstr "Нет событий"
 
-#: abonapp/templates/abonapp/modal_abonamount.html:5
+#: templates/abonapp/modal_abonamount.html:6
 msgid "Additional sum"
 msgstr "Начисление средств на счёт"
 
-#: abonapp/templates/abonapp/modal_abonamount.html:10
-msgid "Amount of money"
-msgstr "Количество денег"
-
-#: abonapp/templates/abonapp/modal_abonamount.html:21
+#: templates/abonapp/modal_abonamount.html:15
 msgid "Refill"
 msgstr "Пополнить"
 
-#: abonapp/templates/abonapp/modal_add_phone.html:18
-#: abonapp/templates/abonapp/modal_additional_telephones.html:12
-#: abonapp/templates/abonapp/modal_phonebook.html:11
+#: templates/abonapp/modal_add_lease.html:8
+msgid "Add ip lease"
+msgstr "Добавить ip аренду"
+
+#: templates/abonapp/modal_add_phone.html:18
+#: templates/abonapp/modal_additional_telephones.html:12
+#: templates/abonapp/modal_phonebook.html:11
 msgid "Telephone owner"
 msgstr "Владелец телефона"
 
-#: abonapp/templates/abonapp/modal_additional_telephones.html:30
+#: templates/abonapp/modal_additional_telephones.html:23
+msgid "Delete"
+msgstr "Удалить"
+
+#: templates/abonapp/modal_additional_telephones.html:30
 msgid "Additional telephones not found"
 msgstr "Дополнительные телефоны не найдены"
 
-#: abonapp/templates/abonapp/modal_addstreet.html:5
-#: abonapp/templates/abonapp/peoples.html:166
+#: templates/abonapp/modal_addstreet.html:5 templates/abonapp/peoples.html:161
 msgid "Add street"
 msgstr "Добавить улицу"
 
-#: abonapp/templates/abonapp/modal_addstreet.html:12
+#: templates/abonapp/modal_addstreet.html:12
 msgid "Street title"
 msgstr "Название улицы"
 
-#: abonapp/templates/abonapp/modal_editstreet.html:5
-#: abonapp/templates/abonapp/peoples.html:169
+#: templates/abonapp/modal_current_networks.html:4
+msgid "Available networks"
+msgstr "Доступные подсети"
+
+#: templates/abonapp/modal_current_networks.html:10
+msgid "Network"
+msgstr "Подсети"
+
+#: templates/abonapp/modal_current_networks.html:11
+msgid "Scope"
+msgstr "Вид"
+
+#: templates/abonapp/modal_current_networks.html:22
+msgid "Available networks not found"
+msgstr "Доступных подсетей не найдено"
+
+#: templates/abonapp/modal_editstreet.html:5 templates/abonapp/peoples.html:164
 msgid "Edit streets"
 msgstr "Редактировать улицы"
 
-#: abonapp/templates/abonapp/modal_editstreet.html:25
+#: templates/abonapp/modal_editstreet.html:25
 msgid "Streets has not been found"
 msgstr "Улицы не найдены"
 
-#: abonapp/templates/abonapp/modal_export.html:6
+#: templates/abonapp/modal_export.html:6
 msgid "Select the fields"
 msgstr "Выберите поля"
 
-#: abonapp/templates/abonapp/modal_export.html:11
+#: templates/abonapp/modal_export.html:11
 msgid "Export"
 msgstr "Экспорт"
 
-#: abonapp/templates/abonapp/modal_extra_field.html:11
-msgid "Field title"
-msgstr "Название поля"
-
-#: abonapp/templates/abonapp/modal_extra_field.html:20
-msgid "Field type"
-msgstr "Тип динамического поля"
-
-#: abonapp/templates/abonapp/modal_extra_field.html:28
-msgid "Field content"
-msgstr "Содержимое динамического поля"
-
-#: abonapp/templates/abonapp/modal_periodic_pay.html:6
-#: abonapp/templates/abonapp/service.html:139
+#: templates/abonapp/modal_periodic_pay.html:6
+#: templates/abonapp/service.html:139
 msgid "Add periodic pay"
 msgstr "Добавить периодический платёж"
 
-#: abonapp/templates/abonapp/modal_phonebook.html:4
-#: abonapp/templates/abonapp/peoples.html:147
+#: templates/abonapp/modal_phonebook.html:4 templates/abonapp/peoples.html:142
 msgid "Phonebook"
 msgstr "Телефонная книга"
 
-#: abonapp/templates/abonapp/modal_phonebook.html:22
+#: templates/abonapp/modal_phonebook.html:22
 msgid "Telephone numbers not found"
 msgstr "Номера телефонов не найдены"
 
-#: abonapp/templates/abonapp/modal_user_markers.html:6
-#: abonapp/templates/abonapp/modal_user_markers.html:12
-#: abonapp/templates/abonapp/peoples.html:64
+#: templates/abonapp/modal_user_markers.html:6
+#: templates/abonapp/modal_user_markers.html:12
+#: templates/abonapp/peoples.html:60
 msgid "Markers"
 msgstr "Метки"
 
-#: abonapp/templates/abonapp/passport_view.html:10
+#: templates/abonapp/passport_view.html:10
 msgid "Passport information"
 msgstr "Паспортные данные"
 
-#: abonapp/templates/abonapp/passport_view.html:20
+#: templates/abonapp/passport_view.html:20
 msgid "Date of acceptance"
 msgstr "Дата выдачи"
 
-#: abonapp/templates/abonapp/payHistory.html:24
+#: templates/abonapp/payHistory.html:24
 msgid "System"
 msgstr "Система"
 
-#: abonapp/templates/abonapp/payHistory.html:31
+#: templates/abonapp/payHistory.html:31
 msgid "Payment history is empty"
 msgstr "История платежей пуста"
 
-#: abonapp/templates/abonapp/payHistory.html:40
-#: abonapp/templates/abonapp/payHistory.html:44
+#: templates/abonapp/payHistory.html:40 templates/abonapp/payHistory.html:44
 msgid "Fill account"
 msgstr "Пополнить счёт"
 
-#: abonapp/templates/abonapp/peoples.html:18
+#: templates/abonapp/peoples.html:20
 msgid "The people in the selected group"
 msgstr "Народ в выбранной группе"
 
-#: abonapp/templates/abonapp/peoples.html:31
+#: templates/abonapp/peoples.html:33
 msgid "Last traffic"
 msgstr "Траф."
 
-#: abonapp/templates/abonapp/peoples.html:34
-msgid "Ip address"
-msgstr "IP Адрес"
-
-#: abonapp/templates/abonapp/peoples.html:52
+#: templates/abonapp/peoples.html:48
 msgid "Apartment"
 msgstr "Квартира"
 
-#: abonapp/templates/abonapp/peoples.html:125
+#: templates/abonapp/peoples.html:120
 msgid "Subscribers not found"
 msgstr "Абоненты не найдены"
 
-#: abonapp/templates/abonapp/peoples.html:144
-#: abonapp/templates/abonapp/service.html:104
+#: templates/abonapp/peoples.html:139 templates/abonapp/service.html:104
 msgid "Tariffs in groups"
 msgstr "Тарифы в группах"
 
-#: abonapp/templates/abonapp/peoples.html:150
+#: templates/abonapp/peoples.html:145
 msgid "Export users"
 msgstr "Экспорт абонентов"
 
-#: abonapp/templates/abonapp/peoples.html:163
+#: templates/abonapp/peoples.html:158
 msgid "No streets found for that group"
 msgstr "Не найдены улицы для группы"
 
-#: abonapp/templates/abonapp/service.html:10
+#: templates/abonapp/service.html:10
 msgid "Subscriber's service"
 msgstr "Текущая услуга абонента"
 
-#: abonapp/templates/abonapp/service.html:27
+#: templates/abonapp/service.html:27
 msgid "We have a problem in DB: AbonTariff instance has no related to service"
 msgstr "У нас проблема с БД: экземпляр AbonTariff не имеет отношения к тарифу"
 
-#: abonapp/templates/abonapp/service.html:33
+#: templates/abonapp/service.html:33
 msgid "Input speed"
 msgstr "Входящая скорость"
 
-#: abonapp/templates/abonapp/service.html:36
+#: templates/abonapp/service.html:36
 msgid "Output speed"
 msgstr "Исходящая скорость"
 
-#: abonapp/templates/abonapp/service.html:39
+#: templates/abonapp/service.html:39
 msgid "Date of start"
 msgstr "Дата начала"
 
-#: abonapp/templates/abonapp/service.html:42
+#: templates/abonapp/service.html:42
 msgid "Works until"
 msgstr "Действует до"
 
-#: abonapp/templates/abonapp/service.html:51
+#: templates/abonapp/service.html:51
 msgid "Subscriber has no service"
 msgstr "У абонента нет услуги"
 
-#: abonapp/templates/abonapp/service.html:53
+#: templates/abonapp/service.html:53
 msgid "Buy service"
 msgstr "Купить услугу"
 
-#: abonapp/templates/abonapp/service.html:59
+#: templates/abonapp/service.html:59
 msgid "Finish service"
 msgstr "Завершить услугу"
 
-#: abonapp/templates/abonapp/service.html:68
+#: templates/abonapp/service.html:68
 msgid "Services for buy"
 msgstr "Услуги для заказа"
 
-#: abonapp/templates/abonapp/service.html:76
+#: templates/abonapp/service.html:76
 msgid "Price"
 msgstr "Сумма"
 
-#: abonapp/templates/abonapp/service.html:77
+#: templates/abonapp/service.html:77
 msgid "Speed In"
 msgstr "Входящая скорость"
 
-#: abonapp/templates/abonapp/service.html:78
+#: templates/abonapp/service.html:78
 msgid "Speed Out"
 msgstr "Исходящая скорость"
 
-#: abonapp/templates/abonapp/service.html:112
+#: templates/abonapp/service.html:112
 msgid "Attach services to group"
 msgstr "Привязать услуги к этой группе"
 
-#: abonapp/templates/abonapp/service.html:127
+#: templates/abonapp/service.html:127
 msgid "Pay logic"
 msgstr "Алгоритм платежа"
 
-#: abonapp/templates/abonapp/service.html:129
+#: templates/abonapp/service.html:129
 msgid "Last pay"
 msgstr "Последний платёж"
 
-#: abonapp/templates/abonapp/service.html:135
+#: templates/abonapp/service.html:135
 msgid "Remove periodic pay"
 msgstr "Удалить периодический платёж"
 
-#: abonapp/templates/abonapp/task_log.html:9
+#: templates/abonapp/task_log.html:9
 msgid "Recipients"
 msgstr "Исполнители"
 
-#: abonapp/templates/abonapp/task_log.html:11
+#: templates/abonapp/task_log.html:11
 msgid "State"
 msgstr "Состояние"
 
-#: abonapp/templates/abonapp/task_log.html:12
+#: templates/abonapp/task_log.html:12
 msgid "Type"
 msgstr "Тип"
 
-#: abonapp/templates/abonapp/task_log.html:24
+#: templates/abonapp/task_log.html:24
 msgid "Recipients not found"
 msgstr "Нет исполнителей"
 
-#: abonapp/templates/abonapp/task_log.html:34
+#: templates/abonapp/task_log.html:34
 msgid "Tasks not found"
 msgstr "Нет задач"
 
-#: abonapp/views.py:123
+#: tests.py:464 tests.py:519
+msgid "Ip that you have passed is greater than allowed network range"
+msgstr "IP который вы указали больше чем разрешённый диапазон адресов"
+
+#: tests.py:472
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Введите валидный IPv4 или IPv6 адрес"
+
+#: tests.py:480 tests.py:495 tests.py:535 tests.py:550
+msgid "Ip that you typed is not in subnet that you have selected"
+msgstr "IP который вы указали не в подсети которую вы выбрали"
+
+#: tests.py:527
+msgid "This is not a valid IPv6 address."
+msgstr "Это не правильный IPv6 адрес"
+
+#: views.py:119
 msgid "Address"
 msgstr "Адрес"
 
-#: abonapp/views.py:142
+#: views.py:138
 msgid "create abon success msg"
 msgstr "Абонент успешно создан"
 
-#: abonapp/views.py:153 abonapp/views.py:320 abonapp/views.py:440
-#: abonapp/views.py:527 abonapp/views.py:670 abonapp/views.py:860
-#: abonapp/views.py:932 abonapp/views.py:1002 abonapp/views.py:1107
+#: views.py:149 views.py:323 views.py:441 views.py:538 views.py:847
+#: views.py:926 views.py:996 views.py:1092
 msgid "fix form errors"
 msgstr "Некоторые поля заполнены не правильно, проверте ещё раз"
 
-#: abonapp/views.py:178
+#: views.py:174
 msgid "delete abon success msg"
 msgstr "Абонент успешно удалён"
 
-#: abonapp/views.py:183
+#: views.py:179
 #, python-format
 msgid "NAS says: '%s'"
 msgstr "NAS сказал: '%s'"
 
-#: abonapp/views.py:200
+#: views.py:199
 msgid "fill account through admin side"
 msgstr "Пополнение счёта через админку"
 
-#: abonapp/views.py:202
+#: views.py:202
 #, python-format
 msgid "Account filled successfully on %.2f"
 msgstr "Счёт пополнен на %.2f"
 
-#: abonapp/views.py:205
+#: views.py:205
 msgid "I not know the account id"
 msgstr "Счёт успешно пополнен на %.2f"
 
-#: abonapp/views.py:263
+#: views.py:266
 msgid "User group id is not matches with group in url"
 msgstr "Группа абонента не совпадает с группой указанной в url"
 
-#: abonapp/views.py:316
+#: views.py:319
 msgid "edit abon success msg"
 msgstr "Абонент успешно изменён"
 
-#: abonapp/views.py:327
+#: views.py:330
 msgid "User device was not found"
 msgstr "Пользовательское устройство не найдено"
 
-#: abonapp/views.py:340
+#: views.py:343
 msgid "User has not have password, and cannot login"
 msgstr "Для абонента не задан пароль, он не сможет войти в учётку"
 
-#: abonapp/views.py:390
+#: views.py:389
 msgid "Receipt has been created"
 msgstr "Квитанция на оплату была создана"
 
-#: abonapp/views.py:417
+#: views.py:416
 #, python-format
 msgid "Service '%(service_name)s' has connected via admin"
 msgstr "Услуга '%(service_name)s' подключена администратором"
 
-#: abonapp/views.py:427
+#: views.py:426
 msgid "Tariff has been picked"
 msgstr "Тариф успешно выбран"
 
-#: abonapp/views.py:435
+#: views.py:436
 msgid "Tariff your picked does not exist"
 msgstr "Тариф, который вы выбрали, не существует"
 
-#: abonapp/views.py:458
+#: views.py:459
 msgid "User has been detached from service"
 msgstr "Абонент отвязан от услуги"
 
-#: abonapp/views.py:524
+#: views.py:529
 msgid "Passport information has been saved"
 msgstr "Информация о паспорте сохранена"
 
-#: abonapp/views.py:532 abonapp/views.py:583 abonapp/views.py:603
-#: abonapp/views.py:640
-msgid "Abon does not exist"
-msgstr "Абонент не найден"
-
-#: abonapp/views.py:535
-msgid "Passport info for the user does not exist"
-msgstr "Для абонента не найдены паспортные данные"
-
-#: abonapp/views.py:555
+#: views.py:560
 msgid "Successfully saved"
 msgstr "Успешно сохранено"
 
-#: abonapp/views.py:576
+#: views.py:580
 msgid "Device has successfully attached"
 msgstr "Устройство успешно прикреплено"
 
-#: abonapp/views.py:581
+#: views.py:585
 msgid "Device your selected already does not exist"
 msgstr "Устройство, выбранное вами, уже не существует"
 
-#: abonapp/views.py:601
+#: views.py:587 views.py:608 views.py:645
+msgid "Abon does not exist"
+msgstr "Абонент не найден"
+
+#: views.py:606
 msgid "Device has successfully unattached"
 msgstr "Устройство успешно откреплено"
 
-#: abonapp/views.py:643
+#: views.py:648
 msgid "Group what you want doesn't exist"
 msgstr "Указанная вами группа не найдена"
 
-#: abonapp/views.py:668
-msgid "Extra field successfully created"
-msgstr "Динамичесое поле добавлено успешно"
-
-#: abonapp/views.py:698
-msgid "Extra fields has been saved"
-msgstr "Динамические поля сохранены"
-
-#: abonapp/views.py:700
-msgid "One or more extra fields has not been saved"
-msgstr "Поле или одно из полей не найдено"
-
-#: abonapp/views.py:712
-msgid "Extra field successfully deleted"
-msgstr "Динамическое поле успешно удалено"
-
-#: abonapp/views.py:724
+#: views.py:669
 msgid "no ping"
 msgstr "не пингуется"
 
-#: abonapp/views.py:727
+#: views.py:672
 msgid "Ip not passed"
 msgstr "Ip адрес не передан"
 
-#: abonapp/views.py:733 abonapp/views.py:749
+#: views.py:678 views.py:694
 msgid "ping ok"
 msgstr "пингуется"
 
-#: abonapp/views.py:740
+#: views.py:685
 #, python-format
 msgid "IP Conflict! %(all)d/%(return)d results"
 msgstr "IP Конфликт! ping %(all)d из %(return)d"
 
-#: abonapp/views.py:743
+#: views.py:688
 #, python-format
 msgid "ok ping, %(all)d/%(return)d loses"
 msgstr "пингуется, %(all)d/%(return)d"
 
-#: abonapp/views.py:747
+#: views.py:692
 #, python-format
 msgid "no ping, %(all)d/%(return)d loses"
 msgstr "не пингуется, %(all)d/%(return)d"
 
-#: abonapp/views.py:807
+#: views.py:794
 msgid "Method is not POST"
 msgstr "Метод не POST"
 
-#: abonapp/views.py:824
+#: views.py:811
 #, python-format
 msgid ""
 "<a href='%(user_url)s'>%(user_name)s</a> already pinned to this port on this "
@@ -1077,75 +1010,98 @@ msgstr ""
 "<a href='%(user_url)s'>%(user_name)s</a> уже привязан к этому порту на этом "
 "устройстве"
 
-#: abonapp/views.py:832
+#: views.py:819
 msgid "Multiple users on the same device port"
 msgstr "Несколько абонентов на одном и том же порту устройства"
 
-#: abonapp/views.py:841
+#: views.py:828
 msgid "User port has been saved"
 msgstr "Порт абонента успешно выбран"
 
-#: abonapp/views.py:843
+#: views.py:830
 msgid "Selected port does not exist"
 msgstr "Выбранный порт не существует"
 
-#: abonapp/views.py:845
+#: views.py:832
 msgid "User does not exist"
 msgstr "Абонент не найден"
 
-#: abonapp/views.py:857
+#: views.py:844
 msgid "Street successfully saved"
 msgstr "Улица успешно сохранена"
 
-#: abonapp/views.py:881
+#: views.py:866
 msgid "Streets has been saved"
 msgstr "Улицы сохранены"
 
-#: abonapp/views.py:889
+#: views.py:874
 msgid "One of these streets has not been found"
 msgstr "Одна из этих улиц не была найдена"
 
-#: abonapp/views.py:900
+#: views.py:885
 msgid "The street successfully deleted"
 msgstr "Улица успешно удалена"
 
-#: abonapp/views.py:902
+#: views.py:887
 msgid "The street has not been found"
 msgstr "Улица не найдена"
 
-#: abonapp/views.py:929
+#: views.py:923
 msgid "New telephone has been saved"
 msgstr "Новый телефон сохранен"
 
-#: abonapp/views.py:949
+#: views.py:943
 msgid "Additional telephone successfully deleted"
 msgstr "Номер телефона успешно удалён"
 
-#: abonapp/views.py:951
+#: views.py:945
 msgid "Telephone not found"
 msgstr "Телефон не найден"
 
-#: abonapp/views.py:999
+#: views.py:993
 #, python-format
 msgid "Unexpected format %(export_format)s"
 msgstr "Нежиданный формат %(export_format)s"
 
-#: abonapp/views.py:1062
+#: views.py:1042
 msgid "Periodic pays has been designated"
 msgstr "Периодический платёж назначен"
 
-#: abonapp/views.py:1064
+#: views.py:1044
 msgid "Something wrong in form"
 msgstr "Что-то не так в форме"
 
-#: abonapp/views.py:1083
+#: views.py:1063
 msgid "Periodic pay successfully deleted"
 msgstr "Периодический платёж успешно удалён"
 
-#: abonapp/views.py:1112
+#: views.py:1097
 msgid "User flags has changed successfully"
 msgstr "Флаги абонента изменены успешно"
 
+#: views.py:1113
+msgid "Ip lease has been freed"
+msgstr "Аренда ip освобождена"
+
+#: views.py:1115
+msgid "You cannot disable last session"
+msgstr "Вы не можете отключить последний ip"
+
+#: views.py:1119
+msgid "Ip lease has been started"
+msgstr "Аренда ip включена"
+
+#: views.py:1147
+msgid "Ip lease has been created"
+msgstr "Аренда ip создана"
+
+#: views.py:1152
+msgid "Check form errors"
+msgstr "Некоторые поля заполнены не правильно, проверте ещё раз"
+
+#~ msgid "Ip Address"
+#~ msgstr "IP Адрес"
+
 msgid "Sub information"
 msgstr "Инфо"
 
@@ -1157,6 +1113,3 @@ msgstr "История задач"
 
 msgid "Charts"
 msgstr "Графики"
-
-msgid "Export vCards"
-msgstr "Экспорт в vCards"
diff --git a/accounts_app/locale/ru/LC_MESSAGES/django.po b/accounts_app/locale/ru/LC_MESSAGES/django.po
index 55837cd..515069c 100644
--- a/accounts_app/locale/ru/LC_MESSAGES/django.po
+++ b/accounts_app/locale/ru/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-04-24 23:27+0300\n"
+"POT-Creation-Date: 2018-08-09 14:54+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Dmitry Novikov nerosketch@gmail.com\n"
 "Language: ru\n"
@@ -18,279 +18,267 @@ msgstr ""
 "%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
 "%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: accounts_app/models.py:22
+#: models.py:19
 msgid "Users must have an telephone number"
 msgstr "У пользователей должен быть номер телефона"
 
-#: accounts_app/models.py:50 accounts_app/templates/accounts/acc_list.html:18
+#: models.py:47 templates/accounts/acc_list.html:21
 msgid "profile username"
 msgstr "Логин"
 
-#: accounts_app/models.py:55
+#: models.py:52
 msgid "fio"
 msgstr "ФИО"
 
-#: accounts_app/models.py:56
+#: models.py:53
 msgid "birth day"
 msgstr "дата рождения"
 
-#: accounts_app/models.py:57
+#: models.py:54
 msgid "Is active"
 msgstr "Активен"
 
-#: accounts_app/models.py:61 accounts_app/templates/accounts/acc_list.html:20
-#: accounts_app/templates/accounts/create_acc.html:62
-#: accounts_app/templates/accounts/index.html:9
-#: accounts_app/templates/accounts/settings/ch_info.html:38
+#: models.py:58 templates/accounts/acc_list.html:23
+#: templates/accounts/create_acc.html:62 templates/accounts/index.html:9
+#: templates/accounts/settings/ch_info.html:38
 msgid "Telephone"
 msgstr "Телефон"
 
-#: accounts_app/models.py:97
+#: models.py:97
 msgid "Avatar"
 msgstr "Аватар"
 
-#: accounts_app/models.py:99
+#: models.py:99
 msgid "Responsibility groups"
 msgstr "Группы администратора"
 
-#: accounts_app/models.py:114
+#: models.py:114
 msgid "Can view staff profile"
 msgstr "Может просматривать учётку сотрудника"
 
-#: accounts_app/models.py:116
+#: models.py:116
 msgid "Staff account profile"
 msgstr "Учётная запись работника"
 
-#: accounts_app/models.py:117
+#: models.py:117
 msgid "Staff account profiles"
 msgstr "Учётные записи работников"
 
-#: accounts_app/templates/accounts/acc_list.html:7
-#: accounts_app/templates/accounts/create_acc.html:8
-#: accounts_app/templates/accounts/perms/objects_of_type.html:7
-#: accounts_app/templates/accounts/perms/objects_types.html:8
-#: accounts_app/templates/accounts/perms/perms_edit.html:8
+#: templates/accounts/acc_list.html:7 templates/accounts/create_acc.html:8
+#: templates/accounts/perms/objects_of_type.html:7
+#: templates/accounts/perms/objects_types.html:8
+#: templates/accounts/perms/perms_edit.html:8
 msgid "Administrators"
 msgstr "Сотрудники"
 
-#: accounts_app/templates/accounts/acc_list.html:12
+#: templates/accounts/acc_list.html:12
 msgid "Admin accounts list"
 msgstr "Список аккаунтов администраторов"
 
-#: accounts_app/templates/accounts/acc_list.html:17
+#: templates/accounts/acc_list.html:20
 msgid "Photo"
 msgstr "Фото"
 
-#: accounts_app/templates/accounts/acc_list.html:19
+#: templates/accounts/acc_list.html:22
 msgid "Fullname, or login if name is empty"
 msgstr "ФИО (или ник если нет)"
 
-#: accounts_app/templates/accounts/acc_list.html:21
-#: accounts_app/templates/accounts/settings/ch_info.html:28
+#: templates/accounts/acc_list.html:24
+#: templates/accounts/settings/ch_info.html:28
 msgid "Email"
 msgstr "Адрес электронной почты"
 
-#: accounts_app/templates/accounts/acc_list.html:38
-#: accounts_app/templates/accounts/acc_list.html:45
+#: templates/accounts/acc_list.html:41 templates/accounts/acc_list.html:48
 msgid "Not assigned"
 msgstr "&lt;Не назначено&gt;"
 
-#: accounts_app/templates/accounts/acc_list.html:56
+#: templates/accounts/acc_list.html:59
 msgid "You have not permissions to delete"
 msgstr "У вас нет прав на удаление"
 
-#: accounts_app/templates/accounts/acc_list.html:65
+#: templates/accounts/acc_list.html:68
 msgid "Users not found"
 msgstr "Пользователи не найдены"
 
-#: accounts_app/templates/accounts/acc_list.html:73
+#: templates/accounts/acc_list.html:76
 msgid "Add account"
 msgstr "Добавить учётную запись"
 
-#: accounts_app/templates/accounts/create_acc.html:9
+#: templates/accounts/create_acc.html:9
 msgid "Add"
 msgstr "Добавить"
 
-#: accounts_app/templates/accounts/create_acc.html:16
+#: templates/accounts/create_acc.html:16
 msgid "Create new account"
 msgstr "Создать новую учётную запись"
 
-#: accounts_app/templates/accounts/create_acc.html:33
-#: accounts_app/templates/accounts/create_acc.html:37
+#: templates/accounts/create_acc.html:33 templates/accounts/create_acc.html:37
 msgid "Username"
 msgstr "Логин"
 
-#: accounts_app/templates/accounts/create_acc.html:42
-#: accounts_app/templates/accounts/create_acc.html:47
+#: templates/accounts/create_acc.html:42 templates/accounts/create_acc.html:47
 msgid "Fullname"
 msgstr "Полное имя"
 
-#: accounts_app/templates/accounts/create_acc.html:52
+#: templates/accounts/create_acc.html:52
 msgid "EMail"
 msgstr "Адрес электронной почты"
 
-#: accounts_app/templates/accounts/create_acc.html:67
-#: accounts_app/templates/accounts/settings/ch_info.html:43
+#: templates/accounts/create_acc.html:67
+#: templates/accounts/settings/ch_info.html:43
 msgid "+[7,8,9,3] and 10,11 digits"
 msgstr "+[7,8,9,3] и 10,11 цифр"
 
-#: accounts_app/templates/accounts/create_acc.html:72
+#: templates/accounts/create_acc.html:72
 msgid "Type password"
 msgstr "Введите пароль"
 
-#: accounts_app/templates/accounts/create_acc.html:80
+#: templates/accounts/create_acc.html:80
 msgid "Repeat password"
 msgstr "Повторите пароль"
 
-#: accounts_app/templates/accounts/create_acc.html:89
-#: accounts_app/templates/accounts/manage_responsibility_groups.html:20
-#: accounts_app/templates/accounts/perms/perms_edit.html:61
-#: accounts_app/templates/accounts/set_abon_groups_permission.html:20
-#: accounts_app/templates/accounts/settings/ch_info.html:67
+#: templates/accounts/create_acc.html:89
+#: templates/accounts/manage_responsibility_groups.html:20
+#: templates/accounts/perms/perms_edit.html:65
+#: templates/accounts/set_abon_groups_permission.html:20
+#: templates/accounts/settings/ch_info.html:67
 msgid "Save"
 msgstr "Сохранить"
 
-#: accounts_app/templates/accounts/create_acc.html:92
-#: accounts_app/templates/accounts/login.html:59
-#: accounts_app/templates/accounts/manage_responsibility_groups.html:21
-#: accounts_app/templates/accounts/perms/perms_edit.html:64
-#: accounts_app/templates/accounts/set_abon_groups_permission.html:21
-#: accounts_app/templates/accounts/settings/ch_info.html:70
+#: templates/accounts/create_acc.html:92 templates/accounts/login.html:59
+#: templates/accounts/manage_responsibility_groups.html:21
+#: templates/accounts/perms/perms_edit.html:68
+#: templates/accounts/set_abon_groups_permission.html:21
+#: templates/accounts/settings/ch_info.html:70
 msgid "Reset"
 msgstr "Сбросить"
 
-#: accounts_app/templates/accounts/index.html:13
-#: accounts_app/templates/accounts/login.html:39
-#: accounts_app/templates/accounts/settings/ch_info.html:9
-#: accounts_app/templates/accounts/settings/ch_info.html:13
+#: templates/accounts/index.html:13 templates/accounts/login.html:39
+#: templates/accounts/settings/ch_info.html:9
+#: templates/accounts/settings/ch_info.html:13
 msgid "User name"
 msgstr "Логин"
 
-#: accounts_app/templates/accounts/index.html:17
-#: accounts_app/templates/accounts/settings/ch_info.html:19
+#: templates/accounts/index.html:17 templates/accounts/settings/ch_info.html:19
 msgid "Name and surname"
 msgstr "Фамилия и Имя"
 
-#: accounts_app/templates/accounts/index.html:21
+#: templates/accounts/index.html:21
 msgid "Is enable"
 msgstr "Включён-ли"
 
-#: accounts_app/templates/accounts/index.html:25
+#: templates/accounts/index.html:25
 msgid "Last login"
 msgstr "Последняя авторизация"
 
-#: accounts_app/templates/accounts/index.html:30
+#: templates/accounts/index.html:30
 msgid "All permissions"
 msgstr "Административный доступ (все права)"
 
-#: accounts_app/templates/accounts/login.html:5
+#: templates/accounts/login.html:5
 msgid "Auth"
 msgstr "Аутентификация"
 
-#: accounts_app/templates/accounts/login.html:27
-#: accounts_app/templates/accounts/login.html:56
+#: templates/accounts/login.html:27 templates/accounts/login.html:56
 msgid "Login"
 msgstr "Войти"
 
-#: accounts_app/templates/accounts/login.html:47
+#: templates/accounts/login.html:47
 msgid "Password"
 msgstr "Пароль"
 
-#: accounts_app/templates/accounts/manage_responsibility_groups.html:5
+#: templates/accounts/manage_responsibility_groups.html:5
 msgid "The responsibility of the administrator of the group of subscribers"
 msgstr "Ответственность администратора за группы абонентов"
 
-#: accounts_app/templates/accounts/perms/objects_of_type.html:9
-#: accounts_app/templates/accounts/perms/objects_types.html:10
-#: accounts_app/templates/accounts/perms/perms_edit.html:10
+#: templates/accounts/perms/objects_of_type.html:9
+#: templates/accounts/perms/objects_types.html:10
+#: templates/accounts/perms/perms_edit.html:10
 msgid "Permission options"
 msgstr "Права"
 
-#: accounts_app/templates/accounts/perms/objects_of_type.html:13
-#: accounts_app/templates/accounts/perms/perms_edit.html:16
+#: templates/accounts/perms/objects_of_type.html:16
+#: templates/accounts/perms/perms_edit.html:19
 msgid "Pick object for edit permissions"
 msgstr "Выберите объект для редактирования прав доступа"
 
-#: accounts_app/templates/accounts/perms/objects_types.html:13
+#: templates/accounts/perms/objects_types.html:15
 msgid "Pick the type of object"
 msgstr "Выберите тип объекта"
 
-#: accounts_app/templates/accounts/perms/objects_types.html:21
+#: templates/accounts/perms/objects_types.html:23
 msgid "Group"
 msgstr "Группа"
 
-#: accounts_app/templates/accounts/perms/perms_edit.html:24
+#: templates/accounts/perms/perms_edit.html:28
 msgid "Profile is superuser, permissions to change it makes no sense"
 msgstr ""
 "Учётная запись является суперпользователем, разрешения менять нет смысла"
 
-#: accounts_app/templates/accounts/perms/perms_edit.html:30
+#: templates/accounts/perms/perms_edit.html:34
 msgid "Change permission for that object"
 msgstr "Изменение прав доступа для выбранного объекта"
 
-#: accounts_app/templates/accounts/perms/perms_edit.html:52
+#: templates/accounts/perms/perms_edit.html:56
 msgid "Not set"
 msgstr "Не найдено"
 
-#: accounts_app/templates/accounts/set_abon_groups_permission.html:5
+#: templates/accounts/set_abon_groups_permission.html:5
 msgid "The list of user groups to which the account has access"
 msgstr "Список групп абонентов, к которым учётка имеет доступ"
 
-#: accounts_app/templates/accounts/settings/ch_info.html:48
+#: templates/accounts/settings/ch_info.html:48
 msgid "Old password"
 msgstr "Старый пароль"
 
-#: accounts_app/templates/accounts/settings/ch_info.html:57
+#: templates/accounts/settings/ch_info.html:57
 msgid "New password"
 msgstr "Новый пароль"
 
-#: accounts_app/views.py:47
+#: views.py:47
 msgid "Wrong login or password, please try again"
 msgstr "Неправильный логин или пароль, попробуйте ещё раз"
 
-#: accounts_app/views.py:123
+#: views.py:123
 msgid "New password is empty, fill it"
 msgstr "Новый пароль пустой, придумайте себе пароль"
 
-#: accounts_app/views.py:125
+#: views.py:125
 msgid "Wrong password"
 msgstr "Неправильный пароль"
 
-#: accounts_app/views.py:127
+#: views.py:127
 msgid "Empty password, fill it"
 msgstr "Пустой пароль, впишите что-то в пароль"
 
-#: accounts_app/views.py:150
+#: views.py:150
 msgid "You forget specify a password for the new account"
 msgstr "Забыли указать пароль для нового аккаунта"
 
-#: accounts_app/views.py:153
+#: views.py:153
 msgid "You forget to repeat a password for the new account"
 msgstr "Забыли повторить пароль для нового аккаунта"
 
-#: accounts_app/views.py:162
+#: views.py:162
 msgid "Subscriber with this name already exist"
 msgstr "Пользователь с таким именем уже есть"
 
-#: accounts_app/views.py:164
+#: views.py:164
 msgid "Passwords does not match, try again"
 msgstr "Пароли не совпадают, попробуйте ещё раз"
 
-#: accounts_app/views.py:179
+#: views.py:179
 msgid "Profile has been deleted"
 msgstr "Учётная запись удалена"
 
-#: accounts_app/views.py:251
+#: views.py:252
 msgid "Permissions has successfully updated"
 msgstr "Права успешно обновлены"
 
-#: accounts_app/views.py:318
+#: views.py:318
 msgid "Responsibilities has been updated"
 msgstr "Ответственность за группы обновлена"
 
-msgid "Options"
-msgstr "Настройки"
-
 msgid "Change self onfo"
 msgstr "Изменить инфу о себе"
 
diff --git a/chatbot/locale/ru/LC_MESSAGES/django.po b/chatbot/locale/ru/LC_MESSAGES/django.po
index 68c1c45..d557baa 100644
--- a/chatbot/locale/ru/LC_MESSAGES/django.po
+++ b/chatbot/locale/ru/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-04-24 23:27+0300\n"
+"POT-Creation-Date: 2018-08-09 14:57+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Dmitry Novikov <nerosketch@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,59 +20,59 @@ msgstr ""
 "%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
 "%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: chatbot/models.py:13
+#: models.py:13
 msgid "Employee"
 msgstr "Сотрудник"
 
-#: chatbot/models.py:14
+#: models.py:14
 msgid "Telegram chat id"
 msgstr "Номер чата из telegram"
 
-#: chatbot/models.py:21
+#: models.py:21
 msgid "Telegram bot"
 msgstr "Telegram бот"
 
-#: chatbot/models.py:22
+#: models.py:22
 msgid "Telegram bots"
 msgstr "Telegram боты"
 
-#: chatbot/models.py:35
+#: models.py:36
 msgid "Message history"
 msgstr "История собщений"
 
-#: chatbot/models.py:36
+#: models.py:37
 msgid "Message histories"
 msgstr "Истории собщений"
 
-#: chatbot/models.py:52
+#: models.py:54
 msgid "Target employee"
 msgstr "Сотрудник"
 
-#: chatbot/models.py:53
+#: models.py:55
 msgid "Message"
 msgstr "Сообщение"
 
-#: chatbot/models.py:58
+#: models.py:60
 msgid "Status of message"
 msgstr "Статус сообщения"
 
-#: chatbot/models.py:60
+#: models.py:62
 msgid "App tag"
 msgstr "Тэг приложения"
 
-#: chatbot/models.py:69 chatbot/models.py:70
+#: models.py:71 models.py:72
 msgid "Message queue"
 msgstr "Очередь оповещений"
 
-#: chatbot/telebot.py:64
+#: telebot.py:64
 msgid "Let's get acquainted, what is your name? Write your login from billing."
 msgstr "Давай знакомиться, как тебя зовут? Напиши свой логин из биллинга."
 
-#: chatbot/telebot.py:85
+#: telebot.py:85
 msgid "I do not know the answer to this yet."
 msgstr "Я пока не знаю ответа на это"
 
-#: chatbot/telebot.py:106
+#: telebot.py:106
 msgid ""
 "You are not found in the database, check that it correctly pointed out its "
 "LOGIN. Try again"
@@ -80,7 +80,7 @@ msgstr ""
 "Ты не найден в базе, проверь что правильно указал именно свой ЛОГИН. "
 "Попробуй ещё"
 
-#: chatbot/telebot.py:110
+#: telebot.py:110
 #, python-format
 msgid ""
 "Yes, it's nice to meet %(username)s, I will notify you about events in "
@@ -89,24 +89,24 @@ msgstr ""
 "Да, приятно познакомиться %(username)s, я буду оповещать тебя о событиях в "
 "биллинге. Удачной работы ;)"
 
-#: chatbot/telebot.py:122
+#: telebot.py:122
 msgid "Let's ping, write ip. It will be necessary to wait 10 seconds"
 msgstr "Давай пинганём, напиши ip. Нужно будет подождать 10 сек"
 
-#: chatbot/telebot.py:129
+#: telebot.py:129
 msgid "It's not like ip address, try again"
 msgstr "Это не похоже на ip адрес, попробуй ещё"
 
-#: chatbot/telebot.py:132
+#: telebot.py:132
 #, python-format
 msgid "You're '%s', right?"
 msgstr "Ты ведь %s ?"
 
-#: chatbot/telebot.py:140
+#: telebot.py:140
 msgid "Telegram bot token not found"
 msgstr "Токен для бота Telegram не найден"
 
-#: chatbot/telebot.py:145
+#: telebot.py:145
 #, python-format
 msgid "Recipient '%s' does not subscribed on notifications"
 msgstr "%s не подписан на оповещения"
diff --git a/clientsideapp/locale/ru/LC_MESSAGES/django.po b/clientsideapp/locale/ru/LC_MESSAGES/django.po
index 7f022e9..c8726c4 100644
--- a/clientsideapp/locale/ru/LC_MESSAGES/django.po
+++ b/clientsideapp/locale/ru/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-05-03 17:15+0300\n"
+"POT-Creation-Date: 2018-08-09 14:57+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Dmitry Novikov nerosketch@gmail.com\n"
 "Language: ru\n"
@@ -59,7 +59,7 @@ msgid "Your debt"
 msgstr "Ваши долги"
 
 #: templates/clientsideapp/debts.html:11
-#: templates/clientsideapp/tasklist.html:11
+#: templates/clientsideapp/tasklist.html:14
 msgid "State"
 msgstr "Состояние"
 
@@ -72,7 +72,7 @@ msgid "Description"
 msgstr "Описание"
 
 #: templates/clientsideapp/debts.html:14
-#: templates/clientsideapp/tasklist.html:12
+#: templates/clientsideapp/tasklist.html:15
 msgid "Date of create"
 msgstr "Дата создания"
 
@@ -84,7 +84,7 @@ msgstr "Дата платежа"
 msgid "Pay"
 msgstr "Оплатить"
 
-#: templates/clientsideapp/debts.html:23 templates/clientsideapp/ext.html:78
+#: templates/clientsideapp/debts.html:23 templates/clientsideapp/ext.html:77
 #: templates/clientsideapp/modal_service_buy.html:19
 #: templates/clientsideapp/services.html:26
 #: templates/clientsideapp/services.html:55
@@ -115,32 +115,28 @@ msgstr "Платежи"
 msgid "Services"
 msgstr "Услуги"
 
-#: templates/clientsideapp/ext.html:55
-msgid "Language"
-msgstr "Язык"
-
-#: templates/clientsideapp/ext.html:69
+#: templates/clientsideapp/ext.html:68
 msgid "Other"
 msgstr "Другое"
 
-#: templates/clientsideapp/ext.html:71
+#: templates/clientsideapp/ext.html:70
 msgid "Show debts and pay it"
 msgstr "Посмотреть долги и оплатить"
 
-#: templates/clientsideapp/ext.html:72
+#: templates/clientsideapp/ext.html:71
 msgid "Show task history"
 msgstr "Посмотреть заявки"
 
-#: templates/clientsideapp/ext.html:73
+#: templates/clientsideapp/ext.html:72
 msgid "Quit"
 msgstr "Выйти"
 
-#: templates/clientsideapp/ext.html:78
+#: templates/clientsideapp/ext.html:77
 #, python-format
 msgid "Your balance is <b>%(ballance)s</b>"
 msgstr "Ваш балланс <b>%(ballance)s</b>"
 
-#: templates/clientsideapp/ext.html:89
+#: templates/clientsideapp/ext.html:88
 msgid ""
 "<strong>Attantion!</strong> You are is admin, and do not be active here, "
 "please back to admin side. Client side to you for reference only."
@@ -173,6 +169,10 @@ msgstr "ip адрес"
 msgid "Address"
 msgstr "Адрес"
 
+#: templates/clientsideapp/index.html:29
+msgid "Num of active tasks"
+msgstr "Кол. активных заявок"
+
 #: templates/clientsideapp/modal_service_buy.html:5
 msgid "Pick service"
 msgstr "Заказать услугу"
@@ -262,44 +262,44 @@ msgstr "Доступные для заказа услуги"
 msgid "No services available for ordering"
 msgstr "Нет доступных для заказа услуг"
 
-#: templates/clientsideapp/tasklist.html:6
+#: templates/clientsideapp/tasklist.html:7
 msgid "Task history"
 msgstr "История заявок"
 
-#: templates/clientsideapp/tasklist.html:13
+#: templates/clientsideapp/tasklist.html:16
 msgid "The nature of the damage"
 msgstr "Характер заявки"
 
-#: templates/clientsideapp/tasklist.html:14
+#: templates/clientsideapp/tasklist.html:17
 msgid "Expected or real completion date"
 msgstr "Ожидаемый или реальный срок выполнения"
 
-#: templates/clientsideapp/tasklist.html:36
+#: templates/clientsideapp/tasklist.html:43
 msgid "You didn't leave any requests for breakdowns."
 msgstr "Заявки по вашей учётной записи не найдены"
 
-#: views.py:51
+#: views.py:54
 #, python-format
 msgid "Buy the service via user side, service '%s'"
 msgstr "Покупка тарифного плана через личный кабинет, тариф '%s'"
 
-#: views.py:54
+#: views.py:57
 #, python-format
 msgid "The service '%s' wan successfully activated"
 msgstr "Услуга '%s' успешно подключена"
 
-#: views.py:84
+#: views.py:87
 msgid "Are you not sure that you want buy the service?"
 msgstr "Вы не уверены что хотите оплатить долг?"
 
-#: views.py:86
+#: views.py:89
 msgid "Your account have not enough money"
 msgstr "Недостаточно средств на счету"
 
-#: views.py:89
+#: views.py:92
 #, python-format
 msgid "%(username)s paid the debt %(amount).2f"
 msgstr "%(username)s заплатил долг в размере %(amount).2f"
 
-msgid "Num of active tasks"
-msgstr "Кол. активных заявок"
+#~ msgid "Language"
+#~ msgstr "Язык"
diff --git a/devapp/locale/ru/LC_MESSAGES/django.po b/devapp/locale/ru/LC_MESSAGES/django.po
index 37cfff3..57c1c67 100644
--- a/devapp/locale/ru/LC_MESSAGES/django.po
+++ b/devapp/locale/ru/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-07 13:20+0300\n"
+"POT-Creation-Date: 2018-08-09 15:01+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Dmitry Novikov nerosketch@gmail.com\n"
 "Language: ru\n"
@@ -18,194 +18,190 @@ msgstr ""
 "%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
 "%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: base_intr.py:103
+#: base_intr.py:116
 msgid "Ip address is required"
 msgstr "Ip адрес необходим"
 
-#: dev_types.py:66
+#: dev_types.py:65
 msgid "DLink switch"
 msgstr "Свич D'Link"
 
-#: dev_types.py:85
+#: dev_types.py:89
 msgid "does not fetch the mac"
 msgstr "не нашёл мак"
 
-#: dev_types.py:148
+#: dev_types.py:140
 msgid "PON OLT"
 msgstr ""
 
-#: dev_types.py:172 views.py:354 views.py:512
+#: dev_types.py:169 views.py:345 views.py:503
 msgid "wait for a reply from the SNMP Timeout"
 msgstr "Время ожидания ответа от SNMP истекло"
 
-#: dev_types.py:219
+#: dev_types.py:199
+msgid "PON ONU"
+msgstr ""
+
+#: dev_types.py:214
 msgid "Ip address or parent device with ip address required for ONU device"
 msgstr ""
 "Необходим ip адрес. Или родительское устройство с назначенным ip адресом "
 "необходимо."
 
-#: dev_types.py:225
-msgid "PON ONU"
-msgstr ""
-
-#: dev_types.py:271
+#: dev_types.py:255
 msgid "ONU not connected"
 msgstr "ONU не в сети"
 
-#: dev_types.py:279
+#: dev_types.py:263
 msgid "Onu snmp field must be en integer"
 msgstr "Поле для snmp информации об ONU должно быть числом"
 
-#: dev_types.py:332
+#: dev_types.py:314
 msgid "Eltex switch"
 msgstr "Элтекс свич"
 
-#: dev_types.py:380
+#: dev_types.py:356
 msgid "OLT ZTE C320"
 msgstr ""
 
-#: dev_types.py:449
+#: dev_types.py:419
 msgid "ZTE PON ONU"
 msgstr ""
 
-#: dev_types.py:483
+#: dev_types.py:454
 msgid "Zte onu snmp field must be two dot separated integers"
 msgstr ""
 "Поле snmp информации для ZTE ONU должно быть двумя целыми числами, "
 "разделенными точкой"
 
-#: forms.py:16
+#: forms.py:31
 msgid "Mac address is required for fill"
 msgstr "MAC-адрес необходим для заполнения"
 
-#: forms.py:17
+#: forms.py:32
 msgid "Device with that mac is already exist"
 msgstr "Устройство с этим мак-адресом уже есть"
 
-#: forms.py:71
+#: forms.py:86
 msgid "Port number on device must be unique"
 msgstr "Номер порта на устройстве должен быть уникальным"
 
-#: models.py:27 templates/devapp/custom_dev_page/onu.html:18
+#: models.py:26 templates/devapp/custom_dev_page/onu.html:18
 #: templates/devapp/custom_dev_page/onu_for_zte.html:18
-#: templates/devapp/devices.html:22 templates/devapp/devices_null_group.html:20
+#: templates/devapp/devices.html:25 templates/devapp/devices_null_group.html:24
 msgid "Ip address"
 msgstr "Ip адрес"
 
-#: models.py:28 templates/devapp/devices.html:32
+#: models.py:27 templates/devapp/devices.html:35
 msgid "Mac address"
 msgstr "Мак адрес"
 
-#: models.py:29 templates/devapp/devices.html:28
-#: templates/devapp/devices_null_group.html:26
+#: models.py:28 templates/devapp/devices.html:31
+#: templates/devapp/devices_null_group.html:30
 msgid "Comment"
 msgstr "Комментарий"
 
-#: models.py:38 templates/devapp/devices.html:35
-#: templates/devapp/devices_null_group.html:32
+#: models.py:37 templates/devapp/devices.html:38
+#: templates/devapp/devices_null_group.html:36
 msgid "Device type"
 msgstr "Тип устройства"
 
-#: models.py:40
+#: models.py:39
 msgid "SNMP password"
 msgstr "Пароль SNMP"
 
-#: models.py:41
+#: models.py:40
 msgid "Device group"
 msgstr "Группа устройства"
 
-#: models.py:42 templates/devapp/add_dev.html:46
+#: models.py:41 templates/devapp/add_dev.html:46
 #: templates/devapp/custom_dev_page/onu.html:34
 #: templates/devapp/custom_dev_page/onu_for_zte.html:34
 #: templates/devapp/custom_dev_page/ports.html:59 templates/devapp/dev.html:33
-#: templates/devapp/fix_dev_group.html:42
+#: templates/devapp/fix_dev_group.html:41
 msgid "Parent device"
 msgstr "Родительское устройство"
 
-#: models.py:45
+#: models.py:44
 msgid "SNMP extra info"
 msgstr "Доп. инфо для snmp"
 
-#: models.py:46
+#: models.py:45
 msgid "Extra data"
 msgstr "Дополнительные данные"
 
-#: models.py:47
+#: models.py:46
 msgid "Extra data in JSON format. You may use it for your custom data"
 msgstr ""
 "Дополнительные данные в формате JSON. Вы можете хранить там собственные "
 "данные"
 
-#: models.py:51
+#: models.py:50
 msgid "Undefined"
 msgstr "Не определено"
 
-#: models.py:52
+#: models.py:51
 msgid "Up"
 msgstr "В сети"
 
-#: models.py:53
+#: models.py:52
 msgid "Unreachable"
 msgstr "Не доступно"
 
-#: models.py:54
+#: models.py:53
 msgid "Down"
 msgstr "Не в сети"
 
-#: models.py:56
+#: models.py:55
 msgid "Status"
 msgstr "Состояние"
 
-#: models.py:58
+#: models.py:57
 msgid "Send notify when monitoring state changed"
 msgstr "Отправлять уведомления при событиях мониторинга"
 
-#: models.py:63
+#: models.py:62
 msgid "Can view device"
 msgstr "Может видеть устройство"
 
-#: models.py:65 models.py:123
+#: models.py:64 models.py:112
 msgid "Device"
 msgstr "Устройство"
 
-#: models.py:66 templates/devapp/devices.html:14
-#: templates/devapp/devices_null_group.html:8
+#: models.py:65 templates/devapp/devices.html:14
+#: templates/devapp/devices_null_group.html:9
 msgid "Devices"
 msgstr "Устройства"
 
-#: models.py:102 views.py:254 views.py:316
-msgid "Device does not have a group, please fix that"
-msgstr "У устройства нет группы, пожалуйста, исправьте это"
-
-#: models.py:124 templates/devapp/manage_ports/list.html:11
+#: models.py:113 templates/devapp/manage_ports/list.html:11
 msgid "Number"
 msgstr "Номер"
 
-#: models.py:125 templates/devapp/custom_dev_page/onu.html:20
+#: models.py:114 templates/devapp/custom_dev_page/onu.html:20
 #: templates/devapp/custom_dev_page/onu_for_zte.html:20
 #: templates/devapp/custom_dev_page/ports.html:88
-#: templates/devapp/manage_ports/add_ports.html:33
+#: templates/devapp/manage_ports/add_ports.html:32
 #: templates/devapp/manage_ports/list.html:12
 msgid "Description"
 msgstr "Описание"
 
-#: models.py:134
+#: models.py:123
 msgid "Can toggle ports"
 msgstr "Может переключать порты"
 
-#: models.py:136 templates/devapp/custom_dev_page/ports.html:110
+#: models.py:125 templates/devapp/custom_dev_page/ports.html:110
 #: templates/devapp/manage_ports/fix_abon_device.html:24
 msgid "Port"
 msgstr "Порт"
 
-#: models.py:137
+#: models.py:126
 msgid "Ports"
 msgstr "Порты"
 
 #: templates/devapp/add_dev.html:8
 #: templates/devapp/custom_dev_page/olt_ztec320_units_uncfg.html:7
-#: templates/devapp/devices.html:8 templates/devapp/devices_null_group.html:7
-#: templates/devapp/fix_dev_group.html:9 templates/devapp/group_list.html:7
+#: templates/devapp/devices.html:8 templates/devapp/devices_null_group.html:8
+#: templates/devapp/fix_dev_group.html:8 templates/devapp/group_list.html:7
 #: templates/devapp/manage_ports/add_ports.html:7
 #: templates/devapp/manage_ports/fix_abon_device.html:7
 msgid "Groups"
@@ -215,12 +211,12 @@ msgstr "Группы"
 msgid "Add new device"
 msgstr "Добавить устройство"
 
-#: templates/devapp/add_dev.html:16
+#: templates/devapp/add_dev.html:15
 #: templates/devapp/custom_dev_page/olt_ztec320_units_uncfg.html:12
 #: templates/devapp/custom_dev_page/olt_ztec320_units_uncfg.html:20
 #: templates/devapp/custom_dev_page/ports.html:68
-#: templates/devapp/devices.html:64
-#: templates/devapp/manage_ports/add_ports.html:16
+#: templates/devapp/devices.html:67
+#: templates/devapp/manage_ports/add_ports.html:15
 msgid "Not assigned"
 msgstr "&lt;Не назначено&gt;"
 
@@ -229,21 +225,21 @@ msgid "Device info"
 msgstr "Инфа о железке"
 
 #: templates/devapp/add_dev.html:60 templates/devapp/dev.html:43
-#: templates/devapp/dev.html:47 templates/devapp/fix_dev_group.html:51
-#: templates/devapp/fix_dev_group.html:55
+#: templates/devapp/dev.html:47 templates/devapp/fix_dev_group.html:50
+#: templates/devapp/fix_dev_group.html:54
 msgid "Find the device"
 msgstr "Найти устройство"
 
 #: templates/devapp/add_dev.html:72 templates/devapp/dev.html:62
-#: templates/devapp/fix_dev_group.html:64
-#: templates/devapp/manage_ports/add_ports.html:75
-#: templates/devapp/manage_ports/add_ports.html:79
+#: templates/devapp/fix_dev_group.html:63
+#: templates/devapp/manage_ports/add_ports.html:74
+#: templates/devapp/manage_ports/add_ports.html:78
 #: templates/devapp/manage_ports/modal_add_edit_port.html:21
 #: templates/devapp/modal_device_extra_edit.html:14
 msgid "Save"
 msgstr "Сохранить"
 
-#: templates/devapp/add_dev.html:75 templates/devapp/fix_dev_group.html:67
+#: templates/devapp/add_dev.html:75 templates/devapp/fix_dev_group.html:66
 msgid "Reset"
 msgstr "Сбросить форму"
 
@@ -286,16 +282,16 @@ msgstr "Создать устройство"
 msgid "Ports not found"
 msgstr "Порты не найдены"
 
-#: templates/devapp/custom_dev_page/olt_ztec320.html:31
+#: templates/devapp/custom_dev_page/olt_ztec320.html:25
 #: templates/devapp/custom_dev_page/ports.html:54
 msgid "We have not received info, please check options :("
 msgstr "Инфа не получена, проверьте настройки :("
 
-#: templates/devapp/custom_dev_page/olt_ztec320.html:36
+#: templates/devapp/custom_dev_page/olt_ztec320.html:30
 msgid "Long description"
 msgstr "Длинное описание"
 
-#: templates/devapp/custom_dev_page/olt_ztec320.html:37
+#: templates/devapp/custom_dev_page/olt_ztec320.html:31
 msgid "Hostname"
 msgstr "Имя хоста"
 
@@ -406,8 +402,8 @@ msgid "We have not received info for ports"
 msgstr "Инфа о портах не получена"
 
 #: templates/devapp/dev.html:66 templates/devapp/dev.html:70
-#: templates/devapp/manage_ports/add_ports.html:53
-#: templates/devapp/manage_ports/add_ports.html:55
+#: templates/devapp/manage_ports/add_ports.html:52
+#: templates/devapp/manage_ports/add_ports.html:54
 #: templates/devapp/manage_ports/list.html:35
 #: templates/devapp/manage_ports/modal_del_port.html:14
 msgid "Delete"
@@ -417,11 +413,11 @@ msgstr "Удалить"
 msgid "Permission denied"
 msgstr "Доступ запрещён"
 
-#: templates/devapp/dev.html:74
+#: templates/devapp/dev.html:75
 msgid "Register device"
 msgstr "Зарегистрировать устройство"
 
-#: templates/devapp/dev.html:81
+#: templates/devapp/dev.html:78
 msgid "Tech date"
 msgstr "Техническая информация"
 
@@ -433,34 +429,38 @@ msgstr "Удалить устройство"
 msgid "Are you sure you want to delete device?"
 msgstr "Вы уверены что хотите удалить устройство?"
 
-#: templates/devapp/devices.html:81 templates/devapp/devices_null_group.html:62
+#: templates/devapp/devices.html:84 templates/devapp/devices_null_group.html:66
 msgid "Devices does not found"
 msgstr "Нет созданных устройств"
 
-#: templates/devapp/devices.html:81 templates/devapp/devices.html:91
-#: templates/devapp/devices_null_group.html:62
-#: templates/devapp/devices_null_group.html:72
+#: templates/devapp/devices.html:84 templates/devapp/devices.html:94
+#: templates/devapp/devices_null_group.html:66
+#: templates/devapp/devices_null_group.html:76
 msgid "Create"
 msgstr "Cоздать"
 
-#: templates/devapp/devices_null_group.html:13
-#: templates/devapp/group_list.html:32
+#: templates/devapp/devices_null_group.html:14
+#: templates/devapp/group_list.html:34
 msgid "Devices without group"
 msgstr "Устройства без группы"
 
-#: templates/devapp/fix_dev_group.html:17
+#: templates/devapp/fix_dev_group.html:16
 msgid "Fix device group"
 msgstr "Поправить группу устройства"
 
-#: templates/devapp/group_list.html:14
+#: templates/devapp/group_list.html:11
+msgid "Select group"
+msgstr "Выберите группу"
+
+#: templates/devapp/group_list.html:16
 msgid "Group title"
 msgstr "Название"
 
-#: templates/devapp/group_list.html:24
+#: templates/devapp/group_list.html:26
 msgid "Groups was not found"
 msgstr "Эта группа не найдена"
 
-#: templates/devapp/group_list.html:35
+#: templates/devapp/group_list.html:37
 msgid "Export to nagios objects"
 msgstr "Экспортировать конфиг для nagios"
 
@@ -469,17 +469,17 @@ msgstr "Экспортировать конфиг для nagios"
 msgid "Add ports"
 msgstr "Добавить порты"
 
-#: templates/devapp/manage_ports/add_ports.html:32
+#: templates/devapp/manage_ports/add_ports.html:31
 msgid "Mode"
 msgstr "Режим"
 
-#: templates/devapp/manage_ports/add_ports.html:60
+#: templates/devapp/manage_ports/add_ports.html:59
 #: templates/devapp/manage_ports/list.html:57
 msgid "Add"
 msgstr "Добавить"
 
 #: templates/devapp/manage_ports/fix_abon_device.html:10
-#: templates/devapp/manage_ports/fix_abon_device.html:16
+#: templates/devapp/manage_ports/fix_abon_device.html:15
 msgid "Fix subscriber ports conflict"
 msgstr "Исправить конфликт абонентов на порту"
 
@@ -542,93 +542,97 @@ msgstr "Изменить дополнительные данные для уст
 msgid "Back"
 msgstr "Назад"
 
-#: views.py:87
+#: views.py:83
 msgid "Device successfully deleted"
 msgstr "Устройство успешно удалено"
 
-#: views.py:109
+#: views.py:105
 #, python-format
 msgid "Duplicate user and port: %s"
 msgstr "Пользователь с таким портом и устройством уже есть: %s"
 
-#: views.py:121 views.py:178
+#: views.py:117 views.py:174
 msgid "You have redirected to existing device"
 msgstr "Вы были переадресованы на существующее устройство"
 
-#: views.py:124 views.py:181 views.py:447 views.py:560
+#: views.py:120 views.py:177 views.py:438 views.py:555
 msgid "Please attach group for device"
 msgstr "Пожалуйста назначте устройству группу в настройках"
 
-#: views.py:131 views.py:188
+#: views.py:128 views.py:185
 msgid "Device info has been saved"
 msgstr "Инфа о точке сохранена"
 
-#: views.py:146 views.py:393 views.py:422 views.py:562
+#: views.py:142 views.py:384 views.py:413 views.py:557
 msgid "Form is invalid, check fields and try again"
 msgstr "Ошибка в данных, проверте их ещё раз"
 
-#: views.py:238
+#: views.py:234
 msgid "Device extra data has successfully updated"
 msgstr "Дополнительная информация об устройстве успешно обновлена"
 
-#: views.py:259 views.py:349 views.py:434
+#: views.py:245 views.py:307
+msgid "Device does not have a group, please fix that"
+msgstr "У устройства нет группы, пожалуйста, исправьте это"
+
+#: views.py:250 views.py:340 views.py:425
 msgid "Device does not exist"
 msgstr "Устойство не найдено"
 
-#: views.py:280
+#: views.py:271
 msgid "Subscribers on port does not exist"
 msgstr "Абоненты на порту не найдены"
 
-#: views.py:282
+#: views.py:273
 msgid "More than one subscriber on device port"
 msgstr "Больше одного абонента на порту устройства"
 
-#: views.py:368
+#: views.py:359
 msgid "Port successfully removed"
 msgstr "Порт успешно удалён"
 
-#: views.py:376 views.py:404
+#: views.py:367 views.py:395
 msgid "Port does not exist"
 msgstr "Порт не найден"
 
-#: views.py:391 views.py:419
+#: views.py:382 views.py:410
 msgid "Port successfully saved"
 msgstr "Порт успешно сохранён"
 
-#: views.py:454 views.py:510
+#: views.py:445 views.py:501
 msgid "Dot was not pinged"
 msgstr "Эта точка не пингуется"
 
-#: views.py:463 views.py:508
+#: views.py:454 views.py:499
 msgid "Not Set snmp device password"
 msgstr "Не указан snmp пароль для устройства"
 
-#: views.py:471
+#: views.py:462
 msgid "SNMP error on device"
 msgstr "Ошибка SNMP на устройстве"
 
-#: views.py:557
+#: views.py:552
 msgid "Device fixed"
 msgstr "Устройство исправлено"
 
-#: views.py:587
+#: views.py:582
 #, python-format
 msgid "Device with mac address %(mac)s does not exist"
 msgstr "Устройство мак адресом %(mac)s не найдено"
 
-#: views.py:595
+#: views.py:590
 msgid "Fixed"
 msgstr "Исправлено, обновите страницу"
 
-#: views.py:598
+#: views.py:593
 msgid "Parent device not found"
 msgstr "Вышестоящее устройство не найдено"
 
-#: views.py:737
+#: views.py:735
 msgid "Unregistered onu not found"
 msgstr "Незарегистрированные ONU не найдены"
 
-#: views.py:739
+#: views.py:737
 msgid "Wrong login or password for telnet access"
 msgstr "Не правильный логин или пароль для доступа по telnet"
 
@@ -636,20 +640,20 @@ msgstr "Не правильный логин или пароль для дост
 msgid "Process locked by another process"
 msgstr "Процесс занят другой задачей, подождите чуть и попробуйте ещё"
 
-msgid "Device %(device_name)s is up"
-msgstr "%(device_name)s в сети"
+#~ msgid "Device %(device_name)s is up"
+#~ msgstr "%(device_name)s в сети"
 
-msgid "Device %(device_name)s is down"
-msgstr "%(device_name)s не в сети"
+#~ msgid "Device %(device_name)s is down"
+#~ msgstr "%(device_name)s не в сети"
 
-msgid "Device %(device_name)s is unreachable"
-msgstr "%(device_name)s недостижим"
+#~ msgid "Device %(device_name)s is unreachable"
+#~ msgstr "%(device_name)s недостижим"
 
-msgid "Device %(device_name)s getting undefined status code"
-msgstr "Устройство %(device_name)s получило не определённый код состояния"
+#~ msgid "Device %(device_name)s getting undefined status code"
+#~ msgstr "Устройство %(device_name)s получило не определённый код состояния"
 
-msgid "View"
-msgstr "Посмотреть"
+#~ msgid "View"
+#~ msgstr "Посмотреть"
 
-msgid "Enter valid JSON"
-msgstr "Введите данные в формате JSON"
+#~ msgid "Enter valid JSON"
+#~ msgstr "Введите данные в формате JSON"
diff --git a/dialing_app/locale/ru/LC_MESSAGES/django.po b/dialing_app/locale/ru/LC_MESSAGES/django.po
index 9159596..25fc26e 100644
--- a/dialing_app/locale/ru/LC_MESSAGES/django.po
+++ b/dialing_app/locale/ru/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-04-24 23:27+0300\n"
+"POT-Creation-Date: 2018-08-09 14:59+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Dmitry Novikov nerosketch@gmail.com\n"
 "Language: \n"
@@ -19,165 +19,162 @@ msgstr ""
 "%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
 "%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: dialing_app/models.py:9 dialing_app/models.py:44
+#: models.py:9 models.py:44
 msgid "No answer"
 msgstr "Не отвечен"
 
-#: dialing_app/models.py:10 dialing_app/models.py:46 dialing_app/models.py:101
+#: models.py:10 models.py:46 models.py:101
 msgid "Failed"
 msgstr "С ошибкой"
 
-#: dialing_app/models.py:11 dialing_app/models.py:48
+#: models.py:11 models.py:48
 msgid "Busy"
 msgstr "Занято"
 
-#: dialing_app/models.py:12 dialing_app/models.py:50
+#: models.py:12 models.py:50
 msgid "Answered"
 msgstr "Отвечен"
 
-#: dialing_app/models.py:13 dialing_app/models.py:52
+#: models.py:13 models.py:52
 msgid "Unknown"
 msgstr "Не определён"
 
-#: dialing_app/models.py:84 dialing_app/models.py:108
+#: models.py:84 models.py:108
 msgid "Can view sms"
 msgstr "Может просматривать смс"
 
-#: dialing_app/models.py:86 dialing_app/models.py:87
+#: models.py:86 models.py:87
 msgid "SMS"
 msgstr "СМС"
 
-#: dialing_app/models.py:95
+#: models.py:95
 msgid "When"
 msgstr "Когда"
 
-#: dialing_app/models.py:96 dialing_app/templates/index.html:26
+#: models.py:96 templates/index.html:25
 msgid "Telephone"
 msgstr "Телефон"
 
-#: dialing_app/models.py:97
+#: models.py:97
 msgid "Text"
 msgstr "Текст"
 
-#: dialing_app/models.py:99
+#: models.py:99
 msgid "New"
 msgstr "Новое"
 
-#: dialing_app/models.py:100
+#: models.py:100
 msgid "Sent"
 msgstr "Отправленное"
 
-#: dialing_app/models.py:103
+#: models.py:103
 msgid "Status"
 msgstr "Статус"
 
-#: dialing_app/models.py:109
+#: models.py:109
 msgid "Can send sms"
 msgstr "Может отправлять смс"
 
-#: dialing_app/models.py:111 dialing_app/models.py:112
+#: models.py:111 models.py:112
 msgid "Out SMS"
 msgstr "Исходящие СМС"
 
-#: dialing_app/templates/ext.html:7 dialing_app/templates/ext.html:21
-#: dialing_app/views.py:44
+#: templates/ext.html:8 templates/ext.html:25 views.py:45
 msgid "Last calls"
 msgstr "Последние звонки"
 
-#: dialing_app/templates/ext.html:28 dialing_app/views.py:73
+#: templates/ext.html:32 views.py:74
 msgid "Voice mail request"
 msgstr "Заявки на подключение"
 
-#: dialing_app/templates/ext.html:35 dialing_app/views.py:82
+#: templates/ext.html:39 views.py:83
 msgid "Voice mail report"
 msgstr "Заявки на поломки"
 
-#: dialing_app/templates/ext.html:42 dialing_app/templates/inbox_sms.html:7
+#: templates/ext.html:46 templates/inbox_sms.html:7
 msgid "Inbox sms"
 msgstr "Входящие смс"
 
-#: dialing_app/templates/inbox_sms.html:23
+#: templates/inbox_sms.html:23
 msgid "Message history is empty"
 msgstr "История сообщений пуста"
 
-#: dialing_app/templates/inbox_sms.html:31
-#: dialing_app/templates/modal_send_sms.html:5
+#: templates/inbox_sms.html:31 templates/modal_send_sms.html:5
 msgid "Send sms"
 msgstr "Отправить смс"
 
-#: dialing_app/templates/index.html:10 dialing_app/templates/vmail.html:10
+#: templates/index.html:9 templates/vmail.html:10
 msgid "Play"
 msgstr "Слушать"
 
-#: dialing_app/templates/index.html:11 dialing_app/templates/index.html:37
-#: dialing_app/templates/vmail.html:11
+#: templates/index.html:10 templates/index.html:36 templates/vmail.html:11
 msgid "calldate"
 msgstr "дата звонка"
 
-#: dialing_app/templates/index.html:12 dialing_app/templates/vmail.html:12
+#: templates/index.html:11 templates/vmail.html:12
 msgid "src"
 msgstr "кто"
 
-#: dialing_app/templates/index.html:13
+#: templates/index.html:12
 msgid "dst"
 msgstr "куда"
 
-#: dialing_app/templates/index.html:14 dialing_app/templates/vmail.html:13
+#: templates/index.html:13 templates/vmail.html:13
 msgid "duration"
 msgstr "продолжительность"
 
-#: dialing_app/templates/index.html:15 dialing_app/templates/vmail.html:14
+#: templates/index.html:14 templates/vmail.html:14
 msgid "start"
 msgstr "начало"
 
-#: dialing_app/templates/index.html:16 dialing_app/templates/vmail.html:15
+#: templates/index.html:15 templates/vmail.html:15
 msgid "answer"
 msgstr "ответ"
 
-#: dialing_app/templates/index.html:17 dialing_app/templates/vmail.html:16
+#: templates/index.html:16 templates/vmail.html:16
 msgid "end"
 msgstr "конец"
 
-#: dialing_app/templates/index.html:18 dialing_app/templates/vmail.html:17
+#: templates/index.html:17 templates/vmail.html:17
 msgid "disposition"
 msgstr "состояние"
 
-#: dialing_app/templates/index.html:24 dialing_app/views.py:93
+#: templates/index.html:23 views.py:94
 msgid "Find dials"
 msgstr "Найти звонки"
 
-#: dialing_app/templates/index.html:35
+#: templates/index.html:34
 msgid "Find by dates"
 msgstr "Найти по дате"
 
-#: dialing_app/templates/index.html:65
+#: templates/index.html:64
 msgid "Download"
 msgstr "Скачать"
 
-#: dialing_app/templates/index.html:81 dialing_app/templates/vmail.html:42
+#: templates/index.html:80 templates/vmail.html:42
 msgid "Calls was not found"
 msgstr "Звонки не найдены"
 
-#: dialing_app/templates/modal_send_sms.html:19
+#: templates/modal_send_sms.html:19
 msgid "Send"
 msgstr "Отправить"
 
-#: dialing_app/views.py:54
+#: views.py:55
 msgid "Multiple users with the telephone number"
 msgstr "Несколько абонентов с указанным номером телефона"
 
-#: dialing_app/views.py:56
+#: views.py:57
 msgid "User with the telephone number not found"
 msgstr "Абонент с таким номером телефона не найден"
 
-#: dialing_app/views.py:113
+#: views.py:114
 msgid "Make sure that your date format is correct"
 msgstr "Убедитесь что формат времени корректен"
 
-#: dialing_app/views.py:137
+#: views.py:138
 msgid "Message was enqueued for sending"
 msgstr "Сообщение было поставлено в очередь для отправки"
 
-#: dialing_app/views.py:150
+#: views.py:151
 msgid "fix form errors"
 msgstr "Некоторые поля заполнены не правильно, проверте ещё раз"
diff --git a/djing/locale/ru/LC_MESSAGES/django.po b/djing/locale/ru/LC_MESSAGES/django.po
index c62ad4a..4d5043c 100644
--- a/djing/locale/ru/LC_MESSAGES/django.po
+++ b/djing/locale/ru/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-04-24 23:27+0300\n"
+"POT-Creation-Date: 2018-08-09 14:59+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Dmitry Novikov nerosketch@gmail.com\n"
 "Language: ru\n"
@@ -18,25 +18,29 @@ msgstr ""
 "%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
 "%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: djing/formfields.py:12
+#: formfields.py:12
 msgid "Enter a valid integer."
 msgstr "Введите валидное число"
 
-#: djing/formfields.py:21
+#: formfields.py:21
 msgid "Enter a valid MAC Address."
 msgstr "Введите валидный мак-адрес"
 
-#: djing/global_base_views.py:162
+#: global_base_views.py:127
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr ""
 "Страница не является 'последней' и не может быть преобразована в "
 "целочисленное значение."
 
-#: djing/global_base_views.py:171
+#: global_base_views.py:136
 msgid "Filter does not contains data, filter without pagination"
 msgstr "Фильтр не содержит данных, фильтр без разбиения на страницы"
 
-#: djing/global_base_views.py:173
+#: global_base_views.py:138
 #, python-format
 msgid "Invalid page (%(page_number)s): %(message)s"
 msgstr "Неверная страница (%(page_number)s): %(message)s"
+
+#: settings.py:137
+msgid "Russian"
+msgstr "Русский"
diff --git a/djing/settings.py b/djing/settings.py
index 7a3a971..a4febba 100644
--- a/djing/settings.py
+++ b/djing/settings.py
@@ -131,11 +131,11 @@ SESSION_COOKIE_HTTPONLY = True
 # Internationalization
 # https://docs.djangoproject.com/en/1.11/topics/i18n/
 
-LANGUAGE_CODE = 'en'
+LANGUAGE_CODE = 'ru'
 
 LANGUAGES = (
     ('ru', _('Russian')),
-    ('en', _('English'))
+    #('en', _('English'))
 )
 
 PROJECT_PATH = os.path.dirname(os.path.abspath(__file__))
diff --git a/ip_pool/locale/ru/LC_MESSAGES/django.po b/ip_pool/locale/ru/LC_MESSAGES/django.po
new file mode 100644
index 0000000..c835621
--- /dev/null
+++ b/ip_pool/locale/ru/LC_MESSAGES/django.po
@@ -0,0 +1,331 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-09 14:34+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
+"%100>=11 && n%100<=14)? 2 : 3);\n"
+
+#: fields.py:35
+msgid "IP address with prefix length, or subnet for ipv4"
+msgstr "IP адрес с длиной префикса, или подсеть IPv4)"
+
+#: fields.py:40
+msgid "Enter a valid IPv4 or IPv6 address with prefix length."
+msgstr "Введите валидный IPv4 или IPv6 адрес с маской сети"
+
+#: forms.py:44
+msgid "Ip that you typed is not in subnet that you have selected"
+msgstr "Введённый вами IP не в выбранной подсети"
+
+#: forms.py:46
+msgid "Ip that you have passed is less than allowed network range"
+msgstr "IP который вы указали меньше чем разрешённый диапазон ip адресов"
+
+#: forms.py:48
+msgid "Ip that you have passed is greater than allowed network range"
+msgstr "IP который вы указали больше чем разрешённый диапазон ip адресов"
+
+#: forms.py:51 models.py:165
+msgid "Ip address"
+msgstr "IP адрес"
+
+#: forms.py:52 models.py:169 templates/ip_pool/ip_leases_list.html:23
+msgid "Is dynamic"
+msgstr "Динамичейский"
+
+#: forms.py:53
+msgid "Possible networks"
+msgstr "Доступные подсети"
+
+#: models.py:23
+msgid "IP network"
+msgstr "IP подсеть"
+
+#: models.py:24
+msgid "Ip address of network. For example: 192.168.1.0 or fde8:6789:1234:1::"
+msgstr "IP адрес подсети. На пример: 192.168.1.0 or fde8:6789:1234:1::"
+
+#: models.py:28
+msgid "Internet"
+msgstr "Интернет"
+
+#: models.py:29
+msgid "Guest"
+msgstr "Гостевая"
+
+#: models.py:30
+msgid "Trusted"
+msgstr "Доверенная"
+
+#: models.py:31
+msgid "Devices"
+msgstr "Устройства"
+
+#: models.py:32
+msgid "Admin"
+msgstr "Административная"
+
+#: models.py:34
+msgid "Kind of network"
+msgstr "Тип сети"
+
+#: models.py:35 templates/ip_pool/network_list.html:22
+msgid "Description"
+msgstr "Описание"
+
+#: models.py:36
+msgid "Groups"
+msgstr "Группы"
+
+#: models.py:39
+msgid "Start work ip range"
+msgstr "Начальный ip из диапазона"
+
+#: models.py:40
+msgid "End work ip range"
+msgstr "Конечный ip из диапазона"
+
+#: models.py:59
+msgid "Network is invalid"
+msgstr "Подсеть не правильная"
+
+#: models.py:63
+msgid "Ip start is invalid"
+msgstr "Начальный ip из диапазона не верный"
+
+#: models.py:67
+msgid "Start ip must be in subnet of specified network"
+msgstr "Начальный ip должен быть в указанной подсети"
+
+#: models.py:69
+msgid "Ip end is invalid"
+msgstr "Конечный ip из диапазона не верный"
+
+#: models.py:73 tests.py:60
+msgid "End ip must be in subnet of specified network"
+msgstr "Конечный ip должен быть в указанной подсети"
+
+#: models.py:83
+#, python-format
+msgid "Network is overlaps with %(other_network)s"
+msgstr "Подсеть пересекается с сетью '%(other_network)s'"
+
+#: models.py:91
+msgid "Global"
+msgstr "Глобальная"
+
+#: models.py:93
+msgid "Link local"
+msgstr ""
+
+#: models.py:95
+msgid "Loopback"
+msgstr "Локальное кольцо(loopback)"
+
+#: models.py:97
+msgid "Multicast"
+msgstr ""
+
+#: models.py:99
+msgid "Private"
+msgstr "Приватный"
+
+#: models.py:101
+msgid "Reserved"
+msgstr "Зарезервированный"
+
+#: models.py:103
+msgid "Site local"
+msgstr ""
+
+#: models.py:105
+msgid "Unspecified"
+msgstr "Не определён"
+
+#: models.py:110 templates/ip_pool/ip_leases_list.html:22
+#: templates/ip_pool/network_list.html:20
+msgid "Network"
+msgstr "Подсеть"
+
+#: models.py:111 templates/ip_pool/ext.html:13
+#: templates/ip_pool/network_list.html:12
+msgid "Networks"
+msgstr "Подсети"
+
+#: models.py:153
+msgid "Ip has already taken"
+msgstr "IP уже занят"
+
+#: models.py:166
+msgid "Parent network"
+msgstr "Родительская подсеть"
+
+#: models.py:167
+msgid "Mac address"
+msgstr "MAC адрес"
+
+#: models.py:168 templates/ip_pool/ip_leases_list.html:21
+msgid "Lease time"
+msgstr "Время аредны"
+
+#: models.py:170
+msgid "Is active"
+msgstr "Активный"
+
+#: models.py:192
+#, python-format
+msgid "Ip address %(ip)s not in %(net)s network"
+msgstr "IP адрес %(ip)s не в %(net)s сети"
+
+#: models.py:199
+msgid "Employed ip"
+msgstr "Занятый ip"
+
+#: models.py:200
+msgid "Employed ip addresses"
+msgstr "Занятые ip"
+
+#: templates/ip_pool/ext.html:8 templates/ip_pool/ip_leases_list.html:7
+#: templates/ip_pool/net_add.html:13 templates/ip_pool/net_edit.html:13
+#: templates/ip_pool/network_groups_available.html:7
+#: templates/ip_pool/network_list.html:7
+msgid "Ip pool"
+msgstr "IP пул"
+
+#: templates/ip_pool/ext.html:23
+msgid "All networks"
+msgstr "Все подсети"
+
+#: templates/ip_pool/ip_leases_list.html:9
+#: templates/ip_pool/ip_leases_list.html:13
+msgid "Ip leases list"
+msgstr "Список аренд ip"
+
+#: templates/ip_pool/ip_leases_list.html:20
+msgid "Ip"
+msgstr ""
+
+#: templates/ip_pool/ip_leases_list.html:36
+msgid "You have not any available dedicated ips in this network"
+msgstr "Нет ни одного выделенного ip в этой сети"
+
+#: templates/ip_pool/net_add.html:14 templates/ip_pool/net_add.html:24
+msgid "Add network"
+msgstr "Добавить сеть"
+
+#: templates/ip_pool/net_add.html:18
+msgid "Add new subnet"
+msgstr "Добавить подсеть"
+
+#: templates/ip_pool/net_add.html:32 templates/ip_pool/network_list.html:76
+msgid "Add"
+msgstr "Добавить"
+
+#: templates/ip_pool/net_add.html:35 templates/ip_pool/net_edit.html:39
+msgid "Back"
+msgstr "Назад"
+
+#: templates/ip_pool/net_edit.html:24
+msgid "Edit network"
+msgstr "Редактировать сеть"
+
+#: templates/ip_pool/net_edit.html:32
+#: templates/ip_pool/network_groups_available.html:31
+msgid "Save"
+msgstr "Сохранить"
+
+#: templates/ip_pool/net_edit.html:36 templates/ip_pool/network_list.html:50
+msgid "Remove"
+msgstr "Удалить"
+
+#: templates/ip_pool/net_edit.html:43 templates/ip_pool/network_list.html:60
+msgid "View employed"
+msgstr "Показать выделенные"
+
+#: templates/ip_pool/net_edit.html:47
+msgid "Groups available"
+msgstr "Доступные группы"
+
+#: templates/ip_pool/network_groups_available.html:9
+msgid "Belonging networks for groups"
+msgstr "Принадлежность сетей к группам"
+
+#: templates/ip_pool/network_groups_available.html:14
+msgid "Make that pool available in specified groups"
+msgstr "Сделать этот пул доступным в указанных группах"
+
+#: templates/ip_pool/network_list.html:21
+msgid "Kind"
+msgstr "Тип"
+
+#: templates/ip_pool/network_list.html:23
+msgid "Scope"
+msgstr "Масштаб"
+
+#: templates/ip_pool/network_list.html:39
+#: templates/ip_pool/network_list.html:44
+msgid "Edit"
+msgstr "Редактировать"
+
+#: templates/ip_pool/network_list.html:55
+msgid "Permission denied"
+msgstr "Не достаточно прав"
+
+#: templates/ip_pool/network_list.html:66
+msgid "You have not any networks available"
+msgstr "Нет ни одной доступной сети"
+
+#: templates/ip_pool/networkmodel_confirm_delete.html:9
+msgid "Remove network"
+msgstr "Удалить сеть"
+
+#: templates/ip_pool/networkmodel_confirm_delete.html:13
+#, python-format
+msgid "To delete network '%(network_name)s'?"
+msgstr "Удалить сеть '%(network_name)s'?"
+
+#: templates/ip_pool/networkmodel_confirm_delete.html:16
+msgid ""
+"Attention! All leases in that network will be removed and services finished."
+msgstr ""
+"Внимание! Все аренды ip в этой сети будут удалены, а услуги приостановлены."
+
+#: tests.py:71
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Введите валидный IPv4 или IPv6 адрес."
+
+#: tests.py:84
+#, python-format
+msgid "Select a valid choice. %(value)s is not one of the available choices."
+msgstr "Выберите правильный вариант. %(value)s не в одной из доступных вариантов."
+
+#: views.py:39
+msgid "Network successfully updated"
+msgstr "Сеть успешно обновлена"
+
+#: views.py:51
+msgid "Network has been deleted"
+msgstr "Сеть успешно удалена"
+
+#: views.py:80
+msgid "Network has been created"
+msgstr "Сеть создана"
+
+#: views.py:91
+msgid "Successfully saved"
+msgstr "Успешно сохранено"
diff --git a/tariff_app/locale/ru/LC_MESSAGES/django.po b/tariff_app/locale/ru/LC_MESSAGES/django.po
index 72211d2..8815cb3 100644
--- a/tariff_app/locale/ru/LC_MESSAGES/django.po
+++ b/tariff_app/locale/ru/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-04-24 23:27+0300\n"
+"POT-Creation-Date: 2018-08-09 15:01+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Dmitry Novikov nerosketch@gmail.com\n"
 "Language: ru\n"
@@ -19,202 +19,195 @@ msgstr ""
 "%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
 "%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: tariff_app/custom_tariffs.py:49
+#: custom_tariffs.py:13
 msgid "Base calculate functionality"
 msgstr "Базовый расчётный функционал"
 
-#: tariff_app/custom_tariffs.py:75
+#: custom_tariffs.py:60
 msgid "Private service"
 msgstr "Для внутреннего пользования"
 
-#: tariff_app/custom_tariffs.py:96
+#: custom_tariffs.py:72
+msgid "IS Daily service"
+msgstr "Услуга на сутки"
+
+#: custom_tariffs.py:91
 msgid "Default periodic pay"
 msgstr "Логика по умолчанию"
 
-#: tariff_app/custom_tariffs.py:109
+#: custom_tariffs.py:102
 msgid "Custom periodic pay"
 msgstr "Пробная логика"
 
-#: tariff_app/models.py:18
+#: models.py:18
 msgid "Service title"
 msgstr "Название тарифа"
 
-#: tariff_app/models.py:19
+#: models.py:19
 msgid "Service description"
 msgstr "Описание тарифа"
 
-#: tariff_app/models.py:20 tariff_app/templates/tariff_app/tarifs.html:17
+#: models.py:20 templates/tariff_app/tarifs.html:18
 msgid "Speed In"
 msgstr "Входящая скорость"
 
-#: tariff_app/models.py:21 tariff_app/templates/tariff_app/tarifs.html:23
+#: models.py:21 templates/tariff_app/tarifs.html:24
 msgid "Speed Out"
 msgstr "Исходящая скорость"
 
-#: tariff_app/models.py:22 tariff_app/templates/tariff_app/tarifs.html:29
+#: models.py:22 templates/tariff_app/tarifs.html:30
 msgid "Price"
 msgstr "Стоимость"
 
-#: tariff_app/models.py:23 tariff_app/templates/tariff_app/tarifs.html:33
+#: models.py:23 templates/tariff_app/tarifs.html:34
 msgid "Script"
 msgstr "Скрипт"
 
-#: tariff_app/models.py:25
+#: models.py:25
 msgid "Tech service"
 msgstr "Административный тариф"
 
-#: tariff_app/models.py:55
+#: models.py:55
 msgid "Service"
 msgstr "Услуга"
 
-#: tariff_app/models.py:56 tariff_app/templates/tariff_app/ext.html:7
-#: tariff_app/templates/tariff_app/ext.html:17
-#: tariff_app/templates/tariff_app/periodic_pays/add_edit.html:8
+#: models.py:56 templates/tariff_app/ext.html:7
+#: templates/tariff_app/ext.html:12 templates/tariff_app/ext.html:21
+#: templates/tariff_app/periodic_pays/add_edit.html:8
 msgid "Services"
 msgstr "Тарифы"
 
-#: tariff_app/models.py:60
-#: tariff_app/templates/tariff_app/periodic_pays/list.html:9
+#: models.py:61 templates/tariff_app/periodic_pays/list.html:9
 msgid "Periodic pay name"
 msgstr "Название"
 
-#: tariff_app/models.py:61
-#: tariff_app/templates/tariff_app/periodic_pays/list.html:10
+#: models.py:62 templates/tariff_app/periodic_pays/list.html:10
 msgid "When pay created"
 msgstr "Когда создан"
 
-#: tariff_app/models.py:62
-#: tariff_app/templates/tariff_app/periodic_pays/list.html:11
+#: models.py:63 templates/tariff_app/periodic_pays/list.html:11
 msgid "Script type for calculations"
 msgstr "Алгоритм расчёта"
 
-#: tariff_app/models.py:64
-#: tariff_app/templates/tariff_app/periodic_pays/list.html:12
+#: models.py:65 templates/tariff_app/periodic_pays/list.html:12
 msgid "Total amount"
 msgstr "Стоимость"
 
-#: tariff_app/models.py:103
+#: models.py:104
 msgid "Can view periodic pay"
 msgstr "Может смотреть периодические платежи"
 
-#: tariff_app/models.py:105
+#: models.py:106
 msgid "Periodic pay"
 msgstr "Периодический платёж"
 
-#: tariff_app/models.py:106 tariff_app/templates/tariff_app/ext.html:24
+#: models.py:107 templates/tariff_app/ext.html:28
 msgid "Periodic pays"
 msgstr "Периодические платежи"
 
-#: tariff_app/templates/tariff_app/editTarif.html:8
+#: templates/tariff_app/editTarif.html:8
 msgid "Tarifs"
 msgstr "Тарифы"
 
-#: tariff_app/templates/tariff_app/editTarif.html:11
-#: tariff_app/templates/tariff_app/periodic_pays/list.html:50
-#: tariff_app/templates/tariff_app/tarifs.html:77
+#: templates/tariff_app/editTarif.html:11
+#: templates/tariff_app/periodic_pays/list.html:50
+#: templates/tariff_app/tarifs.html:78
 msgid "Add"
 msgstr "Добавить"
 
-#: tariff_app/templates/tariff_app/editTarif.html:13
-#: tariff_app/templates/tariff_app/editTarif.html:22
-#: tariff_app/templates/tariff_app/periodic_pays/list.html:17
+#: templates/tariff_app/editTarif.html:13
+#: templates/tariff_app/editTarif.html:22
+#: templates/tariff_app/periodic_pays/list.html:17
 msgid "Edit"
 msgstr "Редактировать"
 
-#: tariff_app/templates/tariff_app/editTarif.html:22
-#: tariff_app/templates/tariff_app/tarifs.html:64
+#: templates/tariff_app/editTarif.html:22 templates/tariff_app/tarifs.html:65
 msgid "Create"
 msgstr "Создать"
 
-#: tariff_app/templates/tariff_app/editTarif.html:22
-#: tariff_app/templates/tariff_app/tarifs.html:11
+#: templates/tariff_app/editTarif.html:22 templates/tariff_app/tarifs.html:12
 msgid "tariff"
 msgstr "тариф"
 
-#: tariff_app/templates/tariff_app/editTarif.html:49
-#: tariff_app/templates/tariff_app/periodic_pays/add_edit.html:44
+#: templates/tariff_app/editTarif.html:51
+#: templates/tariff_app/periodic_pays/add_edit.html:47
 msgid "Save"
 msgstr "Сохранить"
 
-#: tariff_app/templates/tariff_app/editTarif.html:52
-#: tariff_app/templates/tariff_app/modal_del_warning.html:25
+#: templates/tariff_app/editTarif.html:54
 msgid "Reset"
 msgstr "Сбросить"
 
-#: tariff_app/templates/tariff_app/modal_del_warning.html:6
-msgid "Delete service"
-msgstr "Удалить тарифный план"
-
-#: tariff_app/templates/tariff_app/modal_del_warning.html:13
-msgid "Attention"
-msgstr "Внимание"
-
-#: tariff_app/templates/tariff_app/modal_del_warning.html:14
-msgid ""
-"after delete the tariff, subscribers who use that tariff will be "
-"disconnected from it."
-msgstr ""
-"После того как вы удалите тарифный план то абоненты, подписанные на него, "
-"сразу потеряют услугу по этому тарифу. Так что сначала убедитесь что уже "
-"никто не пользуется тарифом, и только после этого удалите его."
-
-#: tariff_app/templates/tariff_app/modal_del_warning.html:22
-msgid "Delete"
-msgstr "Удалить"
-
-#: tariff_app/templates/tariff_app/periodic_pays/add_edit.html:10
+#: templates/tariff_app/periodic_pays/add_edit.html:10
 msgid "Change periodic pay"
 msgstr "Может редактировать периодический платёж"
 
-#: tariff_app/templates/tariff_app/periodic_pays/add_edit.html:12
+#: templates/tariff_app/periodic_pays/add_edit.html:12
 msgid "Add new periodic pay"
 msgstr "Добавить периодический платёж"
 
-#: tariff_app/templates/tariff_app/periodic_pays/add_edit.html:29
+#: templates/tariff_app/periodic_pays/add_edit.html:32
 msgid "Pay details"
 msgstr "Подробности платежа"
 
-#: tariff_app/templates/tariff_app/periodic_pays/list.html:39
+#: templates/tariff_app/periodic_pays/list.html:39
 msgid "The list is empty"
 msgstr "Список пуст"
 
-#: tariff_app/templates/tariff_app/tarifs.html:50
+#: templates/tariff_app/tariff_confirm_delete.html:9
+msgid "Delete service"
+msgstr "Удалить тарифный план"
+
+#: templates/tariff_app/tariff_confirm_delete.html:13
+msgid "Are you sure you want to delete tariff?"
+msgstr "Вы уверены что хотите удалить тариф?"
+
+#: templates/tariff_app/tariff_confirm_delete.html:14
+msgid ""
+"after delete the tariff, subscribers who use that tariff will be "
+"disconnected from it."
+msgstr ""
+"После того как вы удалите тарифный план то абоненты, подписанные на него, "
+"сразу потеряют услугу по этому тарифу. Так что сначала убедитесь что уже "
+"никто не пользуется тарифом, и только после этого удалите его."
+
+#: templates/tariff_app/tarifs.html:51
 msgid "currency"
 msgstr "руб."
 
-#: tariff_app/templates/tariff_app/tarifs.html:62
+#: templates/tariff_app/tarifs.html:63
 msgid "Services does not exist yet"
 msgstr "Ещё нет созданных тарифов"
 
-#: tariff_app/views.py:51
+#: views.py:44
 msgid "Service has been saved"
 msgstr "Тариф успешно сохранён"
 
-#: tariff_app/views.py:54 tariff_app/views.py:106
+#: views.py:47 views.py:103
 msgid "Some fields were filled incorrect, please try again"
 msgstr "Не все поля заполнены правильно, проверте и попробуйте ещё раз"
 
-#: tariff_app/views.py:70
+#: views.py:66
 msgid "Service has been deleted"
 msgstr "Тарифный план успешно удалён"
 
-#: tariff_app/views.py:72
-msgid "Not have a confirmations of delete"
-msgstr "Нет подтверждения удаления"
-
-#: tariff_app/views.py:100
+#: views.py:97
 msgid "New periodic pay successfully created"
 msgstr "Новый периодический платёж создан"
 
-#: tariff_app/views.py:102
+#: views.py:99
 msgid "Periodic pay has been changed"
 msgstr "Периодический платёж изменён"
 
-msgid "Are you sure you want to delete tariff?"
-msgstr "Вы уверены что хотите удалить тариф?"
+msgid "Attention"
+msgstr "Внимание"
 
-msgid "IS Daily service"
-msgstr "Услуга на сутки"
+msgid "Delete"
+msgstr "Удалить"
+
+msgid "Not have a confirmations of delete"
+msgstr "Нет подтверждения удаления"
 
-msgid "Service with this Speed In, Speed Out, Price and Script already exists."
+msgid ""
+"Service with this Speed In, Speed Out, Price and Script already exists."
 msgstr "Услуга с такой скоростью, ценой и логикой уже есть"