From 60be979bc1883fa899ce65399e5940ab825e08b9 Mon Sep 17 00:00:00 2001 From: bashmak Date: Mon, 27 Feb 2017 14:29:09 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4?= =?UTF-8?q?=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- abonapp/locale/ru/LC_MESSAGES/django.po | 141 +++++++------- accounts_app/locale/ru/LC_MESSAGES/django.po | 191 +++++++++++-------- 2 files changed, 184 insertions(+), 148 deletions(-) diff --git a/abonapp/locale/ru/LC_MESSAGES/django.po b/abonapp/locale/ru/LC_MESSAGES/django.po index 9b9d90b..0eebbf9 100644 --- a/abonapp/locale/ru/LC_MESSAGES/django.po +++ b/abonapp/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-02-21 01:59+0300\n" +"POT-Creation-Date: 2017-02-27 14:20+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Dmitry Novikov nerosketch@gmail.com\n" "Language: ru\n" @@ -67,47 +67,26 @@ msgstr "Может просматривать паспортные данные" msgid "pay log" msgstr "Снятие со счёта средств" -#: abonapp/models.py:237 +#: abonapp/models.py:238 msgid "Buy service default log" msgstr "Покупка тарифного плана через админку" -#: abonapp/models.py:249 +#: abonapp/models.py:253 msgid "service overdue log" msgstr "Услуга просрочена, отключаем, и подключаем новую" -#: abonapp/models.py:352 +#: abonapp/models.py:357 msgid "Digital field" msgstr "Цифровое поле" -#: abonapp/models.py:353 +#: abonapp/models.py:358 msgid "Text field" msgstr "Текстовое поле" -#: abonapp/models.py:354 +#: abonapp/models.py:359 msgid "Floating field" msgstr "Дробное с плавающей точкой" -#: abonapp/templates/abonapp/abonamount.html:6 -msgid "Additional sum" -msgstr "Начисление средств на счёт" - -#: abonapp/templates/abonapp/abonamount.html:15 -msgid "Amount of money" -msgstr "Количество денег" - -#: abonapp/templates/abonapp/abonamount.html:27 -msgid "Refill" -msgstr "Пополнить" - -#: abonapp/templates/abonapp/abonamount.html:30 -#: abonapp/templates/abonapp/addAbon.html:89 -#: abonapp/templates/abonapp/addGroup.html:32 -#: abonapp/templates/abonapp/addInvoice.html:49 -#: abonapp/templates/abonapp/buy_tariff.html:37 -#: abonapp/templates/abonapp/complete_service.html:51 -msgid "Reset" -msgstr "Сбросить" - #: abonapp/templates/abonapp/activate_service.html:8 #: abonapp/templates/abonapp/addAbon.html:7 #: abonapp/templates/abonapp/addGroup.html:7 @@ -117,6 +96,7 @@ msgstr "Сбросить" #: abonapp/templates/abonapp/debtors.html:8 #: abonapp/templates/abonapp/group_list.html:8 #: abonapp/templates/abonapp/group_list.html:11 +#: abonapp/templates/abonapp/invoiceForPayment.html:7 #: abonapp/templates/abonapp/log.html:7 #: abonapp/templates/abonapp/peoples.html:8 msgid "User groups" @@ -184,7 +164,7 @@ msgstr "Группа" #: abonapp/templates/abonapp/addInvoice.html:40 #: abonapp/templates/abonapp/debtors.html:22 #: abonapp/templates/abonapp/editAbon.html:80 -#: abonapp/templates/abonapp/invoiceForPayment.html:11 +#: 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 @@ -209,6 +189,15 @@ msgstr "Квартира" msgid "Password" msgstr "Пароль" +#: abonapp/templates/abonapp/addAbon.html:89 +#: abonapp/templates/abonapp/addGroup.html:32 +#: abonapp/templates/abonapp/addInvoice.html:49 +#: abonapp/templates/abonapp/buy_tariff.html:37 +#: abonapp/templates/abonapp/complete_service.html:51 +#: abonapp/templates/abonapp/modal_abonamount.html:26 +msgid "Reset" +msgstr "Сбросить" + #: abonapp/templates/abonapp/addGroup.html:8 #: abonapp/templates/abonapp/addGroup.html:15 #: abonapp/templates/abonapp/group_list.html:60 @@ -221,7 +210,7 @@ msgid "Group title" msgstr "Название группы" #: abonapp/templates/abonapp/addInvoice.html:10 -#: abonapp/templates/abonapp/invoiceForPayment.html:49 +#: abonapp/templates/abonapp/invoiceForPayment.html:61 msgid "Add debt" msgstr "Добавить квитанцию" @@ -235,7 +224,7 @@ msgid "Sum of pay" msgstr "Сумма для платежа" #: abonapp/templates/abonapp/addInvoice.html:36 -#: abonapp/templates/abonapp/invoiceForPayment.html:8 +#: abonapp/templates/abonapp/invoiceForPayment.html:20 msgid "Pay status" msgstr "Статус оплаты" @@ -295,15 +284,12 @@ msgstr "" msgid "Debtors" msgstr "Должники" -msgid "Debtor" -msgstr "Должник" - #: abonapp/templates/abonapp/debtors.html:14 msgid "People with debts" msgstr "Народ, у которого есть неоплаченные услуги" #: abonapp/templates/abonapp/debtors.html:23 -#: abonapp/templates/abonapp/invoiceForPayment.html:12 +#: abonapp/templates/abonapp/invoiceForPayment.html:24 #: abonapp/templates/abonapp/task_log.html:13 msgid "Date of make" msgstr "Дата создания" @@ -363,32 +349,41 @@ msgstr "История действий абонентов" msgid "List of debtors" msgstr "Список должников" -#: abonapp/templates/abonapp/invoiceForPayment.html:9 +#: abonapp/templates/abonapp/invoiceForPayment.html:10 +#: abonapp/templates/abonapp/payHistory.html:39 +msgid "Debts" +msgstr "Долги" + +#: abonapp/templates/abonapp/invoiceForPayment.html:15 +msgid "Debtor" +msgstr "Должник" + +#: abonapp/templates/abonapp/invoiceForPayment.html:21 msgid "Month" msgstr "Месяц" -#: abonapp/templates/abonapp/invoiceForPayment.html:10 +#: abonapp/templates/abonapp/invoiceForPayment.html:22 #: abonapp/templates/abonapp/log.html:18 #: abonapp/templates/abonapp/payHistory.html:9 #: abonapp/templates/abonapp/services.html:11 msgid "Sum" msgstr "Сумма" -#: abonapp/templates/abonapp/invoiceForPayment.html:13 +#: abonapp/templates/abonapp/invoiceForPayment.html:25 #: abonapp/templates/abonapp/payHistory.html:10 msgid "Date of payment" msgstr "Дата оплаты" -#: abonapp/templates/abonapp/invoiceForPayment.html:14 +#: abonapp/templates/abonapp/invoiceForPayment.html:26 #: abonapp/templates/abonapp/payHistory.html:11 msgid "Author of payment" msgstr "Назначил" -#: abonapp/templates/abonapp/invoiceForPayment.html:33 +#: abonapp/templates/abonapp/invoiceForPayment.html:45 msgid "Created paid,Not yet paid" msgstr "Создан оплаченным,Ещё не оплачено" -#: abonapp/templates/abonapp/invoiceForPayment.html:40 +#: abonapp/templates/abonapp/invoiceForPayment.html:52 msgid "Receipts not found" msgstr "Назначенные платежи отсутствуют" @@ -404,6 +399,18 @@ msgstr "Время" msgid "Actions not found" msgstr "Нет событий" +#: abonapp/templates/abonapp/modal_abonamount.html:6 +msgid "Additional sum" +msgstr "Начисление средств на счёт" + +#: abonapp/templates/abonapp/modal_abonamount.html:11 +msgid "Amount of money" +msgstr "Количество денег" + +#: abonapp/templates/abonapp/modal_abonamount.html:23 +msgid "Refill" +msgstr "Пополнить" + #: abonapp/templates/abonapp/passport_view.html:9 #: abonapp/templates/abonapp/viewAbon.html:67 msgid "Passport information" @@ -431,6 +438,10 @@ msgstr "Дата рождения" msgid "Payment history is empty" msgstr "История платежей пуста" +#: abonapp/templates/abonapp/payHistory.html:35 +msgid "Fill account" +msgstr "Пополнить счёт" + #: abonapp/templates/abonapp/peoples.html:14 msgid "The people in the selected group" msgstr "Народ в выбранной группе" @@ -547,93 +558,93 @@ msgstr "Просмотр абонента" msgid "yes,no" msgstr "Да,Нет" -#: abonapp/views.py:50 +#: abonapp/views.py:51 msgid "create group success msg" msgstr "Группа успешно создана" -#: abonapp/views.py:53 abonapp/views.py:111 abonapp/views.py:252 -#: abonapp/views.py:344 +#: abonapp/views.py:54 abonapp/views.py:112 abonapp/views.py:253 +#: abonapp/views.py:345 msgid "fix form errors" msgstr "Некоторые поля заполнены не правильно, проверте ещё раз" -#: abonapp/views.py:88 abonapp/views.py:153 +#: abonapp/views.py:89 abonapp/views.py:154 msgid "delete group success msg" msgstr "Группа успешно удалена" -#: abonapp/views.py:108 +#: abonapp/views.py:109 msgid "create abon success msg" msgstr "Абонент успешно создан" -#: abonapp/views.py:125 +#: abonapp/views.py:126 msgid "Address" msgstr "Адрес" -#: abonapp/views.py:147 +#: abonapp/views.py:148 msgid "delete abon success msg" msgstr "Абонент успешно удалён" -#: abonapp/views.py:156 +#: abonapp/views.py:157 msgid "I not know what to delete" msgstr "Не понятно что удалять" -#: abonapp/views.py:160 +#: abonapp/views.py:161 #, python-format msgid "NAS says: '%s'" msgstr "NAS сказал: '%s'" -#: abonapp/views.py:173 +#: abonapp/views.py:174 msgid "fill account through admin side" msgstr "Пополнение счёта через админку" -#: abonapp/views.py:175 +#: abonapp/views.py:176 #, python-format msgid "Account filled successfully on %.2f" msgstr "" -#: abonapp/views.py:178 +#: abonapp/views.py:179 msgid "I not know the account id" msgstr "Счёт успешно пополнен на %.2f" -#: abonapp/views.py:250 +#: abonapp/views.py:251 msgid "edit abon success msg" msgstr "Абонент успешно изменён" -#: abonapp/views.py:257 +#: abonapp/views.py:258 #, python-format msgid "Ip address already exist. %s" msgstr "" "Проверте введённые вами значения, скорее всего такой ip уже у кого-то есть. " "А вообще: %s" -#: abonapp/views.py:265 +#: abonapp/views.py:266 msgid "Ip address not found" msgstr "Указанный вами ip отсутствует в ip pool" -#: abonapp/views.py:267 +#: abonapp/views.py:268 msgid "User has not have password, and cannot login" msgstr "Для абонента не задан пароль, он не сможет войти в учётку" -#: abonapp/views.py:314 +#: abonapp/views.py:315 msgid "Receipt has been created" msgstr "Квитанция на оплату была создана" -#: abonapp/views.py:341 +#: abonapp/views.py:342 msgid "Tariff has been picked" msgstr "Тариф успешно выбран" -#: abonapp/views.py:398 +#: abonapp/views.py:399 msgid "Service has been finished successfully" msgstr "Услуга успешно завершена" -#: abonapp/views.py:401 abonapp/views.py:430 +#: abonapp/views.py:402 abonapp/views.py:431 msgid "Not confirmed" msgstr "Действие не подтверждено" -#: abonapp/views.py:433 +#: abonapp/views.py:434 msgid "Service has been activated successfully" msgstr "Услуга успешно активирована" -#: abonapp/views.py:458 +#: abonapp/views.py:459 msgid "User has been detached from service" msgstr "Абонент отвязан от услуги" @@ -643,12 +654,6 @@ msgstr "Информация абонента" msgid "Services" msgstr "Услуги" -msgid "Fill account" -msgstr "Пополнить счёт" - -msgid "Debts" -msgstr "Долги" - msgid "Payment history" msgstr "История платежей" diff --git a/accounts_app/locale/ru/LC_MESSAGES/django.po b/accounts_app/locale/ru/LC_MESSAGES/django.po index d0d62e9..ba3578d 100644 --- a/accounts_app/locale/ru/LC_MESSAGES/django.po +++ b/accounts_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-02-20 17:32+0300\n" +"POT-Creation-Date: 2017-02-27 14:20+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Dmitry Novikov nerosketch@gmail.com\n" "Language: ru\n" @@ -19,38 +19,115 @@ msgstr "" "%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n" "%100>=11 && n%100<=14)? 2 : 3);\n" -#: accounts_app/templates/accounts/login.html:5 -msgid "Auth" -msgstr "Авторизация" +#: accounts_app/models.py:18 +msgid "Users must have an telephone number" +msgstr "У пользователей должен быть номер телефона" -#: accounts_app/templates/accounts/login.html:24 -#: accounts_app/templates/accounts/login.html:53 -msgid "Login" -msgstr "Войти" +#: accounts_app/models.py:52 +msgid "Telephone number" +msgstr "Номер телефона" -#: accounts_app/templates/accounts/login.html:36 -#: accounts_app/templates/accounts/settings/ch_info.html:8 -#: accounts_app/templates/accounts/settings/ch_info.html:12 -msgid "User name" -msgstr "Логин" +#: accounts_app/templates/accounts/group.html:7 +#: accounts_app/templates/accounts/group_list.html:7 +msgid "Administrators" +msgstr "Администраторы" + +#: accounts_app/templates/accounts/group.html:8 +#: accounts_app/templates/accounts/group_list.html:8 +msgid "Groups" +msgstr "Группы" + +#: accounts_app/templates/accounts/group.html:16 +msgid "The current distribution of rights for groups" +msgstr "Действующее распределение прав для группы" + +#: accounts_app/templates/accounts/group.html:22 +msgid "Available rights" +msgstr "Доступные права" -#: accounts_app/templates/accounts/login.html:56 +#: accounts_app/templates/accounts/group.html:36 +msgid "Rights for the group" +msgstr "Права группы" + +#: accounts_app/templates/accounts/group.html:44 +#: accounts_app/templates/accounts/profile_chgroup.html:20 +#: accounts_app/templates/accounts/settings/ch_info.html:66 +msgid "Save" +msgstr "Сохранить" + +#: accounts_app/templates/accounts/group.html:44 +#: accounts_app/templates/accounts/login.html:55 +#: accounts_app/templates/accounts/profile_chgroup.html:20 #: accounts_app/templates/accounts/settings/ch_info.html:69 msgid "Reset" msgstr "Сбросить" +#: accounts_app/templates/accounts/group_list.html:11 +msgid "Admin groups list" +msgstr "Список групп администраторов" + +#: accounts_app/templates/accounts/group_list.html:20 +msgid "Group" +msgstr "Группа" + +#: accounts_app/templates/accounts/group_list.html:40 +msgid "Groups does not found" +msgstr "Нет групп" + +#: accounts_app/templates/accounts/group_list.html:47 +msgid "Add group" +msgstr "Добавить группу" + +#: accounts_app/templates/accounts/index.html:8 +#: accounts_app/templates/accounts/settings/ch_info.html:37 +msgid "Telephone" +msgstr "Номер телефона" + +#: accounts_app/templates/accounts/index.html:12 +#: accounts_app/templates/accounts/login.html:35 +#: accounts_app/templates/accounts/settings/ch_info.html:8 +#: accounts_app/templates/accounts/settings/ch_info.html:12 +msgid "User name" +msgstr "Логин" + +#: accounts_app/templates/accounts/index.html:16 #: accounts_app/templates/accounts/settings/ch_info.html:18 msgid "Name and surname" msgstr "Фамилия и Имя" +#: accounts_app/templates/accounts/index.html:20 +msgid "Is enable" +msgstr "Включён-ли" + +#: accounts_app/templates/accounts/index.html:24 +msgid "Last login" +msgstr "Последняя авторизация" + +#: accounts_app/templates/accounts/index.html:29 +msgid "All permissions" +msgstr "Административный доступ (все права)" + +#: accounts_app/templates/accounts/login.html:5 +msgid "Auth" +msgstr "Авторизация" + +#: accounts_app/templates/accounts/login.html:23 +#: accounts_app/templates/accounts/login.html:52 +msgid "Login" +msgstr "Войти" + +#: accounts_app/templates/accounts/login.html:43 +msgid "Password" +msgstr "Пароль" + +#: accounts_app/templates/accounts/profile_chgroup.html:5 +msgid "The responsibility of the administrator of the group of subscribers" +msgstr "Ответственность администратора за группы абонентов" + #: accounts_app/templates/accounts/settings/ch_info.html:27 msgid "Email" msgstr "Адрес электронной почты" -#: accounts_app/templates/accounts/settings/ch_info.html:37 -msgid "Telephone" -msgstr "Номер телефона" - #: accounts_app/templates/accounts/settings/ch_info.html:42 msgid "+[7,8,9,3] and 10,11 digits" msgstr "+[7,8,9,3] и 10,11 цифр" @@ -63,90 +140,44 @@ msgstr "Старый пароль" msgid "New password" msgstr "Новый пароль" -msgid "Password" -msgstr "Пароль" - -#: accounts_app/templates/accounts/settings/ch_info.html:66 -msgid "Save" -msgstr "Сохранить" - -msgid "Administrators" -msgstr "Администраторы" - -msgid "Administrator" -msgstr "Администратор" - -msgid "Options" -msgstr "Настройки" - -msgid "Not assigned" -msgstr "<Не назначено>" - -msgid "Change self onfo" -msgstr "Изменить инфу о себе" - -msgid "Permission options" -msgstr "Настройка прав" - -msgid "Users must have an telephone number" -msgstr "У пользователей должен быть номер телефона" - -msgid "Telephone number" -msgstr "Номер телефона" - +#: accounts_app/views.py:43 msgid "Wrong login or password, please try again" msgstr "Неправильный логин или пароль, попробуйте ещё раз" +#: accounts_app/views.py:137 msgid "Wrong password" msgstr "Неправильный пароль" +#: accounts_app/views.py:162 msgid "You forget specify a password for the new account" msgstr "Забыли указать пароль для нового аккаунта" +#: accounts_app/views.py:165 msgid "You forget to repeat a password for the new account" msgstr "Забыли повторить пароль для нового аккаунта" +#: accounts_app/views.py:174 msgid "Subscriber with this name already exist" msgstr "Пользователь с таким именем уже есть" +#: accounts_app/views.py:176 msgid "Passwords does not match, try again" msgstr "Пароли не совпадают, попробуйте ещё раз" -msgid "The responsibility of the administrator of the group of subscribers" -msgstr "Ответственность администратора за группы абонентов" - -msgid "Is enable" -msgstr "Включён-ли" - -msgid "Last login" -msgstr "Последняя авторизация" - -msgid "All permissions" -msgstr "Административный доступ (все права)" - -msgid "Groups" -msgstr "Группы" - -msgid "Group" -msgstr "Группа" - -msgid "Admin groups list" -msgstr "Список групп администраторов" - -msgid "Groups does not found" -msgstr "Нет групп" +msgid "Administrator" +msgstr "Администратор" -msgid "Add group" -msgstr "Добавить группу" +msgid "Options" +msgstr "Настройки" -msgid "The current distribution of rights for groups" -msgstr "Действующее распределение прав для группы" +msgid "Not assigned" +msgstr "<Не назначено>" -msgid "Available rights" -msgstr "Доступные права" +msgid "Change self onfo" +msgstr "Изменить инфу о себе" -msgid "Rights for the group" -msgstr "Права группы" +msgid "Permission options" +msgstr "Настройка прав" msgid "Edit" msgstr "Редактировать"