diff --git a/mk42/apps/core/locale/en/LC_MESSAGES/django.po b/mk42/apps/core/locale/en/LC_MESSAGES/django.po index fe46006..e95c0e4 100644 --- a/mk42/apps/core/locale/en/LC_MESSAGES/django.po +++ b/mk42/apps/core/locale/en/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-08-26 00:50+0000\n" "PO-Revision-Date: 2017-06-13 19:25+0000\n" -"Last-Translator: Alexei Andrushievich \n" -"Language-Team: Alexei Andrushievich \n" +"Last-Translator: Kirill Boev \n" +"Language-Team: Kirill Boev , Alexei Andrushievich \n" "Language: en\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -111,7 +111,7 @@ msgid "slug" msgstr "" #: models/group.py:33 -msgid "overwrite in creation" +msgid "overwrites during creation" msgstr "" #: models/group.py:34 @@ -171,7 +171,7 @@ msgstr "" #: templates/templated_email/create_group_email.email:14 #: templates/templated_email/create_group_email.email:33 -msgid "If you do not do this please inform us." +msgid "If you don't do this please inform us." msgstr "" #: templates/templated_email/create_group_email.email:16 diff --git a/mk42/apps/core/locale/uk/LC_MESSAGES/django.po b/mk42/apps/core/locale/uk/LC_MESSAGES/django.po index ee2e66e..c8a01ba 100644 --- a/mk42/apps/core/locale/uk/LC_MESSAGES/django.po +++ b/mk42/apps/core/locale/uk/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-08-26 00:51+0000\n" "PO-Revision-Date: 2017-06-13 19:25+0000\n" -"Last-Translator: Alexei Andrushievich \n" -"Language-Team: Alexei Andrushievich \n" +"Last-Translator: Kirill Boev \n" +"Language-Team: Kirill Boev , Alexei Andrushievich \n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,166 +20,166 @@ msgstr "" #: admin/event.py:29 admin/group.py:31 admin/log.py:28 admin/membership.py:29 #: admin/rsvp.py:28 msgid "Other" -msgstr "" +msgstr "Інше" #: admin/group.py:46 msgid "Activate selected groups" -msgstr "" +msgstr "Активувати обрані групи" #: admin/group.py:60 msgid "Deactivate selected groups" -msgstr "" +msgstr "Деактивувати обрані групи" #: admin/membership.py:44 msgid "Activate selected memberships" -msgstr "" +msgstr "Активувати обраних учасників" #: admin/membership.py:58 msgid "Deactivate selected memberships" -msgstr "" +msgstr "Деактивувати обраних учасників" #: api/permissions/event.py:73 msgid "Invalid dates." -msgstr "" +msgstr "Невірна дата" #: api/serializers/event.py:27 msgid "status" -msgstr "" +msgstr "статус" #: apps.py:23 msgid "Core" -msgstr "" +msgstr "Ядро" #: constants.py:22 msgid "Pending" -msgstr "" +msgstr "Очікується" #: constants.py:23 msgid "Canceled" -msgstr "" +msgstr "Скасовано" #: constants.py:24 msgid "Ongoing" -msgstr "" +msgstr "Відбувається" #: constants.py:25 msgid "Finished" -msgstr "" +msgstr "Закінчено" #: models/event.py:43 models/group.py:31 models/log.py:35 #: models/membership.py:25 models/rsvp.py:24 msgid "ID" -msgstr "" +msgstr "ID" #: models/event.py:44 models/group.py:32 msgid "name" -msgstr "" +msgstr "назва" #: models/event.py:45 models/group.py:35 msgid "description" -msgstr "" +msgstr "опис" #: models/event.py:46 models/group.py:45 models/membership.py:27 msgid "group" -msgstr "" +msgstr "група" #: models/event.py:47 msgid "address" -msgstr "" +msgstr "адреса" #: models/event.py:48 models/event.py:51 msgid "start date/time" -msgstr "" +msgstr "дата/час початку" #: models/event.py:49 msgid "end date/time" -msgstr "" +msgstr "дата/час закінчення" #: models/event.py:50 models/group.py:36 models/log.py:38 #: models/membership.py:28 models/rsvp.py:27 msgid "created date/time" -msgstr "" +msgstr "дата/час cтворення" #: models/event.py:83 models/log.py:36 models/rsvp.py:26 msgid "event" -msgstr "" +msgstr "подія" #: models/event.py:84 msgid "events" -msgstr "" +msgstr "події" #: models/group.py:33 msgid "slug" -msgstr "" +msgstr "слаг" #: models/group.py:33 -msgid "overwrite in creation" -msgstr "" +msgid "overwrites during creation" +msgstr "перезаписується під час створення" #: models/group.py:34 msgid "owner" -msgstr "" +msgstr "творець" #: models/group.py:37 msgid "updated date/time" -msgstr "" +msgstr "дата/час оновлення" #: models/group.py:38 models/membership.py:29 msgid "active" -msgstr "" +msgstr "активна" #: models/group.py:46 msgid "groups" -msgstr "" +msgstr "групи" #: models/log.py:44 msgid "event log" -msgstr "" +msgstr "журнал події" #: models/log.py:45 msgid "event logs" -msgstr "" +msgstr "журнал подій" #: models/membership.py:26 models/rsvp.py:25 msgid "user" -msgstr "" +msgstr "користувач" #: models/membership.py:36 models/membership.py:37 msgid "membership" -msgstr "" +msgstr "участь у групі" #: models/rsvp.py:33 models/rsvp.py:34 msgid "rsvp" -msgstr "" +msgstr "rsvp" #: templates/templated_email/create_group_email.email:6 msgid "Group creation at" -msgstr "" +msgstr "Створення групи на" #: templates/templated_email/create_group_email.email:10 #: templates/templated_email/create_group_email.email:27 msgid "Hello!" -msgstr "" +msgstr "Здравствуйте" #: templates/templated_email/create_group_email.email:12 #: templates/templated_email/create_group_email.email:31 msgid "You, or somebody else create group" -msgstr "" +msgstr "Ви або хтось інший створив групу" #: templates/templated_email/create_group_email.email:12 #: templates/templated_email/create_group_email.email:31 msgid "at" -msgstr "" +msgstr "в" #: templates/templated_email/create_group_email.email:14 #: templates/templated_email/create_group_email.email:33 -msgid "If you do not do this please inform us." -msgstr "" +msgid "If you don't do this please inform us." +msgstr "Якщо ви цього не робили, будь ласка, повідомте нас" #: templates/templated_email/create_group_email.email:16 #: templates/templated_email/create_group_email.email:36 msgid "Yours" -msgstr "" +msgstr "Ваша" #: templates/templated_email/create_group_email.email:18 #: templates/templated_email/create_group_email.email:38 @@ -189,12 +189,12 @@ msgstr "" #: templates/templated_email/create_group_email.email:18 #: templates/templated_email/create_group_email.email:38 msgid "team" -msgstr "" +msgstr "команда" #: validators/event.py:29 msgid "Start of new event can't be in the past" -msgstr "" +msgstr "Початок нової події не може бути минулому" #: validators/event.py:42 msgid "End of new event can't be in the past" -msgstr "" +msgstr "Кінець нової події не може бути минулому" diff --git a/mk42/apps/core/models/group.py b/mk42/apps/core/models/group.py index 5dc2e68..c783dac 100644 --- a/mk42/apps/core/models/group.py +++ b/mk42/apps/core/models/group.py @@ -30,7 +30,7 @@ class Group(models.Model): id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False, verbose_name=_("ID")) name = models.CharField(verbose_name=_("name"), max_length=256, db_index=True, unique=True) - slug = AutoSlugField(verbose_name=_("slug"), populate_from="name", max_length=256, default="", blank=True, db_index=True, editable=True, help_text=_("overwrite in creation")) + slug = AutoSlugField(verbose_name=_("slug"), populate_from="name", max_length=256, default="", blank=True, db_index=True, editable=True, help_text=_("overwrites during creation")) owner = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=_("owner"), db_index=True, related_name="owned") description = RedactorField(verbose_name=_("description"), blank=True, null=True, db_index=True) created = models.DateTimeField(verbose_name=_("created date/time"), blank=True, null=True, db_index=True, auto_now_add=True) diff --git a/mk42/apps/users/locale/en/LC_MESSAGES/django.po b/mk42/apps/users/locale/en/LC_MESSAGES/django.po index 5f02cde..a8dc6fb 100644 --- a/mk42/apps/users/locale/en/LC_MESSAGES/django.po +++ b/mk42/apps/users/locale/en/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-08-26 00:50+0000\n" "PO-Revision-Date: 2017-06-13 19:25+0000\n" -"Last-Translator: Alexei Andrushievich \n" -"Language-Team: Alexei Andrushievich \n" +"Last-Translator: Kirill Boev \n" +"Language-Team: Kirill Boev , Alexei Andrushievich \n" "Language: en\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,9 +32,7 @@ msgid "Settings" msgstr "" #: admin/user.py:68 -msgid "" -"Clear all selected users sessions (logout from all logged in devices) (can " -"take very long time)" +msgid "Clear all selected users sessions (logout from all logged in devices) (can take very long time)" msgstr "" #: api/serializers/user.py:26 @@ -85,7 +83,7 @@ msgstr "" #: templates/templated_email/registration.email:14 #: templates/templated_email/registration.email:35 -msgid "If you do not do this please inform us." +msgid "If you don't do this, please inform us." msgstr "" #: templates/templated_email/registration.email:16 diff --git a/mk42/apps/users/locale/uk/LC_MESSAGES/django.po b/mk42/apps/users/locale/uk/LC_MESSAGES/django.po index 29c51f6..ac59335 100644 --- a/mk42/apps/users/locale/uk/LC_MESSAGES/django.po +++ b/mk42/apps/users/locale/uk/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-08-26 00:50+0000\n" "PO-Revision-Date: 2017-06-13 19:25+0000\n" -"Last-Translator: Alexei Andrushievich \n" -"Language-Team: Alexei Andrushievich \n" +"Last-Translator: Kirill Boev \n" +"Language-Team: Kirill Boev , Alexei Andrushievich \n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,86 +19,84 @@ msgstr "" #: admin/user.py:46 msgid "Personal info" -msgstr "" +msgstr "Особиста інформація" #: admin/user.py:47 msgid "Permissions" -msgstr "" +msgstr "Дозволи" #: admin/user.py:48 msgid "Important dates" -msgstr "" +msgstr "Важливі дати" #: admin/user.py:49 msgid "Settings" -msgstr "" +msgstr "Налаштування" #: admin/user.py:68 -msgid "" -"Clear all selected users sessions (logout from all logged in devices) (can " -"take very long time)" -msgstr "" +msgid "Clear all selected users sessions (logout from all logged in devices) (can take very long time)" +msgstr "Очистити всі сеанси обраних користувачів (вийти з усіх вхідних пристроїв) (може зайняти дуже багато часу)" #: api/serializers/user.py:26 msgid "full name" -msgstr "" +msgstr "повне ім'я" #: api/serializers/user.py:27 msgid "short name" -msgstr "" +msgstr "коротке ім'я" #: api/serializers/user.py:28 models/user.py:43 msgid "country" -msgstr "" +msgstr "Країна" #: apps.py:23 msgid "Users" -msgstr "" +msgstr "Користувачі" #: models/user.py:41 msgid "ID" -msgstr "" +msgstr "ID" #: models/user.py:42 msgid "language" -msgstr "" +msgstr "мова" #: models/user.py:58 msgid "user" -msgstr "" +msgstr "користувач" #: models/user.py:59 msgid "users" -msgstr "" +msgstr "користувачі" #: templates/templated_email/registration.email:6 msgid "Registration on" -msgstr "" +msgstr "Реєстрація в" #: templates/templated_email/registration.email:10 #: templates/templated_email/registration.email:29 msgid "Welcome to" -msgstr "" +msgstr "Ласкаво просимо до" #: templates/templated_email/registration.email:12 #: templates/templated_email/registration.email:33 msgid "You, or somebody else register at" -msgstr "" +msgstr "Ви або хтось інший зареєструвался на" #: templates/templated_email/registration.email:14 #: templates/templated_email/registration.email:35 -msgid "If you do not do this please inform us." -msgstr "" +msgid "If you don't do this, please inform us." +msgstr "Якщо ви цього не робили, будь ласка, повідомте про це нас" #: templates/templated_email/registration.email:16 #: templates/templated_email/registration.email:37 -msgid "Enjoy working on" -msgstr "" +msgid "Enjoy working on" # предлагаю убрать working, многие просто не любят работать +msgstr "Насолоджуйтесь роботою з" #: templates/templated_email/registration.email:18 #: templates/templated_email/registration.email:40 msgid "Yours" -msgstr "" +msgstr "Ваша" #: templates/templated_email/registration.email:20 #: templates/templated_email/registration.email:42 @@ -108,4 +106,4 @@ msgstr "" #: templates/templated_email/registration.email:20 #: templates/templated_email/registration.email:42 msgid "team" -msgstr "" +msgstr "команда" diff --git a/mk42/apps/users/templates/templated_email/registration.email b/mk42/apps/users/templates/templated_email/registration.email index dec170a..f4d5ebf 100644 --- a/mk42/apps/users/templates/templated_email/registration.email +++ b/mk42/apps/users/templates/templated_email/registration.email @@ -11,7 +11,7 @@ {% trans "You, or somebody else register at" %} {{ protocol }}//{{ site.domain }} - {% trans "If you do not do this please inform us." %} + {% trans "If you don't do this please inform us." %} {% trans "Enjoy working on" %} {{ protocol }}//{{ site.domain }} @@ -32,7 +32,7 @@

{% trans "You, or somebody else register at" %} {{ site.name }}. - {% trans "If you do not do this please inform us." %} + {% trans "If you don't do this please inform us." %} {% trans "Enjoy working on" %} {{ site.name }}.