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

8 years ago · 39f81c42a2
2 changed files with 4 additions and 0 deletions
--- a/msg_app/locale/ru/LC_MESSAGES/django.po
+++ b/msg_app/locale/ru/LC_MESSAGES/django.po
@ -159,3 +159,6 @@ msgstr "Беседа создана"
 #: views.py:29 views.py:48
 msgid "fix form errors"
 msgstr "заполните все поля в соответствии с их форматом"
+
+msgid "Enter to conversation by clicking to it"
+msgstr "Войдите в беседу кликнув по ней"
--- a/msg_app/templates/msg_app/conversations.html
+++ b/msg_app/templates/msg_app/conversations.html
@ -12,6 +12,7 @@
    <div class="panel panel-default">
        <div class="panel-heading">
            <h3 class="panel-title">{% trans 'Conversations' %}</h3>
+	    <span>{% trans 'Enter to conversation by clicking to it' %}</span>
        </div>
        <div class="list-group">
            {% for conv in conversations %}