diff --git a/abonapp/forms.py b/abonapp/forms.py index 140f310..bc3d14d 100644 --- a/abonapp/forms.py +++ b/abonapp/forms.py @@ -168,7 +168,7 @@ class ExportUsersForm(forms.Form): ('is_active', _('Is active')), ('telephone', _('Telephone')), ('current_tariff__tariff__title', _('Service title')), - ('ballance', _('Ballance')), + ('ballance', _('Balance')), ('device__comment', _('Device')), ('dev_port__descr', _('Device port')), ('is_dynamic_ip', _('Is dynamic ip')) diff --git a/abonapp/locale/ru/LC_MESSAGES/django.po b/abonapp/locale/ru/LC_MESSAGES/django.po index e7dc540..4b0c8b5 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-02-14 14:03+0300\n" +"POT-Creation-Date: 2018-04-24 23:27+0300\n" "Last-Translator: Dmitry Novikov nerosketch@gmail.com\n" "Language: ru\n" "MIME-Version: 1.0\n" @@ -17,1017 +17,1058 @@ 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" -#: forms.py:46 templates/abonapp/addAbon.html:21 -#: templates/abonapp/viewAbon.html:28 +#: abonapp/forms.py:53 abonapp/forms.py:56 msgid "login" msgstr "Логин" -#: forms.py:60 forms.py:165 templates/abonapp/peoples.html:37 -#: templates/abonapp/viewAbon.html:32 +#: abonapp/forms.py:60 abonapp/templates/abonapp/addAbon.html:43 +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 msgid "fio" msgstr "ФИО" -#: forms.py:65 forms.py:147 +#: abonapp/forms.py:75 abonapp/forms.py:144 msgid "telephone placeholder" msgstr "+[7,8,9,3] и 10,11 цифр" -#: forms.py:164 +#: abonapp/forms.py:161 msgid "profile username" msgstr "Логин" -#: forms.py:166 models.py:109 templates/abonapp/editAbon.html:39 -#: templates/abonapp/viewAbon.html:50 -msgid "Ip Address" -msgstr "IP Адрес" - -#: forms.py:167 models.py:157 templates/abonapp/addAbon.html:53 -#: templates/abonapp/addInvoice.html:40 templates/abonapp/debtors.html:22 -#: templates/abonapp/invoiceForPayment.html:23 templates/abonapp/log.html:20 -#: templates/abonapp/payHistory.html:12 templates/abonapp/task_log.html:10 +#: 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 msgid "Comment" msgstr "Комментарий" -#: forms.py:168 models.py:99 models.py:158 templates/abonapp/addAbon.html:59 -#: templates/abonapp/peoples.html:43 templates/abonapp/viewAbon.html:40 +#: abonapp/forms.py:165 abonapp/models.py:83 abonapp/models.py:141 +#: abonapp/templates/abonapp/peoples.html:46 msgid "Street" msgstr "Улица" -#: forms.py:169 models.py:159 templates/abonapp/viewAbon.html:46 +#: abonapp/forms.py:166 abonapp/models.py:142 msgid "House" msgstr "Дом" -#: forms.py:170 +#: abonapp/forms.py:167 msgid "birth day" msgstr "День рождения" -#: forms.py:171 templates/abonapp/viewAbon.html:22 +#: abonapp/forms.py:168 msgid "Is active" msgstr "Активен" -#: forms.py:172 models.py:410 templates/abonapp/addAbon.html:37 -#: templates/abonapp/editAbon.html:19 templates/abonapp/modal_add_phone.html:10 -#: templates/abonapp/modal_additional_telephones.html:14 -#: templates/abonapp/modal_phonebook.html:10 templates/abonapp/peoples.html:53 -#: templates/abonapp/viewAbon.html:36 +#: 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 msgid "Telephone" msgstr "Телефон" -#: forms.py:173 +#: abonapp/forms.py:170 msgid "Service title" msgstr "Название тарифа" -#: forms.py:174 templates/abonapp/peoples.html:57 -msgid "Ballance" +#: abonapp/forms.py:171 abonapp/templates/abonapp/peoples.html:60 +msgid "Balance" msgstr "Балланс" -#: forms.py:175 templates/abonapp/editAbon.html:122 +#: abonapp/forms.py:172 abonapp/templates/abonapp/editAbon.html:134 +#: abonapp/templates/abonapp/editAbon.html:145 msgid "Device" msgstr "Устройство" -#: forms.py:176 templates/abonapp/editAbon.html:141 +#: abonapp/forms.py:173 abonapp/templates/abonapp/editAbon.html:164 msgid "Device port" msgstr "Порт устройства" -#: forms.py:177 +#: abonapp/forms.py:174 msgid "Is dynamic ip" msgstr "Динамический ip" -#: forms.py:181 +#: abonapp/forms.py:178 msgid "Fields" msgstr "Поля" -#: models.py:33 -msgid "Abon group" -msgstr "Группа абонентов" - -#: models.py:34 -msgid "Abon groups" -msgstr "Группы абонентов" - -#: models.py:51 +#: abonapp/models.py:35 msgid "Can view subscriber logs" msgstr "Может видеть логи абонента" -#: models.py:83 +#: abonapp/models.py:67 msgid "finish service perm" msgstr "Снятие со счёта средств" -#: models.py:85 +#: abonapp/models.py:69 msgid "Abon service" msgstr "Услуга абонента" -#: models.py:86 +#: abonapp/models.py:70 msgid "Abon services" msgstr "Услуги абонентов" -#: models.py:100 templates/abonapp/peoples.html:155 +#: abonapp/models.py:84 abonapp/templates/abonapp/peoples.html:158 msgid "Streets" msgstr "Улицы" -#: models.py:106 +#: abonapp/models.py:90 msgid "Digital field" msgstr "Цифровое поле" -#: models.py:107 +#: abonapp/models.py:91 msgid "Text field" msgstr "Текстовое поле" -#: models.py:108 +#: abonapp/models.py:92 msgid "Floating field" msgstr "Дробное с плавающей точкой" -#: models.py:134 +#: abonapp/models.py:118 msgid "Double invalid value" msgstr "Введите число с плавающей запятой" -#: models.py:154 templates/abonapp/addAbon.html:45 -#: templates/abonapp/modal_addstreet.html:21 templates/abonapp/viewAbon.html:16 +#: abonapp/models.py:137 abonapp/templates/abonapp/modal_addstreet.html:21 msgid "User group" msgstr "Группа" -#: models.py:166 +#: abonapp/models.py:149 msgid "Donkey" msgstr "Ослик" -#: models.py:167 +#: abonapp/models.py:150 msgid "Fire" msgstr "Огонь" -#: models.py:168 +#: abonapp/models.py:151 msgid "Ok" msgstr "" -#: models.py:169 +#: abonapp/models.py:152 msgid "King" msgstr "Король" -#: models.py:170 +#: abonapp/models.py:153 msgid "TV" msgstr "Теле" -#: models.py:171 +#: abonapp/models.py:154 msgid "Smile" msgstr "Улыбка" -#: models.py:172 +#: abonapp/models.py:155 msgid "Dollar" msgstr "Доллар" -#: models.py:173 templates/abonapp/peoples.html:54 -#: templates/abonapp/service.html:16 templates/abonapp/service.html:75 +#: abonapp/models.py:156 abonapp/templates/abonapp/peoples.html:57 +#: abonapp/templates/abonapp/service.html:16 +#: abonapp/templates/abonapp/service.html:75 msgid "Service" msgstr "Услуга" -#: models.py:174 +#: abonapp/models.py:157 msgid "Marker" msgstr "Маркер" -#: models.py:196 +#: abonapp/models.py:179 msgid "Buy service perm" msgstr "Покупка тарифа абоненту" -#: models.py:197 +#: abonapp/models.py:180 msgid "Can view passport" msgstr "Может просматривать паспортные данные" -#: models.py:198 +#: abonapp/models.py:181 msgid "fill account" msgstr "Пополнение счёта" -#: models.py:199 +#: abonapp/models.py:182 msgid "Can ping" msgstr "Может пинговать" -#: models.py:203 +#: abonapp/models.py:186 msgid "Abon" msgstr "Абонент" -#: models.py:204 +#: abonapp/models.py:187 msgid "Abons" msgstr "Абоненты" -#: models.py:235 +#: abonapp/models.py:207 +msgid "User that is no staff can not buy admin services" +msgstr "" +"Этот пользователь не является сотрудником и не может назначать " +"административные услуги" + +#: abonapp/models.py:212 msgid "That service already activated" msgstr "Эта услуга уже подключена" -#: models.py:238 +#: abonapp/models.py:215 msgid "Service already activated" msgstr "Услуга уже подключена" -#: models.py:242 +#: abonapp/models.py:219 msgid "not enough money" msgstr "Не хватает денег на счету" -#: models.py:257 +#: abonapp/models.py:234 msgid "Buy service default log" msgstr "Покупка тарифного плана через админку" -#: models.py:298 +#: abonapp/models.py:276 msgid "Ip address already exist" msgstr "Такой ip уже у кого-то есть" -#: models.py:311 models.py:312 +#: abonapp/models.py:295 +msgid "Pasport serial" +msgstr "Серия пас." + +#: abonapp/models.py:296 +msgid "Pasport number" +msgstr "Номер пас." + +#: abonapp/models.py:297 +msgid "Distributor" +msgstr "Кем выдан" + +#: abonapp/models.py:303 abonapp/models.py:304 msgid "Passport Info" msgstr "Паспортные данные" -#: models.py:341 +#: abonapp/models.py:333 msgid "Can view invoice for payment" msgstr "Может видеть назначенные платежи" -#: models.py:343 +#: abonapp/models.py:335 msgid "Debt" msgstr "Квитанция (долг)" -#: models.py:344 templates/abonapp/invoiceForPayment.html:10 -#: templates/abonapp/payHistory.html:48 +#: abonapp/models.py:336 abonapp/templates/abonapp/invoiceForPayment.html:10 +#: abonapp/templates/abonapp/payHistory.html:48 msgid "Debts" msgstr "Квитанции (долги)" -#: models.py:367 +#: abonapp/models.py:358 msgid "Trade point" msgstr "Терминал" -#: models.py:368 +#: abonapp/models.py:359 msgid "Receipt number" msgstr "Номер пас." -#: models.py:423 +#: abonapp/models.py:414 msgid "Can view additional telephones" msgstr "Может видеть дополнительные телефоны" -#: models.py:425 +#: abonapp/models.py:416 msgid "Additional telephone" msgstr "Дополнительный телефон" -#: models.py:426 templates/abonapp/editAbon.html:27 -#: templates/abonapp/modal_additional_telephones.html:5 +#: abonapp/models.py:417 abonapp/templates/abonapp/editAbon.html:28 +#: abonapp/templates/abonapp/modal_additional_telephones.html:4 msgid "Additional telephones" msgstr "Дополнительные телефоны" -#: models.py:430 templates/abonapp/service.html:122 +#: abonapp/models.py:421 abonapp/templates/abonapp/service.html:122 msgid "Periodic pay" msgstr "Периодический платёж" -#: models.py:431 +#: abonapp/models.py:422 msgid "Last pay time" msgstr "Последний платёж" -#: models.py:432 templates/abonapp/service.html:131 +#: abonapp/models.py:423 abonapp/templates/abonapp/service.html:131 msgid "Next time to pay" msgstr "Следующий платёж" -#: models.py:433 +#: abonapp/models.py:424 msgid "Account" msgstr "Учётная запись" -#: models.py:450 +#: abonapp/models.py:438 #, python-format msgid "Charge for \"%(service)s\"" msgstr "Плата за \"%(service)s\"" -#: templates/abonapp/addAbon.html:7 templates/abonapp/addGroup.html:7 -#: templates/abonapp/addInvoice.html:7 templates/abonapp/buy_tariff.html:7 -#: templates/abonapp/debtors.html:8 templates/abonapp/group_list.html:7 -#: templates/abonapp/group_list.html:10 templates/abonapp/group_list.html:46 -#: 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 +#: abonapp/templates/abonapp/abon_confirm_delete.html:5 +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 msgid "User groups" msgstr "Группы абонентов" -#: templates/abonapp/addAbon.html:9 templates/abonapp/addAbon.html:16 -#: templates/abonapp/peoples.html:123 templates/abonapp/peoples.html:135 +#: abonapp/templates/abonapp/addAbon.html:10 +#: abonapp/templates/abonapp/addAbon.html:17 +#: abonapp/templates/abonapp/peoples.html:127 +#: abonapp/templates/abonapp/peoples.html:140 msgid "Add abon" msgstr "Добавить абонента" -#: templates/abonapp/addAbon.html:29 -msgid "Long name" -msgstr "Фамилия и Имя" - -#: templates/abonapp/addAbon.html:67 templates/abonapp/peoples.html:49 -msgid "Apartment" -msgstr "Квартира" - -#: templates/abonapp/addAbon.html:76 templates/abonapp/editAbon.html:58 -#: templates/abonapp/viewAbon.html:54 -msgid "Password" -msgstr "Пароль" - -#: templates/abonapp/addAbon.html:91 templates/abonapp/addGroup.html:29 -#: templates/abonapp/addInvoice.html:46 templates/abonapp/buy_tariff.html:71 -#: templates/abonapp/editAbon.html:76 templates/abonapp/editAbon.html:165 -#: templates/abonapp/editAbon.html:210 templates/abonapp/group_tariffs.html:29 -#: templates/abonapp/modal_dev.html:31 -#: templates/abonapp/modal_editstreet.html:30 -#: templates/abonapp/modal_user_markers.html:28 -#: templates/abonapp/passport_view.html:49 +#: 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 msgid "Save" msgstr "Сохранить" -#: templates/abonapp/addAbon.html:94 templates/abonapp/addGroup.html:32 -#: templates/abonapp/addInvoice.html:49 templates/abonapp/buy_tariff.html:74 -#: templates/abonapp/group_tariffs.html:29 -#: templates/abonapp/modal_abonamount.html:25 -#: 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_extra_field.html:40 -#: templates/abonapp/modal_periodic_pay.html:31 +#: 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 msgid "Reset" msgstr "Сбросить" -#: templates/abonapp/addGroup.html:8 templates/abonapp/addGroup.html:15 -#: templates/abonapp/group_list.html:62 -msgid "Add group" -msgstr "Добавьте группу абонентов" - -#: templates/abonapp/addGroup.html:20 templates/abonapp/group_list.html:21 -msgid "Group title" -msgstr "Название группы" - -#: templates/abonapp/addInvoice.html:10 -#: templates/abonapp/invoiceForPayment.html:61 +#: abonapp/templates/abonapp/addInvoice.html:10 +#: abonapp/templates/abonapp/invoiceForPayment.html:61 msgid "Add debt" msgstr "Добавить квитанцию" -#: templates/abonapp/addInvoice.html:17 +#: abonapp/templates/abonapp/addInvoice.html:17 msgid "Add receipt for" msgstr "Добавьте платёж на оплату для" -#: templates/abonapp/addInvoice.html:25 templates/abonapp/debtors.html:21 +#: abonapp/templates/abonapp/addInvoice.html:25 +#: abonapp/templates/abonapp/debtors.html:21 msgid "Sum of pay" msgstr "Сумма для платежа" -#: templates/abonapp/addInvoice.html:36 -#: templates/abonapp/invoiceForPayment.html:20 +#: abonapp/templates/abonapp/addInvoice.html:36 +#: abonapp/templates/abonapp/invoiceForPayment.html:20 msgid "Pay status" msgstr "Статус оплаты" -#: templates/abonapp/buy_tariff.html:10 templates/abonapp/buy_tariff.html:26 -#: templates/abonapp/service.html:74 +#: abonapp/templates/abonapp/buy_tariff.html:10 +#: abonapp/templates/abonapp/buy_tariff.html:26 +#: abonapp/templates/abonapp/service.html:74 msgid "Pick a service" msgstr "Заказать услугу" -#: templates/abonapp/buy_tariff.html:17 +#: abonapp/templates/abonapp/buy_tariff.html:17 msgid "Pick a service for" msgstr "Купить новую услугу (заказать тариф) для" -#: templates/abonapp/buy_tariff.html:18 templates/abonapp/debtors.html:20 -#: templates/abonapp/log.html:19 templates/abonapp/peoples.html:24 +#: 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 msgid "Sub" msgstr "Абонент" -#: templates/abonapp/buy_tariff.html:36 templates/abonapp/group_tariffs.html:24 -#: templates/abonapp/service.html:31 templates/abonapp/service.html:96 +#: 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 msgid "currency" msgstr "руб" -#: templates/abonapp/buy_tariff.html:61 templates/abonapp/service.html:102 +#: abonapp/templates/abonapp/buy_tariff.html:61 +#: abonapp/templates/abonapp/service.html:102 msgid "This group has no services" msgstr "У этой группы нет услуг" -#: templates/abonapp/buy_tariff.html:63 +#: abonapp/templates/abonapp/buy_tariff.html:63 msgid "Attach serices to groups" msgstr "Привязать услуги к группам" -#: templates/abonapp/charts.html:9 +#: abonapp/templates/abonapp/charts.html:9 #, python-format msgid "Graph of use by %(wantdate_d)s" msgstr "График использования за %(wantdate_d)s" -#: templates/abonapp/charts.html:17 +#: abonapp/templates/abonapp/charts.html:44 +msgid "Static info was Not found" +msgstr "Статистика не найдена" + +#: abonapp/templates/abonapp/charts.html:49 msgid "Show graph by date" msgstr "Показать график по дате" -#: templates/abonapp/charts.html:20 +#: abonapp/templates/abonapp/charts.html:52 msgid "Choose a date" msgstr "Выберите дату" -#: templates/abonapp/charts.html:55 -msgid "Static info was Not found" -msgstr "Статистика не найдена" - -#: templates/abonapp/debtors.html:9 +#: abonapp/templates/abonapp/debtors.html:9 msgid "Debtors" msgstr "Должники" -#: templates/abonapp/debtors.html:14 +#: abonapp/templates/abonapp/debtors.html:14 msgid "People with debts" msgstr "Народ, у которого есть неоплаченные услуги" -#: templates/abonapp/debtors.html:23 -#: templates/abonapp/invoiceForPayment.html:24 -#: templates/abonapp/task_log.html:13 +#: abonapp/templates/abonapp/debtors.html:23 +#: abonapp/templates/abonapp/invoiceForPayment.html:24 +#: abonapp/templates/abonapp/task_log.html:13 msgid "Date of make" msgstr "Дата создания" -#: templates/abonapp/debtors.html:24 templates/abonapp/log.html:22 -#: templates/abonapp/task_log.html:8 +#: abonapp/templates/abonapp/debtors.html:24 +#: abonapp/templates/abonapp/log.html:22 +#: abonapp/templates/abonapp/task_log.html:8 msgid "Author" msgstr "Автор" -#: templates/abonapp/debtors.html:42 +#: abonapp/templates/abonapp/debtors.html:42 msgid "Debts not found" msgstr "Нет должников" -#: templates/abonapp/dial_log.html:8 +#: abonapp/templates/abonapp/dial_log.html:8 msgid "Play" msgstr "Слушать" -#: templates/abonapp/dial_log.html:9 +#: abonapp/templates/abonapp/dial_log.html:9 msgid "calldate" msgstr "дата звонка" -#: templates/abonapp/dial_log.html:10 +#: abonapp/templates/abonapp/dial_log.html:10 msgid "src" msgstr "кто" -#: templates/abonapp/dial_log.html:11 +#: abonapp/templates/abonapp/dial_log.html:11 msgid "dst" msgstr "куда" -#: templates/abonapp/dial_log.html:12 +#: abonapp/templates/abonapp/dial_log.html:12 msgid "duration" msgstr "прод." -#: templates/abonapp/dial_log.html:13 +#: abonapp/templates/abonapp/dial_log.html:13 msgid "start" msgstr "начало" -#: templates/abonapp/dial_log.html:14 +#: abonapp/templates/abonapp/dial_log.html:14 msgid "answer" msgstr "ответ" -#: templates/abonapp/dial_log.html:15 +#: abonapp/templates/abonapp/dial_log.html:15 msgid "end" msgstr "конец" -#: templates/abonapp/dial_log.html:16 +#: abonapp/templates/abonapp/dial_log.html:16 msgid "disposition" msgstr "состояние" -#: templates/abonapp/dial_log.html:38 +#: abonapp/templates/abonapp/dial_log.html:38 msgid "Calls was not found" msgstr "Звонки не найдены" -#: templates/abonapp/editAbon.html:10 +#: abonapp/templates/abonapp/editAbon.html:10 msgid "Change subscriber" msgstr "Изменение абонента" -#: templates/abonapp/editAbon.html:24 +#: abonapp/templates/abonapp/editAbon.html:25 msgid "Call to" msgstr "Позвонить" -#: templates/abonapp/editAbon.html:30 templates/abonapp/modal_add_phone.html:5 +#: abonapp/templates/abonapp/editAbon.html:32 +#: abonapp/templates/abonapp/modal_add_phone.html:5 msgid "Add telephone" msgstr "Добавить номер телефона" -#: templates/abonapp/editAbon.html:42 templates/abonapp/editAbon.html:125 -#: templates/abonapp/editAbon.html:144 templates/abonapp/editAbon.html:188 -#: templates/abonapp/peoples.html:90 templates/abonapp/peoples.html:92 -#: templates/abonapp/viewAbon.html:18 templates/abonapp/viewAbon.html:29 -#: templates/abonapp/viewAbon.html:33 templates/abonapp/viewAbon.html:37 -#: templates/abonapp/viewAbon.html:42 templates/abonapp/viewAbon.html:47 -#: templates/abonapp/viewAbon.html:51 -msgid "Not assigned" -msgstr "<Не назначен>" - -#: templates/abonapp/editAbon.html:44 +#: abonapp/templates/abonapp/editAbon.html:42 msgid "Reset ip" msgstr "Сбросить ip" -#: templates/abonapp/editAbon.html:80 templates/abonapp/editAbon.html:81 +#: abonapp/templates/abonapp/editAbon.html:85 +#: abonapp/templates/abonapp/editAbon.html:87 +#: abonapp/templates/abonapp/editAbon.html:92 msgid "Add new task" msgstr "Добавить задачу" -#: templates/abonapp/editAbon.html:95 +#: abonapp/templates/abonapp/editAbon.html:90 +#: abonapp/templates/abonapp/editAbon.html:102 +#: abonapp/templates/abonapp/editAbon.html:117 +#: abonapp/templates/abonapp/payHistory.html:43 +msgid "Permission denied" +msgstr "Доступ запрещён" + +#: abonapp/templates/abonapp/editAbon.html:108 msgid "No have ip" msgstr "Нет ip адреса" -#: templates/abonapp/editAbon.html:101 +#: abonapp/templates/abonapp/editAbon.html:114 +#: abonapp/templates/abonapp/editAbon.html:118 msgid "Send sms" msgstr "Отправить смс" -#: templates/abonapp/editAbon.html:115 templates/abonapp/modal_dev.html:13 +#: abonapp/templates/abonapp/editAbon.html:136 +#: abonapp/templates/abonapp/modal_dev.html:13 msgid "Select the device" msgstr "Выберите устройство" -#: templates/abonapp/editAbon.html:125 +#: abonapp/templates/abonapp/editAbon.html:148 msgid "Mac Address" msgstr "Мак" -#: templates/abonapp/editAbon.html:129 +#: 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 +msgid "Not assigned" +msgstr "<Не назначен>" + +#: abonapp/templates/abonapp/editAbon.html:152 msgid "Remove clutch" msgstr "Удалить муфту" -#: templates/abonapp/editAbon.html:133 templates/abonapp/modal_dev.html:6 +#: abonapp/templates/abonapp/editAbon.html:156 +#: abonapp/templates/abonapp/modal_dev.html:6 msgid "Add clutch" msgstr "Добавить муфту" -#: templates/abonapp/editAbon.html:158 +#: abonapp/templates/abonapp/editAbon.html:181 msgid "Is dynamic network settings" msgstr "Динамические настройки по dhcp" -#: templates/abonapp/editAbon.html:177 +#: abonapp/templates/abonapp/editAbon.html:200 msgid "Extra fields" msgstr "Динамические записи" -#: templates/abonapp/editAbon.html:191 -#: templates/abonapp/modal_additional_telephones.html:24 -msgid "Delete" -msgstr "Удалить" - -#: templates/abonapp/editAbon.html:200 views.py:686 +#: abonapp/templates/abonapp/editAbon.html:223 abonapp/views.py:714 msgid "Extra field does not exist" msgstr "Поле не найдено" -#: templates/abonapp/editAbon.html:205 -#: templates/abonapp/modal_extra_field.html:6 +#: abonapp/templates/abonapp/editAbon.html:228 +#: abonapp/templates/abonapp/modal_extra_field.html:6 msgid "Add extra field" msgstr "Добавить новое динамическое поле" -#: templates/abonapp/editAbon.html:206 -#: templates/abonapp/modal_add_phone.html:27 -#: templates/abonapp/modal_addstreet.html:30 -#: templates/abonapp/modal_extra_field.html:37 -#: templates/abonapp/modal_periodic_pay.html:28 -#: templates/abonapp/peoples.html:134 templates/abonapp/peoples.html:164 +#: 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 msgid "Add" msgstr "Добавить" -#: templates/abonapp/editAbon.html:221 templates/abonapp/viewAbon.html:67 +#: abonapp/templates/abonapp/editAbon.html:244 msgid "User flags" msgstr "Флаги абонента" -#: templates/abonapp/editAbon.html:231 templates/abonapp/peoples.html:167 +#: abonapp/templates/abonapp/editAbon.html:254 +#: abonapp/templates/abonapp/peoples.html:170 msgid "Edit" msgstr "Редактировать" -#: templates/abonapp/fin_report.html:7 templates/abonapp/group_list.html:77 +#: abonapp/templates/abonapp/fin_report.html:7 +#: abonapp/templates/abonapp/group_list.html:65 msgid "Fin report" msgstr "Финансовый отчёт" -#: templates/abonapp/fin_report.html:12 +#: abonapp/templates/abonapp/fin_report.html:12 msgid "Money by days" msgstr "Сумма денег за сутки" -#: templates/abonapp/fin_report.html:17 -#: templates/abonapp/invoiceForPayment.html:22 templates/abonapp/log.html:18 -#: templates/abonapp/payHistory.html:9 templates/abonapp/service.html:30 +#: 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 msgid "Sum" msgstr "Сумма" -#: templates/abonapp/fin_report.html:18 templates/abonapp/log.html:21 +#: abonapp/templates/abonapp/fin_report.html:18 +#: abonapp/templates/abonapp/log.html:21 msgid "Date" msgstr "Время" -#: templates/abonapp/fin_report.html:29 +#: abonapp/templates/abonapp/fin_report.html:29 msgid "Pays not found" msgstr "Нет платежей" -#: templates/abonapp/fin_report.html:38 -#: templates/abonapp/modal_phonebook.html:30 +#: abonapp/templates/abonapp/fin_report.html:38 +#: abonapp/templates/abonapp/modal_phonebook.html:30 msgid "Export to csv" msgstr "Сохранить в csv" -#: templates/abonapp/group_list.html:26 +#: abonapp/templates/abonapp/group_list.html:21 +msgid "Group title" +msgstr "Название группы" + +#: abonapp/templates/abonapp/group_list.html:26 msgid "Number of subscribers" msgstr "Количество абонентов" -#: templates/abonapp/group_list.html:53 +#: abonapp/templates/abonapp/group_list.html:46 msgid "Groups was not found" msgstr "Ещё нет групп" -#: templates/abonapp/group_list.html:67 templates/abonapp/log.html:8 +#: abonapp/templates/abonapp/group_list.html:55 +#: abonapp/templates/abonapp/log.html:8 msgid "Subscribers actions" msgstr "История действий абонентов" -#: templates/abonapp/group_list.html:72 +#: abonapp/templates/abonapp/group_list.html:60 msgid "List of debtors" msgstr "Список должников" -#: templates/abonapp/group_tariffs.html:9 -#: templates/abonapp/group_tariffs.html:14 +#: abonapp/templates/abonapp/group_tariffs.html:9 +#: abonapp/templates/abonapp/group_tariffs.html:14 msgid "Belonging services for groups" msgstr "Принадлежность услуг к группам" -#: templates/abonapp/invoiceForPayment.html:15 +#: abonapp/templates/abonapp/invoiceForPayment.html:15 msgid "Debtor" msgstr "Должник" -#: templates/abonapp/invoiceForPayment.html:21 +#: abonapp/templates/abonapp/invoiceForPayment.html:21 msgid "Month" msgstr "Месяц" -#: templates/abonapp/invoiceForPayment.html:25 -#: templates/abonapp/payHistory.html:10 +#: abonapp/templates/abonapp/invoiceForPayment.html:25 +#: abonapp/templates/abonapp/payHistory.html:10 msgid "Date of payment" msgstr "Дата оплаты" -#: templates/abonapp/invoiceForPayment.html:26 -#: templates/abonapp/payHistory.html:11 +#: abonapp/templates/abonapp/invoiceForPayment.html:26 +#: abonapp/templates/abonapp/payHistory.html:11 msgid "Author of payment" msgstr "Назначил" -#: templates/abonapp/invoiceForPayment.html:45 +#: abonapp/templates/abonapp/invoiceForPayment.html:45 msgid "Created paid,Not yet paid" msgstr "Создан оплаченным,Ещё не оплачено" -#: templates/abonapp/invoiceForPayment.html:52 +#: abonapp/templates/abonapp/invoiceForPayment.html:52 msgid "Receipts not found" msgstr "Назначенные платежи отсутствуют" -#: templates/abonapp/log.html:13 +#: abonapp/templates/abonapp/log.html:13 msgid "History of subscriber" msgstr "История абонента" -#: templates/abonapp/log.html:46 +#: abonapp/templates/abonapp/log.html:51 msgid "Actions not found" msgstr "Нет событий" -#: templates/abonapp/modal_abonamount.html:6 +#: abonapp/templates/abonapp/modal_abonamount.html:5 msgid "Additional sum" msgstr "Начисление средств на счёт" -#: templates/abonapp/modal_abonamount.html:11 +#: abonapp/templates/abonapp/modal_abonamount.html:10 msgid "Amount of money" msgstr "Количество денег" -#: templates/abonapp/modal_abonamount.html:22 +#: abonapp/templates/abonapp/modal_abonamount.html:21 msgid "Refill" msgstr "Пополнить" -#: templates/abonapp/modal_add_phone.html:18 -#: templates/abonapp/modal_additional_telephones.html:13 -#: templates/abonapp/modal_phonebook.html:11 +#: abonapp/templates/abonapp/modal_add_phone.html:18 +#: abonapp/templates/abonapp/modal_additional_telephones.html:12 +#: abonapp/templates/abonapp/modal_phonebook.html:11 msgid "Telephone owner" msgstr "Владелец телефона" -#: templates/abonapp/modal_additional_telephones.html:31 +#: abonapp/templates/abonapp/modal_additional_telephones.html:30 msgid "Additional telephones not found" msgstr "Дополнительные телефоны не найдены" -#: templates/abonapp/modal_addstreet.html:5 templates/abonapp/peoples.html:163 +#: abonapp/templates/abonapp/modal_addstreet.html:5 +#: abonapp/templates/abonapp/peoples.html:166 msgid "Add street" msgstr "Добавить улицу" -#: templates/abonapp/modal_addstreet.html:12 +#: abonapp/templates/abonapp/modal_addstreet.html:12 msgid "Street title" msgstr "Название улицы" -#: templates/abonapp/modal_editstreet.html:5 templates/abonapp/peoples.html:166 +#: abonapp/templates/abonapp/modal_editstreet.html:5 +#: abonapp/templates/abonapp/peoples.html:169 msgid "Edit streets" msgstr "Редактировать улицы" -#: templates/abonapp/modal_editstreet.html:25 +#: abonapp/templates/abonapp/modal_editstreet.html:25 msgid "Streets has not been found" msgstr "Улицы не найдены" -#: templates/abonapp/modal_export.html:6 +#: abonapp/templates/abonapp/modal_export.html:6 msgid "Select the fields" msgstr "Выберите поля" -#: templates/abonapp/modal_export.html:11 +#: abonapp/templates/abonapp/modal_export.html:11 msgid "Export" msgstr "Экспорт" -#: templates/abonapp/modal_extra_field.html:11 +#: abonapp/templates/abonapp/modal_extra_field.html:11 msgid "Field title" msgstr "Название поля" -#: templates/abonapp/modal_extra_field.html:20 +#: abonapp/templates/abonapp/modal_extra_field.html:20 msgid "Field type" msgstr "Тип динамического поля" -#: templates/abonapp/modal_extra_field.html:28 +#: abonapp/templates/abonapp/modal_extra_field.html:28 msgid "Field content" msgstr "Содержимое динамического поля" -#: templates/abonapp/modal_periodic_pay.html:6 -#: templates/abonapp/service.html:139 +#: abonapp/templates/abonapp/modal_periodic_pay.html:6 +#: abonapp/templates/abonapp/service.html:139 msgid "Add periodic pay" msgstr "Добавить периодический платёж" -#: templates/abonapp/modal_phonebook.html:4 templates/abonapp/peoples.html:142 +#: abonapp/templates/abonapp/modal_phonebook.html:4 +#: abonapp/templates/abonapp/peoples.html:147 msgid "Phonebook" msgstr "Телефонная книга" -#: templates/abonapp/modal_phonebook.html:22 +#: abonapp/templates/abonapp/modal_phonebook.html:22 msgid "Telephone numbers not found" msgstr "Номера телефонов не найдены" -#: templates/abonapp/modal_user_markers.html:6 -#: templates/abonapp/modal_user_markers.html:12 -#: templates/abonapp/peoples.html:61 +#: abonapp/templates/abonapp/modal_user_markers.html:6 +#: abonapp/templates/abonapp/modal_user_markers.html:12 +#: abonapp/templates/abonapp/peoples.html:64 msgid "Markers" msgstr "Метки" -#: templates/abonapp/passport_view.html:9 +#: abonapp/templates/abonapp/passport_view.html:10 msgid "Passport information" msgstr "Паспортные данные" -#: templates/abonapp/passport_view.html:15 -msgid "Pasport serial" -msgstr "Серия пас." - -#: templates/abonapp/passport_view.html:21 -msgid "Pasport number" -msgstr "Номер пас." - -#: templates/abonapp/passport_view.html:27 -msgid "Distributor" -msgstr "Кем выдан" - -#: templates/abonapp/passport_view.html:33 +#: abonapp/templates/abonapp/passport_view.html:20 msgid "Date of acceptance" msgstr "Дата выдачи" -#: templates/abonapp/payHistory.html:24 +#: abonapp/templates/abonapp/payHistory.html:24 msgid "System" msgstr "Система" -#: templates/abonapp/payHistory.html:31 +#: abonapp/templates/abonapp/payHistory.html:31 msgid "Payment history is empty" msgstr "История платежей пуста" -#: templates/abonapp/payHistory.html:40 templates/abonapp/payHistory.html:44 +#: abonapp/templates/abonapp/payHistory.html:40 +#: abonapp/templates/abonapp/payHistory.html:44 msgid "Fill account" msgstr "Пополнить счёт" -#: templates/abonapp/payHistory.html:43 -msgid "Permission denied" -msgstr "Доступ запрещён" - -#: templates/abonapp/peoples.html:14 +#: abonapp/templates/abonapp/peoples.html:18 msgid "The people in the selected group" msgstr "Народ в выбранной группе" -#: templates/abonapp/peoples.html:28 +#: abonapp/templates/abonapp/peoples.html:31 msgid "Last traffic" msgstr "Траф." -#: templates/abonapp/peoples.html:31 +#: abonapp/templates/abonapp/peoples.html:34 msgid "Ip address" msgstr "IP Адрес" -#: templates/abonapp/peoples.html:121 +#: abonapp/templates/abonapp/peoples.html:52 +msgid "Apartment" +msgstr "Квартира" + +#: abonapp/templates/abonapp/peoples.html:125 msgid "Subscribers not found" msgstr "Абоненты не найдены" -#: templates/abonapp/peoples.html:139 templates/abonapp/service.html:104 +#: abonapp/templates/abonapp/peoples.html:144 +#: abonapp/templates/abonapp/service.html:104 msgid "Tariffs in groups" msgstr "Тарифы в группах" -#: templates/abonapp/peoples.html:145 +#: abonapp/templates/abonapp/peoples.html:150 msgid "Export users" msgstr "Экспорт абонентов" -#: templates/abonapp/peoples.html:160 +#: abonapp/templates/abonapp/peoples.html:163 msgid "No streets found for that group" msgstr "Не найдены улицы для группы" -#: templates/abonapp/service.html:10 +#: abonapp/templates/abonapp/service.html:10 msgid "Subscriber's service" msgstr "Текущая услуга абонента" -#: templates/abonapp/service.html:27 +#: abonapp/templates/abonapp/service.html:27 msgid "We have a problem in DB: AbonTariff instance has no related to service" msgstr "У нас проблема с БД: экземпляр AbonTariff не имеет отношения к тарифу" -#: templates/abonapp/service.html:33 +#: abonapp/templates/abonapp/service.html:33 msgid "Input speed" msgstr "Входящая скорость" -#: templates/abonapp/service.html:36 +#: abonapp/templates/abonapp/service.html:36 msgid "Output speed" msgstr "Исходящая скорость" -#: templates/abonapp/service.html:39 +#: abonapp/templates/abonapp/service.html:39 msgid "Date of start" msgstr "Дата начала" -#: templates/abonapp/service.html:42 +#: abonapp/templates/abonapp/service.html:42 msgid "Works until" msgstr "Действует до" -#: templates/abonapp/service.html:51 +#: abonapp/templates/abonapp/service.html:51 msgid "Subscriber has no service" msgstr "У абонента нет услуги" -#: templates/abonapp/service.html:53 +#: abonapp/templates/abonapp/service.html:53 msgid "Buy service" msgstr "Купить услугу" -#: templates/abonapp/service.html:59 +#: abonapp/templates/abonapp/service.html:59 msgid "Finish service" msgstr "Завершить услугу" -#: templates/abonapp/service.html:68 +#: abonapp/templates/abonapp/service.html:68 msgid "Services for buy" msgstr "Услуги для заказа" -#: templates/abonapp/service.html:76 +#: abonapp/templates/abonapp/service.html:76 msgid "Price" msgstr "Сумма" -#: templates/abonapp/service.html:77 +#: abonapp/templates/abonapp/service.html:77 msgid "Speed In" msgstr "Входящая скорость" -#: templates/abonapp/service.html:78 +#: abonapp/templates/abonapp/service.html:78 msgid "Speed Out" msgstr "Исходящая скорость" -#: templates/abonapp/service.html:112 +#: abonapp/templates/abonapp/service.html:112 msgid "Attach services to group" msgstr "Привязать услуги к этой группе" -#: templates/abonapp/service.html:127 +#: abonapp/templates/abonapp/service.html:127 msgid "Pay logic" msgstr "Алгоритм платежа" -#: templates/abonapp/service.html:129 +#: abonapp/templates/abonapp/service.html:129 msgid "Last pay" msgstr "Последний платёж" -#: templates/abonapp/service.html:135 +#: abonapp/templates/abonapp/service.html:135 msgid "Remove periodic pay" msgstr "Удалить периодический платёж" -#: templates/abonapp/task_log.html:9 +#: abonapp/templates/abonapp/task_log.html:9 msgid "Recipients" msgstr "Исполнители" -#: templates/abonapp/task_log.html:11 +#: abonapp/templates/abonapp/task_log.html:11 msgid "State" msgstr "Состояние" -#: templates/abonapp/task_log.html:12 +#: abonapp/templates/abonapp/task_log.html:12 msgid "Type" msgstr "Тип" -#: templates/abonapp/task_log.html:24 +#: abonapp/templates/abonapp/task_log.html:24 msgid "Recipients not found" msgstr "Нет исполнителей" -#: templates/abonapp/task_log.html:34 +#: abonapp/templates/abonapp/task_log.html:34 msgid "Tasks not found" msgstr "Нет задач" -#: templates/abonapp/viewAbon.html:24 -msgid "yes,no" -msgstr "Да,Нет" - -#: views.py:97 views.py:161 views.py:308 views.py:423 views.py:500 views.py:642 -#: views.py:812 views.py:884 views.py:953 views.py:1059 -msgid "fix form errors" -msgstr "Некоторые поля заполнены не правильно, проверте ещё раз" +#: abonapp/views.py:123 +msgid "Address" +msgstr "Адрес" -#: views.py:158 +#: abonapp/views.py:142 msgid "create abon success msg" msgstr "Абонент успешно создан" -#: views.py:172 -msgid "Address" -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 +msgid "fix form errors" +msgstr "Некоторые поля заполнены не правильно, проверте ещё раз" -#: views.py:193 +#: abonapp/views.py:178 msgid "delete abon success msg" msgstr "Абонент успешно удалён" -#: views.py:199 +#: abonapp/views.py:183 #, python-format msgid "NAS says: '%s'" msgstr "NAS сказал: '%s'" -#: views.py:216 +#: abonapp/views.py:200 msgid "fill account through admin side" msgstr "Пополнение счёта через админку" -#: views.py:218 +#: abonapp/views.py:202 #, python-format msgid "Account filled successfully on %.2f" msgstr "Счёт пополнен на %.2f" -#: views.py:221 +#: abonapp/views.py:205 msgid "I not know the account id" msgstr "Счёт успешно пополнен на %.2f" -#: views.py:270 +#: abonapp/views.py:263 msgid "User group id is not matches with group in url" msgstr "Группа абонента не совпадает с группой указанной в url" -#: views.py:306 +#: abonapp/views.py:316 msgid "edit abon success msg" msgstr "Абонент успешно изменён" -#: views.py:313 +#: abonapp/views.py:327 msgid "User device was not found" msgstr "Пользовательское устройство не найдено" -#: views.py:322 +#: abonapp/views.py:340 msgid "User has not have password, and cannot login" msgstr "Для абонента не задан пароль, он не сможет войти в учётку" -#: views.py:375 +#: abonapp/views.py:390 msgid "Receipt has been created" msgstr "Квитанция на оплату была создана" -#: views.py:401 +#: abonapp/views.py:417 #, python-format msgid "Service '%(service_name)s' has connected via admin" msgstr "Услуга '%(service_name)s' подключена администратором" -#: views.py:410 +#: abonapp/views.py:427 msgid "Tariff has been picked" msgstr "Тариф успешно выбран" -#: views.py:418 +#: abonapp/views.py:435 msgid "Tariff your picked does not exist" msgstr "Тариф, который вы выбрали, не существует" -#: views.py:439 +#: abonapp/views.py:458 msgid "User has been detached from service" msgstr "Абонент отвязан от услуги" -#: views.py:497 +#: abonapp/views.py:524 msgid "Passport information has been saved" msgstr "Информация о паспорте сохранена" -#: views.py:505 views.py:552 views.py:571 views.py:612 +#: abonapp/views.py:532 abonapp/views.py:583 abonapp/views.py:603 +#: abonapp/views.py:640 msgid "Abon does not exist" msgstr "Абонент не найден" -#: views.py:508 +#: abonapp/views.py:535 msgid "Passport info for the user does not exist" msgstr "Для абонента не найдены паспортные данные" -#: views.py:545 +#: abonapp/views.py:555 +msgid "Successfully saved" +msgstr "Успешно сохранено" + +#: abonapp/views.py:576 msgid "Device has successfully attached" msgstr "Устройство успешно прикреплено" -#: views.py:550 +#: abonapp/views.py:581 msgid "Device your selected already does not exist" msgstr "Устройство, выбранное вами, уже не существует" -#: views.py:569 +#: abonapp/views.py:601 msgid "Device has successfully unattached" msgstr "Устройство успешно откреплено" -#: views.py:615 +#: abonapp/views.py:643 msgid "Group what you want doesn't exist" msgstr "Указанная вами группа не найдена" -#: views.py:640 +#: abonapp/views.py:668 msgid "Extra field successfully created" msgstr "Динамичесое поле добавлено успешно" -#: views.py:670 +#: abonapp/views.py:698 msgid "Extra fields has been saved" msgstr "Динамические поля сохранены" -#: views.py:672 +#: abonapp/views.py:700 msgid "One or more extra fields has not been saved" msgstr "Поле или одно из полей не найдено" -#: views.py:684 +#: abonapp/views.py:712 msgid "Extra field successfully deleted" msgstr "Динамическое поле успешно удалено" -#: views.py:695 +#: abonapp/views.py:724 msgid "no ping" msgstr "не пингуется" -#: views.py:698 +#: abonapp/views.py:727 msgid "Ip not passed" msgstr "Ip адрес не передан" -#: views.py:704 views.py:717 +#: abonapp/views.py:733 abonapp/views.py:749 msgid "ping ok" msgstr "пингуется" -#: views.py:710 +#: abonapp/views.py:740 #, python-format msgid "IP Conflict! %(all)d/%(return)d results" msgstr "IP Конфликт! ping %(all)d из %(return)d" -#: views.py:712 +#: abonapp/views.py:743 #, python-format msgid "ok ping, %(all)d/%(return)d loses" msgstr "пингуется, %(all)d/%(return)d" -#: views.py:715 +#: abonapp/views.py:747 #, python-format msgid "no ping, %(all)d/%(return)d loses" msgstr "не пингуется, %(all)d/%(return)d" -#: views.py:758 +#: abonapp/views.py:807 msgid "Method is not POST" msgstr "Метод не POST" -#: views.py:773 +#: abonapp/views.py:824 #, python-format msgid "" "%(user_name)s already pinned to this port on this " @@ -1036,104 +1077,71 @@ msgstr "" "%(user_name)s уже привязан к этому порту на этом " "устройстве" -#: views.py:781 +#: abonapp/views.py:832 msgid "Multiple users on the same device port" msgstr "Несколько абонентов на одном и том же порту устройства" -#: views.py:793 +#: abonapp/views.py:841 msgid "User port has been saved" msgstr "Порт абонента успешно выбран" -#: views.py:795 +#: abonapp/views.py:843 msgid "Selected port does not exist" msgstr "Выбранный порт не существует" -#: views.py:797 +#: abonapp/views.py:845 msgid "User does not exist" msgstr "Абонент не найден" -#: views.py:809 +#: abonapp/views.py:857 msgid "Street successfully saved" msgstr "Улица успешно сохранена" -#: views.py:833 +#: abonapp/views.py:881 msgid "Streets has been saved" msgstr "Улицы сохранены" -#: views.py:841 +#: abonapp/views.py:889 msgid "One of these streets has not been found" msgstr "Одна из этих улиц не была найдена" -#: views.py:852 +#: abonapp/views.py:900 msgid "The street successfully deleted" msgstr "Улица успешно удалена" -#: views.py:854 +#: abonapp/views.py:902 msgid "The street has not been found" msgstr "Улица не найдена" -#: views.py:881 +#: abonapp/views.py:929 msgid "New telephone has been saved" msgstr "Новый телефон сохранен" -#: views.py:901 +#: abonapp/views.py:949 msgid "Additional telephone successfully deleted" msgstr "Номер телефона успешно удалён" -#: views.py:903 +#: abonapp/views.py:951 msgid "Telephone not found" msgstr "Телефон не найден" -#: views.py:950 +#: abonapp/views.py:999 #, python-format msgid "Unexpected format %(export_format)s" msgstr "Нежиданный формат %(export_format)s" -#: views.py:1014 +#: abonapp/views.py:1062 msgid "Periodic pays has been designated" msgstr "Периодический платёж назначен" -#: views.py:1016 +#: abonapp/views.py:1064 msgid "Something wrong in form" msgstr "Что-то не так в форме" -#: views.py:1035 +#: abonapp/views.py:1083 msgid "Periodic pay successfully deleted" msgstr "Периодический платёж успешно удалён" -#: views.py:1064 +#: abonapp/views.py:1112 msgid "User flags has changed successfully" msgstr "Флаги абонента изменены успешно" - -msgid "Services" -msgstr "Тарифы" - -msgid "Payments" -msgstr "Финансы" - -msgid "History of tasks" -msgstr "История задач" - -msgid "Charts" -msgstr "Графики" - -msgid "Sub information" -msgstr "Инфо." - -msgid "Dialing" -msgstr "Звонки" - -msgid "Subscribers" -msgstr "Абоненты" - -msgid "Successfully saved" -msgstr "Успешно сохранено" - -msgid "This user can not buy admin services" -msgstr "Этот пользователь не может назначать административные услуги" - -msgid "Remove subscriber" -msgstr "Удаление абонента" - -msgid "Are you sure about them?" -msgstr "Вы уверены в этом?" diff --git a/abonapp/templates/abonapp/peoples.html b/abonapp/templates/abonapp/peoples.html index 9072a81..dfc7eb2 100644 --- a/abonapp/templates/abonapp/peoples.html +++ b/abonapp/templates/abonapp/peoples.html @@ -57,7 +57,7 @@ {% trans 'Service' %} - {% trans 'Ballance' %} + {% trans 'Balance' %} {% if order_by == 'ballance' %}{% endif %} diff --git a/accounts_app/locale/ru/LC_MESSAGES/django.po b/accounts_app/locale/ru/LC_MESSAGES/django.po index 49fd17d..0715f3f 100644 --- a/accounts_app/locale/ru/LC_MESSAGES/django.po +++ b/accounts_app/locale/ru/LC_MESSAGES/django.po @@ -6,7 +6,8 @@ #, fuzzy msgid "" msgstr "" -"POT-Creation-Date: 2018-02-15 15:15+0300\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-04-24 23:27+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Dmitry Novikov nerosketch@gmail.com\n" "Language: ru\n" @@ -17,272 +18,275 @@ 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" -#: models.py:22 +#: accounts_app/models.py:22 msgid "Users must have an telephone number" msgstr "У пользователей должен быть номер телефона" -#: models.py:49 templates/accounts/acc_list.html:18 +#: accounts_app/models.py:50 accounts_app/templates/accounts/acc_list.html:18 msgid "profile username" msgstr "Логин" -#: models.py:50 +#: accounts_app/models.py:55 msgid "fio" msgstr "ФИО" -#: models.py:51 +#: accounts_app/models.py:56 msgid "birth day" msgstr "дата рождения" -#: models.py:52 +#: accounts_app/models.py:57 msgid "Is active" msgstr "Активен" -#: models.py:56 templates/accounts/acc_list.html:20 -#: templates/accounts/create_acc.html:60 templates/accounts/index.html:9 -#: templates/accounts/settings/ch_info.html:37 +#: 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 msgid "Telephone" msgstr "Телефон" -#: models.py:107 +#: accounts_app/models.py:97 +msgid "Avatar" +msgstr "Аватар" + +#: accounts_app/models.py:99 +msgid "Responsibility groups" +msgstr "Группы администратора" + +#: accounts_app/models.py:114 msgid "Can view staff profile" msgstr "Может просматривать учётку сотрудника" -#: models.py:109 +#: accounts_app/models.py:116 msgid "Staff account profile" msgstr "Учётная запись работника" -#: models.py:110 +#: accounts_app/models.py:117 msgid "Staff account profiles" msgstr "Учётные записи работников" -#: templates/accounts/acc_list.html:7 templates/accounts/create_acc.html:6 -#: templates/accounts/perms/objects_of_type.html:7 -#: templates/accounts/perms/objects_types.html:8 -#: templates/accounts/perms/perms_edit.html:8 +#: 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 msgid "Administrators" msgstr "Сотрудники" -#: templates/accounts/acc_list.html:12 +#: accounts_app/templates/accounts/acc_list.html:12 msgid "Admin accounts list" msgstr "Список аккаунтов администраторов" -#: templates/accounts/acc_list.html:17 +#: accounts_app/templates/accounts/acc_list.html:17 msgid "Photo" msgstr "Фото" -#: templates/accounts/acc_list.html:19 +#: accounts_app/templates/accounts/acc_list.html:19 msgid "Fullname, or login if name is empty" msgstr "ФИО (или ник если нет)" -#: templates/accounts/acc_list.html:21 -#: templates/accounts/settings/ch_info.html:27 +#: accounts_app/templates/accounts/acc_list.html:21 +#: accounts_app/templates/accounts/settings/ch_info.html:28 msgid "Email" msgstr "Адрес электронной почты" -#: templates/accounts/acc_list.html:38 templates/accounts/acc_list.html:45 +#: accounts_app/templates/accounts/acc_list.html:38 +#: accounts_app/templates/accounts/acc_list.html:45 msgid "Not assigned" msgstr "<Не назначено>" -#: templates/accounts/acc_list.html:56 +#: accounts_app/templates/accounts/acc_list.html:56 msgid "You have not permissions to delete" msgstr "У вас нет прав на удаление" -#: templates/accounts/acc_list.html:65 +#: accounts_app/templates/accounts/acc_list.html:65 msgid "Users not found" msgstr "Пользователи не найдены" -#: templates/accounts/acc_list.html:73 +#: accounts_app/templates/accounts/acc_list.html:73 msgid "Add account" msgstr "Добавить учётную запись" -#: templates/accounts/create_acc.html:7 +#: accounts_app/templates/accounts/create_acc.html:9 msgid "Add" msgstr "Добавить" -#: templates/accounts/create_acc.html:14 +#: accounts_app/templates/accounts/create_acc.html:16 msgid "Create new account" msgstr "Создать новую учётную запись" -#: templates/accounts/create_acc.html:31 templates/accounts/create_acc.html:35 +#: accounts_app/templates/accounts/create_acc.html:33 +#: accounts_app/templates/accounts/create_acc.html:37 msgid "Username" msgstr "Логин" -#: templates/accounts/create_acc.html:40 templates/accounts/create_acc.html:45 +#: accounts_app/templates/accounts/create_acc.html:42 +#: accounts_app/templates/accounts/create_acc.html:47 msgid "Fullname" msgstr "Полное имя" -#: templates/accounts/create_acc.html:50 +#: accounts_app/templates/accounts/create_acc.html:52 msgid "EMail" msgstr "Адрес электронной почты" -#: templates/accounts/create_acc.html:65 -#: templates/accounts/settings/ch_info.html:42 +#: accounts_app/templates/accounts/create_acc.html:67 +#: accounts_app/templates/accounts/settings/ch_info.html:43 msgid "+[7,8,9,3] and 10,11 digits" msgstr "+[7,8,9,3] и 10,11 цифр" -#: templates/accounts/create_acc.html:70 +#: accounts_app/templates/accounts/create_acc.html:72 msgid "Type password" msgstr "Введите пароль" -#: templates/accounts/create_acc.html:78 +#: accounts_app/templates/accounts/create_acc.html:80 msgid "Repeat password" msgstr "Повторите пароль" -#: templates/accounts/create_acc.html:87 -#: templates/accounts/perms/perms_edit.html:61 -#: templates/accounts/profile_chgroup.html:20 -#: templates/accounts/set_abon_groups_permission.html:20 -#: templates/accounts/settings/ch_info.html:66 +#: 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 msgid "Save" msgstr "Сохранить" -#: templates/accounts/create_acc.html:90 templates/accounts/login.html:59 -#: templates/accounts/perms/perms_edit.html:64 -#: templates/accounts/profile_chgroup.html:20 -#: templates/accounts/set_abon_groups_permission.html:21 -#: templates/accounts/settings/ch_info.html:69 +#: 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 msgid "Reset" msgstr "Сбросить" -#: templates/accounts/index.html:13 templates/accounts/login.html:39 -#: templates/accounts/settings/ch_info.html:8 -#: templates/accounts/settings/ch_info.html:12 +#: 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 msgid "User name" msgstr "Логин" -#: templates/accounts/index.html:17 templates/accounts/settings/ch_info.html:18 +#: accounts_app/templates/accounts/index.html:17 +#: accounts_app/templates/accounts/settings/ch_info.html:19 msgid "Name and surname" msgstr "Фамилия и Имя" -#: templates/accounts/index.html:21 +#: accounts_app/templates/accounts/index.html:21 msgid "Is enable" msgstr "Включён-ли" -#: templates/accounts/index.html:25 +#: accounts_app/templates/accounts/index.html:25 msgid "Last login" msgstr "Последняя авторизация" -#: templates/accounts/index.html:30 +#: accounts_app/templates/accounts/index.html:30 msgid "All permissions" msgstr "Административный доступ (все права)" -#: templates/accounts/login.html:5 +#: accounts_app/templates/accounts/login.html:5 msgid "Auth" msgstr "Аутентификация" -#: templates/accounts/login.html:27 templates/accounts/login.html:56 +#: accounts_app/templates/accounts/login.html:27 +#: accounts_app/templates/accounts/login.html:56 msgid "Login" msgstr "Войти" -#: templates/accounts/login.html:47 +#: accounts_app/templates/accounts/login.html:47 msgid "Password" msgstr "Пароль" -#: templates/accounts/login.html:70 -msgid "Contact us" -msgstr "Напишите нам" +#: accounts_app/templates/accounts/manage_responsibility_groups.html:5 +msgid "The responsibility of the administrator of the group of subscribers" +msgstr "Ответственность администратора за группы абонентов" -#: templates/accounts/perms/objects_of_type.html:9 -#: templates/accounts/perms/objects_types.html:10 -#: templates/accounts/perms/perms_edit.html:10 +#: 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 msgid "Permission options" msgstr "Права" -#: templates/accounts/perms/objects_of_type.html:13 -#: templates/accounts/perms/perms_edit.html:16 +#: accounts_app/templates/accounts/perms/objects_of_type.html:13 +#: accounts_app/templates/accounts/perms/perms_edit.html:16 msgid "Pick object for edit permissions" msgstr "Выберите объект для редактирования прав доступа" -#: templates/accounts/perms/objects_types.html:13 +#: accounts_app/templates/accounts/perms/objects_types.html:13 msgid "Pick the type of object" msgstr "Выберите тип объекта" -#: templates/accounts/perms/objects_types.html:21 +#: accounts_app/templates/accounts/perms/objects_types.html:21 msgid "Group" msgstr "Группа" -#: templates/accounts/perms/perms_edit.html:24 +#: accounts_app/templates/accounts/perms/perms_edit.html:24 msgid "Profile is superuser, permissions to change it makes no sense" msgstr "" "Учётная запись является суперпользователем, разрешения менять нет смысла" -#: templates/accounts/perms/perms_edit.html:30 +#: accounts_app/templates/accounts/perms/perms_edit.html:30 msgid "Change permission for that object" msgstr "Изменение прав доступа для выбранного объекта" -#: templates/accounts/perms/perms_edit.html:52 +#: accounts_app/templates/accounts/perms/perms_edit.html:52 msgid "Not set" msgstr "Не найдено" -#: templates/accounts/profile_chgroup.html:5 -msgid "The responsibility of the staff of the group of subscribers" -msgstr "Ответственность работника за группы абонентов" - -#: templates/accounts/set_abon_groups_permission.html:5 +#: accounts_app/templates/accounts/set_abon_groups_permission.html:5 msgid "The list of user groups to which the account has access" msgstr "Список групп абонентов, к которым учётка имеет доступ" -#: templates/accounts/settings/ch_info.html:47 +#: accounts_app/templates/accounts/settings/ch_info.html:48 msgid "Old password" msgstr "Старый пароль" -#: templates/accounts/settings/ch_info.html:56 +#: accounts_app/templates/accounts/settings/ch_info.html:57 msgid "New password" msgstr "Новый пароль" -#: views.py:45 +#: accounts_app/views.py:47 msgid "Wrong login or password, please try again" msgstr "Неправильный логин или пароль, попробуйте ещё раз" -#: views.py:114 -msgid "Please select an image" -msgstr "Пожалуйста выберите изображение" - -#: views.py:125 -msgid "Avatar successfully changed" -msgstr "Аватар успешно изменён" - -#: views.py:153 +#: accounts_app/views.py:123 msgid "New password is empty, fill it" msgstr "Новый пароль пустой, придумайте себе пароль" -#: views.py:155 +#: accounts_app/views.py:125 msgid "Wrong password" msgstr "Неправильный пароль" -#: views.py:157 +#: accounts_app/views.py:127 msgid "Empty password, fill it" msgstr "Пустой пароль, впишите что-то в пароль" -#: views.py:180 +#: accounts_app/views.py:150 msgid "You forget specify a password for the new account" msgstr "Забыли указать пароль для нового аккаунта" -#: views.py:183 +#: accounts_app/views.py:153 msgid "You forget to repeat a password for the new account" msgstr "Забыли повторить пароль для нового аккаунта" -#: views.py:192 +#: accounts_app/views.py:162 msgid "Subscriber with this name already exist" msgstr "Пользователь с таким именем уже есть" -#: views.py:194 +#: accounts_app/views.py:164 msgid "Passwords does not match, try again" msgstr "Пароли не совпадают, попробуйте ещё раз" -#: views.py:209 +#: accounts_app/views.py:179 msgid "Profile has been deleted" msgstr "Учётная запись удалена" -#: views.py:279 +#: accounts_app/views.py:251 msgid "Permissions has successfully updated" msgstr "Права успешно обновлены" -msgid "The responsibility of the administrator of the group of subscribers" -msgstr "Ответственность администратора за группы абонентов" - -msgid "Administrator" -msgstr "Администратор" +#: accounts_app/views.py:318 +msgid "Responsibilities has been updated" +msgstr "Ответственность за группы обновлена" msgid "Options" msgstr "Настройки" @@ -295,12 +299,3 @@ msgstr "Редактировать" msgid "Access to groups" msgstr "Доступ к группам" - -msgid "Manage responsibility groups" -msgstr "Группы администратора" - -msgid "Responsibilities has been updated" -msgstr "Ответственность за группы обновлена" - -msgid "Avatar" -msgstr "Аватар" diff --git a/chatbot/locale/ru/LC_MESSAGES/django.po b/chatbot/locale/ru/LC_MESSAGES/django.po index 5b94f42..68c1c45 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: 2017-12-14 15:04+0300\n" +"POT-Creation-Date: 2018-04-24 23:27+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Dmitry Novikov \n" "Language-Team: LANGUAGE \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" -#: models.py:13 +#: chatbot/models.py:13 msgid "Employee" msgstr "Сотрудник" -#: models.py:14 +#: chatbot/models.py:14 msgid "Telegram chat id" msgstr "Номер чата из telegram" -#: models.py:21 +#: chatbot/models.py:21 msgid "Telegram bot" msgstr "Telegram бот" -#: models.py:22 +#: chatbot/models.py:22 msgid "Telegram bots" msgstr "Telegram боты" -#: models.py:35 +#: chatbot/models.py:35 msgid "Message history" msgstr "История собщений" -#: models.py:36 +#: chatbot/models.py:36 msgid "Message histories" msgstr "Истории собщений" -#: models.py:53 +#: chatbot/models.py:52 msgid "Target employee" msgstr "Сотрудник" -#: models.py:54 +#: chatbot/models.py:53 msgid "Message" msgstr "Сообщение" -#: models.py:59 +#: chatbot/models.py:58 msgid "Status of message" msgstr "Статус сообщения" -#: models.py:61 +#: chatbot/models.py:60 msgid "App tag" msgstr "Тэг приложения" -#: models.py:70 models.py:71 +#: chatbot/models.py:69 chatbot/models.py:70 msgid "Message queue" msgstr "Очередь оповещений" -#: telebot.py:63 +#: chatbot/telebot.py:64 msgid "Let's get acquainted, what is your name? Write your login from billing." msgstr "Давай знакомиться, как тебя зовут? Напиши свой логин из биллинга." -#: telebot.py:84 +#: chatbot/telebot.py:85 msgid "I do not know the answer to this yet." msgstr "Я пока не знаю ответа на это" -#: telebot.py:104 +#: chatbot/telebot.py:106 msgid "" "You are not found in the database, check that it correctly pointed out its " "LOGIN. Try again" @@ -80,29 +80,33 @@ msgstr "" "Ты не найден в базе, проверь что правильно указал именно свой ЛОГИН. " "Попробуй ещё" -#: telebot.py:120 +#: chatbot/telebot.py:110 +#, python-format +msgid "" +"Yes, it's nice to meet %(username)s, I will notify you about events in " +"billing. Successful work ;)" +msgstr "" +"Да, приятно познакомиться %(username)s, я буду оповещать тебя о событиях в " +"биллинге. Удачной работы ;)" + +#: chatbot/telebot.py:122 msgid "Let's ping, write ip. It will be necessary to wait 10 seconds" msgstr "Давай пинганём, напиши ip. Нужно будет подождать 10 сек" -#: telebot.py:127 +#: chatbot/telebot.py:129 msgid "It's not like ip address, try again" msgstr "Это не похоже на ip адрес, попробуй ещё" -#: telebot.py:130 +#: chatbot/telebot.py:132 #, python-format msgid "You're '%s', right?" msgstr "Ты ведь %s ?" -#: telebot.py:138 +#: chatbot/telebot.py:140 msgid "Telegram bot token not found" msgstr "Токен для бота Telegram не найден" -#: telebot.py:143 +#: chatbot/telebot.py:145 #, python-format msgid "Recipient '%s' does not subscribed on notifications" msgstr "%s не подписан на оповещения" - -msgid "" -"Yes, it's nice to meet %(username)s, I will notify you about events in billing. Successful work ;)" -msgstr "" -"Да, приятно познакомиться %(username)s, я буду оповещать тебя о событиях в биллинге. Удачной работы ;)" diff --git a/clientsideapp/locale/ru/LC_MESSAGES/django.po b/clientsideapp/locale/ru/LC_MESSAGES/django.po index b72ec63..18c7ad8 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-03-20 01:51+0300\n" +"POT-Creation-Date: 2018-04-24 23:27+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Dmitry Novikov nerosketch@gmail.com\n" "Language: ru\n" @@ -19,19 +19,19 @@ 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" -#: templates/clientsideapp/debt_buy.html:6 +#: clientsideapp/templates/clientsideapp/debt_buy.html:6 msgid "Debts" msgstr "Задолженность" -#: templates/clientsideapp/debt_buy.html:11 +#: clientsideapp/templates/clientsideapp/debt_buy.html:11 msgid "repayment of debts" msgstr "Оплатить задолженность" -#: templates/clientsideapp/debt_buy.html:18 +#: clientsideapp/templates/clientsideapp/debt_buy.html:18 msgid "Are you sure you want to spend a payment?" msgstr "Вы уверены что хотите провести платёж?" -#: templates/clientsideapp/debt_buy.html:21 +#: clientsideapp/templates/clientsideapp/debt_buy.html:21 #, python-format msgid "" "From your account, they withdraw funds in %(amount)s rub.
As a " @@ -42,95 +42,98 @@ msgstr "" "результате у вас на счету останется %(ballance_after)s руб.
Администратор сразу сможет видеть что у вас закрыта задолженность." -#: templates/clientsideapp/debt_buy.html:26 +#: clientsideapp/templates/clientsideapp/debt_buy.html:26 msgid "Description of payment" msgstr "Описание платежа" -#: templates/clientsideapp/debt_buy.html:34 +#: clientsideapp/templates/clientsideapp/debt_buy.html:34 msgid "Confirm" msgstr "Подтвердить" -#: templates/clientsideapp/debt_buy.html:37 +#: clientsideapp/templates/clientsideapp/debt_buy.html:37 msgid "Cancel" msgstr "Отменить" -#: templates/clientsideapp/debts.html:6 +#: clientsideapp/templates/clientsideapp/debts.html:6 msgid "Your debt" msgstr "Ваши долги" -#: templates/clientsideapp/debts.html:11 +#: clientsideapp/templates/clientsideapp/debts.html:11 msgid "State" msgstr "Состояние" -#: templates/clientsideapp/debts.html:12 +#: clientsideapp/templates/clientsideapp/debts.html:12 msgid "Summ" msgstr "Сумма" -#: templates/clientsideapp/debts.html:13 +#: clientsideapp/templates/clientsideapp/debts.html:13 msgid "Description" msgstr "Описание" -#: templates/clientsideapp/debts.html:14 +#: clientsideapp/templates/clientsideapp/debts.html:14 msgid "Date of create" msgstr "Дата создания" -#: templates/clientsideapp/debts.html:15 +#: clientsideapp/templates/clientsideapp/debts.html:15 msgid "Date of pay" msgstr "Дата платежа" -#: templates/clientsideapp/debts.html:16 templates/clientsideapp/debts.html:38 +#: clientsideapp/templates/clientsideapp/debts.html:16 +#: clientsideapp/templates/clientsideapp/debts.html:38 msgid "Pay" msgstr "Оплатить" -#: templates/clientsideapp/debts.html:23 templates/clientsideapp/ext.html:63 -#: templates/clientsideapp/modal_service_buy.html:19 -#: templates/clientsideapp/services.html:26 -#: templates/clientsideapp/services.html:55 +#: clientsideapp/templates/clientsideapp/debts.html:23 +#: clientsideapp/templates/clientsideapp/ext.html:63 +#: clientsideapp/templates/clientsideapp/modal_service_buy.html:19 +#: clientsideapp/templates/clientsideapp/services.html:26 +#: clientsideapp/templates/clientsideapp/services.html:55 msgid "currency" msgstr "руб." -#: templates/clientsideapp/debts.html:31 +#: clientsideapp/templates/clientsideapp/debts.html:31 msgid "Created paid" msgstr "Создан оплаченным" -#: templates/clientsideapp/debts.html:33 +#: clientsideapp/templates/clientsideapp/debts.html:33 msgid "Not yet paid" msgstr "Ещё не оплачен" -#: templates/clientsideapp/debts.html:45 +#: clientsideapp/templates/clientsideapp/debts.html:45 msgid "You have no debt" msgstr "У вас нет долгов" -#: templates/clientsideapp/ext.html:7 templates/clientsideapp/ext.html:41 +#: clientsideapp/templates/clientsideapp/ext.html:7 +#: clientsideapp/templates/clientsideapp/ext.html:41 msgid "Personal account" msgstr "Личный кабинет" -#: templates/clientsideapp/ext.html:46 +#: clientsideapp/templates/clientsideapp/ext.html:46 msgid "Pays" msgstr "Платежи" -#: templates/clientsideapp/ext.html:51 +#: clientsideapp/templates/clientsideapp/ext.html:51 msgid "Services" msgstr "Услуги" -#: templates/clientsideapp/ext.html:55 +#: clientsideapp/templates/clientsideapp/ext.html:55 msgid "Other" msgstr "Другое" -#: templates/clientsideapp/ext.html:57 +#: clientsideapp/templates/clientsideapp/ext.html:57 msgid "Show debts and pay it" msgstr "Посмотреть долги и оплатить" -#: templates/clientsideapp/ext.html:58 +#: clientsideapp/templates/clientsideapp/ext.html:58 msgid "Quit" msgstr "Выйти" -#: templates/clientsideapp/ext.html:63 +#: clientsideapp/templates/clientsideapp/ext.html:63 #, python-format msgid "Your balance is %(ballance)s" msgstr "Ваш балланс %(ballance)s" -#: templates/clientsideapp/ext.html:74 +#: clientsideapp/templates/clientsideapp/ext.html:74 msgid "" "Attantion! You are is admin, and do not be active here, " "please back to admin side. Client side to you for reference only." @@ -139,15 +142,15 @@ msgstr "" "из кабинета пользователя, производите их из админки. Кабинет клиента для вас " "только для ознакомления." -#: templates/clientsideapp/modal_service_buy.html:5 +#: clientsideapp/templates/clientsideapp/modal_service_buy.html:5 msgid "Pick service" msgstr "Заказать услугу" -#: templates/clientsideapp/modal_service_buy.html:8 +#: clientsideapp/templates/clientsideapp/modal_service_buy.html:8 msgid "Are you sure you want to order the service?" msgstr "Вы уверены что хотите заказать услугу?" -#: templates/clientsideapp/modal_service_buy.html:9 +#: clientsideapp/templates/clientsideapp/modal_service_buy.html:9 msgid "" "Be careful, after purchasing the service you will withdraw money, and " "you will be able to use the purchased service." @@ -155,64 +158,64 @@ msgstr "" "Будте внимательны, после заказа услуги с вашего счёта снимутся средства, и вы сможете пользоваться купленной услугой." -#: templates/clientsideapp/modal_service_buy.html:15 +#: clientsideapp/templates/clientsideapp/modal_service_buy.html:15 #, python-format msgid "" "Inbound speed: %(speedIn)s MBit/s
Outgoing speed: %(speedOut)s MBit/" "s
Cost: %(amount)s rubles." msgstr "" -#: templates/clientsideapp/modal_service_buy.html:19 +#: clientsideapp/templates/clientsideapp/modal_service_buy.html:19 #, python-format msgid "The cost is %(amount)s" msgstr "Стоимость %(amount)s" -#: templates/clientsideapp/modal_service_buy.html:23 -#: templates/clientsideapp/services.html:63 +#: clientsideapp/templates/clientsideapp/modal_service_buy.html:23 +#: clientsideapp/templates/clientsideapp/services.html:63 msgid "Pick" msgstr "Заказать" -#: templates/clientsideapp/modal_service_buy.html:25 +#: clientsideapp/templates/clientsideapp/modal_service_buy.html:25 msgid "Close" msgstr "Закрыть" -#: templates/clientsideapp/pays.html:6 +#: clientsideapp/templates/clientsideapp/pays.html:6 msgid "conducted payments" msgstr "Проведённые платежи" -#: templates/clientsideapp/pays.html:11 +#: clientsideapp/templates/clientsideapp/pays.html:11 msgid "Transaction Amount (rubles)" msgstr "Сумма транзакции (руб)" -#: templates/clientsideapp/pays.html:12 +#: clientsideapp/templates/clientsideapp/pays.html:12 msgid "Date of transaction" msgstr "Дата транзакции" -#: templates/clientsideapp/pays.html:13 +#: clientsideapp/templates/clientsideapp/pays.html:13 msgid "Comment" msgstr "Комментарий" -#: templates/clientsideapp/pays.html:25 +#: clientsideapp/templates/clientsideapp/pays.html:25 msgid "You have not spent payments" msgstr "У вас нет проведённых платежей" -#: templates/clientsideapp/services.html:14 +#: clientsideapp/templates/clientsideapp/services.html:14 msgid "Your current service" msgstr "Ваша текущая услуга" -#: templates/clientsideapp/services.html:19 +#: clientsideapp/templates/clientsideapp/services.html:19 msgid "The date of connection" msgstr "Дата подключения" -#: templates/clientsideapp/services.html:22 +#: clientsideapp/templates/clientsideapp/services.html:22 msgid "The date of finish service" msgstr "Дата завершения услуги" -#: templates/clientsideapp/services.html:25 +#: clientsideapp/templates/clientsideapp/services.html:25 msgid "Cost" msgstr "Стоимость" -#: templates/clientsideapp/services.html:35 +#: clientsideapp/templates/clientsideapp/services.html:35 msgid "" "Attantion! You have not yet a service, for use the services " "please purchase service you want." @@ -220,33 +223,33 @@ msgstr "" "Внимание! У вас нет услуги, для использования ресурсов " "приобретите нужную услугу из представленных тут." -#: templates/clientsideapp/services.html:46 +#: clientsideapp/templates/clientsideapp/services.html:46 msgid "Services available for ordering" msgstr "Доступные для заказа услуги" -#: templates/clientsideapp/services.html:68 +#: clientsideapp/templates/clientsideapp/services.html:68 msgid "No services available for ordering" msgstr "Нет доступных для заказа услуг" -#: views.py:51 +#: clientsideapp/views.py:51 #, python-format msgid "Buy the service via user side, service '%s'" msgstr "Покупка тарифного плана через личный кабинет, тариф '%s'" -#: views.py:54 +#: clientsideapp/views.py:54 #, python-format msgid "The service '%s' wan successfully activated" msgstr "Услуга '%s' успешно подключена" -#: views.py:84 +#: clientsideapp/views.py:84 msgid "Are you not sure that you want buy the service?" msgstr "Вы не уверены что хотите оплатить долг?" -#: views.py:86 +#: clientsideapp/views.py:86 msgid "Your account have not enough money" msgstr "Недостаточно средств на счету" -#: views.py:89 +#: clientsideapp/views.py:89 #, python-format msgid "%(username)s paid the debt %(amount).2f" msgstr "%(username)s заплатил долг в размере %(amount).2f" diff --git a/devapp/locale/ru/LC_MESSAGES/django.po b/devapp/locale/ru/LC_MESSAGES/django.po index 221a575..260048e 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-01-06 16:05+0300\n" +"POT-Creation-Date: 2018-04-24 23:27+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Dmitry Novikov nerosketch@gmail.com\n" "Language: ru\n" @@ -18,365 +18,394 @@ 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" -#: dev_types.py:38 +#: devapp/base_intr.py:82 +msgid "Ip address is required" +msgstr "Ip адрес необходим" + +#: devapp/dev_types.py:35 msgid "DLink switch" msgstr "Свич D'Link" -#: dev_types.py:53 -msgid "does not fetch the name" -msgstr "не получил имя" - -#: dev_types.py:55 +#: devapp/dev_types.py:54 msgid "does not fetch the mac" msgstr "не нашёл мак" -#: dev_types.py:108 +#: devapp/dev_types.py:106 msgid "PON OLT" msgstr "" -#: dev_types.py:160 +#: devapp/dev_types.py:131 devapp/views.py:268 devapp/views.py:413 +msgid "wait for a reply from the SNMP Timeout" +msgstr "Время ожидания ответа от SNMP истекло" + +#: devapp/dev_types.py:171 msgid "PON ONU" msgstr "" -#: dev_types.py:205 +#: devapp/dev_types.py:216 msgid "ONU not connected" msgstr "ONU не в сети" -#: dev_types.py:236 +#: devapp/dev_types.py:242 msgid "Eltex switch" msgstr "Элтекс свич" -#: forms.py:16 +#: devapp/forms.py:14 msgid "Mac address is required for fill" msgstr "MAC-адрес необходим для заполнения" -#: forms.py:17 +#: devapp/forms.py:15 msgid "Device with that mac is already exist" msgstr "Устройство с этим мак-адресом уже есть" -#: forms.py:53 +#: devapp/forms.py:48 msgid "Port number on device must be unique" msgstr "Номер порта на устройстве должен быть уникальным" -#: models.py:49 templates/devapp/custom_dev_page/onu.html.py:18 -#: templates/devapp/devices.html:21 templates/devapp/devices_null_group.html:20 +#: devapp/models.py:21 devapp/templates/devapp/custom_dev_page/onu.html:18 +#: devapp/templates/devapp/devices.html:22 +#: devapp/templates/devapp/devices_null_group.html:20 msgid "Ip address" msgstr "Ip адрес" -#: models.py:50 templates/devapp/devices.html.py:31 +#: devapp/models.py:22 devapp/templates/devapp/devices.html:32 msgid "Mac address" msgstr "Мак адрес" -#: models.py:51 templates/devapp/devices.html.py:27 -#: templates/devapp/devices_null_group.html:26 +#: devapp/models.py:23 devapp/templates/devapp/devices.html:28 +#: devapp/templates/devapp/devices_null_group.html:26 msgid "Comment" msgstr "Комментарий" -#: models.py:52 templates/devapp/devices.html.py:35 -#: templates/devapp/devices_null_group.html:32 +#: devapp/models.py:30 devapp/templates/devapp/devices.html:36 +#: devapp/templates/devapp/devices_null_group.html:32 msgid "Device type" msgstr "Тип устройства" -#: models.py:53 +#: devapp/models.py:32 msgid "SNMP password" msgstr "Пароль SNMP" -#: models.py:54 -msgid "User group" -msgstr "Группа" +#: devapp/models.py:33 +msgid "Device group" +msgstr "Группа устройства" -#: models.py:55 templates/devapp/add_dev.html.py:46 -#: templates/devapp/custom_dev_page/onu.html:34 templates/devapp/dev.html:33 -#: templates/devapp/fix_dev_group.html.py:49 +#: devapp/models.py:34 devapp/templates/devapp/add_dev.html:46 +#: devapp/templates/devapp/custom_dev_page/onu.html:34 +#: devapp/templates/devapp/custom_dev_page/ports.html:59 +#: devapp/templates/devapp/dev.html:33 +#: devapp/templates/devapp/fix_dev_group.html:42 msgid "Parent device" msgstr "Родительское устройство" -#: models.py:57 -#, fuzzy -#| msgid "SNMP Num" +#: devapp/models.py:37 msgid "SNMP Number" msgstr "SNMP Ном." -#: models.py:64 +#: devapp/models.py:40 +msgid "Undefined" +msgstr "Не определено" + +#: devapp/models.py:41 +msgid "Up" +msgstr "В сети" + +#: devapp/models.py:42 +msgid "Unreachable" +msgstr "Не доступно" + +#: devapp/models.py:43 +msgid "Down" +msgstr "Не в сети" + +#: devapp/models.py:45 +msgid "Status" +msgstr "Состояние" + +#: devapp/models.py:47 +msgid "Send notify when monitoring state changed" +msgstr "Отправлять уведомления при событиях мониторинга" + +#: devapp/models.py:52 msgid "Can view device" msgstr "Может видеть устройство" -#: models.py:66 models.py:135 +#: devapp/models.py:54 devapp/models.py:126 msgid "Device" msgstr "Устройство" -#: models.py:67 templates/devapp/devices.html.py:13 -#: templates/devapp/devices_null_group.html:8 +#: devapp/models.py:55 devapp/templates/devapp/devices.html:14 +#: devapp/templates/devapp/devices_null_group.html:8 msgid "Devices" msgstr "Устройства" -#: models.py:136 templates/devapp/manage_ports/list.html.py:11 +#: devapp/models.py:127 devapp/templates/devapp/manage_ports/list.html:11 msgid "Number" msgstr "Номер" -#: models.py:137 templates/devapp/custom_dev_page/onu.html.py:20 -#: templates/devapp/custom_dev_page/ports.html:74 -#: templates/devapp/manage_ports/add_ports.html:33 -#: templates/devapp/manage_ports/list.html:12 +#: devapp/models.py:128 devapp/templates/devapp/custom_dev_page/onu.html:20 +#: devapp/templates/devapp/custom_dev_page/ports.html:88 +#: devapp/templates/devapp/manage_ports/add_ports.html:33 +#: devapp/templates/devapp/manage_ports/list.html:12 msgid "Description" msgstr "Описание" -#: models.py:146 +#: devapp/models.py:137 msgid "Can toggle ports" msgstr "Может переключать порты" -#: models.py:148 templates/devapp/custom_dev_page/ports.html.py:96 -#: templates/devapp/manage_ports/fix_abon_device.html:25 +#: devapp/models.py:139 devapp/templates/devapp/custom_dev_page/ports.html:110 +#: devapp/templates/devapp/manage_ports/fix_abon_device.html:24 msgid "Port" msgstr "Порт" -#: models.py:149 +#: devapp/models.py:140 msgid "Ports" msgstr "Порты" -#: templates/devapp/add_dev.html:8 templates/devapp/devices.html.py:7 -#: templates/devapp/devices_null_group.html:7 -#: templates/devapp/fix_dev_group.html:9 templates/devapp/group_list.html:7 -#: templates/devapp/group_list.html.py:10 -#: templates/devapp/manage_ports/add_ports.html:7 -#: templates/devapp/manage_ports/fix_abon_device.html:7 +#: devapp/templates/devapp/add_dev.html:8 +#: devapp/templates/devapp/devices.html:8 +#: devapp/templates/devapp/devices_null_group.html:7 +#: devapp/templates/devapp/fix_dev_group.html:9 +#: devapp/templates/devapp/group_list.html:7 +#: devapp/templates/devapp/manage_ports/add_ports.html:7 +#: devapp/templates/devapp/manage_ports/fix_abon_device.html:7 msgid "Groups" msgstr "Группы" -#: templates/devapp/add_dev.html:10 +#: devapp/templates/devapp/add_dev.html:10 msgid "Add new device" msgstr "Добавить устройство" -#: templates/devapp/add_dev.html:16 -#: templates/devapp/custom_dev_page/ports.html:104 -#: templates/devapp/devices.html:58 -#: templates/devapp/manage_ports/add_ports.html:16 +#: devapp/templates/devapp/add_dev.html:16 +#: devapp/templates/devapp/custom_dev_page/ports.html:68 +#: devapp/templates/devapp/devices.html:63 +#: devapp/templates/devapp/manage_ports/add_ports.html:16 msgid "Not assigned" msgstr "<Не назначено>" -#: templates/devapp/add_dev.html:21 templates/devapp/dev.html.py:8 +#: devapp/templates/devapp/add_dev.html:21 devapp/templates/devapp/dev.html:8 msgid "Device info" msgstr "Инфа о железке" -#: templates/devapp/add_dev.html:52 templates/devapp/dev.html.py:43 -#: templates/devapp/dev.html:47 templates/devapp/fix_dev_group.html.py:58 -#: templates/devapp/fix_dev_group.html:62 +#: devapp/templates/devapp/add_dev.html:60 devapp/templates/devapp/dev.html:43 +#: devapp/templates/devapp/dev.html:47 +#: devapp/templates/devapp/fix_dev_group.html:51 +#: devapp/templates/devapp/fix_dev_group.html:55 msgid "Find the device" msgstr "Найти устройство" -#: templates/devapp/add_dev.html:62 templates/devapp/dev.html.py:59 -#: templates/devapp/fix_dev_group.html:71 -#: templates/devapp/manage_ports/add_ports.html:75 -#: templates/devapp/manage_ports/add_ports.html:79 -#: templates/devapp/manage_ports/modal_add_edit_port.html:21 +#: devapp/templates/devapp/add_dev.html:72 devapp/templates/devapp/dev.html:61 +#: devapp/templates/devapp/fix_dev_group.html:64 +#: devapp/templates/devapp/manage_ports/add_ports.html:75 +#: devapp/templates/devapp/manage_ports/add_ports.html:79 +#: devapp/templates/devapp/manage_ports/modal_add_edit_port.html:21 msgid "Save" msgstr "Сохранить" -#: templates/devapp/add_dev.html:65 templates/devapp/dev.html.py:62 -#: templates/devapp/fix_dev_group.html:74 +#: devapp/templates/devapp/add_dev.html:75 devapp/templates/devapp/dev.html:73 +#: devapp/templates/devapp/fix_dev_group.html:67 msgid "Reset" msgstr "Сбросить" -#: templates/devapp/custom_dev_page/olt.html:10 -#: templates/devapp/custom_dev_page/onu.html:12 -#: templates/devapp/custom_dev_page/ports.html:12 +#: devapp/templates/devapp/custom_dev_page/olt.html:10 +#: devapp/templates/devapp/custom_dev_page/onu.html:12 +#: devapp/templates/devapp/custom_dev_page/ports.html:12 msgid "Uptime" msgstr "Без перезагрузки" -#: templates/devapp/custom_dev_page/olt.html:17 +#: devapp/templates/devapp/custom_dev_page/olt.html:17 msgid "SNMP Num" msgstr "SNMP Ном." -#: templates/devapp/custom_dev_page/olt.html:18 +#: devapp/templates/devapp/custom_dev_page/olt.html:18 msgid "Name" msgstr "Имя" -#: templates/devapp/custom_dev_page/olt.html:19 -#: templates/devapp/custom_dev_page/onu.html:19 +#: devapp/templates/devapp/custom_dev_page/olt.html:19 +#: devapp/templates/devapp/custom_dev_page/onu.html:19 msgid "Mac" msgstr "Мак" -#: templates/devapp/custom_dev_page/olt.html:20 -#: templates/devapp/custom_dev_page/onu.html:73 +#: devapp/templates/devapp/custom_dev_page/olt.html:20 +#: devapp/templates/devapp/custom_dev_page/onu.html:73 msgid "Signal" msgstr "Ур. сигнала" -#: templates/devapp/custom_dev_page/olt.html:38 +#: devapp/templates/devapp/custom_dev_page/olt.html:38 msgid "Create device" msgstr "Создать устройство" -#: templates/devapp/custom_dev_page/olt.html:45 -#: templates/devapp/manage_ports/list.html:45 +#: devapp/templates/devapp/custom_dev_page/olt.html:45 +#: devapp/templates/devapp/manage_ports/list.html:48 msgid "Ports not found" msgstr "Порты не найдены" -#: templates/devapp/custom_dev_page/onu.html:10 -#: templates/devapp/custom_dev_page/ports.html:10 +#: devapp/templates/devapp/custom_dev_page/onu.html:10 +#: devapp/templates/devapp/custom_dev_page/ports.html:10 msgid "Title of the type of switch" msgstr "Название типа свича" -#: templates/devapp/custom_dev_page/onu.html:22 +#: devapp/templates/devapp/custom_dev_page/onu.html:22 msgid "Attached user" msgstr "Прикрепленный абонент" -#: templates/devapp/custom_dev_page/onu.html:47 +#: devapp/templates/devapp/custom_dev_page/onu.html:47 msgid "ONU Status" msgstr "Состояние ONU" -#: templates/devapp/custom_dev_page/onu.html:57 +#: devapp/templates/devapp/custom_dev_page/onu.html:57 msgid "ONU error" msgstr "ONU ошибка" -#: templates/devapp/custom_dev_page/onu.html:71 +#: devapp/templates/devapp/custom_dev_page/onu.html:71 msgid "Name on OLT" msgstr "Имя на OLT" -#: templates/devapp/custom_dev_page/onu.html:72 +#: devapp/templates/devapp/custom_dev_page/onu.html:72 msgid "Distance(m)" msgstr "Расстояние (м)" -#: templates/devapp/custom_dev_page/onu.html:77 -#: templates/devapp/custom_dev_page/onu.html:85 +#: devapp/templates/devapp/custom_dev_page/onu.html:77 +#: devapp/templates/devapp/custom_dev_page/onu.html:85 msgid "Mac on OLT" msgstr "MAC адрес на OLT" -#: templates/devapp/custom_dev_page/onu.html:78 +#: devapp/templates/devapp/custom_dev_page/onu.html:78 msgid "Mac-addresses does not match" msgstr "MAC адреса не совпадают" -#: templates/devapp/custom_dev_page/onu.html:79 -#: templates/devapp/custom_dev_page/onu.html:81 +#: devapp/templates/devapp/custom_dev_page/onu.html:79 +#: devapp/templates/devapp/custom_dev_page/onu.html:81 msgid "Fix it" msgstr "Исправить" -#: templates/devapp/custom_dev_page/onu.html:92 -#, fuzzy -#| msgid "Port does not exist" +#: devapp/templates/devapp/custom_dev_page/onu.html:92 msgid "Info does not fetch" -msgstr "Порт не найден" +msgstr "Информация не получена" -#: templates/devapp/custom_dev_page/ports.html:44 +#: devapp/templates/devapp/custom_dev_page/ports.html:44 msgid "Disable port" msgstr "Выключить порт" -#: templates/devapp/custom_dev_page/ports.html:48 +#: devapp/templates/devapp/custom_dev_page/ports.html:48 msgid "Enable port" msgstr "Включить порт" -#: templates/devapp/custom_dev_page/ports.html:54 +#: devapp/templates/devapp/custom_dev_page/ports.html:54 msgid "We have not received info, please check options :(" msgstr "Инфа не получена, проверьте настройки :(" -#: templates/devapp/custom_dev_page/ports.html:66 +#: devapp/templates/devapp/custom_dev_page/ports.html:80 msgid "Device log" msgstr "Лог устройства" -#: templates/devapp/custom_dev_page/ports.html:73 +#: devapp/templates/devapp/custom_dev_page/ports.html:87 msgid "Level" msgstr "Уровень" -#: templates/devapp/custom_dev_page/ports.html:75 +#: devapp/templates/devapp/custom_dev_page/ports.html:89 msgid "Date" msgstr "Дата" -#: templates/devapp/custom_dev_page/ports.html:90 +#: devapp/templates/devapp/custom_dev_page/ports.html:104 msgid "Ports comment" msgstr "Комментарии портов" -#: templates/devapp/custom_dev_page/ports.html:97 +#: devapp/templates/devapp/custom_dev_page/ports.html:111 msgid "Title" msgstr "Название" -#: templates/devapp/custom_dev_page/ports.html:108 +#: devapp/templates/devapp/custom_dev_page/ports.html:122 msgid "We have not received info for ports" msgstr "Инфа о портах не получена" -#: templates/devapp/devices.html:32 -msgid "Plugin output" -msgstr "Вывод мониторинга" +#: devapp/templates/devapp/dev.html:65 devapp/templates/devapp/dev.html:69 +#: devapp/templates/devapp/manage_ports/add_ports.html:53 +#: devapp/templates/devapp/manage_ports/add_ports.html:55 +#: devapp/templates/devapp/manage_ports/list.html:35 +#: devapp/templates/devapp/manage_ports/modal_del_port.html:14 +msgid "Delete" +msgstr "Удалить" -#: templates/devapp/devices.html:76 templates/devapp/devices_null_group.html:62 +#: devapp/templates/devapp/dev.html:68 +msgid "Permission denied" +msgstr "Доступ запрещён" + +#: devapp/templates/devapp/devices.html:81 +#: devapp/templates/devapp/devices_null_group.html:62 msgid "Devices does not found" msgstr "Нет созданных устройств" -#: templates/devapp/devices.html:76 templates/devapp/devices.html.py:86 -#: templates/devapp/devices_null_group.html:62 -#: templates/devapp/devices_null_group.html:72 +#: devapp/templates/devapp/devices.html:81 +#: devapp/templates/devapp/devices.html:91 +#: devapp/templates/devapp/devices_null_group.html:62 +#: devapp/templates/devapp/devices_null_group.html:72 msgid "Create" msgstr "Cоздать" -#: templates/devapp/devices_null_group.html:13 -#: templates/devapp/group_list.html:41 +#: devapp/templates/devapp/devices_null_group.html:13 +#: devapp/templates/devapp/group_list.html:32 msgid "Devices without group" msgstr "Устройства без группы" -#: templates/devapp/fix_dev_group.html:17 +#: devapp/templates/devapp/fix_dev_group.html:17 msgid "Fix device group" msgstr "Поправить группу устройства" -#: templates/devapp/group_list.html:18 +#: devapp/templates/devapp/group_list.html:14 msgid "Group title" msgstr "Название" -#: templates/devapp/group_list.html:28 -#, fuzzy -#| msgid "Dot was not pinged" +#: devapp/templates/devapp/group_list.html:24 msgid "Groups was not found" -msgstr "Эта точка не пингуется" +msgstr "Эта группа не найдена" -#: templates/devapp/group_list.html:37 -msgid "Add group" -msgstr "Добавить группу" +#: devapp/templates/devapp/group_list.html:35 +msgid "Export to nagios objects" +msgstr "Экспортировать конфиг для nagios" -#: templates/devapp/manage_ports/add_ports.html:10 -#: templates/devapp/manage_ports/list.html:55 +#: devapp/templates/devapp/manage_ports/add_ports.html:10 +#: devapp/templates/devapp/manage_ports/list.html:58 msgid "Add ports" msgstr "Добавить порты" -#: templates/devapp/manage_ports/add_ports.html:32 +#: devapp/templates/devapp/manage_ports/add_ports.html:32 msgid "Mode" msgstr "Режим" -#: templates/devapp/manage_ports/add_ports.html:53 -#: templates/devapp/manage_ports/add_ports.html:55 -#: templates/devapp/manage_ports/list.html:32 -#: templates/devapp/manage_ports/modal_del_port.html:14 -msgid "Delete" -msgstr "Удалить" - -#: templates/devapp/manage_ports/add_ports.html:60 -#: templates/devapp/manage_ports/list.html:54 +#: devapp/templates/devapp/manage_ports/add_ports.html:60 +#: devapp/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 +#: devapp/templates/devapp/manage_ports/fix_abon_device.html:10 +#: devapp/templates/devapp/manage_ports/fix_abon_device.html:16 msgid "Fix subscriber ports conflict" msgstr "Исправить конфликт абонентов на порту" -#: templates/devapp/manage_ports/fix_abon_device.html:22 +#: devapp/templates/devapp/manage_ports/fix_abon_device.html:21 msgid "Subscribers list on port" msgstr "Список абонентов на порту" -#: templates/devapp/manage_ports/fix_abon_device.html:26 +#: devapp/templates/devapp/manage_ports/fix_abon_device.html:25 msgid "" "You may choose the subscriber who correctly attached to device port. When " "you have found right subscriber, remove the port from the other person" msgstr "" "Вы можете выбрать абонента который правильно подключён к порту. Когда вы " -"найдёте нужного абонента удалите этот порт у другого абонента чтоб исправить конфликт" +"найдёте нужного абонента удалите этот порт у другого абонента чтоб исправить " +"конфликт" -#: templates/devapp/manage_ports/fix_abon_device.html:32 -#, fuzzy -#| msgid "Ports not found" +#: devapp/templates/devapp/manage_ports/fix_abon_device.html:31 msgid "Abons not found" -msgstr "Порты не найдены" +msgstr "Абоненты не найдены" -#: templates/devapp/manage_ports/list.html:13 +#: devapp/templates/devapp/manage_ports/list.html:13 msgid "Count of subscribers" msgstr "Сколько абонов" -#: templates/devapp/manage_ports/list.html:26 +#: devapp/templates/devapp/manage_ports/list.html:26 #, python-format msgid "" "Port should not have more than one subscriber, fix thatисправить" -#: templates/devapp/manage_ports/list.html:37 -#: templates/devapp/manage_ports/modal_add_edit_port.html:14 +#: devapp/templates/devapp/manage_ports/list.html:31 +msgid "Show subscriber on port" +msgstr "Показать абонента на порту" + +#: devapp/templates/devapp/manage_ports/list.html:40 +#: devapp/templates/devapp/manage_ports/modal_add_edit_port.html:14 msgid "Edit" msgstr "Редактировать" -#: templates/devapp/manage_ports/modal_del_port.html:7 +#: devapp/templates/devapp/manage_ports/modal_del_port.html:7 msgid "Are you sure?" msgstr "Вы уверены?" -#: templates/devapp/manage_ports/modal_del_port.html:11 +#: devapp/templates/devapp/manage_ports/modal_del_port.html:11 msgid "Are you sure that you want to delete switch port from db?" msgstr "Вы уверены что хотите удалить порт свича из бд?" -#: views.py:78 +#: devapp/templates/devapp/manage_ports/modal_show_subscriber_on_port.html:5 +msgid "Subscriber on port" +msgstr "Абонент на порту" + +#: devapp/views.py:80 msgid "Delete failed" msgstr "Неизвестная ошибка при удалении :(" -#: views.py:104 -msgid "Device info has been saved" -msgstr "Инфа о точке сохранена" - -#: views.py:110 +#: devapp/views.py:109 msgid "You have redirected to existing device" msgstr "Вы были переадресованы на существующее устройство" -#: views.py:113 views.py:329 views.py:419 +#: devapp/views.py:112 devapp/views.py:361 devapp/views.py:457 msgid "Please attach group for device" msgstr "Пожалуйста назначте устройству группу в настройках" -#: views.py:117 views.py:275 views.py:304 views.py:421 +#: devapp/views.py:121 +msgid "Device info has been saved" +msgstr "Инфа о точке сохранена" + +#: devapp/views.py:124 devapp/views.py:307 devapp/views.py:336 +#: devapp/views.py:459 msgid "Form is invalid, check fields and try again" msgstr "Ошибка в данных, проверте их ещё раз" -#: views.py:120 +#: devapp/views.py:127 #, python-format msgid "Duplicate user and port: %s" msgstr "Пользователь с таким портом и устройством уже есть: %s" -#: views.py:159 views.py:198 +#: devapp/views.py:168 devapp/views.py:230 msgid "Device does not have a group, please fix that" msgstr "У устройства нет группы, пожалуйста, исправьте это" -#: views.py:164 views.py:231 views.py:316 +#: devapp/views.py:173 devapp/views.py:263 devapp/views.py:348 msgid "Device does not exist" msgstr "Устойство не найдено" -#: views.py:236 views.py:378 -msgid "wait for a reply from the SNMP Timeout" -msgstr "Время ожидания ответа от SNMP истекло" +#: devapp/views.py:194 +msgid "Subscribers on port does not exist" +msgstr "Абоненты на порту не найдены" + +#: devapp/views.py:196 +msgid "More than one subscriber on device port" +msgstr "Больше одного абонента на порту устройства" -#: views.py:250 +#: devapp/views.py:282 msgid "Port successfully removed" msgstr "Порт успешно удалён" -#: views.py:258 views.py:286 +#: devapp/views.py:290 devapp/views.py:318 msgid "Port does not exist" msgstr "Порт не найден" -#: views.py:273 views.py:301 +#: devapp/views.py:305 devapp/views.py:333 msgid "Port successfully saved" msgstr "Порт успешно сохранён" -#: views.py:340 views.py:374 -msgid "Not Set snmp device password" -msgstr "Не указан snmp пароль для устройства" - -#: views.py:342 views.py:376 +#: devapp/views.py:368 devapp/views.py:411 msgid "Dot was not pinged" msgstr "Эта точка не пингуется" -#: views.py:350 +#: devapp/views.py:377 devapp/views.py:409 +msgid "Not Set snmp device password" +msgstr "Не указан snmp пароль для устройства" + +#: devapp/views.py:385 msgid "SNMP error on device" msgstr "Ошибка SNMP на устройстве" -#: views.py:416 -#, fuzzy -#| msgid "Device info" +#: devapp/views.py:454 msgid "Device fixed" -msgstr "Инфа о железке" +msgstr "Устройство исправлено" -#: views.py:450 +#: devapp/views.py:483 +#, python-format +msgid "Device with mac address %(mac)s does not exist" +msgstr "Устройство мак адресом %(mac)s не найдено" + +#: devapp/views.py:491 msgid "Fixed" msgstr "Исправлено, обновите страницу" -#: views.py:453 +#: devapp/views.py:494 msgid "Parent device not found" msgstr "Вышестоящее устройство не найдено" -msgid "Send notify when monitoring state changed" -msgstr "Отправлять уведомления при событиях мониторинга" - -msgid "Device with mac address %(mac)s does not exist" -msgstr "Устройство мак адресом %(mac)s не найдено" +#~ msgid "Plugin output" +#~ msgstr "Вывод мониторинга" msgid "Device %(device_name)s is up" msgstr "%(device_name)s в сети" @@ -490,34 +532,3 @@ msgstr "%(device_name)s недостижим" msgid "Device %(device_name)s getting undefined status code" msgstr "Устройство %(device_name)s получило не определённый код состояния" - -msgid "Undefined" -msgstr "Не определено" - -msgid "Up" -msgstr "В сети" - -msgid "Unreachable" -msgstr "Не доступно" - -msgid "Down" -msgstr "Не в сети" - -msgid "Subscriber on port" -msgstr "Абонент на порту" - -msgid "Show subscriber on port" -msgstr "Показать абонента на порту" - -msgid "Subscribers on port does not exist" -msgstr "Абоненты на порту не найдены" - -msgid "Export to nagios objects" -msgstr "Экспортировать конфиг для nagios" - -msgid "Ip address or parent device with ip address required for ONU device" -msgstr "Ip-адрес или родительское устройство с ip-адресом, необходимым для устройства ONU" - -msgid "Device group" -msgstr "Группа устройства" - diff --git a/dialing_app/locale/ru/LC_MESSAGES/django.po b/dialing_app/locale/ru/LC_MESSAGES/django.po index 8564340..9159596 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: 2017-12-29 13:59+0300\n" +"POT-Creation-Date: 2018-04-24 23:27+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Dmitry Novikov nerosketch@gmail.com\n" "Language: \n" @@ -19,135 +19,165 @@ 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" -#: models.py:8 models.py:43 +#: dialing_app/models.py:9 dialing_app/models.py:44 msgid "No answer" msgstr "Не отвечен" -#: models.py:9 models.py:45 +#: dialing_app/models.py:10 dialing_app/models.py:46 dialing_app/models.py:101 msgid "Failed" msgstr "С ошибкой" -#: models.py:10 models.py:47 +#: dialing_app/models.py:11 dialing_app/models.py:48 msgid "Busy" msgstr "Занято" -#: models.py:11 models.py:49 +#: dialing_app/models.py:12 dialing_app/models.py:50 msgid "Answered" msgstr "Отвечен" -#: models.py:12 models.py:51 +#: dialing_app/models.py:13 dialing_app/models.py:52 msgid "Unknown" msgstr "Не определён" -#: models.py:79 +#: dialing_app/models.py:84 dialing_app/models.py:108 msgid "Can view sms" msgstr "Может просматривать смс" -#: models.py:81 models.py:82 +#: dialing_app/models.py:86 dialing_app/models.py:87 msgid "SMS" msgstr "СМС" -#: templates/ext.html:7 templates/ext.html.py:21 views.py:19 +#: dialing_app/models.py:95 +msgid "When" +msgstr "Когда" + +#: dialing_app/models.py:96 dialing_app/templates/index.html:26 +msgid "Telephone" +msgstr "Телефон" + +#: dialing_app/models.py:97 +msgid "Text" +msgstr "Текст" + +#: dialing_app/models.py:99 +msgid "New" +msgstr "Новое" + +#: dialing_app/models.py:100 +msgid "Sent" +msgstr "Отправленное" + +#: dialing_app/models.py:103 +msgid "Status" +msgstr "Статус" + +#: dialing_app/models.py:109 +msgid "Can send sms" +msgstr "Может отправлять смс" + +#: dialing_app/models.py:111 dialing_app/models.py:112 +msgid "Out SMS" +msgstr "Исходящие СМС" + +#: dialing_app/templates/ext.html:7 dialing_app/templates/ext.html:21 +#: dialing_app/views.py:44 msgid "Last calls" msgstr "Последние звонки" -#: templates/ext.html:28 views.py:46 +#: dialing_app/templates/ext.html:28 dialing_app/views.py:73 msgid "Voice mail request" msgstr "Заявки на подключение" -#: templates/ext.html:35 views.py:57 +#: dialing_app/templates/ext.html:35 dialing_app/views.py:82 msgid "Voice mail report" msgstr "Заявки на поломки" -#: templates/index.html:10 templates/vmail.html.py:10 +#: dialing_app/templates/ext.html:42 dialing_app/templates/inbox_sms.html:7 +msgid "Inbox sms" +msgstr "Входящие смс" + +#: dialing_app/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 +msgid "Send sms" +msgstr "Отправить смс" + +#: dialing_app/templates/index.html:10 dialing_app/templates/vmail.html:10 msgid "Play" msgstr "Слушать" -#: templates/index.html:11 templates/vmail.html.py:11 +#: dialing_app/templates/index.html:11 dialing_app/templates/index.html:37 +#: dialing_app/templates/vmail.html:11 msgid "calldate" msgstr "дата звонка" -#: templates/index.html:12 templates/vmail.html.py:12 +#: dialing_app/templates/index.html:12 dialing_app/templates/vmail.html:12 msgid "src" msgstr "кто" -#: templates/index.html:13 +#: dialing_app/templates/index.html:13 msgid "dst" msgstr "куда" -#: templates/index.html:14 templates/vmail.html.py:13 +#: dialing_app/templates/index.html:14 dialing_app/templates/vmail.html:13 msgid "duration" msgstr "продолжительность" -#: templates/index.html:15 templates/vmail.html.py:14 +#: dialing_app/templates/index.html:15 dialing_app/templates/vmail.html:14 msgid "start" msgstr "начало" -#: templates/index.html:16 templates/vmail.html.py:15 +#: dialing_app/templates/index.html:16 dialing_app/templates/vmail.html:15 msgid "answer" msgstr "ответ" -#: templates/index.html:17 templates/vmail.html.py:16 +#: dialing_app/templates/index.html:17 dialing_app/templates/vmail.html:16 msgid "end" msgstr "конец" -#: templates/index.html:18 templates/vmail.html.py:17 +#: dialing_app/templates/index.html:18 dialing_app/templates/vmail.html:17 msgid "disposition" msgstr "состояние" -#: templates/index.html:24 views.py:74 +#: dialing_app/templates/index.html:24 dialing_app/views.py:93 msgid "Find dials" msgstr "Найти звонки" -#: templates/index.html:26 -msgid "Telephone" -msgstr "Телефон" +#: dialing_app/templates/index.html:35 +msgid "Find by dates" +msgstr "Найти по дате" -#: templates/index.html:47 +#: dialing_app/templates/index.html:65 msgid "Download" msgstr "Скачать" -#: templates/index.html:63 templates/vmail.html.py:42 +#: dialing_app/templates/index.html:81 dialing_app/templates/vmail.html:42 msgid "Calls was not found" msgstr "Звонки не найдены" -#: views.py:32 +#: dialing_app/templates/modal_send_sms.html:19 +msgid "Send" +msgstr "Отправить" + +#: dialing_app/views.py:54 msgid "Multiple users with the telephone number" msgstr "Несколько абонентов с указанным номером телефона" -#: views.py:34 +#: dialing_app/views.py:56 msgid "User with the telephone number not found" msgstr "Абонент с таким номером телефона не найден" -msgid "Dialing" -msgstr "Звонки" - -msgid "Inbox sms" -msgstr "Входящие смс" - -msgid "Out SMS" -msgstr "Исходящие СМС" - -msgid "Can send sms" -msgstr "Может отправлять смс" - -msgid "Send sms" -msgstr "Отправить смс" +#: dialing_app/views.py:113 +msgid "Make sure that your date format is correct" +msgstr "Убедитесь что формат времени корректен" +#: dialing_app/views.py:137 msgid "Message was enqueued for sending" msgstr "Сообщение было поставлено в очередь для отправки" +#: dialing_app/views.py:150 msgid "fix form errors" msgstr "Некоторые поля заполнены не правильно, проверте ещё раз" - -msgid "Text" -msgstr "Текст" - -msgid "When" -msgstr "Когда" - -msgid "Status" -msgstr "Статус" - -msgid "Send" -msgstr "Отправить" diff --git a/djing/locale/ru/LC_MESSAGES/django.po b/djing/locale/ru/LC_MESSAGES/django.po new file mode 100644 index 0000000..c62ad4a --- /dev/null +++ b/djing/locale/ru/LC_MESSAGES/django.po @@ -0,0 +1,42 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Dmitry Novikov nerosketch@gmail.com, 2018. +# +#, fuzzy +msgid "" +msgstr "" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-04-24 23:27+0300\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Dmitry Novikov nerosketch@gmail.com\n" +"Language: ru\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" + +#: djing/formfields.py:12 +msgid "Enter a valid integer." +msgstr "Введите валидное число" + +#: djing/formfields.py:21 +msgid "Enter a valid MAC Address." +msgstr "Введите валидный мак-адрес" + +#: djing/global_base_views.py:162 +msgid "Page is not 'last', nor can it be converted to an int." +msgstr "" +"Страница не является 'последней' и не может быть преобразована в " +"целочисленное значение." + +#: djing/global_base_views.py:171 +msgid "Filter does not contains data, filter without pagination" +msgstr "Фильтр не содержит данных, фильтр без разбиения на страницы" + +#: djing/global_base_views.py:173 +#, python-format +msgid "Invalid page (%(page_number)s): %(message)s" +msgstr "Неверная страница (%(page_number)s): %(message)s" diff --git a/djing/settings.py b/djing/settings.py index c5a3629..32c00b7 100644 --- a/djing/settings.py +++ b/djing/settings.py @@ -6,6 +6,8 @@ try: except ImportError: raise ImportError("You must create config file local_settings.py from template") +from django.utils.translation import gettext_lazy as _ + # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) from django.urls import reverse_lazy @@ -125,6 +127,17 @@ SESSION_COOKIE_HTTPONLY = True LANGUAGE_CODE = 'ru-RU' +LANGUAGES = [ + ('ru', _('Russian')), + ('en', _('English')), +] + +PROJECT_PATH = os.path.dirname(os.path.abspath(__file__)) + +LOCALE_PATHS = ( + os.path.join(PROJECT_PATH, '../locale'), +) + TIME_ZONE = 'Europe/Simferopol' USE_I18N = True diff --git a/group_app/locale/ru/LC_MESSAGES/django.po b/group_app/locale/ru/LC_MESSAGES/django.po index 397d392..25251e4 100644 --- a/group_app/locale/ru/LC_MESSAGES/django.po +++ b/group_app/locale/ru/LC_MESSAGES/django.po @@ -7,7 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2018-02-26 01:47+0300\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-04-24 23:27+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Dmitry Novikov \n" "Language: ru\n" @@ -18,52 +19,57 @@ 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" -#: models.py:7 +#: group_app/models.py:7 group_app/templates/group_app/group_list.html:21 msgid "Title" msgstr "Название" -#: models.py:16 +#: group_app/models.py:16 msgid "Can view group" msgstr "Может видеть группы" -#: models.py:18 +#: group_app/models.py:18 msgid "Group" msgstr "Группа" -#: models.py:19 templates/group_app/ext.html:7 templates/group_app/ext.html:8 -#: templates/group_app/ext.html:14 templates/group_app/group_list.html:7 -#: templates/group_app/group_list.html:10 +#: group_app/models.py:19 group_app/templates/group_app/ext.html:7 +#: group_app/templates/group_app/ext.html:8 +#: group_app/templates/group_app/ext.html:14 +#: group_app/templates/group_app/group_list.html:7 +#: group_app/templates/group_app/group_list.html:10 msgid "Groups" msgstr "Группы" -#: templates/group_app/add_group.html:9 templates/group_app/group_list.html:49 +#: group_app/templates/group_app/add_group.html:4 +#: group_app/templates/group_app/add_group.html:9 +#: group_app/templates/group_app/group_list.html:49 msgid "Add group" msgstr "Добавить группу" -#: templates/group_app/add_group.html:16 +#: group_app/templates/group_app/add_group.html:16 msgid "Add" msgstr "Добавить" -#: templates/group_app/edit_group.html:4 templates/group_app/edit_group.html:9 +#: group_app/templates/group_app/edit_group.html:4 +#: group_app/templates/group_app/edit_group.html:9 msgid "Edit group" msgstr "Изменить группу" -#: templates/group_app/edit_group.html:16 +#: group_app/templates/group_app/edit_group.html:16 msgid "Save" msgstr "Сохранить" -#: templates/group_app/group_list.html:41 +#: group_app/templates/group_app/group_list.html:41 msgid "Groups was not found" msgstr "Не найдено ни одной группы" -#: views.py:31 +#: group_app/views.py:31 msgid "Group changes has been saved" msgstr "Изменения сохранены" -#: views.py:35 views.py:51 +#: group_app/views.py:35 group_app/views.py:51 msgid "Please fix form errors" msgstr "Исправьте ошибки формы" -#: views.py:47 +#: group_app/views.py:47 msgid "New group are created" msgstr "Новая группа успешно создана" diff --git a/locale/ru/LC_MESSAGES/django.po b/locale/ru/LC_MESSAGES/django.po index 3e80fd8..330cab6 100644 --- a/locale/ru/LC_MESSAGES/django.po +++ b/locale/ru/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-26 02:06+0300\n" +"POT-Creation-Date: 2018-04-24 23:27+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Dmitry Novikov nerosketch@gmail.com\n" "Language: ru\n" @@ -18,14 +18,6 @@ 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:13 -msgid "Enter a valid integer." -msgstr "Введите число" - -#: djing/formfields.py:22 -msgid "Enter a valid MAC Address." -msgstr "Введите мак адрес" - #: templates/403.html:5 msgid "Permission denied" msgstr "Доступ запрещён" @@ -43,6 +35,43 @@ msgstr "У вас нет прав просматривать эту страни msgid "Close" msgstr "Закрыть" +#: templates/404.html:6 templates/404.html:14 templates/404.html:48 +msgid "Page does not exist" +msgstr "Страница не найдена" + +#: templates/404.html:7 templates/404.html:53 +#, python-format +msgid "The page '%(pth)s' was not found" +msgstr "Страница по адресу '%(pth)s' не найдена" + +#: templates/404.html:55 +msgid "To main" +msgstr "На главную" + +#: templates/all_base.html:4 +msgid "Admin side" +msgstr "Админка" + +#: templates/all_base.html:47 +msgid "Main page" +msgstr "Главная" + +#: templates/all_base.html:51 +msgid "Map page" +msgstr "Карта" + +#: templates/all_base.html:55 +msgid "Other" +msgstr "Другое" + +#: templates/all_base.html:57 +msgid "Settings" +msgstr "Настройки" + +#: templates/all_base.html:58 +msgid "Exit" +msgstr "Выйти" + #: templates/base.html:28 msgid "Administrators" msgstr "Сотрудники" @@ -71,9 +100,10 @@ msgstr "Настройки карты" msgid "Messages" msgstr "Сообщения" +#: templates/base.html:78 +msgid "Dialing" +msgstr "Звонки" + #: templates/base.html:85 msgid "Devices" -msgstr "Устрофства" - -#~ msgid "Service '%(service_name)s' has expired" -#~ msgstr "Срок действия услуги '%(service_name)s' истёк" +msgstr "Устройства" diff --git a/mapapp/locale/ru/LC_MESSAGES/django.po b/mapapp/locale/ru/LC_MESSAGES/django.po index 33d5149..e28ff24 100644 --- a/mapapp/locale/ru/LC_MESSAGES/django.po +++ b/mapapp/locale/ru/LC_MESSAGES/django.po @@ -5,10 +5,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-03 00:12+0300\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"POT-Creation-Date: 2018-04-24 23:27+0300\n" "Last-Translator: Dmitry Novikov nerosketch@gmail.com\n" "Language: \n" "MIME-Version: 1.0\n" @@ -18,159 +15,168 @@ 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" -#: models.py:7 +#: mapapp/models.py:7 msgid "Map point title" msgstr "Название точки" -#: models.py:8 +#: mapapp/models.py:8 mapapp/templates/maps/options.html:20 msgid "Latitude" msgstr "Широта" -#: models.py:9 templates/maps/options.html.py:18 +#: mapapp/models.py:9 mapapp/templates/maps/options.html:19 msgid "Longitude" msgstr "Долгота" -#: models.py:10 templates/maps/dot.html.py:63 +#: mapapp/models.py:10 mapapp/templates/maps/dot.html:64 msgid "Devices" msgstr "Устройства" -#: models.py:11 +#: mapapp/models.py:11 msgid "Attachment" msgstr "Приложение" -#: models.py:15 +#: mapapp/models.py:15 mapapp/templates/maps/dot.html:27 +#: mapapp/templates/maps/options.html:13 msgid "Map point" msgstr "Геоточка" -#: models.py:16 +#: mapapp/models.py:16 msgid "Map points" msgstr "Геоточки" -#: models.py:18 +#: mapapp/models.py:18 msgid "Can view" msgstr "Может просматривать" -#: templates/maps/add_device.html:8 templates/maps/dot.html.py:8 -#: templates/maps/options.html:7 +#: mapapp/templates/maps/add_device.html:8 mapapp/templates/maps/dot.html:9 +#: mapapp/templates/maps/options.html:7 msgid "Map settings" msgstr "Настройки карты" -#: templates/maps/add_device.html:10 +#: mapapp/templates/maps/add_device.html:10 msgid "Add devices" msgstr "Добавить устройства" -#: templates/maps/add_device.html:24 +#: mapapp/templates/maps/add_device.html:24 msgid "Pick the group" msgstr "Выбрать группу" -#: templates/maps/add_device.html:55 +#: mapapp/templates/maps/add_device.html:55 msgid "Select the devices" msgstr "Выбрать устройства" -#: templates/maps/add_device.html:62 templates/maps/dot.html.py:49 -#: templates/maps/modal_add_device.html:15 templates/maps/modal_add_dot.html:25 +#: mapapp/templates/maps/add_device.html:62 mapapp/templates/maps/dot.html:50 +#: mapapp/templates/maps/modal_add_device.html:15 +#: mapapp/templates/maps/modal_add_dot.html:25 msgid "Save" msgstr "Сохранить" -#: templates/maps/dot.html:13 +#: mapapp/templates/maps/dot.html:14 msgid "Add new point" msgstr "Добавить новую точку" -#: templates/maps/dot.html:52 +#: mapapp/templates/maps/dot.html:53 msgid "Reset" msgstr "Сбросить" -#: templates/maps/dot.html:83 +#: mapapp/templates/maps/dot.html:84 msgid "User group has no attached" msgstr "Группа абонентов не привязана" -#: templates/maps/dot.html:89 +#: mapapp/templates/maps/dot.html:90 msgid "Devices not found" msgstr "Устройства не найдены" -#: templates/maps/dot.html:94 +#: mapapp/templates/maps/dot.html:95 msgid "Add" msgstr "Добавить" -#: templates/maps/map_tooltip.html:15 +#: mapapp/templates/maps/map_tooltip.html:15 msgid "Pinned devices not found" msgstr "Привязанные устройства не найдены" -#: templates/maps/modal_add_device.html:5 +#: mapapp/templates/maps/modal_add_device.html:5 msgid "Add device" msgstr "Добавить устройство" -#: templates/maps/modal_add_device.html:17 +#: mapapp/templates/maps/modal_add_device.html:17 msgid "Close" msgstr "Закрыть" -#: templates/maps/modal_add_dot.html:6 +#: mapapp/templates/maps/modal_add_dot.html:6 msgid "Add point" msgstr "Добавить точку" -#: templates/maps/modal_add_dot.html:9 +#: mapapp/templates/maps/modal_add_dot.html:9 #, python-format msgid "Coords: %(coords)s" msgstr "Координаты %(coords)s" -#: templates/maps/options.html:17 +#: mapapp/templates/maps/options.html:18 msgid "Title" msgstr "Название" -#: templates/maps/options.html:32 +#: mapapp/templates/maps/options.html:34 msgid "Edit" msgstr "Изменить" -#: templates/maps/options.html:39 +#: mapapp/templates/maps/options.html:41 msgid "Delete" msgstr "Удалить" -#: templates/maps/options.html:49 +#: mapapp/templates/maps/options.html:53 msgid "You have not created map points yet" msgstr "Вы ещё не создали ни одной геоточки" -#: templates/maps/options.html:49 +#: mapapp/templates/maps/options.html:54 msgid "Create" msgstr "Создать" -#: templates/maps/preload_devices_tmpl.html:7 +#: mapapp/templates/maps/preload_devices_tmpl.html:7 msgid "no devices found" msgstr "нет усройств" -#: templates/maps/ya_index.html:11 +#: mapapp/templates/maps/ya_index.html:31 msgid "Loading.." msgstr "Загрузка.." -#: templates/maps/ya_index.html:144 +#: mapapp/templates/maps/ya_index.html:46 +msgid "Please allow popups for this website" +msgstr "Разрешите сайту открывать всплывающие окна" + +#: mapapp/templates/maps/ya_index.html:224 msgid "Layers" msgstr "Слои" -#: templates/maps/ya_index.html:153 +#: mapapp/templates/maps/ya_index.html:225 +msgid "Help" +msgstr "Справка" + +#: mapapp/templates/maps/ya_index.html:236 msgid "Show all" msgstr "Показать всё" -#: views.py:53 +#: mapapp/templates/maps/ya_index.html:239 +msgid "Update states" +msgstr "Обновить состояния" + +#: mapapp/views.py:69 msgid "Map point has been saved" msgstr "Геоточка сохранена" -#: views.py:56 views.py:111 +#: mapapp/views.py:72 mapapp/views.py:154 msgid "fix form errors" msgstr "исправте ошибки формы" -#: views.py:66 views.py:79 +#: mapapp/views.py:82 mapapp/views.py:95 msgid "Map point does not exist" msgstr "Геоточка не найдена" -#: views.py:77 +#: mapapp/views.py:93 #, python-format msgid "Map point '%(title)s' has been deleted" msgstr "Геоточка '%(title)s' была удалена" -msgid "Please allow popups for this website" -msgstr "Разрешите сайту открывать всплывающие окна" - -msgid "Help" -msgstr "Справка" - -msgid "Update states" -msgstr "Обновить состояния" +#: mapapp/views.py:251 +msgid "Devices is not found on the dot" +msgstr "На точке не найдены устройства" diff --git a/msg_app/locale/ru/LC_MESSAGES/django.po b/msg_app/locale/ru/LC_MESSAGES/django.po index 498530c..ac457e0 100644 --- a/msg_app/locale/ru/LC_MESSAGES/django.po +++ b/msg_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: 2017-10-04 17:52+0300\n" +"POT-Creation-Date: 2018-04-24 23:27+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Dmitry Novikov nerosketch@gmail.com\n" "Language: ru\n" @@ -19,146 +19,148 @@ 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" -#: forms.py:25 +#: msg_app/forms.py:26 msgid "you must choose at least 1 participants" msgstr "вы должны выбрать как минимум одного участника" -#: models.py:14 templates/msg_app/conversations.html.py:54 +#: msg_app/models.py:16 msg_app/templates/msg_app/conversations.html:55 msgid "New" msgstr "Новая" -#: models.py:15 +#: msg_app/models.py:17 msgid "Seen" msgstr "Просмотренное" -#: models.py:16 +#: msg_app/models.py:18 msgid "Deleted" msgstr "Удалённое" -#: models.py:28 +#: msg_app/models.py:30 msgid "Message status" msgstr "Статус сообщения" -#: models.py:29 +#: msg_app/models.py:31 msgid "Messages statuses" msgstr "Статусы сообщений" -#: models.py:33 +#: msg_app/models.py:35 msgid "Body" msgstr "Тело" -#: models.py:34 +#: msg_app/models.py:36 msgid "sent at" msgstr "отправлено" -#: models.py:36 models.py:234 +#: msg_app/models.py:38 msg_app/models.py:241 msgid "Conversation" msgstr "Беседа" -#: models.py:66 +#: msg_app/models.py:68 msg_app/views.py:90 msgid "Message" msgstr "Сообщение" -#: models.py:67 +#: msg_app/models.py:69 msgid "Messages" msgstr "Сообщения" -#: models.py:69 +#: msg_app/models.py:71 msgid "Can view messages" msgstr "может просматривать сообщения" -#: models.py:77 +#: msg_app/models.py:79 msgid "Admin" msgstr "Админ" -#: models.py:78 +#: msg_app/models.py:80 msgid "Guest" msgstr "Гость" -#: models.py:79 +#: msg_app/models.py:81 msgid "Banned user" msgstr "Запрещённый пользователь" -#: models.py:80 +#: msg_app/models.py:82 msgid "Inviter" msgstr "Создатель" -#: models.py:90 +#: msg_app/models.py:93 msgid "Conversation membership" msgstr "Членство в беседе" -#: models.py:91 +#: msg_app/models.py:94 msgid "Conversation memberships" msgstr "Членства в беседах" -#: models.py:100 +#: msg_app/models.py:103 msgid "Participant profile does not found" msgstr "Учётная запись участника не найдена" -#: models.py:110 +#: msg_app/models.py:112 msgid "No name" msgstr "Без имени" -#: models.py:235 templates/msg_app/conversations.html.py:14 +#: msg_app/models.py:242 msg_app/templates/msg_app/conversations.html:14 msgid "Conversations" msgstr "Беседы" -#: models.py:237 +#: msg_app/models.py:244 msgid "Can view conversation" msgstr "Может просматривать беседы" -#: templates/msg_app/chat.html:7 templates/msg_app/conversations.html.py:7 +#: msg_app/templates/msg_app/chat.html:7 +#: msg_app/templates/msg_app/conversations.html:7 msgid "Private messages" msgstr "Личные сообщения" -#: templates/msg_app/chat.html:16 +#: msg_app/templates/msg_app/chat.html:16 msgid "peoples" msgstr "участников" -#: templates/msg_app/chat.html:26 +#: msg_app/templates/msg_app/chat.html:26 msgid "Delete" msgstr "Удалить" -#: templates/msg_app/chat.html:58 +#: msg_app/templates/msg_app/chat.html:58 msgid "Message history is empty" msgstr "История сообщений пуста" -#: templates/msg_app/chat.html:75 +#: msg_app/templates/msg_app/chat.html:75 msgid "Send" msgstr "Отправить" -#: templates/msg_app/conversations.html:32 +#: msg_app/templates/msg_app/conversations.html:15 +msgid "Enter to conversation by clicking to it" +msgstr "Войдите в беседу кликнув по ней" + +#: msg_app/templates/msg_app/conversations.html:33 #, python-format msgid "%(participants_count)s participants, %(msg_count)s messages" msgstr "%(participants_count)s участников, %(msg_count)s сообщений" -#: templates/msg_app/conversations.html:38 +#: msg_app/templates/msg_app/conversations.html:39 msgid "No messages found" msgstr "Сообщения не найдены" -#: templates/msg_app/conversations.html:47 +#: msg_app/templates/msg_app/conversations.html:48 msgid "Any conversations not found" msgstr "Не найдено ни одной беседы" -#: templates/msg_app/modal_new_conversation.html:5 +#: msg_app/templates/msg_app/modal_new_conversation.html:5 msgid "Create conversation" msgstr "Создать беседу" -#: templates/msg_app/modal_new_conversation.html:19 +#: msg_app/templates/msg_app/modal_new_conversation.html:19 msgid "for select multiple press ctrl and click on field" msgstr "Для выбора нескольких вариантов зажмите ctrl и кликните нужный вариант" -#: templates/msg_app/modal_new_conversation.html:28 +#: msg_app/templates/msg_app/modal_new_conversation.html:28 msgid "Add" msgstr "Добавить" -#: views.py:26 +#: msg_app/views.py:35 msgid "Conversation has been created" msgstr "Беседа создана" -#: views.py:29 views.py:48 +#: msg_app/views.py:38 msg_app/views.py:57 msgid "fix form errors" msgstr "заполните все поля в соответствии с их форматом" - -msgid "Enter to conversation by clicking to it" -msgstr "Войдите в беседу кликнув по ней" diff --git a/searchapp/locale/ru/LC_MESSAGES/django.po b/searchapp/locale/ru/LC_MESSAGES/django.po index 6268af7..f4d08e2 100644 --- a/searchapp/locale/ru/LC_MESSAGES/django.po +++ b/searchapp/locale/ru/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-09 11:15+0300\n" +"POT-Creation-Date: 2018-04-24 23:27+0300\n" "Last-Translator: Dmitry Novikov nerosketch@gmail.com\n" "Language: ru\n" "MIME-Version: 1.0\n" @@ -17,28 +17,30 @@ 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" -#: templates/searchapp/index.html:8 +#: searchapp/templates/searchapp/index.html:8 #, python-format msgid "Search by %(searchstring)s" msgstr "Поиск по %(searchstring)s" -#: templates/searchapp/index.html:16 +#: searchapp/templates/searchapp/index.html:16 msgid "Change search string there" msgstr "Измените строку поиска" -#: templates/searchapp/index.html:21 +#: searchapp/templates/searchapp/index.html:21 msgid "Find" msgstr "Найти" -#: templates/searchapp/index.html:46 templates/searchapp/index.html:75 +#: searchapp/templates/searchapp/index.html:48 +#: searchapp/templates/searchapp/index.html:85 msgid "Nothing to found" msgstr "Ничего не найдено" -#: templates/searchapp/index.html:49 templates/searchapp/index.html:78 +#: searchapp/templates/searchapp/index.html:52 +#: searchapp/templates/searchapp/index.html:89 msgid "You can change search string and try again" msgstr "Вы можете изменить строку поиска и попробовать ещё раз" -#: templates/searchapp/index.html:68 +#: searchapp/templates/searchapp/index.html:76 #, python-format msgid "Network state is %(netw_status)s" msgstr "Сетевой статус: %(netw_status)s" diff --git a/tariff_app/locale/ru/LC_MESSAGES/django.po b/tariff_app/locale/ru/LC_MESSAGES/django.po index c60447b..08b181f 100644 --- a/tariff_app/locale/ru/LC_MESSAGES/django.po +++ b/tariff_app/locale/ru/LC_MESSAGES/django.po @@ -8,10 +8,10 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-15 13:44+0300\n" +"POT-Creation-Date: 2018-04-24 23:27+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Dmitry Novikov nerosketch@gmail.com\n" -"Language: \n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -19,119 +19,193 @@ 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/templates/tariff_app/modal_del_warning.html:23 -msgid "Delete" -msgstr "Удалить" - -#: tariff_app/templates/tariff_app/modal_del_warning.html:26 -msgid "Reset" -msgstr "Сбросить" - -msgid "Tarifs" -msgstr "Тарифы" - -msgid "Add" -msgstr "Добавить" +#: tariff_app/custom_tariffs.py:49 +msgid "Base calculate functionality" +msgstr "Базовый расчётный функционал" -msgid "Edit" -msgstr "Редактировать" +#: tariff_app/custom_tariffs.py:75 +msgid "Private service" +msgstr "Для внутреннего пользования" -msgid "Create" -msgstr "Создать" +#: tariff_app/custom_tariffs.py:96 +msgid "Default periodic pay" +msgstr "Логика по умолчанию" -msgid "tariff" -msgstr "тариф" +#: tariff_app/custom_tariffs.py:109 +msgid "Custom periodic pay" +msgstr "Пробная логика" +#: tariff_app/models.py:18 msgid "Service title" msgstr "Название тарифа" +#: tariff_app/models.py:19 msgid "Service description" msgstr "Описание тарифа" +#: tariff_app/models.py:20 tariff_app/templates/tariff_app/tarifs.html:17 msgid "Speed In" msgstr "Входящая скорость" +#: tariff_app/models.py:21 tariff_app/templates/tariff_app/tarifs.html:23 msgid "Speed Out" msgstr "Исходящая скорость" +#: tariff_app/models.py:22 tariff_app/templates/tariff_app/tarifs.html:29 msgid "Price" msgstr "Стоимость" +#: tariff_app/models.py:23 tariff_app/templates/tariff_app/tarifs.html:33 msgid "Script" msgstr "Скрипт" +#: tariff_app/models.py:25 msgid "Tech service" msgstr "Административный тариф" -msgid "Save" -msgstr "Сохранить" +#: tariff_app/models.py:55 +msgid "Service" +msgstr "Услуга" -msgid "Service list" -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 +msgid "Services" +msgstr "Тарифы" -msgid "Services does not exist yet" -msgstr "Ещё нет созданных тарифов" +#: tariff_app/models.py:60 +#: tariff_app/templates/tariff_app/periodic_pays/list.html:9 +msgid "Periodic pay name" +msgstr "Название" -msgid "Base calculate functionality" -msgstr "Базовый расчётный функционал" +#: tariff_app/models.py:61 +#: tariff_app/templates/tariff_app/periodic_pays/list.html:10 +msgid "When pay created" +msgstr "Когда создан" -msgid "Private service" -msgstr "Для внутреннего пользования" +#: tariff_app/models.py:62 +#: tariff_app/templates/tariff_app/periodic_pays/list.html:11 +msgid "Script type for calculations" +msgstr "Алгоритм расчёта" -msgid "Service has been saved" -msgstr "Тариф успешно сохранён" +#: tariff_app/models.py:64 +#: tariff_app/templates/tariff_app/periodic_pays/list.html:12 +msgid "Total amount" +msgstr "Стоимость" -msgid "Some fields were filled incorrect, please try again" -msgstr "Не все поля заполнены правильно, проверте и попробуйте ещё раз" +#: tariff_app/models.py:103 +msgid "Can view periodic pay" +msgstr "Может смотреть периодические платежи" -msgid "Service has been deleted" -msgstr "Тарифный план успешно удалён" +#: tariff_app/models.py:105 +msgid "Periodic pay" +msgstr "Периодический платёж" -msgid "Not have a confirmations of delete" -msgstr "Нет подтверждения удаления" +#: tariff_app/models.py:106 tariff_app/templates/tariff_app/ext.html:24 +msgid "Periodic pays" +msgstr "Периодические платежи" + +#: tariff_app/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 +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 +msgid "Edit" +msgstr "Редактировать" + +#: tariff_app/templates/tariff_app/editTarif.html:22 +#: tariff_app/templates/tariff_app/tarifs.html:64 +msgid "Create" +msgstr "Создать" + +#: tariff_app/templates/tariff_app/editTarif.html:22 +#: tariff_app/templates/tariff_app/tarifs.html:11 +msgid "tariff" +msgstr "тариф" + +#: tariff_app/templates/tariff_app/editTarif.html:49 +#: tariff_app/templates/tariff_app/periodic_pays/add_edit.html:44 +msgid "Save" +msgstr "Сохранить" + +#: tariff_app/templates/tariff_app/editTarif.html:52 +#: tariff_app/templates/tariff_app/modal_del_warning.html:25 +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." +"after delete the tariff, subscribers who use that tariff will be " +"disconnected from it." msgstr "" -"После того как вы удалите тарифный план то абоненты, подписанные на него, сразу потеряют услугу по этому тарифу. " -"Так что сначала убедитесь что уже никто не пользуется тарифом, и только после этого удалите его." +"После того как вы удалите тарифный план то абоненты, подписанные на него, " +"сразу потеряют услугу по этому тарифу. Так что сначала убедитесь что уже " +"никто не пользуется тарифом, и только после этого удалите его." -msgid "Services" -msgstr "Тарифы" +#: tariff_app/templates/tariff_app/modal_del_warning.html:22 +msgid "Delete" +msgstr "Удалить" -msgid "Periodic pays" -msgstr "Периодические платежи" +#: tariff_app/templates/tariff_app/periodic_pays/add_edit.html:10 +msgid "Change periodic pay" +msgstr "Может редактировать периодический платёж" -msgid "Periodic pay name" -msgstr "Название" +#: tariff_app/templates/tariff_app/periodic_pays/add_edit.html:12 +msgid "Add new periodic pay" +msgstr "Добавить периодический платёж" -msgid "When pay created" -msgstr "Когда создан" +#: tariff_app/templates/tariff_app/periodic_pays/add_edit.html:29 +msgid "Pay details" +msgstr "Подробности платежа" -msgid "Script type for calculations" -msgstr "Алгоритм расчёта" +#: tariff_app/templates/tariff_app/periodic_pays/list.html:39 +msgid "The list is empty" +msgstr "Список пуст" -msgid "Total amount" -msgstr "Стоимость" +#: tariff_app/templates/tariff_app/tarifs.html:50 +msgid "currency" +msgstr "руб." -msgid "Pay details" -msgstr "Подробности платежа" +#: tariff_app/templates/tariff_app/tarifs.html:62 +msgid "Services does not exist yet" +msgstr "Ещё нет созданных тарифов" -msgid "Default periodic pay" -msgstr "Логика по умолчанию" +#: tariff_app/views.py:51 +msgid "Service has been saved" +msgstr "Тариф успешно сохранён" -msgid "Custom periodic pay" -msgstr "Пробная логика" +#: tariff_app/views.py:54 tariff_app/views.py:106 +msgid "Some fields were filled incorrect, please try again" +msgstr "Не все поля заполнены правильно, проверте и попробуйте ещё раз" -msgid "Add new periodic pay" -msgstr "Добавить периодический платёж" +#: tariff_app/views.py:70 +msgid "Service has been deleted" +msgstr "Тарифный план успешно удалён" -msgid "Service" -msgstr "Услуга" +#: tariff_app/views.py:72 +msgid "Not have a confirmations of delete" +msgstr "Нет подтверждения удаления" + +#: tariff_app/views.py:100 +msgid "New periodic pay successfully created" +msgstr "Новый периодический платёж создан" +#: tariff_app/views.py:102 +msgid "Periodic pay has been changed" +msgstr "Периодический платёж изменён" diff --git a/taskapp/locale/ru/LC_MESSAGES/django.po b/taskapp/locale/ru/LC_MESSAGES/django.po index 45171c7..f9dde29 100644 --- a/taskapp/locale/ru/LC_MESSAGES/django.po +++ b/taskapp/locale/ru/LC_MESSAGES/django.po @@ -1,8 +1,14 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Dmitry Novikov nerosketch@gmail.com, 2017. +# +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-19 16:36+0300\n" +"POT-Creation-Date: 2018-04-24 23:27+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Dmitry Novikov nerosketch@gmail.com\n" "Language: ru\n" @@ -13,423 +19,482 @@ 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" -#: forms.py:17 +#: taskapp/forms.py:19 +msgid "No responsible employee for the users group" +msgstr "Нет ответственных за группу, в которой находится выбранный абонент" + +#: taskapp/forms.py:24 +msgid "You must select the subscriber" +msgstr "Нужно выбрать абонента" + +#: taskapp/forms.py:32 msgid "Short description" msgstr "Краткое описание" -#: handle.py:17 views.py:234 +#: taskapp/handle.py:17 taskapp/views.py:255 msgid "Task" msgstr "Задача" -#: handle.py:23 +#: taskapp/handle.py:23 msgid "Task completed" msgstr "Задача завершена" -#: handle.py:28 +#: taskapp/handle.py:28 #, python-format msgid "locality %s.\n" msgstr "с. %s\n" -#: handle.py:30 +#: taskapp/handle.py:30 +#, python-format msgid "" "address %(street)s %(house)s.\n" "telephone %(telephone)s\n" msgstr "по адресу %(street)s %(house)s тел. %(telephone)s.\n" -#: handle.py:31 models.py:25 +#: taskapp/handle.py:31 taskapp/models.py:24 msgid "not chosen" msgstr "не выбрано" -#: handle.py:35 +#: taskapp/handle.py:35 #, python-format msgid "Task type - %s." msgstr "Тип задачи - %s." -#: models.py:13 +#: taskapp/models.py:12 msgid "Higher" msgstr "Высший" -#: models.py:14 +#: taskapp/models.py:13 msgid "Average" msgstr "Средний" -#: models.py:15 +#: taskapp/models.py:14 msgid "Low" msgstr "Низкий" -#: models.py:19 +#: taskapp/models.py:18 msgid "New" msgstr "Новая" -#: models.py:20 +#: taskapp/models.py:19 msgid "Confused" msgstr "Провалена" -#: models.py:21 +#: taskapp/models.py:20 msgid "Completed" msgstr "Выполнена" -#: models.py:26 +#: taskapp/models.py:25 msgid "ip conflict" msgstr "Ip конфликт" -#: models.py:27 +#: taskapp/models.py:26 msgid "yellow triangle" msgstr "жёлтый треугольник" -#: models.py:28 +#: taskapp/models.py:27 msgid "red cross" msgstr "красный крестик" -#: models.py:29 +#: taskapp/models.py:28 msgid "weak speed" msgstr "слабая скорость" -#: models.py:30 +#: taskapp/models.py:29 msgid "cable break" msgstr "обрыв кабеля" -#: models.py:31 +#: taskapp/models.py:30 msgid "connection" msgstr "подключение" -#: models.py:32 +#: taskapp/models.py:31 msgid "periodic disappearance" msgstr "переодическое пропадание" -#: models.py:33 +#: taskapp/models.py:32 msgid "router setup" msgstr "настройка роутера" -#: models.py:34 +#: taskapp/models.py:33 msgid "configure onu" msgstr "настроить onu" -#: models.py:35 +#: taskapp/models.py:34 msgid "crimp cable" msgstr "обжать кабель" -#: models.py:36 +#: taskapp/models.py:35 msgid "Internet crash" msgstr "Нет интернета" -#: models.py:37 +#: taskapp/models.py:36 msgid "other" msgstr "другое" -#: models.py:44 +#: taskapp/models.py:43 msgid "Change task" msgstr "Изменение задачи" -#: models.py:45 +#: taskapp/models.py:44 msgid "Create task" msgstr "Создание задачи" -#: models.py:46 +#: taskapp/models.py:45 msgid "Delete task" msgstr "Удаление задачи" -#: models.py:47 +#: taskapp/models.py:46 msgid "Completing tasks" msgstr "Завершение задачи" -#: models.py:48 +#: taskapp/models.py:47 msgid "The task failed" msgstr "Задача провалена" -#: models.py:63 templates/taskapp/details.html:8 -#: templates/taskapp/tasklist.html:13 templates/taskapp/tasklist_all.html:25 -#: templates/taskapp/tasklist_failed.html:13 -#: templates/taskapp/tasklist_finish.html:13 -#: templates/taskapp/tasklist_own.html:13 +#: taskapp/models.py:62 taskapp/templates/taskapp/details.html:8 +#: taskapp/templates/taskapp/tasklist.html:13 +#: taskapp/templates/taskapp/tasklist_all.html:25 +#: taskapp/templates/taskapp/tasklist_empty.html:18 +#: taskapp/templates/taskapp/tasklist_failed.html:18 +#: taskapp/templates/taskapp/tasklist_finish.html:13 +#: taskapp/templates/taskapp/tasklist_own.html:13 msgid "Description" msgstr "Описание" -#: models.py:65 templates/taskapp/details.html:10 -#: templates/taskapp/tasklist.html:14 templates/taskapp/tasklist_all.html:26 -#: templates/taskapp/tasklist_failed.html:14 -#: templates/taskapp/tasklist_finish.html:14 +#: taskapp/models.py:63 +msgid "Recipients" +msgstr "Исполнители" + +#: taskapp/models.py:66 taskapp/templates/taskapp/details.html:10 +#: taskapp/templates/taskapp/tasklist.html:14 +#: taskapp/templates/taskapp/tasklist_all.html:26 +#: taskapp/templates/taskapp/tasklist_empty.html:19 +#: taskapp/templates/taskapp/tasklist_failed.html:19 +#: taskapp/templates/taskapp/tasklist_finish.html:14 msgid "Task author" msgstr "Автор задачи" -#: models.py:66 templates/taskapp/details.html:18 +#: taskapp/models.py:67 taskapp/templates/taskapp/details.html:23 msgid "A priority" msgstr "Приоритет" -#: models.py:67 templates/taskapp/add_edit_task.html:65 +#: taskapp/models.py:68 taskapp/templates/taskapp/add_edit_task.html:66 msgid "Reality" msgstr "Актуальность (дата, до которой нужно завершить задачу)" -#: models.py:68 templates/taskapp/details.html:20 -#: templates/taskapp/tasklist.html:15 templates/taskapp/tasklist_all.html:28 -#: templates/taskapp/tasklist_failed.html:15 -#: templates/taskapp/tasklist_finish.html:15 -#: templates/taskapp/tasklist_own.html:15 +#: taskapp/models.py:69 taskapp/templates/taskapp/details.html:25 +#: taskapp/templates/taskapp/tasklist.html:15 +#: taskapp/templates/taskapp/tasklist_all.html:28 +#: taskapp/templates/taskapp/tasklist_empty.html:20 +#: taskapp/templates/taskapp/tasklist_failed.html:20 +#: taskapp/templates/taskapp/tasklist_finish.html:15 +#: taskapp/templates/taskapp/tasklist_own.html:15 msgid "Date of create" msgstr "Дата создания" -#: models.py:69 templates/taskapp/details.html:23 -#: templates/taskapp/tasklist_all.html:27 -#: templates/taskapp/tasklist_own.html:14 +#: taskapp/models.py:70 taskapp/templates/taskapp/details.html:28 +#: taskapp/templates/taskapp/tasklist_all.html:27 +#: taskapp/templates/taskapp/tasklist_own.html:14 msgid "Condition" msgstr "Состояние" -#: models.py:70 +#: taskapp/models.py:71 msgid "Attached image" msgstr "Прикреплённое изображение" -#: models.py:71 templates/taskapp/tasklist.html:12 -#: templates/taskapp/tasklist_all.html:24 -#: templates/taskapp/tasklist_failed.html:12 -#: templates/taskapp/tasklist_finish.html:12 -#: templates/taskapp/tasklist_own.html:12 +#: taskapp/models.py:72 taskapp/templates/taskapp/tasklist.html:12 +#: taskapp/templates/taskapp/tasklist_all.html:24 +#: taskapp/templates/taskapp/tasklist_empty.html:17 +#: taskapp/templates/taskapp/tasklist_failed.html:17 +#: taskapp/templates/taskapp/tasklist_finish.html:12 +#: taskapp/templates/taskapp/tasklist_own.html:12 msgid "The nature of the damage" msgstr "Характер поломки" -#: models.py:72 templates/taskapp/add_edit_task.html:49 -#: templates/taskapp/details.html:24 +#: taskapp/models.py:73 taskapp/templates/taskapp/add_edit_task.html:50 +#: taskapp/templates/taskapp/details.html:29 msgid "Subscriber" msgstr "Абонент" -#: models.py:78 +#: taskapp/models.py:79 msgid "Access to all tasks" msgstr "Доступ ко всем задачам" -#: models.py:79 +#: taskapp/models.py:80 msgid "Reminders of tasks" msgstr "Напоминания о задачах" -#: models.py:109 +#: taskapp/models.py:120 msgid "Text of comment" msgstr "Текст комментария" -#: models.py:110 +#: taskapp/models.py:121 msgid "Owner task" msgstr "Владелец задачи" -#: models.py:111 +#: taskapp/models.py:122 msgid "Author" msgstr "Автор" -#: models.py:112 +#: taskapp/models.py:123 msgid "Time of create" msgstr "Дата создания" -#: models.py:120 +#: taskapp/models.py:131 msgid "Can view comments" msgstr "Может видеть комментарии" -#: models.py:122 +#: taskapp/models.py:133 msgid "Extra comment" msgstr "Комментарий" -#: models.py:123 +#: taskapp/models.py:134 msgid "Extra comments" msgstr "Комментарии" -#: templates/taskapp/add_edit_task.html:8 templates/taskapp/tasklist_all.html:8 +#: taskapp/templates/taskapp/add_edit_task.html:9 +#: taskapp/templates/taskapp/tasklist_all.html:8 msgid "Tasks" msgstr "Задачи" -#: templates/taskapp/add_edit_task.html:9 templates/taskapp/tasklist.html:82 -#: templates/taskapp/tasklist_all.html:90 -#: templates/taskapp/tasklist_failed.html:58 -#: templates/taskapp/tasklist_finish.html:64 -#: templates/taskapp/tasklist_own.html:61 +#: taskapp/templates/taskapp/add_edit_task.html:10 +#: taskapp/templates/taskapp/tasklist.html:83 +#: taskapp/templates/taskapp/tasklist_all.html:91 +#: taskapp/templates/taskapp/tasklist_empty.html:66 +#: taskapp/templates/taskapp/tasklist_failed.html:69 +#: taskapp/templates/taskapp/tasklist_finish.html:68 +#: taskapp/templates/taskapp/tasklist_own.html:61 msgid "Edit" msgstr "Редактировать" -#: templates/taskapp/add_edit_task.html:9 +#: taskapp/templates/taskapp/add_edit_task.html:10 msgid "Create" msgstr "Создать" -#: templates/taskapp/add_edit_task.html:19 templates/taskapp/footer_btns.html:5 -#: templates/taskapp/tasklist_all.html:111 -#: templates/taskapp/tasklist_all.html:112 +#: taskapp/templates/taskapp/add_edit_task.html:20 +#: taskapp/templates/taskapp/footer_btns.html:5 +#: taskapp/templates/taskapp/tasklist_all.html:112 +#: taskapp/templates/taskapp/tasklist_all.html:113 msgid "Add new task" msgstr "Добавьте задачу" -#: templates/taskapp/add_edit_task.html:21 +#: taskapp/templates/taskapp/add_edit_task.html:22 msgid "Edit task" msgstr "Редактировать задачу" -#: templates/taskapp/add_edit_task.html:56 -#: templates/taskapp/add_edit_task.html:59 +#: taskapp/templates/taskapp/add_edit_task.html:57 +#: taskapp/templates/taskapp/add_edit_task.html:60 msgid "Find the subscriber" msgstr "Найти абонента" -#: templates/taskapp/add_edit_task.html:85 +#: taskapp/templates/taskapp/add_edit_task.html:86 msgid "Save" msgstr "Сохранить" -#: templates/taskapp/add_edit_task.html:88 +#: taskapp/templates/taskapp/add_edit_task.html:89 msgid "Reset" msgstr "Сбросить" -#: templates/taskapp/add_edit_task.html:92 -#: templates/taskapp/comments/extracomment_confirm_delete.html:15 -#: templates/taskapp/comments/task_comments.html:13 -#: templates/taskapp/tasklist_own.html:71 +#: taskapp/templates/taskapp/add_edit_task.html:93 +#: taskapp/templates/taskapp/comments/extracomment_confirm_delete.html:15 +#: taskapp/templates/taskapp/comments/task_comments.html:13 +#: taskapp/templates/taskapp/tasklist_own.html:71 msgid "Delete" msgstr "Удалить" -#: templates/taskapp/comments/extracomment_confirm_delete.html:6 +#: taskapp/templates/taskapp/comments/extracomment_confirm_delete.html:6 msgid "Delete comment" msgstr "Удаление комментарий" -#: templates/taskapp/comments/extracomment_confirm_delete.html:10 +#: taskapp/templates/taskapp/comments/extracomment_confirm_delete.html:10 #, python-format msgid "Are you sure you want to delete \"%(object)s\"?" msgstr "Вы уверены что хотите удалить \"%(object)s\"?" -#: templates/taskapp/comments/task_comments.html:5 +#: taskapp/templates/taskapp/comments/task_comments.html:5 msgid "Task comments" msgstr "Комментарии задачи" -#: templates/taskapp/comments/task_comments.html:25 +#: taskapp/templates/taskapp/comments/task_comments.html:25 msgid "Comment history is empty" msgstr "Коментариев нет" -#: templates/taskapp/comments/task_comments.html:33 +#: taskapp/templates/taskapp/comments/task_comments.html:33 msgid "Send" msgstr "Отправить" -#: templates/taskapp/details.html:4 +#: taskapp/templates/taskapp/details.html:4 msgid "Task details" msgstr "Детали задачи" -#: templates/taskapp/details.html:12 +#: taskapp/templates/taskapp/details.html:14 +#: taskapp/templates/taskapp/details.html:33 +#: taskapp/templates/taskapp/tasklist_all.html:59 +#: taskapp/templates/taskapp/tasklist_all.html:72 +#: taskapp/templates/taskapp/tasklist_empty.html:46 +#: taskapp/templates/taskapp/tasklist_empty.html:59 +#: taskapp/templates/taskapp/tasklist_failed.html:46 +#: taskapp/templates/taskapp/tasklist_failed.html:59 +#: taskapp/templates/taskapp/tasklist_finish.html:45 +#: taskapp/templates/taskapp/tasklist_finish.html:46 +#: taskapp/templates/taskapp/tasklist_own.html:46 +#: taskapp/templates/taskapp/tasklist_own.html:47 +msgid "Not assigned" +msgstr "<Не назначено>" + +#: taskapp/templates/taskapp/details.html:17 msgid "Implementers" msgstr "Исполнители" -#: templates/taskapp/details.html:19 +#: taskapp/templates/taskapp/details.html:24 msgid "The task is valid until" msgstr "Задача действительна до" -#: templates/taskapp/details.html:22 +#: taskapp/templates/taskapp/details.html:27 msgid "Task type" msgstr "Тип задачи" -#: templates/taskapp/details.html:28 templates/taskapp/tasklist_all.html:58 -#: templates/taskapp/tasklist_all.html:71 -#: templates/taskapp/tasklist_failed.html:41 -#: templates/taskapp/tasklist_finish.html:45 -#: templates/taskapp/tasklist_finish.html:46 -#: templates/taskapp/tasklist_own.html:46 -#: templates/taskapp/tasklist_own.html:47 -msgid "Not assigned" -msgstr "<Не назначено>" - -#: templates/taskapp/details.html:31 +#: taskapp/templates/taskapp/details.html:36 msgid "Attachment" msgstr "Приложение" -#: templates/taskapp/footer_btns.html:10 +#: taskapp/templates/taskapp/footer_btns.html:10 msgid "View all tasks" msgstr "Просмотреть все задачи" -#: templates/taskapp/tasklist.html:10 templates/taskapp/tasklist_all.html:22 -#: templates/taskapp/tasklist_failed.html:10 -#: templates/taskapp/tasklist_finish.html:10 -#: templates/taskapp/tasklist_own.html:10 -msgid "Name" -msgstr "ФИО" +#: taskapp/templates/taskapp/footer_btns.html:14 +msgid "View empty tasks" +msgstr "Задачи без получателей" + +#: taskapp/templates/taskapp/tasklist.html:10 +#: taskapp/templates/taskapp/tasklist_all.html:22 +msgid "Name and comment count" +msgstr "Имя и количество комментов" -#: templates/taskapp/tasklist.html:11 templates/taskapp/tasklist_all.html:23 -#: templates/taskapp/tasklist_failed.html:11 -#: templates/taskapp/tasklist_finish.html:11 -#: templates/taskapp/tasklist_own.html:11 +#: taskapp/templates/taskapp/tasklist.html:11 +#: taskapp/templates/taskapp/tasklist_all.html:23 +#: taskapp/templates/taskapp/tasklist_empty.html:16 +#: taskapp/templates/taskapp/tasklist_failed.html:16 +#: taskapp/templates/taskapp/tasklist_finish.html:11 +#: taskapp/templates/taskapp/tasklist_own.html:11 msgid "Address" msgstr "Адрес" -#: templates/taskapp/tasklist.html:16 templates/taskapp/tasklist_all.html:29 -#: templates/taskapp/tasklist_failed.html:16 -#: templates/taskapp/tasklist_own.html:16 +#: taskapp/templates/taskapp/tasklist.html:16 +#: taskapp/templates/taskapp/tasklist_all.html:29 +#: taskapp/templates/taskapp/tasklist_empty.html:21 +#: taskapp/templates/taskapp/tasklist_failed.html:21 +#: taskapp/templates/taskapp/tasklist_own.html:16 msgid "Actions" msgstr "Действия" -#: templates/taskapp/tasklist.html:48 templates/taskapp/tasklist_all.html:60 -#: templates/taskapp/tasklist_failed.html:43 -#: templates/taskapp/tasklist_finish.html:49 -#: templates/taskapp/tasklist_own.html:50 +#: taskapp/templates/taskapp/tasklist.html:49 +#: taskapp/templates/taskapp/tasklist_all.html:61 +#: taskapp/templates/taskapp/tasklist_empty.html:48 +#: taskapp/templates/taskapp/tasklist_failed.html:48 +#: taskapp/templates/taskapp/tasklist_finish.html:49 +#: taskapp/templates/taskapp/tasklist_own.html:50 msgid "User does not exist" msgstr "Абонент не найден" -#: templates/taskapp/tasklist.html:58 +#: taskapp/templates/taskapp/tasklist.html:59 msgid "Author does not exist" msgstr "Автор не найден" -#: templates/taskapp/tasklist.html:66 templates/taskapp/tasklist_all.html:80 +#: taskapp/templates/taskapp/tasklist.html:67 +#: taskapp/templates/taskapp/tasklist_all.html:81 msgid "Today" msgstr "Сегодня" -#: templates/taskapp/tasklist.html:68 templates/taskapp/tasklist_all.html:82 +#: taskapp/templates/taskapp/tasklist.html:69 +#: taskapp/templates/taskapp/tasklist_all.html:83 msgid "Yesterday" msgstr "Вчера" -#: templates/taskapp/tasklist.html:75 templates/taskapp/tasklist_failed.html:54 +#: taskapp/templates/taskapp/tasklist.html:76 +#: taskapp/templates/taskapp/tasklist_failed.html:65 msgid "Complete" msgstr "Завершить" -#: templates/taskapp/tasklist.html:78 +#: taskapp/templates/taskapp/tasklist.html:79 msgid "Mark as unsuccessful" msgstr "Отметить задачу как проваленную" -#: templates/taskapp/tasklist.html:90 templates/taskapp/tasklist_all.html:103 -#: templates/taskapp/tasklist_failed.html:66 -#: templates/taskapp/tasklist_finish.html:72 +#: taskapp/templates/taskapp/tasklist.html:91 +#: taskapp/templates/taskapp/tasklist_all.html:104 +#: taskapp/templates/taskapp/tasklist_empty.html:74 +#: taskapp/templates/taskapp/tasklist_failed.html:77 +#: taskapp/templates/taskapp/tasklist_finish.html:76 msgid "The list is empty" msgstr "Список пуст" -#: templates/taskapp/tasklist_all.html:9 +#: taskapp/templates/taskapp/tasklist_all.html:9 msgid "All tasks" msgstr "Все задачи" -#: templates/taskapp/tasklist_all.html:15 +#: taskapp/templates/taskapp/tasklist_all.html:15 msgid "Records of all the tasks in the system" msgstr "Лог всех задач в системе" -#: templates/taskapp/tasklist_all.html:95 -#: templates/taskapp/tasklist_own.html:66 +#: taskapp/templates/taskapp/tasklist_all.html:66 +#: taskapp/templates/taskapp/tasklist_finish.html:54 +msgid "None" +msgstr "Нету" + +#: taskapp/templates/taskapp/tasklist_all.html:96 +#: taskapp/templates/taskapp/tasklist_own.html:66 msgid "Remind" msgstr "Напомнить" -#: templates/taskapp/tasklist_own.html:79 +#: taskapp/templates/taskapp/tasklist_empty.html:5 +msgid "Tasks in which no recipients" +msgstr "Задачи, в которых нет получателей" + +#: taskapp/templates/taskapp/tasklist_empty.html:15 +#: taskapp/templates/taskapp/tasklist_failed.html:15 +#: taskapp/templates/taskapp/tasklist_finish.html:10 +#: taskapp/templates/taskapp/tasklist_own.html:10 +msgid "Name" +msgstr "ФИО" + +#: taskapp/templates/taskapp/tasklist_failed.html:5 +msgid "Tasks in which was trouble while at runtime" +msgstr "Задачи в которых возникли проблемы во время выполнения" + +#: taskapp/templates/taskapp/tasklist_finish.html:61 +msgid "Author does not specified" +msgstr "Автор не указан" + +#: taskapp/templates/taskapp/tasklist_own.html:79 msgid "All your tasks has been performed" msgstr "Все ваши задачи выполнены" -#: views.py:99 +#: taskapp/views.py:109 msgid "You cannot delete task that assigned to you" msgstr "Вы не можете удалять назначенные на вас задачи" -#: views.py:141 +#: taskapp/views.py:156 +msgid "Task has successfully created" +msgstr "Задача успешно создана" + +#: taskapp/views.py:158 msgid "Task has changed successfully" msgstr "Задача успешно изменена" -#: views.py:143 -msgid "No responsible employee for the users group" -msgstr "Нет ответственных за группу, в которой находится выбранный абонент" - -#: views.py:145 -msgid "You must select the subscriber" -msgstr "Нужно выбрать абонента" - -#: views.py:160 +#: taskapp/views.py:178 msgid "time left" msgstr "Времени осталось" -#: views.py:162 +#: taskapp/views.py:180 #, python-format msgid "Expired timeout -%(time_left)s" msgstr "Время ожидания истекло -%(time_left)s" -#: views.py:183 +#: taskapp/views.py:201 msgid "fix form errors" msgstr "исправте ошибки формы" -msgid "Task has successfully created" -msgstr "Задача успешно создана" - msgid "Failed tasks" msgstr "Проваленные задачи" @@ -448,26 +513,5 @@ msgstr "Назначенные мной задачи" msgid "Tasks to be performed" msgstr "Задачи, которые необходимо выполнить" -msgid "locality %s. Task type - %s. " -msgstr "с. %s. Тип задачи - %s. " - -msgid "Recipients" -msgstr "Исполнители" - -msgid "Author does not specified" -msgstr "Автор не указан" - -msgid "Name and comment count" -msgstr "Имя и количество комментов" - -msgid "None" -msgstr "Нету" - -msgid "View empty tasks" -msgstr "Задачи без получателей" - -msgid "Tasks in which no recipients" -msgstr "Задачи, в которых нет получателей" - -msgid "Tasks in which was trouble while at runtime" -msgstr "Задачи в которых возникли проблемы во время выполнения" +#~ msgid "locality %s. Task type - %s. " +#~ msgstr "с. %s. Тип задачи - %s. " diff --git a/templates/404.html b/templates/404.html index 5522e31..f895739 100644 --- a/templates/404.html +++ b/templates/404.html @@ -1,16 +1,17 @@ +{% load i18n %} {% if request.is_ajax %} {% if exception %} {{ exception }} {% else %} -

Страница не найдена

-

Такого пути '{{ request_path }}' нет на сервере

+

{% trans 'Page does not exist' %}

+

{% blocktrans with pth=request_path %}The page '{{ pth }}' was not found{% endblocktrans %}

{% endif %} {% else %} - Страница не найдена + {% trans 'Page does not exist' %} @@ -44,14 +45,14 @@
-

404 - Страница не найдена

+

404 - {% trans 'Page does not exist' %}

{% if exception %} {{ exception }} {% else %} -

Такого пути '{{ request_path }}' нет на сервере

+

{% blocktrans with pth=request_path %}The page '{{ pth }}' was not found{% endblocktrans %}

{% endif %} - На главную + {% trans 'To main' %}
diff --git a/templates/all_base.html b/templates/all_base.html index 3ac6aae..b1fd8ee 100644 --- a/templates/all_base.html +++ b/templates/all_base.html @@ -1,7 +1,7 @@ -{% load globaltags %} +{% load globaltags %}{% load i18n %} - {% global_var 'COMPANY_NAME' %} - Админка + {% global_var 'COMPANY_NAME' %} - {% trans 'Admin side' %} @@ -10,7 +10,8 @@ - + + @@ -43,20 +44,18 @@