From affb82c0b31e00901e2db95b384042b18a2ae132 Mon Sep 17 00:00:00 2001 From: bashmak Date: Mon, 27 Feb 2017 14:05:13 +0300 Subject: [PATCH] Merge branch 'master' of https://github.com/nerosketch/djing # Conflicts: # accounts_app/locale/ru/LC_MESSAGES/django.po # accounts_app/templates/accounts/index.html --- abonapp/locale/ru/LC_MESSAGES/django.po | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/abonapp/locale/ru/LC_MESSAGES/django.po b/abonapp/locale/ru/LC_MESSAGES/django.po index a7edd0a..9b9d90b 100644 --- a/abonapp/locale/ru/LC_MESSAGES/django.po +++ b/abonapp/locale/ru/LC_MESSAGES/django.po @@ -295,6 +295,9 @@ msgstr "" msgid "Debtors" msgstr "Должники" +msgid "Debtor" +msgstr "Должник" + #: abonapp/templates/abonapp/debtors.html:14 msgid "People with debts" msgstr "Народ, у которого есть неоплаченные услуги" @@ -649,6 +652,9 @@ msgstr "Долги" msgid "Payment history" msgstr "История платежей" +msgid "Payments" +msgstr "Финансы" + msgid "History of tasks" msgstr "История задач"