From 0286248ceb78fbcb51f764849406d131d6e1700b Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 4 Feb 2016 10:38:01 +0100 Subject: [PATCH] locale --- teleforma/locale/en/LC_MESSAGES/django.mo | Bin 13187 -> 13187 bytes teleforma/locale/en/LC_MESSAGES/django.po | 47 ++++++++++++++------ teleforma/locale/fr/LC_MESSAGES/django.mo | Bin 14411 -> 14492 bytes teleforma/locale/fr/LC_MESSAGES/django.po | 51 +++++++++++++++------- teleforma/models/messages.py | 2 + 5 files changed, 70 insertions(+), 30 deletions(-) diff --git a/teleforma/locale/en/LC_MESSAGES/django.mo b/teleforma/locale/en/LC_MESSAGES/django.mo index c5d14fdaadbc8f6ad9d27937b2e11065523a4f4d..25024dc78e578765354574378554d3eeb53e9495 100644 GIT binary patch delta 15 WcmZopZ%*IPs?20;zPVlb4?h4gpauZ| delta 15 WcmZopZ%*IPs?20)u(@6N4?h4gXa)EH diff --git a/teleforma/locale/en/LC_MESSAGES/django.po b/teleforma/locale/en/LC_MESSAGES/django.po index 51cc0f65..f416eff2 100644 --- a/teleforma/locale/en/LC_MESSAGES/django.po +++ b/teleforma/locale/en/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-04 10:10+0100\n" +"POT-Creation-Date: 2016-02-04 10:37+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Guillaume Pellerin \n" "Language-Team: LANGUAGE \n" @@ -371,7 +371,7 @@ msgstr "Nouvelle note" #: exam/templates/exam/score_form.html:60 #: exam/templates/exam/script_form.html:78 -#: templates/registration/registration_form.html:21 +#: templates/registration/registration_form.html:22 msgid "Submit" msgstr "Soumettre" @@ -710,11 +710,11 @@ msgstr "spécialité écrit" msgid "oral speciality" msgstr "spécialité orale" -#: models/crfpa.py:82 models/crfpa.py:133 +#: models/crfpa.py:82 msgid "oral 1" msgstr "" -#: models/crfpa.py:85 models/crfpa.py:136 +#: models/crfpa.py:85 msgid "oral 2" msgstr "" @@ -738,6 +738,14 @@ msgstr "formation" msgid "trainings" msgstr "formations" +#: models/crfpa.py:133 +msgid "oral 1 (option)" +msgstr "" + +#: models/crfpa.py:136 +msgid "oral 2 (option)" +msgstr "" + #: models/crfpa.py:143 #, fuzzy #| msgid "platform only" @@ -884,31 +892,41 @@ msgstr "Frais optionnels" msgid "students" msgstr "étudiant" -#: models/messages.py:27 +#: models/messages.py:18 +#, fuzzy +#| msgid "Student" +msgid "Student group" +msgstr "Etudiant" + +#: models/messages.py:28 msgid "group" msgstr "" -#: models/messages.py:30 +#: models/messages.py:31 msgid "sender" msgstr "" -#: models/messages.py:32 +#: models/messages.py:33 #, fuzzy #| msgid "Reject" msgid "subject" msgstr "Rejeter" -#: models/messages.py:33 +#: models/messages.py:34 #, fuzzy msgid "message" msgstr "Messages" -#: models/messages.py:36 +#: models/messages.py:37 #, fuzzy #| msgid "date end" msgid "date sent" msgstr "date de fin" +#: models/messages.py:41 templates/telemeta/users.html:55 +msgid "Grouped message" +msgstr "Message groupé" + #: models/pro.py:47 msgid "price" msgstr "prix" @@ -1460,7 +1478,7 @@ msgid "" msgstr "" #: templates/registration/registration_complete.html:6 -#: templates/registration/registration_pdf.html:13 views/crfpa.py:469 +#: templates/registration/registration_pdf.html:13 views/crfpa.py:471 msgid "Registration" msgstr "Inscription" @@ -1965,10 +1983,6 @@ msgstr "" msgid "Courses" msgstr "Matières" -#: templates/telemeta/users.html:55 -msgid "Grouped message" -msgstr "Message groupé" - #: templates/telemeta/users.html:74 msgid "No users" msgstr "Pas d'utilisateurs" @@ -2016,6 +2030,11 @@ msgstr "Une nouvelle conférence en direct a commencé : " msgid "You have successfully register your account." msgstr "" +#, fuzzy +#~| msgid "Grouped message" +#~ msgid "Group messages" +#~ msgstr "Message groupé" + #~ msgid "Testimonials" #~ msgstr "Attestations" diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo index fe0ba3eef5d3718b5a569dd8d6042ea5ecc541dc..0363bfd63567516eb2b1b907fa8e673f1f6c9d27 100644 GIT binary patch delta 6295 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 diff --git a/teleforma/locale/fr/LC_MESSAGES/django.po b/teleforma/locale/fr/LC_MESSAGES/django.po index 057449ef..8ee3c4db 100644 --- a/teleforma/locale/fr/LC_MESSAGES/django.po +++ b/teleforma/locale/fr/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-04 10:10+0100\n" +"POT-Creation-Date: 2016-02-04 10:37+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Guillaume Pellerin \n" "Language-Team: LANGUAGE \n" @@ -25,7 +25,7 @@ msgstr "période" #: admin.py:62 msgid "Group" -msgstr "" +msgstr "Groupe" #: exam/models.py:62 exam/models.py:442 msgid "rejected" @@ -371,7 +371,7 @@ msgstr "Nouvelle note" #: exam/templates/exam/score_form.html:60 #: exam/templates/exam/script_form.html:78 -#: templates/registration/registration_form.html:21 +#: templates/registration/registration_form.html:22 msgid "Submit" msgstr "Soumettre" @@ -706,11 +706,11 @@ msgstr "spécialité écrit" msgid "oral speciality" msgstr "spécialité orale" -#: models/crfpa.py:82 models/crfpa.py:133 +#: models/crfpa.py:82 msgid "oral 1" msgstr "" -#: models/crfpa.py:85 models/crfpa.py:136 +#: models/crfpa.py:85 msgid "oral 2" msgstr "" @@ -734,6 +734,14 @@ msgstr "formation" msgid "trainings" msgstr "formations" +#: models/crfpa.py:133 +msgid "oral 1 (option)" +msgstr "" + +#: models/crfpa.py:136 +msgid "oral 2 (option)" +msgstr "" + #: models/crfpa.py:143 msgid "e-learning platform only" msgstr "formation e-learning uniquement" @@ -872,31 +880,41 @@ msgstr "Frais optionnels" msgid "students" msgstr "étudiants" -#: models/messages.py:27 +#: models/messages.py:18 +#, fuzzy +#| msgid "Student" +msgid "Student group" +msgstr "Etudiant groupe" + +#: models/messages.py:28 msgid "group" -msgstr "" +msgstr "group" -#: models/messages.py:30 +#: models/messages.py:31 msgid "sender" msgstr "" -#: models/messages.py:32 +#: models/messages.py:33 #, fuzzy #| msgid "Reject" msgid "subject" msgstr "Rejeter" -#: models/messages.py:33 +#: models/messages.py:34 #, fuzzy msgid "message" msgstr "Messages" -#: models/messages.py:36 +#: models/messages.py:37 #, fuzzy #| msgid "date end" msgid "date sent" msgstr "date de fin" +#: models/messages.py:41 templates/telemeta/users.html:55 +msgid "Grouped message" +msgstr "Message groupé" + #: models/pro.py:47 msgid "price" msgstr "prix" @@ -1448,7 +1466,7 @@ msgid "" msgstr "" #: templates/registration/registration_complete.html:6 -#: templates/registration/registration_pdf.html:13 views/crfpa.py:469 +#: templates/registration/registration_pdf.html:13 views/crfpa.py:471 msgid "Registration" msgstr "Inscription" @@ -1943,10 +1961,6 @@ msgstr "" msgid "Courses" msgstr "Matières" -#: templates/telemeta/users.html:55 -msgid "Grouped message" -msgstr "Message groupé" - #: templates/telemeta/users.html:74 msgid "No users" msgstr "Pas d'utilisateurs" @@ -1994,6 +2008,11 @@ msgstr "Une nouvelle conférence en direct a commencé : " msgid "You have successfully register your account." msgstr "" +#, fuzzy +#~| msgid "Grouped message" +#~ msgid "Group messages" +#~ msgstr "Message groupé" + #~ msgid "Testimonials" #~ msgstr "Attestations" diff --git a/teleforma/models/messages.py b/teleforma/models/messages.py index f3622496..e0fb88ae 100644 --- a/teleforma/models/messages.py +++ b/teleforma/models/messages.py @@ -15,6 +15,7 @@ class StudentGroup(models.Model): class Meta(MetaCore): db_table = app_label + '_' + 'student_groups' + verbose_name = _('Student group') def __unicode__(self): return self.name @@ -37,6 +38,7 @@ class GroupedMessage(models.Model): class Meta(MetaCore): db_table = app_label + '_' + 'grouped_messages' + verbose_name = _('Grouped message') def __unicode__(self): return self.group.name + ' ' + self.subject -- 2.39.5