Commit 6ca0bce4 authored by Och's avatar Och Committed by Och
Browse files

settings: Added a new subscription

parent 3c4dbc34
Pipeline #2214 failed with stage
in 9 minutes and 19 seconds
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-08-27 14:47+0200\n"
"POT-Creation-Date: 2020-08-28 12:05+0200\n"
"PO-Revision-Date: 2016-07-18\n"
"Last-Translator: Skia <skia@libskia.so>\n"
"Language-Team: AE info <ae.info@utbm.fr>\n"
......@@ -21,7 +21,7 @@ msgstr ""
#: com/models.py:294 counter/models.py:121 counter/models.py:149
#: counter/models.py:213 forum/models.py:58 launderette/models.py:38
#: launderette/models.py:93 launderette/models.py:131 stock/models.py:40
#: stock/models.py:63 stock/models.py:105 stock/models.py:134
#: stock/models.py:63 stock/models.py:105 stock/models.py:133
msgid "name"
msgstr "nom"
......@@ -1169,7 +1169,7 @@ msgid "There are no members in this club."
msgstr "Il n'y a pas de membres dans ce club."
#: club/templates/club/club_members.jinja:78
#: core/templates/core/file_detail.jinja:19 core/views/forms.py:337
#: core/templates/core/file_detail.jinja:19 core/views/forms.py:331
#: launderette/views.py:226 trombi/templates/trombi/detail.jinja:19
msgid "Add"
msgstr "Ajouter"
......@@ -1444,7 +1444,7 @@ msgstr "contenu"
#: com/models.py:72 core/models.py:1432 launderette/models.py:101
#: launderette/models.py:139 launderette/models.py:196 stock/models.py:80
#: stock/models.py:138
#: stock/models.py:137
msgid "type"
msgstr "type"
......@@ -3543,7 +3543,7 @@ msgstr "Ajouter un nouveau dossier"
msgid "Error creating folder %(folder_name)s: %(msg)s"
msgstr "Erreur de création du dossier %(folder_name)s : %(msg)s"
#: core/views/files.py:121 core/views/forms.py:305 core/views/forms.py:312
#: core/views/files.py:121 core/views/forms.py:299 core/views/forms.py:306
#: sas/views.py:94
#, python-format
msgid "Error uploading file %(file_name)s: %(msg)s"
......@@ -3625,32 +3625,58 @@ msgstr "Activer le plein écran"
msgid "Markdown guide"
msgstr "Guide markdown"
#: core/views/forms.py:121 core/views/forms.py:129
#: core/views/forms.py:119 core/views/forms.py:126
msgid "Choose file"
msgstr "Choisir un fichier"
#: core/views/forms.py:145 core/views/forms.py:153
#: core/views/forms.py:140 core/views/forms.py:147
msgid "Choose user"
msgstr "Choisir un utilisateur"
#: core/views/forms.py:185
#: core/views/forms.py:179
msgid "Username, email, or account number"
msgstr "Nom d'utilisateur, email, ou numéro de compte AE"
#: core/views/forms.py:251
#: core/views/forms.py:245
msgid ""
msgstr "Fillot"
"Profile: you need to be visible on the picture, in order to be recognized (e."
"g. by the barmen)"
msgstr ""
#: core/views/forms.py:247
msgid "Avatar: used on the forum"
msgstr ""
#: core/views/forms.py:248
msgid "Scrub: let other know how your scrub looks like!"
msgstr ""
#: core/views/forms.py:310
msgid "Bad image format, only jpeg, png, and gif are accepted"
msgstr ""
#: core/views/forms.py:330
#, fuzzy
#| msgid "Godfathers"
msgid "Godfather"
msgstr "Parrains"
#: core/views/forms.py:330
#, fuzzy
#| msgid "Godchildren"
msgid "Godchild"
msgstr "Fillots"
#: core/views/forms.py:340 counter/views.py:154 trombi/views.py:158
#: core/views/forms.py:334 counter/views.py:154 trombi/views.py:158
msgid "Select user"
msgstr "Choisir un utilisateur"
#: core/views/forms.py:353 core/views/forms.py:371 election/models.py:24
#: core/views/forms.py:347 core/views/forms.py:365 election/models.py:24
#: election/views.py:154
msgid "edit groups"
msgstr "groupe d'édition"
#: core/views/forms.py:356 core/views/forms.py:374 election/models.py:31
#: core/views/forms.py:350 core/views/forms.py:368 election/models.py:31
#: election/views.py:157
msgid "view groups"
msgstr "groupe de vue"
......@@ -4737,6 +4763,8 @@ msgstr "Lavage et séchage"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: sith/settings.py:594
=======
#: sith/settings.py:593
......@@ -4756,6 +4784,12 @@ msgstr "Lavage et séchage"
=======
#: sith/settings.py:594
>>>>>>> d815b6f... subscription: Corrected bad changes
=======
#: sith/settings.py:593
>>>>>>> 797ca0f... settings: Added a new subscription
=======
#: sith/settings.py:594
>>>>>>> 39dfb9e... Corrected conflicts
msgid "Washing"
msgstr "Lavage"
......@@ -4766,6 +4800,8 @@ msgstr "Lavage"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: sith/settings.py:594
=======
#: sith/settings.py:593
......@@ -4785,6 +4821,12 @@ msgstr "Lavage"
=======
#: sith/settings.py:594
>>>>>>> d815b6f... subscription: Corrected bad changes
=======
#: sith/settings.py:593
>>>>>>> 797ca0f... settings: Added a new subscription
=======
#: sith/settings.py:594
>>>>>>> 39dfb9e... Corrected conflicts
msgid "Drying"
msgstr "Séchage"
......@@ -5543,6 +5585,7 @@ msgstr "Bénévole Eurockéennes"
msgid "One day"
msgstr "Un jour"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: sith/settings.py:503
......@@ -5565,50 +5608,73 @@ msgstr "Membre staff GA, 1 €"
msgstr "Membre staff GA (2 semaines), 1 €"
>>>>>>> a68c74f... locale: Added traduction for the new subscription
<<<<<<< HEAD
<<<<<<< HEAD
#: sith/settings.py:512
=======
=======
>>>>>>> 797ca0f... settings: Added a new subscription
#: sith/settings.py:508
msgid "GA staff member"
msgstr "Membre staff GA (2 semaines), 1 €"
#: sith/settings.py:511
<<<<<<< HEAD
>>>>>>> e007d8e... locale: Added traduction for the new subscription
=======
>>>>>>> 797ca0f... settings: Added a new subscription
msgid "One semester (-20%)"
msgstr "Un semestre, 20 €"
<<<<<<< HEAD
<<<<<<< HEAD
#: sith/settings.py:517
=======
#: sith/settings.py:516
>>>>>>> e007d8e... locale: Added traduction for the new subscription
=======
#: sith/settings.py:516
>>>>>>> 797ca0f... settings: Added a new subscription
msgid "Two semesters (-20%)"
msgstr "Deux semestres, 35 €"
<<<<<<< HEAD
<<<<<<< HEAD
#: sith/settings.py:522
=======
#: sith/settings.py:521
>>>>>>> e007d8e... locale: Added traduction for the new subscription
=======
#: sith/settings.py:521
>>>>>>> 797ca0f... settings: Added a new subscription
msgid "Common core cursus (-20%)"
msgstr "Cursus tronc commun, 60 €"
<<<<<<< HEAD
<<<<<<< HEAD
#: sith/settings.py:527
=======
#: sith/settings.py:526
>>>>>>> e007d8e... locale: Added traduction for the new subscription
=======
#: sith/settings.py:526
>>>>>>> 797ca0f... settings: Added a new subscription
msgid "Branch cursus (-20%)"
msgstr "Cursus branche, 60 €"
<<<<<<< HEAD
<<<<<<< HEAD
#: sith/settings.py:532
=======
#: sith/settings.py:531
>>>>>>> e007d8e... locale: Added traduction for the new subscription
=======
#: sith/settings.py:531
>>>>>>> 797ca0f... settings: Added a new subscription
msgid "Alternating cursus (-20%)"
msgstr "Cursus alternant, 30 €"
<<<<<<< HEAD
<<<<<<< HEAD
#: sith/settings.py:554
msgid "President"
......@@ -5659,6 +5725,8 @@ msgstr "Une nouvelle mailing list a besoin d'être modérée"
=======
#: sith/settings.py:521
=======
=======
>>>>>>> 39dfb9e... Corrected conflicts
#: sith/settings.py:512
msgid "One semester (-20%)"
msgstr "Un semestre, 20 €"
......@@ -5680,7 +5748,6 @@ msgid "Alternating cursus (-20%)"
msgstr "Cursus alternant, 30 €"
#: sith/settings.py:554
>>>>>>> d815b6f... subscription: Corrected bad changes
msgid "President"
msgstr "Président"
......@@ -5722,109 +5789,58 @@ msgstr "Une nouvelle affiche a besoin d'être modérée"
#: sith/settings.py:599
msgid "A new mailing list needs to be moderated"
msgstr "Une nouvelle mailing list a besoin d'être modérée"
msgstr "Une nouvelle mailing list à besoin d'être modérée"
<<<<<<< HEAD
#: sith/settings.py:569
>>>>>>> c3de7f1... sith: Edited cotisations prices
=======
#: sith/settings.py:602
<<<<<<< HEAD
>>>>>>> d815b6f... subscription: Corrected bad changes
=======
#: sith/settings.py:553
=======
=======
>>>>>>> d815b6f... subscription: Corrected bad changes
msgid "Eurock's volunteer"
msgstr "Bénévole Eurockéennes"
#: sith/settings.py:508
msgid "One day"
msgstr "Un jour"
#: sith/settings.py:509
msgid "GA staff member"
msgstr "Membre staff GA (2 semaines), 1 €"
<<<<<<< HEAD
#: sith/settings.py:521
>>>>>>> c3de7f1... sith: Edited cotisations prices
=======
#: sith/settings.py:512
msgid "One semester (-20%)"
msgstr "Un semestre, 20 €"
#: sith/settings.py:517
msgid "Two semesters (-20%)"
msgstr "Deux semestres, 35 €"
#: sith/settings.py:522
msgid "Common core cursus (-20%)"
msgstr "Cursus tronc commun, 60 €"
#: sith/settings.py:527
msgid "Branch cursus (-20%)"
msgstr "Cursus branche, 60 €"
#: sith/settings.py:532
msgid "Alternating cursus (-20%)"
msgstr "Cursus alternant, 30 €"
#: sith/settings.py:554
>>>>>>> d815b6f... subscription: Corrected bad changes
msgid "President"
msgstr "Président"
#: sith/settings.py:555
#: sith/settings.py:554
msgid "Vice-President"
msgstr "Vice-Président"
#: sith/settings.py:556
#: sith/settings.py:555
msgid "Treasurer"
msgstr "Trésorier"
#: sith/settings.py:557
#: sith/settings.py:556
msgid "Communication supervisor"
msgstr "Responsable communication"
#: sith/settings.py:558
#: sith/settings.py:557
msgid "Secretary"
msgstr "Secrétaire"
#: sith/settings.py:559
#: sith/settings.py:558
msgid "IT supervisor"
msgstr "Responsable info"
#: sith/settings.py:560
#: sith/settings.py:559
msgid "Board member"
msgstr "Membre du bureau"
#: sith/settings.py:561
#: sith/settings.py:560
msgid "Active member"
msgstr "Membre actif"
#: sith/settings.py:562
#: sith/settings.py:561
msgid "Curious"
msgstr "Curieux"
#: sith/settings.py:598
#: sith/settings.py:597
msgid "A new poster needs to be moderated"
msgstr "Une nouvelle affiche a besoin d'être modérée"
#: sith/settings.py:599
#: sith/settings.py:598
msgid "A new mailing list needs to be moderated"
msgstr "Une nouvelle mailing list a besoin d'être modérée"
<<<<<<< HEAD
<<<<<<< HEAD
#: sith/settings.py:601
>>>>>>> e007d8e... locale: Added traduction for the new subscription
=======
#: sith/settings.py:569
>>>>>>> c3de7f1... sith: Edited cotisations prices
=======
#: sith/settings.py:602
>>>>>>> d815b6f... subscription: Corrected bad changes
>>>>>>> 797ca0f... settings: Added a new subscription
msgid "A new pedagogy comment has been signaled for moderation"
msgstr ""
"Un nouveau commentaire de la pédagogie a été signalé pour la modération"
......@@ -5835,6 +5851,7 @@ msgstr ""
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: sith/settings.py:604
=======
#: sith/settings.py:603
......@@ -5854,6 +5871,9 @@ msgstr ""
=======
#: sith/settings.py:604
>>>>>>> d815b6f... subscription: Corrected bad changes
=======
#: sith/settings.py:603
>>>>>>> 797ca0f... settings: Added a new subscription
#, python-format
msgid "There are %s fresh news to be moderated"
msgstr "Il y a %s nouvelles toutes fraîches à modérer"
......@@ -5864,6 +5884,7 @@ msgstr "Il y a %s nouvelles toutes fraîches à modérer"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: sith/settings.py:605
msgid "New files to be moderated"
msgstr "Nouveaux fichiers à modérer"
......@@ -5887,30 +5908,31 @@ msgstr "Nouveaux fichiers à modérer"
#: sith/settings.py:605
msgid "New files to be moderated"
msgstr "Nouveaux fichiers à modérer"
#: sith/settings.py:606
>>>>>>> d815b6f... subscription: Corrected bad changes
=======
msgid "A new pedagogy comment has been signaled for moderation"
msgstr "Un nouveau commentaire d'UV à besoin d'être modéré"
>>>>>>> 39dfb9e... Corrected conflicts
#: sith/settings.py:604
msgid "New files to be moderated"
msgstr "Nouveaux fichiers à modérer"
msgid "There are %s fresh news to be moderated"
msgstr "Il y a %s nouvelles à modérer"
#: sith/settings.py:605
>>>>>>> e007d8e... locale: Added traduction for the new subscription
=======
#: sith/settings.py:572
msgid "New files to be moderated"
msgstr "Nouveaux fichiers à modérer"
#: sith/settings.py:573
>>>>>>> c3de7f1... sith: Edited cotisations prices
#: sith/settings.py:606
<<<<<<< HEAD
>>>>>>> d815b6f... subscription: Corrected bad changes
=======
#: sith/settings.py:605
#: sith/settings.py:604
msgid "New files to be moderated"
msgstr "Nouveaux fichiers à modérer"
#: sith/settings.py:606
>>>>>>> d815b6f... subscription: Corrected bad changes
#: sith/settings.py:605
>>>>>>> 797ca0f... settings: Added a new subscription
=======
>>>>>>> 39dfb9e... Corrected conflicts
#, python-format
msgid "There are %s pictures to be moderated in the SAS"
msgstr "Il y a %s photos à modérer dans le SAS"
......@@ -5921,11 +5943,16 @@ msgstr "Il y a %s photos à modérer dans le SAS"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 39dfb9e... Corrected conflicts
#: sith/settings.py:607
msgid "You've been identified on some pictures"
msgstr "Vous avez été identifié sur des photos"
#: sith/settings.py:608
<<<<<<< HEAD
=======
#: sith/settings.py:606
msgid "You've been identified on some pictures"
......@@ -5968,6 +5995,15 @@ msgstr "Vous avez été identifié sur des photos"
#: sith/settings.py:608
>>>>>>> d815b6f... subscription: Corrected bad changes
=======
#: sith/settings.py:606
msgid "You've been identified on some pictures"
msgstr "Vous avez été identifié sur des photos"
#: sith/settings.py:607
>>>>>>> 797ca0f... settings: Added a new subscription
=======
>>>>>>> 39dfb9e... Corrected conflicts
#, python-format
msgid "You just refilled of %s €"
msgstr "Vous avez rechargé votre compte de %s€"
......@@ -5978,6 +6014,8 @@ msgstr "Vous avez rechargé votre compte de %s€"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: sith/settings.py:609
=======
#: sith/settings.py:608
......@@ -5997,6 +6035,12 @@ msgstr "Vous avez rechargé votre compte de %s€"
=======
#: sith/settings.py:609
>>>>>>> d815b6f... subscription: Corrected bad changes
=======
#: sith/settings.py:608
>>>>>>> 797ca0f... settings: Added a new subscription
=======
#: sith/settings.py:609
>>>>>>> 39dfb9e... Corrected conflicts
#, python-format
msgid "You just bought %s"
msgstr "Vous avez acheté %s"
......@@ -6007,6 +6051,10 @@ msgstr "Vous avez acheté %s"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 39dfb9e... Corrected conflicts
#: sith/settings.py:610
msgid "You have a notification"
msgstr "Vous avez une notification"
......@@ -6032,6 +6080,7 @@ msgid "You successfully sent the Weekmail"
msgstr "Weekmail envoyé avec succès"
#: sith/settings.py:634
<<<<<<< HEAD
=======
#: sith/settings.py:609
=======
......@@ -6114,6 +6163,35 @@ msgstr "Weekmail envoyé avec succès"
=======
#: sith/settings.py:634
>>>>>>> d815b6f... subscription: Corrected bad changes
=======
#: sith/settings.py:609
msgid "You have a notification"
msgstr "Vous avez une notification"
#: sith/settings.py:621
msgid "Success!"
msgstr "Succès !"
#: sith/settings.py:622
msgid "Fail!"
msgstr "Échec !"
#: sith/settings.py:623
msgid "You successfully posted an article in the Weekmail"
msgstr "Article posté avec succès dans le Weekmail"
#: sith/settings.py:624
msgid "You successfully edited an article in the Weekmail"
msgstr "Article édité avec succès dans le Weekmail"
#: sith/settings.py:625
msgid "You successfully sent the Weekmail"
msgstr "Weekmail envoyé avec succès"
#: sith/settings.py:633
>>>>>>> 797ca0f... settings: Added a new subscription
=======
>>>>>>> 39dfb9e... Corrected conflicts
msgid "AE tee-shirt"
msgstr "Tee-shirt AE"
......@@ -6149,23 +6227,23 @@ msgstr ""
msgid "todo"
msgstr "à faire"
#: stock/models.py:128
#: stock/models.py:127
msgid "shopping lists"
msgstr "listes de courses"
#: stock/models.py:144
#: stock/models.py:143
msgid "quantity to buy"
msgstr "quantité à acheter"
#: stock/models.py:146
#: stock/models.py:145
msgid "quantity to buy during the next shopping session"
msgstr "quantité à acheter pendant les prochaines courses"
#: stock/models.py:149
#: stock/models.py:148
msgid "quantity bought"
msgstr "quantité achetée"
#: stock/models.py:151
#: stock/models.py:150
msgid "quantity bought during the last shopping session"
msgstr "quantité achetée pendant les dernières courses"
......@@ -6665,6 +6743,9 @@ msgstr "Vous ne pouvez plus écrire de commentaires, la date est passée."
msgid "Maximum characters: %(max_length)s"
msgstr "Nombre de caractères max: %(max_length)s"
#~ msgid "Fillot"
#~ msgstr "Fillot"
#~ msgid "ENERGIE"
#~ msgstr "ENERGIE"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment