Browse Source

Merge branch 'master' of https://github.com/nerosketch/djing

# Conflicts:
#	accounts_app/locale/ru/LC_MESSAGES/django.po
#	accounts_app/templates/accounts/index.html
devel
bashmak 9 years ago
parent
commit
affb82c0b3
  1. 6
      abonapp/locale/ru/LC_MESSAGES/django.po

6
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 "История задач"

Loading…
Cancel
Save