mirror of
https://gitlab.crans.org/bde/nk20
synced 2025-07-18 15:20:19 +02:00
Merge branch 'main' into 'wei'
# Conflicts: # locale/fr/LC_MESSAGES/django.po
This commit is contained in:
ehouarn
@ -357,7 +357,7 @@ msgstr "Détails de l'activité"
|
||||
#: apps/note/models/transactions.py:261
|
||||
#: apps/note/templates/note/transaction_form.html:17
|
||||
#: apps/note/templates/note/transaction_form.html:152
|
||||
#: note_kfet/templates/base.html:78
|
||||
#: note_kfet/templates/base.html:79
|
||||
msgid "Transfer"
|
||||
msgstr "Virement"
|
||||
|
||||
@ -474,7 +474,7 @@ msgstr "Inviter"
|
||||
msgid "Create new activity"
|
||||
msgstr "Créer une nouvelle activité"
|
||||
|
||||
#: apps/activity/views.py:71 note_kfet/templates/base.html:96
|
||||
#: apps/activity/views.py:71 note_kfet/templates/base.html:97
|
||||
msgid "Activities"
|
||||
msgstr "Activités"
|
||||
|
||||
@ -563,7 +563,7 @@ msgstr "Nom"
|
||||
#, fuzzy
|
||||
#| msgid "QR-code number"
|
||||
msgid "QR code number"
|
||||
msgstr "numéro de QR-code"
|
||||
msgstr "Numéro de QR-code"
|
||||
|
||||
#: apps/food/models.py:23
|
||||
msgid "Allergen"
|
||||
@ -597,7 +597,7 @@ msgstr "est prêt"
|
||||
msgid "order"
|
||||
msgstr "consigne"
|
||||
|
||||
#: apps/food/models.py:107 apps/food/views.py:34
|
||||
#: apps/food/models.py:107 apps/food/views.py:35
|
||||
#: note_kfet/templates/base.html:72
|
||||
msgid "Food"
|
||||
msgstr "Bouffe"
|
||||
@ -657,61 +657,75 @@ msgstr "QR-codes"
|
||||
#: apps/food/models.py:286
|
||||
#: apps/food/templates/food/transformedfood_update.html:24
|
||||
msgid "QR-code number"
|
||||
msgstr "numéro de QR-code"
|
||||
msgstr "Numéro de QR-code"
|
||||
|
||||
#: apps/food/templates/food/food_detail.html:19
|
||||
#: apps/food/templates/food/food_detail.html:22
|
||||
msgid "Contained in"
|
||||
msgstr "Contenu dans"
|
||||
|
||||
#: apps/food/templates/food/food_detail.html:26
|
||||
#: apps/food/templates/food/food_detail.html:29
|
||||
msgid "Contain"
|
||||
msgstr "Contient"
|
||||
|
||||
#: apps/food/templates/food/food_detail.html:35
|
||||
#: apps/food/templates/food/food_detail.html:38
|
||||
msgid "Update"
|
||||
msgstr "Modifier"
|
||||
|
||||
#: apps/food/templates/food/food_detail.html:40
|
||||
#: apps/food/templates/food/food_detail.html:43
|
||||
msgid "Add to a meal"
|
||||
msgstr "Ajouter à un plat"
|
||||
|
||||
#: apps/food/templates/food/food_detail.html:45
|
||||
#: apps/food/templates/food/food_detail.html:48
|
||||
msgid "Manage ingredients"
|
||||
msgstr "Gérer les ingrédients"
|
||||
|
||||
#: apps/food/templates/food/food_detail.html:49
|
||||
#: apps/food/templates/food/food_detail.html:52
|
||||
msgid "Return to the food list"
|
||||
msgstr "Retour à la liste de nourriture"
|
||||
|
||||
#: apps/food/templates/food/food_list.html:14
|
||||
#: apps/food/templates/food/food_list.html:32
|
||||
msgid "View food"
|
||||
msgstr "Voir l'aliment"
|
||||
|
||||
#: apps/food/templates/food/food_list.html:37
|
||||
#: note_kfet/templates/base_search.html:15
|
||||
msgid "Search by attribute such as name..."
|
||||
msgstr "Chercher par un attribut tel que le nom..."
|
||||
|
||||
#: apps/food/templates/food/food_list.html:49
|
||||
#: note_kfet/templates/base_search.html:23
|
||||
msgid "There is no results."
|
||||
msgstr "Il n'y a pas de résultat."
|
||||
|
||||
#: apps/food/templates/food/food_list.html:58
|
||||
msgid "Meal served"
|
||||
msgstr "Plat servis"
|
||||
|
||||
#: apps/food/templates/food/food_list.html:19
|
||||
#: apps/food/templates/food/food_list.html:63
|
||||
msgid "New meal"
|
||||
msgstr "Nouveau plat"
|
||||
|
||||
#: apps/food/templates/food/food_list.html:28
|
||||
#: apps/food/templates/food/food_list.html:72
|
||||
msgid "There is no meal served."
|
||||
msgstr "Il n'y a pas de plat servi."
|
||||
|
||||
#: apps/food/templates/food/food_list.html:35
|
||||
#: apps/food/templates/food/food_list.html:79
|
||||
msgid "Free food"
|
||||
msgstr "Open"
|
||||
|
||||
#: apps/food/templates/food/food_list.html:42
|
||||
#: apps/food/templates/food/food_list.html:86
|
||||
msgid "There is no free food."
|
||||
msgstr "Il n'y a pas de bouffe en open"
|
||||
|
||||
#: apps/food/templates/food/food_list.html:50
|
||||
#: apps/food/templates/food/food_list.html:94
|
||||
msgid "Food of your clubs"
|
||||
msgstr "Bouffe de tes clubs"
|
||||
|
||||
#: apps/food/templates/food/food_list.html:56
|
||||
#: apps/food/templates/food/food_list.html:100
|
||||
msgid "Food of club"
|
||||
msgstr "Bouffe du club"
|
||||
|
||||
#: apps/food/templates/food/food_list.html:63
|
||||
#: apps/food/templates/food/food_list.html:107
|
||||
msgid "Yours club has not food yet."
|
||||
msgstr "Ton club n'a pas de bouffe pour l'instant"
|
||||
|
||||
@ -785,49 +799,49 @@ msgstr "semaines"
|
||||
msgid "and"
|
||||
msgstr "et"
|
||||
|
||||
#: apps/food/views.py:118
|
||||
#: apps/food/views.py:120
|
||||
msgid "Add a new QRCode"
|
||||
msgstr "Ajouter un nouveau QR-code"
|
||||
|
||||
#: apps/food/views.py:167
|
||||
#: apps/food/views.py:169
|
||||
msgid "Add an aliment"
|
||||
msgstr "Ajouter un nouvel aliment"
|
||||
|
||||
#: apps/food/views.py:235
|
||||
#: apps/food/views.py:228
|
||||
msgid "Add a meal"
|
||||
msgstr "Ajouter un plat"
|
||||
|
||||
#: apps/food/views.py:275
|
||||
#: apps/food/views.py:259
|
||||
msgid "Manage ingredients of:"
|
||||
msgstr "Gestion des ingrédienrs de :"
|
||||
|
||||
#: apps/food/views.py:289 apps/food/views.py:297
|
||||
#: apps/food/views.py:273 apps/food/views.py:281
|
||||
#, python-brace-format
|
||||
msgid "Fully used in {meal}"
|
||||
msgstr "Aliment entièrement utilisé dans : {meal}"
|
||||
|
||||
#: apps/food/views.py:344
|
||||
#: apps/food/views.py:320
|
||||
msgid "Add the ingredient:"
|
||||
msgstr "Ajouter l'ingrédient"
|
||||
|
||||
#: apps/food/views.py:370
|
||||
#: apps/food/views.py:346
|
||||
#, python-brace-format
|
||||
msgid "Food fully used in : {meal.name}"
|
||||
msgstr "Aliment entièrement utilisé dans : {meal.name}"
|
||||
|
||||
#: apps/food/views.py:389
|
||||
#: apps/food/views.py:365
|
||||
msgid "Update an aliment"
|
||||
msgstr "Modifier un aliment"
|
||||
|
||||
#: apps/food/views.py:437
|
||||
#: apps/food/views.py:413
|
||||
msgid "Details of:"
|
||||
msgstr "Détails de :"
|
||||
|
||||
#: apps/food/views.py:447 apps/treasury/tables.py:149
|
||||
#: apps/food/views.py:423 apps/treasury/tables.py:149
|
||||
msgid "Yes"
|
||||
msgstr "Oui"
|
||||
|
||||
#: apps/food/views.py:449 apps/member/models.py:99 apps/treasury/tables.py:149
|
||||
#: apps/food/views.py:425 apps/member/models.py:99 apps/treasury/tables.py:149
|
||||
msgid "No"
|
||||
msgstr "Non"
|
||||
|
||||
@ -2065,6 +2079,8 @@ msgstr "Historique des transactions récentes"
|
||||
#: apps/note/templates/note/mails/weekly_report.txt:32
|
||||
#: apps/registration/templates/registration/mails/email_validation_email.html:40
|
||||
#: apps/registration/templates/registration/mails/email_validation_email.txt:16
|
||||
#: apps/scripts/templates/scripts/food_report.html:48
|
||||
#: apps/scripts/templates/scripts/food_report.txt:14
|
||||
msgid "Mail generated by the Note Kfet on the"
|
||||
msgstr "Mail généré par la Note Kfet le"
|
||||
|
||||
@ -2176,7 +2192,7 @@ msgstr "Chercher un bouton"
|
||||
msgid "Update button"
|
||||
msgstr "Modifier le bouton"
|
||||
|
||||
#: apps/note/views.py:156 note_kfet/templates/base.html:66
|
||||
#: apps/note/views.py:156 note_kfet/templates/base.html:67
|
||||
msgid "Consumptions"
|
||||
msgstr "Consommations"
|
||||
|
||||
@ -2269,7 +2285,7 @@ msgstr "s'applique au club"
|
||||
msgid "role permissions"
|
||||
msgstr "permissions par rôles"
|
||||
|
||||
#: apps/permission/signals.py:73
|
||||
#: apps/permission/signals.py:75
|
||||
#, python-brace-format
|
||||
msgid ""
|
||||
"You don't have the permission to change the field {field} on this instance "
|
||||
@ -2278,7 +2294,7 @@ msgstr ""
|
||||
"Vous n'avez pas la permission de modifier le champ {field} sur l'instance du "
|
||||
"modèle {app_label}.{model_name}."
|
||||
|
||||
#: apps/permission/signals.py:83 apps/permission/views.py:104
|
||||
#: apps/permission/signals.py:85 apps/permission/views.py:104
|
||||
#, python-brace-format
|
||||
msgid ""
|
||||
"You don't have the permission to add an instance of model {app_label}."
|
||||
@ -2287,7 +2303,7 @@ msgstr ""
|
||||
"Vous n'avez pas la permission d'ajouter une instance du modèle {app_label}."
|
||||
"{model_name}."
|
||||
|
||||
#: apps/permission/signals.py:112
|
||||
#: apps/permission/signals.py:114
|
||||
#, python-brace-format
|
||||
msgid ""
|
||||
"You don't have the permission to delete this instance of model {app_label}."
|
||||
@ -2375,7 +2391,7 @@ msgstr ""
|
||||
"Vous n'avez pas la permission d'ajouter une instance du modèle « {model} » "
|
||||
"avec ces paramètres. Merci de les corriger et de réessayer."
|
||||
|
||||
#: apps/permission/views.py:111 note_kfet/templates/base.html:120
|
||||
#: apps/permission/views.py:111 note_kfet/templates/base.html:121
|
||||
msgid "Rights"
|
||||
msgstr "Droits"
|
||||
|
||||
@ -2580,7 +2596,7 @@ msgstr ""
|
||||
msgid "Invalidate pre-registration"
|
||||
msgstr "Invalider l'inscription"
|
||||
|
||||
#: apps/treasury/apps.py:12 note_kfet/templates/base.html:102
|
||||
#: apps/treasury/apps.py:12 note_kfet/templates/base.html:103
|
||||
msgid "Treasury"
|
||||
msgstr "Trésorerie"
|
||||
|
||||
@ -3748,13 +3764,13 @@ msgstr "bde"
|
||||
|
||||
#: apps/wrapped/models.py:65
|
||||
msgid "data json"
|
||||
msgstr "donnée json"
|
||||
msgstr "données json"
|
||||
|
||||
#: apps/wrapped/models.py:66
|
||||
msgid "data in the wrapped and generated by the script generate_wrapped"
|
||||
msgstr "donnée dans le wrapped et générée par le script generate_wrapped"
|
||||
|
||||
#: apps/wrapped/models.py:70 note_kfet/templates/base.html:114
|
||||
#: apps/wrapped/models.py:70 note_kfet/templates/base.html:115
|
||||
msgid "Wrapped"
|
||||
msgstr "Wrapped"
|
||||
|
||||
@ -3787,7 +3803,7 @@ msgid "Copy link"
|
||||
msgstr "Copier le lien"
|
||||
|
||||
#: apps/wrapped/templates/wrapped/1/wrapped_base.html:16
|
||||
#: note_kfet/templates/base.html:14
|
||||
#: note_kfet/templates/base.html:15
|
||||
msgid "The ENS Paris-Saclay BDE note."
|
||||
msgstr "La note du BDE de l'ENS Paris-Saclay."
|
||||
|
||||
@ -3890,7 +3906,7 @@ msgid ""
|
||||
"Do not forget to ask permission to people who are in your wrapped before to "
|
||||
"make them public"
|
||||
msgstr ""
|
||||
"N'oublies pas de demander la permission des personnes apparaissant dans un "
|
||||
"N'oublie pas de demander la permission des personnes apparaissant dans un "
|
||||
"wrapped avant de le rendre public"
|
||||
|
||||
#: apps/wrapped/templates/wrapped/wrapped_list.html:40
|
||||
@ -3909,19 +3925,19 @@ msgstr "Le wrapped est public"
|
||||
msgid "List of wrapped"
|
||||
msgstr "Liste des wrapped"
|
||||
|
||||
#: note_kfet/settings/base.py:177
|
||||
#: note_kfet/settings/base.py:180
|
||||
msgid "German"
|
||||
msgstr "Allemand"
|
||||
|
||||
#: note_kfet/settings/base.py:178
|
||||
#: note_kfet/settings/base.py:181
|
||||
msgid "English"
|
||||
msgstr "Anglais"
|
||||
|
||||
#: note_kfet/settings/base.py:179
|
||||
#: note_kfet/settings/base.py:182
|
||||
msgid "Spanish"
|
||||
msgstr "Espagnol"
|
||||
|
||||
#: note_kfet/settings/base.py:180
|
||||
#: note_kfet/settings/base.py:183
|
||||
msgid "French"
|
||||
msgstr "Français"
|
||||
|
||||
@ -3982,34 +3998,34 @@ msgstr ""
|
||||
msgid "Reset"
|
||||
msgstr "Réinitialiser"
|
||||
|
||||
#: note_kfet/templates/base.html:84
|
||||
#: note_kfet/templates/base.html:85
|
||||
msgid "Users"
|
||||
msgstr "Utilisateur·rices"
|
||||
|
||||
#: note_kfet/templates/base.html:90
|
||||
#: note_kfet/templates/base.html:91
|
||||
msgid "Clubs"
|
||||
msgstr "Clubs"
|
||||
|
||||
#: note_kfet/templates/base.html:125
|
||||
#: note_kfet/templates/base.html:126
|
||||
msgid "Admin"
|
||||
msgstr "Admin"
|
||||
|
||||
#: note_kfet/templates/base.html:139
|
||||
#: note_kfet/templates/base.html:140
|
||||
msgid "My account"
|
||||
msgstr "Mon compte"
|
||||
|
||||
#: note_kfet/templates/base.html:142
|
||||
#: note_kfet/templates/base.html:145
|
||||
msgid "Log out"
|
||||
msgstr "Se déconnecter"
|
||||
|
||||
#: note_kfet/templates/base.html:150
|
||||
#: note_kfet/templates/base.html:154
|
||||
#: note_kfet/templates/registration/signup.html:6
|
||||
#: note_kfet/templates/registration/signup.html:11
|
||||
#: note_kfet/templates/registration/signup.html:28
|
||||
msgid "Sign up"
|
||||
msgstr "Inscription"
|
||||
|
||||
#: note_kfet/templates/base.html:157
|
||||
#: note_kfet/templates/base.html:161
|
||||
#: note_kfet/templates/registration/login.html:6
|
||||
#: note_kfet/templates/registration/login.html:15
|
||||
#: note_kfet/templates/registration/login.html:38
|
||||
@ -4017,7 +4033,7 @@ msgstr "Inscription"
|
||||
msgid "Log in"
|
||||
msgstr "Se connecter"
|
||||
|
||||
#: note_kfet/templates/base.html:171
|
||||
#: note_kfet/templates/base.html:175
|
||||
msgid ""
|
||||
"You are not a BDE member anymore. Please renew your membership if you want "
|
||||
"to use the note."
|
||||
@ -4025,7 +4041,7 @@ msgstr ""
|
||||
"Vous n'êtes plus adhérent·e BDE. Merci de réadhérer si vous voulez profiter "
|
||||
"de la note."
|
||||
|
||||
#: note_kfet/templates/base.html:177
|
||||
#: note_kfet/templates/base.html:181
|
||||
msgid ""
|
||||
"Your e-mail address is not validated. Please check your mail inbox and click "
|
||||
"on the validation link."
|
||||
@ -4033,7 +4049,7 @@ msgstr ""
|
||||
"Votre adresse e-mail n'est pas validée. Merci de vérifier votre boîte mail "
|
||||
"et de cliquer sur le lien de validation."
|
||||
|
||||
#: note_kfet/templates/base.html:183
|
||||
#: note_kfet/templates/base.html:187
|
||||
msgid ""
|
||||
"You declared that you opened a bank account in the Société générale. The "
|
||||
"bank did not validate the creation of the account to the BDE, so the "
|
||||
@ -4047,22 +4063,38 @@ msgstr ""
|
||||
"vérification peut durer quelques jours. Merci de vous assurer de bien aller "
|
||||
"au bout de vos démarches."
|
||||
|
||||
#: note_kfet/templates/base.html:206
|
||||
#: note_kfet/templates/base.html:214
|
||||
msgid "Contact us"
|
||||
msgstr "Nous contacter"
|
||||
|
||||
#: note_kfet/templates/base.html:208
|
||||
#: note_kfet/templates/base.html:216
|
||||
msgid "Technical Support"
|
||||
msgstr "Support technique"
|
||||
|
||||
#: note_kfet/templates/base.html:210
|
||||
#: note_kfet/templates/base.html:218
|
||||
msgid "Charte Info (FR)"
|
||||
msgstr "Charte Info (FR)"
|
||||
|
||||
#: note_kfet/templates/base.html:212
|
||||
#: note_kfet/templates/base.html:220
|
||||
msgid "FAQ (FR)"
|
||||
msgstr "FAQ (FR)"
|
||||
|
||||
#: note_kfet/templates/base.html:222
|
||||
msgid "Managed by BDE"
|
||||
msgstr "Géré par le BDE"
|
||||
|
||||
#: note_kfet/templates/base.html:224
|
||||
msgid "Hosted by Cr@ns"
|
||||
msgstr "Hébergé par le Cr@ans"
|
||||
|
||||
#: note_kfet/templates/base.html:266
|
||||
msgid "The note is not available for now"
|
||||
msgstr "La note est indisponible pour le moment"
|
||||
|
||||
#: note_kfet/templates/base.html:268
|
||||
msgid "Thank you for your understanding -- The Respos Info of BDE"
|
||||
msgstr "Merci de votre compréhension -- Les Respos Info du BDE"
|
||||
|
||||
#: note_kfet/templates/base_search.html:15
|
||||
msgid "Search by attribute such as name..."
|
||||
msgstr "Chercher par un attribut tel que le nom..."
|
||||
@ -4071,6 +4103,41 @@ msgstr "Chercher par un attribut tel que le nom..."
|
||||
msgid "There is no results."
|
||||
msgstr "Il n'y a pas de résultat."
|
||||
|
||||
#: note_kfet/templates/cas/logged.html:8
|
||||
msgid ""
|
||||
"<h3>Log In Successful</h3>You have successfully logged into the Central "
|
||||
"Authentication Service.<br/>For security reasons, please Log Out and Exit "
|
||||
"your web browser when you are done accessing services that require "
|
||||
"authentication!"
|
||||
msgstr ""
|
||||
"<h3>Connection réussie</h3>Vous vous êtes bien connecté au Service Central d'Authentification."
|
||||
"<br/>Pour des raisons de sécurité, veuillez vous déconnecter et fermer votre navigateur internet "
|
||||
"une fois que vous aurez fini d'accéder aux services qui requiert une authentification !"
|
||||
|
||||
#: note_kfet/templates/cas/logged.html:14
|
||||
msgid "Log me out from all my sessions"
|
||||
msgstr "Me déconnecter de toutes mes sessions"
|
||||
|
||||
#: note_kfet/templates/cas/logged.html:20
|
||||
msgid "Forget the identity provider"
|
||||
msgstr "Oublier le fournisseur d'identité"
|
||||
|
||||
#: note_kfet/templates/cas/logged.html:24
|
||||
msgid "Logout"
|
||||
msgstr "Déconnexion"
|
||||
|
||||
#: note_kfet/templates/cas/login.html:11
|
||||
msgid "Please log in"
|
||||
msgstr "Veuillez vous connecter"
|
||||
|
||||
#: note_kfet/templates/cas/login.html:23
|
||||
msgid "Login"
|
||||
msgstr "Connexion"
|
||||
|
||||
#: note_kfet/templates/cas/warn.html:14
|
||||
msgid "Connect to the service"
|
||||
msgstr "Connexion au service"
|
||||
|
||||
#: note_kfet/templates/oauth2_provider/application_confirm_delete.html:8
|
||||
msgid "Are you sure to delete the application"
|
||||
msgstr "Êtes-vous sûr⋅e de vouloir supprimer l'application"
|
||||
@ -4716,7 +4783,7 @@ msgstr ""
|
||||
|
||||
#, python-brace-format
|
||||
#~ msgid "QR-code number {qr_code_number}"
|
||||
#~ msgstr "numéro du QR-code {qr_code_number}"
|
||||
#~ msgstr "Numéro du QR-code {qr_code_number}"
|
||||
|
||||
#~ msgid "was eaten"
|
||||
#~ msgstr "a été mangé"
|
||||
|
||||
Reference in New Issue
Block a user