diff --git a/apps/activity/templates/activity/activity_detail.html b/apps/activity/templates/activity/activity_detail.html index 9cfc7640fe7bca79d71274e925ff5b28f2081bd5..c3a40891d8e5db733bb2a3755795038df15069de 100644 --- a/apps/activity/templates/activity/activity_detail.html +++ b/apps/activity/templates/activity/activity_detail.html @@ -6,6 +6,7 @@ SPDX-License-Identifier: GPL-3.0-or-later {% load render_table from django_tables2 %} {% block content %} +<h1 class="text-white">{{ title }}</h1> {% include "activity/includes/activity_info.html" %} {% if guests.data %} diff --git a/apps/activity/templates/activity/activity_entry.html b/apps/activity/templates/activity/activity_entry.html index b5989378daed16f2257e4f115856ce76bcefb8ff..d59a4c48166a6640a3f7aa9555813ff26a73ad23 100644 --- a/apps/activity/templates/activity/activity_entry.html +++ b/apps/activity/templates/activity/activity_entry.html @@ -6,6 +6,7 @@ SPDX-License-Identifier: GPL-3.0-or-later {% load render_table from django_tables2 %} {% block content %} +<h1 class="text-white">{{ title }}</h1> <div class="row"> <div class="col-xl-12"> <div class="btn-group btn-group-toggle bg-light" style="width: 100%" data-toggle="buttons"> diff --git a/apps/activity/templates/activity/activity_form.html b/apps/activity/templates/activity/activity_form.html index 6bfd4f346a98004ed60e608eda3471ff835a06dd..c472d3cb97d2413e3482c81d4ab010a12a39b5bb 100644 --- a/apps/activity/templates/activity/activity_form.html +++ b/apps/activity/templates/activity/activity_form.html @@ -3,7 +3,6 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} {% load i18n crispy_forms_tags %} -{% block contenttitle %}{% endblock %} {% block content %} <div class="card bg-white mb-3"> diff --git a/apps/activity/templates/activity/activity_list.html b/apps/activity/templates/activity/activity_list.html index 1fadd164a57b6eabc732148167d03f6333849ea9..3316d698964c9efa8aff0da6af0877be5e78ec67 100644 --- a/apps/activity/templates/activity/activity_list.html +++ b/apps/activity/templates/activity/activity_list.html @@ -4,7 +4,6 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} {% load render_table from django_tables2 %} {% load i18n %} -{% block contenttitle %}{% endblock %} {% block content %} {% if started_activities %} diff --git a/apps/member/templates/member/base.html b/apps/member/templates/member/base.html index 2e3e929c42d64fa994c5ccf88376ecac98c6efcd..bb99595efd09e07baae52cea01c19f69b1e9d555 100644 --- a/apps/member/templates/member/base.html +++ b/apps/member/templates/member/base.html @@ -3,7 +3,6 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} {% load i18n perms %} -{% block contenttitle %}{% endblock %} {# Use a fluid-width container #} {% block containertype %}container-fluid{% endblock %} diff --git a/apps/member/templates/member/club_form.html b/apps/member/templates/member/club_form.html index bd44ff161c56de8182e0577a2dbd7c1b3a850c0b..1dc43c4f94539b0a4b0564568cad52debc6cc89f 100644 --- a/apps/member/templates/member/club_form.html +++ b/apps/member/templates/member/club_form.html @@ -3,7 +3,6 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} {% load i18n crispy_forms_tags %} -{% block contenttitle %}{% endblock %} {% block profile_content %} <div class="card bg-light"> diff --git a/apps/member/templates/member/club_members.html b/apps/member/templates/member/club_members.html index 0da9524273fc79d7f8ba1648d0ed31cf4875093b..3645050a75cb6ae636b7d35a6176ce74ef6a0437 100644 --- a/apps/member/templates/member/club_members.html +++ b/apps/member/templates/member/club_members.html @@ -1,4 +1,7 @@ {% extends "member/base.html" %} +{% comment %} +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} {% load i18n %} {% load render_table from django_tables2 %} diff --git a/apps/member/templates/member/includes/club_info.html b/apps/member/templates/member/includes/club_info.html index 271083b83f77d3b68c13e2f3ffe9f06ec8d6fdc8..92c7b569dd658973880e63da0fb2aa1129f2bc2f 100644 --- a/apps/member/templates/member/includes/club_info.html +++ b/apps/member/templates/member/includes/club_info.html @@ -46,8 +46,9 @@ <dt class="col-xl-6">{% trans 'aliases'|capfirst %}</dt> <dd class="col-xl-6"> - <a class="small" href="{% url 'member:club_alias' club.pk %}"> - {% trans 'Edit aliases' %} ({{ club.note.alias_set.all|length }}) + <a class="badge badge-secondary" href="{% url 'member:club_alias' club.pk %}"> + <i class="fa fa-edit"></i> + {% trans 'Manage aliases' %} ({{ user_object.note.alias_set.all|length }}) </a> </dd> diff --git a/apps/member/templates/member/includes/profile_info.html b/apps/member/templates/member/includes/profile_info.html index ba12572fe0b2b743355fb5f69f3a8254a567b173..04fc6742f6fa874714fe7aec548517f487bd5fb9 100644 --- a/apps/member/templates/member/includes/profile_info.html +++ b/apps/member/templates/member/includes/profile_info.html @@ -10,7 +10,8 @@ {% if user_object.pk == user.pk %} <dt class="col-xl-6">{% trans 'password'|capfirst %}</dt> <dd class="col-xl-6"> - <a class="small" href="{% url 'password_change' %}"> + <a class="badge badge-secondary" href="{% url 'password_change' %}"> + <i class="fa fa-lock"></i> {% trans 'Change password' %} </a> </dd> @@ -18,8 +19,9 @@ <dt class="col-xl-6">{% trans 'aliases'|capfirst %}</dt> <dd class="col-xl-6"> - <a class="small" href="{% url 'member:user_alias' user_object.pk %}"> - {% trans 'Edit aliases' %} ({{ user_object.note.alias_set.all|length }}) + <a class="badge badge-secondary" href="{% url 'member:user_alias' user_object.pk %}"> + <i class="fa fa-edit"></i> + {% trans 'Manage aliases' %} ({{ user_object.note.alias_set.all|length }}) </a> </dd> diff --git a/apps/member/templates/member/picture_update.html b/apps/member/templates/member/picture_update.html index 41568cfbe05df5680b12214bd86a28498c6a26b8..7c9128ceaa9d6e1c7c10db6f6977f162bd7e79ad 100644 --- a/apps/member/templates/member/picture_update.html +++ b/apps/member/templates/member/picture_update.html @@ -1,4 +1,7 @@ {% extends "member/base.html" %} +{% comment %} +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} {% load i18n crispy_forms_tags %} {% block profile_content %} diff --git a/apps/member/templates/member/profile_update.html b/apps/member/templates/member/profile_update.html index a50f4afd33e98db7410fd9be5e66f0335feface1..2f0183813b08ac1870e084800950bdef31068dcb 100644 --- a/apps/member/templates/member/profile_update.html +++ b/apps/member/templates/member/profile_update.html @@ -3,7 +3,6 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} {% load i18n crispy_forms_tags %} -{% block contenttitle %}{% endblock %} {% block profile_content %} <div class="card bg-light"> diff --git a/apps/note/templates/note/amount_input.html b/apps/note/templates/note/amount_input.html index 43ac1687ea89922e20daf16583fe377d701f0bb5..d4873115319f01d67e6394ee039dd2a6896ef4ae 100644 --- a/apps/note/templates/note/amount_input.html +++ b/apps/note/templates/note/amount_input.html @@ -1,3 +1,7 @@ +{% comment %} +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} + {# Select amount to transfert in € #} <div class="input-group"> <input class="form-control mx-auto d-block" type="number" {% if not widget.attrs.negative %}min="0"{% endif %} step="0.01" diff --git a/apps/note/templates/note/conso_form.html b/apps/note/templates/note/conso_form.html index 8e9073aa62c7f19af1b5a7a3524d6400264dcfc5..07c63488984c08ee80d70de782a3f950ba18e360 100644 --- a/apps/note/templates/note/conso_form.html +++ b/apps/note/templates/note/conso_form.html @@ -1,10 +1,9 @@ {% extends "base.html" %} - +{% comment %} +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} {% load i18n static pretty_money django_tables2 %} -{# Remove page title #} -{% block contenttitle %}{% endblock %} - {# Use a fluid-width container #} {% block containertype %}container-fluid{% endblock %} diff --git a/apps/note/templates/note/search_transactions.html b/apps/note/templates/note/search_transactions.html index 2a952e5afb3aecfc468f59b7d19b2a30e3bf1be6..70a1261fd1786d75e096ad87f73d1393e9b23559 100644 --- a/apps/note/templates/note/search_transactions.html +++ b/apps/note/templates/note/search_transactions.html @@ -4,7 +4,6 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} {% load render_table from django_tables2 %} {% load crispy_forms_tags %} -{% block contenttitle %}{% endblock %} {# Use a fluid-width container #} {% block containertype %}container-fluid{% endblock %} diff --git a/apps/note/templates/note/transaction_form.html b/apps/note/templates/note/transaction_form.html index f6e1f8c09dfb4a6c7679f5aef9b3abfc967c18af..acb09bebe7e1e476a3b7bc73e9a1c56799c06ae3 100644 --- a/apps/note/templates/note/transaction_form.html +++ b/apps/note/templates/note/transaction_form.html @@ -2,10 +2,11 @@ {% comment %} SPDX-License-Identifier: GPL-2.0-or-later {% endcomment %} - {% load i18n static django_tables2 perms %} {% block content %} +<h1 class="text-white">{{ title }}</h1> + {# bandeau transfert/crédit/débit/activité #} <div class="row"> <div class="col-xl-12"> diff --git a/apps/note/templates/note/transactiontemplate_form.html b/apps/note/templates/note/transactiontemplate_form.html index e4bc42a717aa6d9fa1ad79c4361030a65eafd440..f64c1f3c2c542b77c40ddd8d38868f14a658c9bb 100644 --- a/apps/note/templates/note/transactiontemplate_form.html +++ b/apps/note/templates/note/transactiontemplate_form.html @@ -1,11 +1,11 @@ {% extends "base.html" %} - -{% load static %} -{% load i18n %} -{% load crispy_forms_tags %} -{% load pretty_money %} +{% comment %} +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} +{% load static i18n crispy_forms_tags pretty_money %} {% block content %} +<h1 class="text-white">{{ title }}</h1> <p> <a class="btn btn-default" href="{% url 'note:template_list' %}">{% trans "Buttons list" %}</a> </p> diff --git a/apps/note/templates/note/transactiontemplate_list.html b/apps/note/templates/note/transactiontemplate_list.html index 76b116e993077fdc6362cf9153e589510ab22c16..2a19922e716c86e6b9b02eeb73eaac4db6f4acea 100644 --- a/apps/note/templates/note/transactiontemplate_list.html +++ b/apps/note/templates/note/transactiontemplate_list.html @@ -1,8 +1,12 @@ {% extends "base.html" %} -{% load pretty_money %} -{% load i18n %} +{% comment %} +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} +{% load pretty_money i18n %} {% load render_table from django_tables2 %} + {% block content %} +<h1 class="text-white">{{ title }}</h1> <div class="row justify-content-center mb-4"> <div class="col-md-10 text-center"> {# Search field , see js #} diff --git a/apps/permission/templates/permission/all_rights.html b/apps/permission/templates/permission/all_rights.html index 82e383926e4a816161ce120919d7ec267cbc3fb2..107f8f25769befa683a92bf3c68b69cef41eb9d8 100644 --- a/apps/permission/templates/permission/all_rights.html +++ b/apps/permission/templates/permission/all_rights.html @@ -1,10 +1,9 @@ {% extends "base.html" %} {% comment %} - SPDX-License-Identifier: GPL-3.0-or-later +SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} {% load i18n %} {% load render_table from django_tables2 %} -{% block contenttitle %}{% endblock %} {% block content %} {% if user.is_authenticated %} diff --git a/apps/registration/templates/registration/email_validation_complete.html b/apps/registration/templates/registration/email_validation_complete.html index b54432f36220215ae04a059d4ddfddc898090dec..dca26470d3d2591e320aaa89acab6738fc551b89 100644 --- a/apps/registration/templates/registration/email_validation_complete.html +++ b/apps/registration/templates/registration/email_validation_complete.html @@ -1,4 +1,7 @@ {% extends "base.html" %} +{% comment %} +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} {% load i18n %} {% block content %} diff --git a/apps/registration/templates/registration/email_validation_email_sent.html b/apps/registration/templates/registration/email_validation_email_sent.html index bb2bcea81000194fa9f61609e443d759aaea4f56..627c864bd9a4abe428ec3d1138d31d8a74b5ae3d 100644 --- a/apps/registration/templates/registration/email_validation_email_sent.html +++ b/apps/registration/templates/registration/email_validation_email_sent.html @@ -1,4 +1,7 @@ {% extends "base.html" %} +{% comment %} +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} {% load i18n %} {% block content %} diff --git a/apps/registration/templates/registration/future_profile_detail.html b/apps/registration/templates/registration/future_profile_detail.html index 1d2d08c791be34eb9874fd53b61062050b9f7ec1..914b42244b0b89483c80d154e4785290f328a969 100644 --- a/apps/registration/templates/registration/future_profile_detail.html +++ b/apps/registration/templates/registration/future_profile_detail.html @@ -1,8 +1,8 @@ {% extends "base.html" %} -{% load static %} -{% load i18n %} -{% load crispy_forms_tags %} -{% load perms %} +{% comment %} +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} +{% load i18n crispy_forms_tags perms %} {% block content %} <div class="row mt-4"> diff --git a/apps/registration/templates/registration/future_user_list.html b/apps/registration/templates/registration/future_user_list.html index aa0b05e5ad587408e3f3eaae99dc8faae14b39fe..1e82403fa28064c08c6f70e7e1f06be5cb1c5fca 100644 --- a/apps/registration/templates/registration/future_user_list.html +++ b/apps/registration/templates/registration/future_user_list.html @@ -2,8 +2,6 @@ {% comment %} SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} -{% load render_table from django_tables2 %} -{% load crispy_forms_tags %} {% load i18n %} {% block content %} diff --git a/apps/treasury/templates/treasury/invoice_confirm_delete.html b/apps/treasury/templates/treasury/invoice_confirm_delete.html index 2ab0b95469e525bb96607ed87b486649b2873f16..e1de9c83e736f219c7d9e57c4feaf8434e8e71d8 100644 --- a/apps/treasury/templates/treasury/invoice_confirm_delete.html +++ b/apps/treasury/templates/treasury/invoice_confirm_delete.html @@ -1,6 +1,8 @@ {% extends "base.html" %} -{% load i18n %} -{% load crispy_forms_tags %} +{% comment %} +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} +{% load i18n crispy_forms_tags %} {% block content %} <div class="card bg-light"> diff --git a/apps/treasury/templates/treasury/invoice_form.html b/apps/treasury/templates/treasury/invoice_form.html index 294812164bb2b9213e1a669a1217b8ea20e4aa4d..fee4140dc4f0bd4d466fa90ea0f8df1d8b070255 100644 --- a/apps/treasury/templates/treasury/invoice_form.html +++ b/apps/treasury/templates/treasury/invoice_form.html @@ -3,7 +3,6 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} {% load i18n crispy_forms_tags %} -{% block contenttitle %}{% endblock %} {% block content %} <div class="card bg-white mb-3"> diff --git a/apps/treasury/templates/treasury/invoice_list.html b/apps/treasury/templates/treasury/invoice_list.html index 7dba4fa88d4808e7360d34fc71c2da66b020c259..32c1b1c1034e5afc78924b90cbcc2049c21c3efb 100644 --- a/apps/treasury/templates/treasury/invoice_list.html +++ b/apps/treasury/templates/treasury/invoice_list.html @@ -4,7 +4,6 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} {% load render_table from django_tables2 %} {% load i18n %} -{% block contenttitle %}{% endblock %} {% block content %} <div class="row"> diff --git a/apps/treasury/templates/treasury/remittance_list.html b/apps/treasury/templates/treasury/remittance_list.html index bf25803cf5ab7328837c3a331ea7cfffe91232a2..c400f18fb5b2dcead0751c645af3ab181dec468c 100644 --- a/apps/treasury/templates/treasury/remittance_list.html +++ b/apps/treasury/templates/treasury/remittance_list.html @@ -4,7 +4,6 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} {% load render_table from django_tables2 %} {% load i18n %} -{% block contenttitle %}{% endblock %} {% block content %} <div class="row"> diff --git a/apps/treasury/templates/treasury/sogecredit_detail.html b/apps/treasury/templates/treasury/sogecredit_detail.html index 6d304f32a4886efc3315e39a6fca4ca04c435d42..994aca08c8a8216207ddeedcb81adde0a16b8f1e 100644 --- a/apps/treasury/templates/treasury/sogecredit_detail.html +++ b/apps/treasury/templates/treasury/sogecredit_detail.html @@ -3,7 +3,6 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} {% load i18n pretty_money perms %} -{% block contenttitle %}{% endblock %} {% block content %} <div class="card bg-light"> diff --git a/apps/treasury/templates/treasury/sogecredit_list.html b/apps/treasury/templates/treasury/sogecredit_list.html index a33b1c0dba61de9515e00490664ef2d787aa3cdb..c3862811827c92114401f4ed9ec9da0f59feffba 100644 --- a/apps/treasury/templates/treasury/sogecredit_list.html +++ b/apps/treasury/templates/treasury/sogecredit_list.html @@ -4,7 +4,6 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} {% load render_table from django_tables2 %} {% load i18n %} -{% block contenttitle %}{% endblock %} {% block content %} <div class="row"> diff --git a/apps/treasury/templates/treasury/specialtransactionproxy_form.html b/apps/treasury/templates/treasury/specialtransactionproxy_form.html index 6cbbcd784b2bfa898796639bf4441f2a04886e95..5d80c904f9609b1ad24dcdb207ce705eddca3ebc 100644 --- a/apps/treasury/templates/treasury/specialtransactionproxy_form.html +++ b/apps/treasury/templates/treasury/specialtransactionproxy_form.html @@ -3,7 +3,6 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} {% load crispy_forms_tags %} -{% block contenttitle %}{% endblock %} {% block content %} <div class="card bg-white mb-3"> diff --git a/apps/wei/templates/wei/base.html b/apps/wei/templates/wei/base.html index db8f2c408597be230a1e27067ebe921d9ccb68b8..dd343f8e44a66c55b136c0096f576a728c014582 100644 --- a/apps/wei/templates/wei/base.html +++ b/apps/wei/templates/wei/base.html @@ -3,7 +3,6 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} {% load i18n pretty_money perms %} -{% block contenttitle %}{% endblock %} {# Use a fluid-width container #} {% block containertype %}container-fluid{% endblock %} diff --git a/apps/wei/templates/wei/bus_detail.html b/apps/wei/templates/wei/bus_detail.html index 00c901e76dd9c2efbc9798146f8e27733bcc170c..c8f3ce2039b4b67f178247f9592136c3b43f0aa4 100644 --- a/apps/wei/templates/wei/bus_detail.html +++ b/apps/wei/templates/wei/bus_detail.html @@ -1,4 +1,7 @@ {% extends "wei/base.html" %} +{% comment %} +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} {% load render_table from django_tables2 %} {% load i18n %} diff --git a/apps/wei/templates/wei/busteam_detail.html b/apps/wei/templates/wei/busteam_detail.html index f77dc3c9b3e1b97caee4a1ab6bd31b4fd62f88bb..27348d03810e3763689ced633220c49db437e60f 100644 --- a/apps/wei/templates/wei/busteam_detail.html +++ b/apps/wei/templates/wei/busteam_detail.html @@ -1,4 +1,7 @@ {% extends "wei/base.html" %} +{% comment %} +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} {% load render_table from django_tables2 %} {% load i18n %} diff --git a/apps/wei/templates/wei/survey.html b/apps/wei/templates/wei/survey.html index 4bf183256de58b089b274fe5c6e3f8762c3a2346..9eabab590c30d9f22e52bade1b7bf99e828aa106 100644 --- a/apps/wei/templates/wei/survey.html +++ b/apps/wei/templates/wei/survey.html @@ -1,4 +1,7 @@ {% extends "wei/base.html" %} +{% comment %} +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} {% load i18n %} {% load crispy_forms_tags %} diff --git a/apps/wei/templates/wei/survey_closed.html b/apps/wei/templates/wei/survey_closed.html index e4da253d7480e5511ec5631d5992c8dd57712c00..aac9e833967d651439772aff4b5eedc568fa17d6 100644 --- a/apps/wei/templates/wei/survey_closed.html +++ b/apps/wei/templates/wei/survey_closed.html @@ -1,4 +1,7 @@ {% extends "wei/base.html" %} +{% comment %} +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} {% load i18n %} {% load crispy_forms_tags %} diff --git a/apps/wei/templates/wei/survey_end.html b/apps/wei/templates/wei/survey_end.html index af6dace883d17cadba6b42e38754ccebf2382dc9..3152f6e16e55ec6d1dfcbca28bf5fb6cb6b82b84 100644 --- a/apps/wei/templates/wei/survey_end.html +++ b/apps/wei/templates/wei/survey_end.html @@ -1,4 +1,7 @@ {% extends "wei/base.html" %} +{% comment %} +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} {% load i18n %} {% load crispy_forms_tags %} diff --git a/apps/wei/templates/wei/weiclub_list.html b/apps/wei/templates/wei/weiclub_list.html index 2739e5bfe8af552fac0831469433323a2a7f3401..1202a66704b42b385c2f4c5af4fdcc0153422d3c 100644 --- a/apps/wei/templates/wei/weiclub_list.html +++ b/apps/wei/templates/wei/weiclub_list.html @@ -1,6 +1,10 @@ {% extends "base.html" %} +{% comment %} +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} {% load render_table from django_tables2 %} {% load i18n %} + {% block content %} <div class="row justify-content-center mb-4"> <div class="col-md-10 text-center"> diff --git a/apps/wei/templates/wei/weimembership_form.html b/apps/wei/templates/wei/weimembership_form.html index fd721f9f7f349d151752a01429582939a616c8e9..1225175d4088a6a8b66ad8b994a8bb42cc8fd85a 100644 --- a/apps/wei/templates/wei/weimembership_form.html +++ b/apps/wei/templates/wei/weimembership_form.html @@ -1,8 +1,8 @@ {% extends "wei/base.html" %} -{% load crispy_forms_tags %} -{% load i18n %} -{% load pretty_money %} -{% load perms %} +{% comment %} +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} +{% load i18n crispy_forms_tags pretty_money perms %} {% block profile_content %} <div class="card bg-light shadow"> diff --git a/apps/wei/templates/wei/weimembership_list.html b/apps/wei/templates/wei/weimembership_list.html index 76643c0693b36cf03dbec455887188917f1d6a12..8e541d7acbae3c85fb7d2e094c614c49af80851f 100644 --- a/apps/wei/templates/wei/weimembership_list.html +++ b/apps/wei/templates/wei/weimembership_list.html @@ -1,4 +1,7 @@ {% extends "wei/base.html" %} +{% comment %} +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} {% load i18n %} {% load render_table from django_tables2 %} diff --git a/apps/wei/templates/wei/weiregistration_confirm_delete.html b/apps/wei/templates/wei/weiregistration_confirm_delete.html index 79aff24ecc27c6a1eeb1732011931810c1233461..f1d2e88c37dd01d43596419bb9a3b66b850c00f1 100644 --- a/apps/wei/templates/wei/weiregistration_confirm_delete.html +++ b/apps/wei/templates/wei/weiregistration_confirm_delete.html @@ -1,4 +1,7 @@ {% extends "wei/base.html" %} +{% comment %} +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} {% load i18n %} {% load crispy_forms_tags %} diff --git a/apps/wei/templates/wei/weiregistration_list.html b/apps/wei/templates/wei/weiregistration_list.html index 3e0a3295e193e2d9f26faa056c53d11062b9b0f8..842696bbe8d1c4812f7f34061dab54585b3fc39b 100644 --- a/apps/wei/templates/wei/weiregistration_list.html +++ b/apps/wei/templates/wei/weiregistration_list.html @@ -1,4 +1,7 @@ {% extends "wei/base.html" %} +{% comment %} +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} {% load i18n %} {% load render_table from django_tables2 %} diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 6c693436261d97143a7a1fe0120999a874637637..3145e2addd8b4d95166a30e13484f6c478bce50c 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-08-31 23:03+0200\n" +"POT-Creation-Date: 2020-09-01 10:28+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -56,7 +56,7 @@ msgstr "" #: apps/permission/models.py:329 #: apps/registration/templates/registration/future_profile_detail.html:16 #: apps/wei/models.py:66 apps/wei/models.py:118 -#: apps/wei/templates/wei/base.html:27 +#: apps/wei/templates/wei/base.html:26 #: apps/wei/templates/wei/weimembership_form.html:14 msgid "name" msgstr "" @@ -111,8 +111,8 @@ msgstr "" #: apps/activity/models.py:88 apps/logs/models.py:22 apps/member/models.py:303 #: apps/note/models/notes.py:142 apps/treasury/models.py:267 -#: apps/treasury/templates/treasury/sogecredit_detail.html:15 -#: apps/wei/models.py:160 apps/wei/templates/wei/survey.html:12 +#: apps/treasury/templates/treasury/sogecredit_detail.html:14 +#: apps/wei/models.py:160 apps/wei/templates/wei/survey.html:15 msgid "user" msgstr "" @@ -169,12 +169,12 @@ msgid "note" msgstr "" #: apps/activity/models.py:183 -#: apps/activity/templates/activity/activity_entry.html:45 +#: apps/activity/templates/activity/activity_entry.html:46 msgid "entry" msgstr "" #: apps/activity/models.py:184 -#: apps/activity/templates/activity/activity_entry.html:45 +#: apps/activity/templates/activity/activity_entry.html:46 msgid "entries" msgstr "" @@ -248,7 +248,7 @@ msgid "Last name" msgstr "" #: apps/activity/tables.py:84 apps/member/forms.py:136 -#: apps/note/templates/note/transaction_form.html:133 +#: apps/note/templates/note/transaction_form.html:134 #: apps/registration/forms.py:86 apps/treasury/forms.py:137 #: apps/wei/forms/registration.py:101 msgid "First name" @@ -262,45 +262,45 @@ msgstr "" msgid "Balance" msgstr "" -#: apps/activity/templates/activity/activity_detail.html:14 +#: apps/activity/templates/activity/activity_detail.html:15 msgid "Guests list" msgstr "" -#: apps/activity/templates/activity/activity_entry.html:13 +#: apps/activity/templates/activity/activity_entry.html:14 #: apps/note/models/transactions.py:259 -#: apps/note/templates/note/transaction_form.html:15 -#: apps/note/templates/note/transaction_form.html:147 +#: apps/note/templates/note/transaction_form.html:16 +#: apps/note/templates/note/transaction_form.html:148 #: note_kfet/templates/base.html:78 msgid "Transfer" msgstr "" -#: apps/activity/templates/activity/activity_entry.html:17 +#: apps/activity/templates/activity/activity_entry.html:18 #: apps/note/models/transactions.py:313 -#: apps/note/templates/note/transaction_form.html:20 +#: apps/note/templates/note/transaction_form.html:21 msgid "Credit" msgstr "" -#: apps/activity/templates/activity/activity_entry.html:20 +#: apps/activity/templates/activity/activity_entry.html:21 #: apps/note/models/transactions.py:313 -#: apps/note/templates/note/transaction_form.html:24 +#: apps/note/templates/note/transaction_form.html:25 msgid "Debit" msgstr "" -#: apps/activity/templates/activity/activity_entry.html:26 -#: apps/note/templates/note/transaction_form.html:29 +#: apps/activity/templates/activity/activity_entry.html:27 +#: apps/note/templates/note/transaction_form.html:30 msgid "Entries" msgstr "" -#: apps/activity/templates/activity/activity_entry.html:36 +#: apps/activity/templates/activity/activity_entry.html:37 msgid "Return to activity page" msgstr "" -#: apps/activity/templates/activity/activity_form.html:17 +#: apps/activity/templates/activity/activity_form.html:16 #: apps/member/templates/member/add_members.html:32 -#: apps/member/templates/member/club_form.html:17 +#: apps/member/templates/member/club_form.html:16 #: apps/note/templates/note/transactiontemplate_form.html:15 #: apps/treasury/forms.py:93 apps/treasury/forms.py:147 -#: apps/treasury/templates/treasury/invoice_form.html:75 +#: apps/treasury/templates/treasury/invoice_form.html:74 #: apps/wei/templates/wei/bus_form.html:17 #: apps/wei/templates/wei/busteam_form.html:17 #: apps/wei/templates/wei/weiclub_form.html:17 @@ -308,23 +308,23 @@ msgstr "" msgid "Submit" msgstr "" -#: apps/activity/templates/activity/activity_list.html:13 +#: apps/activity/templates/activity/activity_list.html:12 msgid "Current activity" msgstr "" -#: apps/activity/templates/activity/activity_list.html:25 +#: apps/activity/templates/activity/activity_list.html:24 msgid "Upcoming activities" msgstr "" -#: apps/activity/templates/activity/activity_list.html:32 +#: apps/activity/templates/activity/activity_list.html:31 msgid "There is no planned activity." msgstr "" -#: apps/activity/templates/activity/activity_list.html:39 +#: apps/activity/templates/activity/activity_list.html:38 msgid "New activity" msgstr "" -#: apps/activity/templates/activity/activity_list.html:46 +#: apps/activity/templates/activity/activity_list.html:45 msgid "All activities" msgstr "" @@ -529,7 +529,7 @@ msgstr "" msgid "Credit amount" msgstr "" -#: apps/member/forms.py:141 apps/note/templates/note/transaction_form.html:139 +#: apps/member/forms.py:141 apps/note/templates/note/transaction_form.html:140 #: apps/registration/forms.py:91 apps/treasury/forms.py:139 #: apps/wei/forms/registration.py:106 msgid "Bank" @@ -544,14 +544,14 @@ msgid "Roles" msgstr "" #: apps/member/models.py:38 -#: apps/member/templates/member/includes/profile_info.html:32 +#: apps/member/templates/member/includes/profile_info.html:34 #: apps/registration/templates/registration/future_profile_detail.html:40 #: apps/wei/templates/wei/weimembership_form.html:44 msgid "phone number" msgstr "" #: apps/member/models.py:45 -#: apps/member/templates/member/includes/profile_info.html:26 +#: apps/member/templates/member/includes/profile_info.html:28 #: apps/registration/templates/registration/future_profile_detail.html:34 #: apps/wei/templates/wei/weimembership_form.html:38 msgid "section" @@ -638,14 +638,14 @@ msgid "Year of entry to the school (None if not ENS student)" msgstr "" #: apps/member/models.py:83 -#: apps/member/templates/member/includes/profile_info.html:36 +#: apps/member/templates/member/includes/profile_info.html:38 #: apps/registration/templates/registration/future_profile_detail.html:37 #: apps/wei/templates/wei/weimembership_form.html:41 msgid "address" msgstr "" #: apps/member/models.py:90 -#: apps/member/templates/member/includes/profile_info.html:43 +#: apps/member/templates/member/includes/profile_info.html:45 #: apps/registration/templates/registration/future_profile_detail.html:43 #: apps/wei/templates/wei/weimembership_form.html:47 msgid "paid" @@ -710,10 +710,10 @@ msgid "Activate your Note Kfet account" msgstr "" #: apps/member/models.py:203 -#: apps/member/templates/member/includes/club_info.html:54 -#: apps/member/templates/member/includes/profile_info.html:29 +#: apps/member/templates/member/includes/club_info.html:55 +#: apps/member/templates/member/includes/profile_info.html:31 #: apps/registration/templates/registration/future_profile_detail.html:22 -#: apps/wei/templates/wei/base.html:71 +#: apps/wei/templates/wei/base.html:70 #: apps/wei/templates/wei/weimembership_form.html:20 msgid "email" msgstr "" @@ -819,61 +819,61 @@ msgid "" "charged to adhere automatically to this/these club·s." msgstr "" -#: apps/member/templates/member/base.html:18 +#: apps/member/templates/member/base.html:17 #: apps/registration/templates/registration/future_profile_detail.html:12 msgid "Account #" msgstr "" -#: apps/member/templates/member/base.html:49 -#: apps/member/templates/member/base.html:63 apps/member/views.py:59 +#: apps/member/templates/member/base.html:48 +#: apps/member/templates/member/base.html:62 apps/member/views.py:59 #: apps/registration/templates/registration/future_profile_detail.html:48 #: apps/wei/templates/wei/weimembership_form.html:117 msgid "Update Profile" msgstr "" -#: apps/member/templates/member/base.html:53 -#: apps/member/templates/member/base.html:68 +#: apps/member/templates/member/base.html:52 +#: apps/member/templates/member/base.html:67 msgid "View Profile" msgstr "" -#: apps/member/templates/member/base.html:58 +#: apps/member/templates/member/base.html:57 msgid "Add member" msgstr "" -#: apps/member/templates/member/base.html:73 -#: apps/member/templates/member/base.html:94 -#: apps/member/templates/member/base.html:115 +#: apps/member/templates/member/base.html:72 +#: apps/member/templates/member/base.html:93 +#: apps/member/templates/member/base.html:114 msgid "Lock note" msgstr "" -#: apps/member/templates/member/base.html:77 -#: apps/member/templates/member/base.html:127 -#: apps/member/templates/member/base.html:139 +#: apps/member/templates/member/base.html:76 +#: apps/member/templates/member/base.html:126 +#: apps/member/templates/member/base.html:138 msgid "Unlock note" msgstr "" -#: apps/member/templates/member/base.html:100 +#: apps/member/templates/member/base.html:99 msgid "" "Are you sure you want to lock this note? This will prevent any transaction " "that would be performed, until the note is unlocked." msgstr "" -#: apps/member/templates/member/base.html:105 +#: apps/member/templates/member/base.html:104 msgid "" "If you use the force mode, the user won't be able to unlock the note by " "itself." msgstr "" -#: apps/member/templates/member/base.html:111 -#: apps/member/templates/member/base.html:138 apps/treasury/forms.py:95 +#: apps/member/templates/member/base.html:110 +#: apps/member/templates/member/base.html:137 apps/treasury/forms.py:95 msgid "Close" msgstr "" -#: apps/member/templates/member/base.html:113 +#: apps/member/templates/member/base.html:112 msgid "Force mode" msgstr "" -#: apps/member/templates/member/base.html:133 +#: apps/member/templates/member/base.html:132 msgid "" "Are you sure you want to unlock this note? Transactions will be re-enabled." msgstr "" @@ -891,7 +891,7 @@ msgid "Add" msgstr "" #: apps/member/templates/member/club_detail.html:13 -#: apps/permission/templates/permission/all_rights.html:33 +#: apps/permission/templates/permission/all_rights.html:32 msgid "Club managers" msgstr "" @@ -909,16 +909,16 @@ msgstr "" msgid "Create club" msgstr "" -#: apps/member/templates/member/club_members.html:16 +#: apps/member/templates/member/club_members.html:19 msgid "Display only active memberships" msgstr "" -#: apps/member/templates/member/club_members.html:20 +#: apps/member/templates/member/club_members.html:23 msgid "Filter roles:" msgstr "" -#: apps/member/templates/member/club_members.html:33 -#: apps/wei/templates/wei/weimembership_list.html:14 +#: apps/member/templates/member/club_members.html:36 +#: apps/wei/templates/wei/weimembership_list.html:17 msgid "There is no membership found with this pattern." msgstr "" @@ -931,26 +931,26 @@ msgid "days" msgstr "" #: apps/member/templates/member/includes/club_info.html:31 -#: apps/wei/templates/wei/base.html:41 +#: apps/wei/templates/wei/base.html:40 msgid "membership fee" msgstr "" #: apps/member/templates/member/includes/club_info.html:43 -#: apps/member/templates/member/includes/profile_info.html:40 -#: apps/treasury/templates/treasury/sogecredit_detail.html:19 -#: apps/wei/templates/wei/base.html:61 +#: apps/member/templates/member/includes/profile_info.html:42 +#: apps/treasury/templates/treasury/sogecredit_detail.html:18 +#: apps/wei/templates/wei/base.html:60 msgid "balance" msgstr "" #: apps/member/templates/member/includes/club_info.html:47 -#: apps/member/templates/member/includes/profile_info.html:19 -#: apps/note/models/notes.py:273 apps/wei/templates/wei/base.html:67 +#: apps/member/templates/member/includes/profile_info.html:20 +#: apps/note/models/notes.py:273 apps/wei/templates/wei/base.html:66 msgid "aliases" msgstr "" -#: apps/member/templates/member/includes/club_info.html:50 -#: apps/member/templates/member/includes/profile_info.html:22 -msgid "Edit aliases" +#: apps/member/templates/member/includes/club_info.html:51 +#: apps/member/templates/member/includes/profile_info.html:24 +msgid "Manage aliases" msgstr "" #: apps/member/templates/member/includes/profile_info.html:7 @@ -963,11 +963,11 @@ msgstr "" msgid "password" msgstr "" -#: apps/member/templates/member/includes/profile_info.html:14 +#: apps/member/templates/member/includes/profile_info.html:15 msgid "Change password" msgstr "" -#: apps/member/templates/member/includes/profile_info.html:50 +#: apps/member/templates/member/includes/profile_info.html:52 #: apps/member/views.py:318 msgid "Manage auth token" msgstr "" @@ -1000,7 +1000,7 @@ msgstr "" msgid "View my memberships" msgstr "" -#: apps/member/templates/member/profile_update.html:19 +#: apps/member/templates/member/profile_update.html:18 msgid "Save Changes" msgstr "" @@ -1101,7 +1101,7 @@ msgstr "" msgid "Destination" msgstr "" -#: apps/note/forms.py:72 apps/note/templates/note/transaction_form.html:118 +#: apps/note/forms.py:72 apps/note/templates/note/transaction_form.html:119 msgid "Reason" msgstr "" @@ -1286,7 +1286,7 @@ msgid "transaction" msgstr "" #: apps/note/models/transactions.py:160 -#: apps/treasury/templates/treasury/sogecredit_detail.html:23 +#: apps/treasury/templates/treasury/sogecredit_detail.html:22 msgid "transactions" msgstr "" @@ -1358,41 +1358,41 @@ msgid "No reason specified" msgstr "" #: apps/note/tables.py:143 apps/note/tables.py:177 apps/treasury/tables.py:39 -#: apps/treasury/templates/treasury/invoice_confirm_delete.html:28 -#: apps/treasury/templates/treasury/sogecredit_detail.html:60 +#: apps/treasury/templates/treasury/invoice_confirm_delete.html:30 +#: apps/treasury/templates/treasury/sogecredit_detail.html:59 #: apps/wei/tables.py:76 apps/wei/tables.py:103 -#: apps/wei/templates/wei/weiregistration_confirm_delete.html:28 +#: apps/wei/templates/wei/weiregistration_confirm_delete.html:31 msgid "Delete" msgstr "" #: apps/note/tables.py:171 apps/note/templates/note/conso_form.html:132 #: apps/wei/tables.py:47 apps/wei/tables.py:48 -#: apps/wei/templates/wei/base.html:90 -#: apps/wei/templates/wei/bus_detail.html:17 -#: apps/wei/templates/wei/busteam_detail.html:17 -#: apps/wei/templates/wei/busteam_detail.html:37 +#: apps/wei/templates/wei/base.html:89 +#: apps/wei/templates/wei/bus_detail.html:20 +#: apps/wei/templates/wei/busteam_detail.html:20 +#: apps/wei/templates/wei/busteam_detail.html:40 msgid "Edit" msgstr "" -#: apps/note/templates/note/conso_form.html:33 +#: apps/note/templates/note/conso_form.html:32 msgid "Consum" msgstr "" -#: apps/note/templates/note/conso_form.html:44 -#: apps/note/templates/note/transaction_form.html:64 -#: apps/note/templates/note/transaction_form.html:91 +#: apps/note/templates/note/conso_form.html:43 +#: apps/note/templates/note/transaction_form.html:65 +#: apps/note/templates/note/transaction_form.html:92 msgid "Name or alias..." msgstr "" -#: apps/note/templates/note/conso_form.html:53 +#: apps/note/templates/note/conso_form.html:52 msgid "Select consumptions" msgstr "" -#: apps/note/templates/note/conso_form.html:62 +#: apps/note/templates/note/conso_form.html:61 msgid "Consume!" msgstr "" -#: apps/note/templates/note/conso_form.html:76 +#: apps/note/templates/note/conso_form.html:73 msgid "Highlighted buttons" msgstr "" @@ -1405,7 +1405,7 @@ msgid "Double consumptions" msgstr "" #: apps/note/templates/note/conso_form.html:154 -#: apps/note/templates/note/transaction_form.html:158 +#: apps/note/templates/note/transaction_form.html:159 msgid "Recent transactions history" msgstr "" @@ -1419,45 +1419,45 @@ msgstr "" msgid "Mail generated by the Note Kfet on the" msgstr "" -#: apps/note/templates/note/transaction_form.html:53 -#: apps/note/templates/note/transaction_form.html:173 +#: apps/note/templates/note/transaction_form.html:54 +#: apps/note/templates/note/transaction_form.html:174 msgid "Select emitters" msgstr "" -#: apps/note/templates/note/transaction_form.html:68 +#: apps/note/templates/note/transaction_form.html:69 msgid "I am the emitter" msgstr "" -#: apps/note/templates/note/transaction_form.html:80 -#: apps/note/templates/note/transaction_form.html:175 +#: apps/note/templates/note/transaction_form.html:81 +#: apps/note/templates/note/transaction_form.html:176 msgid "Select receivers" msgstr "" -#: apps/note/templates/note/transaction_form.html:103 +#: apps/note/templates/note/transaction_form.html:104 msgid "Action" msgstr "" -#: apps/note/templates/note/transaction_form.html:111 +#: apps/note/templates/note/transaction_form.html:112 #: apps/treasury/forms.py:141 apps/treasury/tables.py:67 #: apps/treasury/tables.py:135 #: apps/treasury/templates/treasury/remittance_form.html:23 msgid "Amount" msgstr "" -#: apps/note/templates/note/transaction_form.html:127 +#: apps/note/templates/note/transaction_form.html:128 #: apps/treasury/models.py:51 msgid "Name" msgstr "" -#: apps/note/templates/note/transaction_form.html:172 +#: apps/note/templates/note/transaction_form.html:173 msgid "Select emitter" msgstr "" -#: apps/note/templates/note/transaction_form.html:174 +#: apps/note/templates/note/transaction_form.html:175 msgid "Select receiver" msgstr "" -#: apps/note/templates/note/transaction_form.html:176 +#: apps/note/templates/note/transaction_form.html:177 msgid "Transfer type" msgstr "" @@ -1477,23 +1477,23 @@ msgstr "" msgid "Current price" msgstr "" -#: apps/note/templates/note/transactiontemplate_list.html:9 +#: apps/note/templates/note/transactiontemplate_list.html:13 msgid "Name of the button..." msgstr "" -#: apps/note/templates/note/transactiontemplate_list.html:11 +#: apps/note/templates/note/transactiontemplate_list.html:15 msgid "New button" msgstr "" -#: apps/note/templates/note/transactiontemplate_list.html:18 +#: apps/note/templates/note/transactiontemplate_list.html:22 msgid "buttons listing " msgstr "" -#: apps/note/templates/note/transactiontemplate_list.html:69 +#: apps/note/templates/note/transactiontemplate_list.html:73 msgid "button successfully deleted " msgstr "" -#: apps/note/templates/note/transactiontemplate_list.html:73 +#: apps/note/templates/note/transactiontemplate_list.html:77 msgid "Unable to delete button " msgstr "" @@ -1578,7 +1578,7 @@ msgid "" msgstr "" #: apps/permission/models.py:183 -#: apps/permission/templates/permission/all_rights.html:90 +#: apps/permission/templates/permission/all_rights.html:89 msgid "permanent" msgstr "" @@ -1623,43 +1623,43 @@ msgid "" "{model_name}." msgstr "" -#: apps/permission/templates/permission/all_rights.html:13 +#: apps/permission/templates/permission/all_rights.html:12 msgid "Users that have surnormal rights" msgstr "" -#: apps/permission/templates/permission/all_rights.html:17 +#: apps/permission/templates/permission/all_rights.html:16 msgid "Superusers have all rights on everything, to manage the website." msgstr "" -#: apps/permission/templates/permission/all_rights.html:22 +#: apps/permission/templates/permission/all_rights.html:21 msgid "Superusers" msgstr "" -#: apps/permission/templates/permission/all_rights.html:46 +#: apps/permission/templates/permission/all_rights.html:45 msgid "Roles description" msgstr "" -#: apps/permission/templates/permission/all_rights.html:53 +#: apps/permission/templates/permission/all_rights.html:52 msgid "Filter with roles that I have in at least one club" msgstr "" -#: apps/permission/templates/permission/all_rights.html:70 +#: apps/permission/templates/permission/all_rights.html:69 msgid "Owned" msgstr "" -#: apps/permission/templates/permission/all_rights.html:81 +#: apps/permission/templates/permission/all_rights.html:80 msgid "Own this role in the clubs" msgstr "" -#: apps/permission/templates/permission/all_rights.html:87 +#: apps/permission/templates/permission/all_rights.html:86 msgid "Mask:" msgstr "" -#: apps/permission/templates/permission/all_rights.html:87 +#: apps/permission/templates/permission/all_rights.html:86 msgid "Query:" msgstr "" -#: apps/permission/templates/permission/all_rights.html:93 +#: apps/permission/templates/permission/all_rights.html:92 msgid "No associated permission" msgstr "" @@ -1711,43 +1711,43 @@ msgstr "" msgid "Join Kfet Club" msgstr "" -#: apps/registration/templates/registration/email_validation_complete.html:6 +#: apps/registration/templates/registration/email_validation_complete.html:9 msgid "Your email have successfully been validated." msgstr "" -#: apps/registration/templates/registration/email_validation_complete.html:8 +#: apps/registration/templates/registration/email_validation_complete.html:11 #, python-format msgid "You can now <a href=\"%(login_url)s\">log in</a>." msgstr "" -#: apps/registration/templates/registration/email_validation_complete.html:10 +#: apps/registration/templates/registration/email_validation_complete.html:13 msgid "" "You must pay now your membership in the Kfet to complete your registration." msgstr "" -#: apps/registration/templates/registration/email_validation_complete.html:13 +#: apps/registration/templates/registration/email_validation_complete.html:16 msgid "" "The link was invalid. The token may have expired. Please send us an email to " "activate your account." msgstr "" -#: apps/registration/templates/registration/email_validation_email_sent.html:5 +#: apps/registration/templates/registration/email_validation_email_sent.html:8 msgid "Account activation" msgstr "" -#: apps/registration/templates/registration/email_validation_email_sent.html:8 +#: apps/registration/templates/registration/email_validation_email_sent.html:11 msgid "" "An email has been sent. Please click on the link to activate your account." msgstr "" -#: apps/registration/templates/registration/email_validation_email_sent.html:12 +#: apps/registration/templates/registration/email_validation_email_sent.html:15 msgid "" "You must also go to the Kfet to pay your membership. The WEI registration " "includes the BDE membership." msgstr "" #: apps/registration/templates/registration/future_profile_detail.html:49 -#: apps/wei/templates/wei/weiregistration_confirm_delete.html:8 +#: apps/wei/templates/wei/weiregistration_confirm_delete.html:11 msgid "Delete registration" msgstr "" @@ -1761,7 +1761,7 @@ msgstr "" msgid "Validate registration" msgstr "" -#: apps/registration/templates/registration/future_user_list.html:11 +#: apps/registration/templates/registration/future_user_list.html:9 msgid "New user" msgstr "" @@ -1869,9 +1869,9 @@ msgstr "" #: apps/treasury/forms.py:129 apps/treasury/models.py:252 #: apps/treasury/tables.py:97 apps/treasury/tables.py:105 -#: apps/treasury/templates/treasury/invoice_list.html:17 -#: apps/treasury/templates/treasury/remittance_list.html:17 -#: apps/treasury/templates/treasury/sogecredit_list.html:17 +#: apps/treasury/templates/treasury/invoice_list.html:16 +#: apps/treasury/templates/treasury/remittance_list.html:16 +#: apps/treasury/templates/treasury/sogecredit_list.html:16 msgid "Remittance" msgstr "" @@ -1920,7 +1920,7 @@ msgid "tex source" msgstr "" #: apps/treasury/models.py:89 -#: apps/treasury/templates/treasury/invoice_form.html:23 +#: apps/treasury/templates/treasury/invoice_form.html:22 msgid "This invoice is locked and can no longer be edited." msgstr "" @@ -1999,7 +1999,7 @@ msgid "" msgstr "" #: apps/treasury/models.py:355 -#: apps/treasury/templates/treasury/sogecredit_detail.html:11 +#: apps/treasury/templates/treasury/sogecredit_detail.html:10 msgid "Credit from the Société générale" msgstr "" @@ -2012,9 +2012,9 @@ msgid "Invoice #{:d}" msgstr "" #: apps/treasury/tables.py:25 -#: apps/treasury/templates/treasury/invoice_list.html:14 -#: apps/treasury/templates/treasury/remittance_list.html:14 -#: apps/treasury/templates/treasury/sogecredit_list.html:14 +#: apps/treasury/templates/treasury/invoice_list.html:13 +#: apps/treasury/templates/treasury/remittance_list.html:13 +#: apps/treasury/templates/treasury/sogecredit_list.html:13 msgid "Invoice" msgstr "" @@ -2030,45 +2030,45 @@ msgstr "" msgid "Yes" msgstr "" -#: apps/treasury/templates/treasury/invoice_confirm_delete.html:8 +#: apps/treasury/templates/treasury/invoice_confirm_delete.html:10 #: apps/treasury/views.py:166 msgid "Delete invoice" msgstr "" -#: apps/treasury/templates/treasury/invoice_confirm_delete.html:13 +#: apps/treasury/templates/treasury/invoice_confirm_delete.html:15 msgid "This invoice is locked and can't be deleted." msgstr "" -#: apps/treasury/templates/treasury/invoice_confirm_delete.html:19 +#: apps/treasury/templates/treasury/invoice_confirm_delete.html:21 msgid "" "Are you sure you want to delete this invoice? This action can't be undone." msgstr "" -#: apps/treasury/templates/treasury/invoice_confirm_delete.html:26 +#: apps/treasury/templates/treasury/invoice_confirm_delete.html:28 msgid "Return to invoices list" msgstr "" -#: apps/treasury/templates/treasury/invoice_form.html:16 +#: apps/treasury/templates/treasury/invoice_form.html:15 msgid "" "Warning: the LaTeX template is saved with this object. Updating the invoice " "implies regenerate it. Be careful if you manipulate old invoices." msgstr "" -#: apps/treasury/templates/treasury/invoice_form.html:70 +#: apps/treasury/templates/treasury/invoice_form.html:69 msgid "Add product" msgstr "" -#: apps/treasury/templates/treasury/invoice_form.html:71 +#: apps/treasury/templates/treasury/invoice_form.html:70 msgid "Remove product" msgstr "" -#: apps/treasury/templates/treasury/invoice_list.html:20 -#: apps/treasury/templates/treasury/remittance_list.html:20 -#: apps/treasury/templates/treasury/sogecredit_list.html:20 +#: apps/treasury/templates/treasury/invoice_list.html:19 +#: apps/treasury/templates/treasury/remittance_list.html:19 +#: apps/treasury/templates/treasury/sogecredit_list.html:19 msgid "Société générale credits" msgstr "" -#: apps/treasury/templates/treasury/invoice_list.html:32 +#: apps/treasury/templates/treasury/invoice_list.html:31 msgid "New invoice" msgstr "" @@ -2088,96 +2088,96 @@ msgstr "" msgid "There is no transaction linked with this remittance." msgstr "" -#: apps/treasury/templates/treasury/remittance_list.html:28 +#: apps/treasury/templates/treasury/remittance_list.html:27 msgid "Opened remittances" msgstr "" -#: apps/treasury/templates/treasury/remittance_list.html:35 +#: apps/treasury/templates/treasury/remittance_list.html:34 msgid "There is no opened remittance." msgstr "" -#: apps/treasury/templates/treasury/remittance_list.html:40 +#: apps/treasury/templates/treasury/remittance_list.html:39 msgid "New remittance" msgstr "" -#: apps/treasury/templates/treasury/remittance_list.html:46 +#: apps/treasury/templates/treasury/remittance_list.html:45 msgid "Transfers without remittances" msgstr "" -#: apps/treasury/templates/treasury/remittance_list.html:53 +#: apps/treasury/templates/treasury/remittance_list.html:52 msgid "There is no transaction without any linked remittance." msgstr "" -#: apps/treasury/templates/treasury/remittance_list.html:61 +#: apps/treasury/templates/treasury/remittance_list.html:60 msgid "Transfers with opened remittances" msgstr "" -#: apps/treasury/templates/treasury/remittance_list.html:68 +#: apps/treasury/templates/treasury/remittance_list.html:67 msgid "There is no transaction with an opened linked remittance." msgstr "" -#: apps/treasury/templates/treasury/remittance_list.html:76 +#: apps/treasury/templates/treasury/remittance_list.html:75 msgid "Closed remittances" msgstr "" -#: apps/treasury/templates/treasury/remittance_list.html:83 +#: apps/treasury/templates/treasury/remittance_list.html:82 msgid "There is no closed remittance yet." msgstr "" -#: apps/treasury/templates/treasury/sogecredit_detail.html:30 +#: apps/treasury/templates/treasury/sogecredit_detail.html:29 msgid "total amount" msgstr "" -#: apps/treasury/templates/treasury/sogecredit_detail.html:36 +#: apps/treasury/templates/treasury/sogecredit_detail.html:35 msgid "" "Warning: Validating this credit implies that all membership transactions " "will be validated." msgstr "" -#: apps/treasury/templates/treasury/sogecredit_detail.html:37 +#: apps/treasury/templates/treasury/sogecredit_detail.html:36 msgid "" "If you delete this credit, there all membership transactions will be also " "validated, but no credit will be operated." msgstr "" -#: apps/treasury/templates/treasury/sogecredit_detail.html:38 +#: apps/treasury/templates/treasury/sogecredit_detail.html:37 msgid "" "If this credit is validated, then the user won't be able to ask for a credit " "from the Société générale." msgstr "" -#: apps/treasury/templates/treasury/sogecredit_detail.html:39 +#: apps/treasury/templates/treasury/sogecredit_detail.html:38 msgid "If you think there is an error, please contact the \"respos info\"." msgstr "" -#: apps/treasury/templates/treasury/sogecredit_detail.html:45 +#: apps/treasury/templates/treasury/sogecredit_detail.html:44 msgid "This credit is already validated." msgstr "" -#: apps/treasury/templates/treasury/sogecredit_detail.html:50 +#: apps/treasury/templates/treasury/sogecredit_detail.html:49 msgid "" "Warning: if you don't validate this credit, the note of the user doesn't " "have enough money to pay its memberships." msgstr "" -#: apps/treasury/templates/treasury/sogecredit_detail.html:51 +#: apps/treasury/templates/treasury/sogecredit_detail.html:50 msgid "Please ask the user to credit its note before deleting this credit." msgstr "" -#: apps/treasury/templates/treasury/sogecredit_detail.html:58 +#: apps/treasury/templates/treasury/sogecredit_detail.html:57 #: apps/wei/tables.py:59 apps/wei/tables.py:60 apps/wei/tables.py:99 msgid "Validate" msgstr "" -#: apps/treasury/templates/treasury/sogecredit_detail.html:66 +#: apps/treasury/templates/treasury/sogecredit_detail.html:65 msgid "Return to credit list" msgstr "" -#: apps/treasury/templates/treasury/sogecredit_list.html:35 +#: apps/treasury/templates/treasury/sogecredit_list.html:34 msgid "Filter with unvalidated credits only" msgstr "" -#: apps/treasury/templates/treasury/sogecredit_list.html:45 +#: apps/treasury/templates/treasury/sogecredit_list.html:44 msgid "There is no matched user that have asked for a Société générale credit." msgstr "" @@ -2266,15 +2266,15 @@ msgstr "" msgid "Choose a word:" msgstr "" -#: apps/wei/models.py:24 apps/wei/templates/wei/base.html:37 +#: apps/wei/models.py:24 apps/wei/templates/wei/base.html:36 msgid "year" msgstr "" -#: apps/wei/models.py:28 apps/wei/templates/wei/base.html:31 +#: apps/wei/models.py:28 apps/wei/templates/wei/base.html:30 msgid "date start" msgstr "" -#: apps/wei/models.py:32 apps/wei/templates/wei/base.html:34 +#: apps/wei/models.py:32 apps/wei/templates/wei/base.html:33 msgid "date end" msgstr "" @@ -2408,8 +2408,8 @@ msgstr "" msgid "Year" msgstr "" -#: apps/wei/tables.py:165 apps/wei/templates/wei/bus_detail.html:29 -#: apps/wei/templates/wei/busteam_detail.html:47 +#: apps/wei/tables.py:165 apps/wei/templates/wei/bus_detail.html:32 +#: apps/wei/templates/wei/busteam_detail.html:50 msgid "Teams" msgstr "" @@ -2421,73 +2421,73 @@ msgstr "" msgid "members" msgstr "" -#: apps/wei/templates/wei/base.html:45 +#: apps/wei/templates/wei/base.html:44 msgid "WEI fee (paid students)" msgstr "" -#: apps/wei/templates/wei/base.html:48 apps/wei/templates/wei/base.html:55 +#: apps/wei/templates/wei/base.html:47 apps/wei/templates/wei/base.html:54 msgid "The BDE membership is included in the WEI registration." msgstr "" -#: apps/wei/templates/wei/base.html:52 +#: apps/wei/templates/wei/base.html:51 msgid "WEI fee (unpaid students)" msgstr "" -#: apps/wei/templates/wei/base.html:77 +#: apps/wei/templates/wei/base.html:76 msgid "WEI list" msgstr "" -#: apps/wei/templates/wei/base.html:82 apps/wei/views.py:506 +#: apps/wei/templates/wei/base.html:81 apps/wei/views.py:506 msgid "Register 1A" msgstr "" -#: apps/wei/templates/wei/base.html:86 apps/wei/views.py:573 +#: apps/wei/templates/wei/base.html:85 apps/wei/views.py:573 msgid "Register 2A+" msgstr "" -#: apps/wei/templates/wei/base.html:94 +#: apps/wei/templates/wei/base.html:93 msgid "Add bus" msgstr "" -#: apps/wei/templates/wei/base.html:98 +#: apps/wei/templates/wei/base.html:97 msgid "View WEI" msgstr "" -#: apps/wei/templates/wei/bus_detail.html:19 -#: apps/wei/templates/wei/busteam_detail.html:19 +#: apps/wei/templates/wei/bus_detail.html:22 +#: apps/wei/templates/wei/busteam_detail.html:22 msgid "Add team" msgstr "" -#: apps/wei/templates/wei/bus_detail.html:42 +#: apps/wei/templates/wei/bus_detail.html:45 msgid "Members" msgstr "" -#: apps/wei/templates/wei/bus_detail.html:51 -#: apps/wei/templates/wei/busteam_detail.html:57 -#: apps/wei/templates/wei/weimembership_list.html:26 +#: apps/wei/templates/wei/bus_detail.html:54 +#: apps/wei/templates/wei/busteam_detail.html:60 +#: apps/wei/templates/wei/weimembership_list.html:29 msgid "View as PDF" msgstr "" -#: apps/wei/templates/wei/survey.html:8 -#: apps/wei/templates/wei/survey_closed.html:8 -#: apps/wei/templates/wei/survey_end.html:8 apps/wei/views.py:978 +#: apps/wei/templates/wei/survey.html:11 +#: apps/wei/templates/wei/survey_closed.html:11 +#: apps/wei/templates/wei/survey_end.html:11 apps/wei/views.py:978 #: apps/wei/views.py:1032 apps/wei/views.py:1042 msgid "Survey WEI" msgstr "" -#: apps/wei/templates/wei/survey.html:20 +#: apps/wei/templates/wei/survey.html:23 msgid "Next" msgstr "" -#: apps/wei/templates/wei/survey_closed.html:12 +#: apps/wei/templates/wei/survey_closed.html:15 msgid "The inscription for this WEI are now closed." msgstr "" -#: apps/wei/templates/wei/survey_closed.html:16 +#: apps/wei/templates/wei/survey_closed.html:19 msgid "Return to WEI detail" msgstr "" -#: apps/wei/templates/wei/survey_end.html:12 +#: apps/wei/templates/wei/survey_end.html:15 msgid "The survey is now ended. Your answers have been saved." msgstr "" @@ -2511,11 +2511,11 @@ msgstr "" msgid "Unvalidated registrations" msgstr "" -#: apps/wei/templates/wei/weiclub_list.html:10 apps/wei/views.py:76 +#: apps/wei/templates/wei/weiclub_list.html:14 apps/wei/views.py:76 msgid "Create WEI" msgstr "" -#: apps/wei/templates/wei/weiclub_list.html:18 +#: apps/wei/templates/wei/weiclub_list.html:22 msgid "WEI listing" msgstr "" @@ -2560,7 +2560,7 @@ msgid "preferred roles" msgstr "" #: apps/wei/templates/wei/weimembership_form.html:115 -#: apps/wei/templates/wei/weiregistration_confirm_delete.html:27 +#: apps/wei/templates/wei/weiregistration_confirm_delete.html:30 msgid "Update registration" msgstr "" @@ -2617,26 +2617,26 @@ msgid "" "the membership fee." msgstr "" -#: apps/wei/templates/wei/weimembership_list.html:20 +#: apps/wei/templates/wei/weimembership_list.html:23 msgid "View unvalidated registrations..." msgstr "" -#: apps/wei/templates/wei/weiregistration_confirm_delete.html:13 +#: apps/wei/templates/wei/weiregistration_confirm_delete.html:16 msgid "This registration is already validated and can't be deleted." msgstr "" -#: apps/wei/templates/wei/weiregistration_confirm_delete.html:20 +#: apps/wei/templates/wei/weiregistration_confirm_delete.html:23 #, python-format msgid "" "Are you sure you want to delete the registration of %(user)s for the WEI " "%(wei_name)s? This action can't be undone." msgstr "" -#: apps/wei/templates/wei/weiregistration_list.html:14 +#: apps/wei/templates/wei/weiregistration_list.html:17 msgid "There is no pre-registration found with this pattern." msgstr "" -#: apps/wei/templates/wei/weiregistration_list.html:20 +#: apps/wei/templates/wei/weiregistration_list.html:23 msgid "View validated memberships..." msgstr "" @@ -2746,51 +2746,51 @@ msgstr "" msgid "French" msgstr "" -#: note_kfet/templates/400.html:11 +#: note_kfet/templates/400.html:10 msgid "Bad request" msgstr "" -#: note_kfet/templates/400.html:15 +#: note_kfet/templates/400.html:14 msgid "" "Sorry, your request was bad. Don't know what could be wrong. An email has " "been sent to webmasters with the details of the error. You can now drink a " "coke." msgstr "" -#: note_kfet/templates/403.html:11 +#: note_kfet/templates/403.html:10 msgid "Permission denied" msgstr "" -#: note_kfet/templates/403.html:14 +#: note_kfet/templates/403.html:13 msgid "You don't have the right to perform this request." msgstr "" -#: note_kfet/templates/403.html:16 note_kfet/templates/404.html:20 +#: note_kfet/templates/403.html:15 note_kfet/templates/404.html:19 msgid "Exception message:" msgstr "" -#: note_kfet/templates/404.html:11 +#: note_kfet/templates/404.html:10 msgid "Page not found" msgstr "" -#: note_kfet/templates/404.html:15 +#: note_kfet/templates/404.html:14 #, python-format msgid "" "The requested path <code>%(request_path)s</code> was not found on the server." msgstr "" -#: note_kfet/templates/500.html:11 +#: note_kfet/templates/500.html:10 msgid "Server error" msgstr "" -#: note_kfet/templates/500.html:15 +#: note_kfet/templates/500.html:14 msgid "" "Sorry, an error occurred when processing your request. An email has been " "sent to webmasters with the detail of the error, and this will be fixed " "soon. You can now drink a beer." msgstr "" -#: note_kfet/templates/autocomplete_model.html:11 +#: note_kfet/templates/autocomplete_model.html:14 msgid "Reset" msgstr "" @@ -2816,11 +2816,11 @@ msgid "" "on the validation link." msgstr "" -#: note_kfet/templates/base_search.html:16 +#: note_kfet/templates/base_search.html:15 msgid "Search by attribute such as name…" msgstr "" -#: note_kfet/templates/base_search.html:24 +#: note_kfet/templates/base_search.html:23 msgid "There is no results." msgstr "" @@ -2836,22 +2836,22 @@ msgid "" "upgrading." msgstr "" -#: note_kfet/templates/registration/logged_out.html:14 +#: note_kfet/templates/registration/logged_out.html:13 msgid "Thanks for spending some quality time with the Web site today." msgstr "" -#: note_kfet/templates/registration/logged_out.html:15 +#: note_kfet/templates/registration/logged_out.html:14 msgid "Log in again" msgstr "" #: note_kfet/templates/registration/login.html:6 -#: note_kfet/templates/registration/login.html:16 -#: note_kfet/templates/registration/login.html:39 -#: note_kfet/templates/registration/password_reset_complete.html:16 +#: note_kfet/templates/registration/login.html:15 +#: note_kfet/templates/registration/login.html:38 +#: note_kfet/templates/registration/password_reset_complete.html:15 msgid "Log in" msgstr "" -#: note_kfet/templates/registration/login.html:21 +#: note_kfet/templates/registration/login.html:20 #, python-format msgid "" "You are authenticated as %(username)s, but are not authorized to access this " @@ -2859,76 +2859,76 @@ msgid "" "permission mask?" msgstr "" -#: note_kfet/templates/registration/login.html:31 +#: note_kfet/templates/registration/login.html:30 msgid "" "You must be logged with a staff account with the higher mask to access " "Django Admin." msgstr "" -#: note_kfet/templates/registration/login.html:41 +#: note_kfet/templates/registration/login.html:40 msgid "Forgotten your password or username?" msgstr "" -#: note_kfet/templates/registration/password_change_done.html:14 +#: note_kfet/templates/registration/password_change_done.html:13 msgid "Your password was changed." msgstr "" -#: note_kfet/templates/registration/password_change_form.html:15 +#: note_kfet/templates/registration/password_change_form.html:14 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." msgstr "" -#: note_kfet/templates/registration/password_change_form.html:17 -#: note_kfet/templates/registration/password_reset_confirm.html:18 +#: note_kfet/templates/registration/password_change_form.html:16 +#: note_kfet/templates/registration/password_reset_confirm.html:17 msgid "Change my password" msgstr "" -#: note_kfet/templates/registration/password_reset_complete.html:14 +#: note_kfet/templates/registration/password_reset_complete.html:13 msgid "Your password has been set. You may go ahead and log in now." msgstr "" -#: note_kfet/templates/registration/password_reset_confirm.html:15 +#: note_kfet/templates/registration/password_reset_confirm.html:14 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." msgstr "" -#: note_kfet/templates/registration/password_reset_confirm.html:22 +#: note_kfet/templates/registration/password_reset_confirm.html:21 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." msgstr "" -#: note_kfet/templates/registration/password_reset_done.html:14 +#: note_kfet/templates/registration/password_reset_done.html:13 msgid "" "We've emailed you instructions for setting your password, if an account " "exists with the email you entered. You should receive them shortly." msgstr "" -#: note_kfet/templates/registration/password_reset_done.html:15 +#: note_kfet/templates/registration/password_reset_done.html:14 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" -#: note_kfet/templates/registration/password_reset_form.html:14 +#: note_kfet/templates/registration/password_reset_form.html:13 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "" -#: note_kfet/templates/registration/password_reset_form.html:19 +#: note_kfet/templates/registration/password_reset_form.html:18 msgid "Reset my password" msgstr "" #: note_kfet/templates/registration/signup.html:6 -#: note_kfet/templates/registration/signup.html:12 -#: note_kfet/templates/registration/signup.html:28 +#: note_kfet/templates/registration/signup.html:11 +#: note_kfet/templates/registration/signup.html:27 msgid "Sign up" msgstr "" -#: note_kfet/templates/registration/signup.html:16 +#: note_kfet/templates/registration/signup.html:15 msgid "" "If you already signed up, your registration is taken into account. The BDE " "must validate your account before your can log in. You have to go to the " diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 3ee5d223986a963b06f350c66ec82b11296c86bb..0335d24a56254a241359ba90bace504939be8cf7 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-08-31 23:03+0200\n" +"POT-Creation-Date: 2020-09-01 10:28+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -57,7 +57,7 @@ msgstr "Vous ne pouvez pas inviter plus de 3 personnes à cette activité." #: apps/permission/models.py:329 #: apps/registration/templates/registration/future_profile_detail.html:16 #: apps/wei/models.py:66 apps/wei/models.py:118 -#: apps/wei/templates/wei/base.html:27 +#: apps/wei/templates/wei/base.html:26 #: apps/wei/templates/wei/weimembership_form.html:14 msgid "name" msgstr "nom" @@ -112,8 +112,8 @@ msgstr "type" #: apps/activity/models.py:88 apps/logs/models.py:22 apps/member/models.py:303 #: apps/note/models/notes.py:142 apps/treasury/models.py:267 -#: apps/treasury/templates/treasury/sogecredit_detail.html:15 -#: apps/wei/models.py:160 apps/wei/templates/wei/survey.html:12 +#: apps/treasury/templates/treasury/sogecredit_detail.html:14 +#: apps/wei/models.py:160 apps/wei/templates/wei/survey.html:15 msgid "user" msgstr "utilisateur" @@ -172,12 +172,12 @@ msgid "note" msgstr "note" #: apps/activity/models.py:183 -#: apps/activity/templates/activity/activity_entry.html:45 +#: apps/activity/templates/activity/activity_entry.html:46 msgid "entry" msgstr "entrée" #: apps/activity/models.py:184 -#: apps/activity/templates/activity/activity_entry.html:45 +#: apps/activity/templates/activity/activity_entry.html:46 msgid "entries" msgstr "entrées" @@ -251,7 +251,7 @@ msgid "Last name" msgstr "Nom de famille" #: apps/activity/tables.py:84 apps/member/forms.py:136 -#: apps/note/templates/note/transaction_form.html:133 +#: apps/note/templates/note/transaction_form.html:134 #: apps/registration/forms.py:86 apps/treasury/forms.py:137 #: apps/wei/forms/registration.py:101 msgid "First name" @@ -265,45 +265,45 @@ msgstr "Note" msgid "Balance" msgstr "Solde du compte" -#: apps/activity/templates/activity/activity_detail.html:14 +#: apps/activity/templates/activity/activity_detail.html:15 msgid "Guests list" msgstr "Liste des invités" -#: apps/activity/templates/activity/activity_entry.html:13 +#: apps/activity/templates/activity/activity_entry.html:14 #: apps/note/models/transactions.py:259 -#: apps/note/templates/note/transaction_form.html:15 -#: apps/note/templates/note/transaction_form.html:147 +#: apps/note/templates/note/transaction_form.html:16 +#: apps/note/templates/note/transaction_form.html:148 #: note_kfet/templates/base.html:78 msgid "Transfer" msgstr "Virement" -#: apps/activity/templates/activity/activity_entry.html:17 +#: apps/activity/templates/activity/activity_entry.html:18 #: apps/note/models/transactions.py:313 -#: apps/note/templates/note/transaction_form.html:20 +#: apps/note/templates/note/transaction_form.html:21 msgid "Credit" msgstr "Crédit" -#: apps/activity/templates/activity/activity_entry.html:20 +#: apps/activity/templates/activity/activity_entry.html:21 #: apps/note/models/transactions.py:313 -#: apps/note/templates/note/transaction_form.html:24 +#: apps/note/templates/note/transaction_form.html:25 msgid "Debit" msgstr "Débit" -#: apps/activity/templates/activity/activity_entry.html:26 -#: apps/note/templates/note/transaction_form.html:29 +#: apps/activity/templates/activity/activity_entry.html:27 +#: apps/note/templates/note/transaction_form.html:30 msgid "Entries" msgstr "Entrées" -#: apps/activity/templates/activity/activity_entry.html:36 +#: apps/activity/templates/activity/activity_entry.html:37 msgid "Return to activity page" msgstr "Retour à la page de l'activité" -#: apps/activity/templates/activity/activity_form.html:17 +#: apps/activity/templates/activity/activity_form.html:16 #: apps/member/templates/member/add_members.html:32 -#: apps/member/templates/member/club_form.html:17 +#: apps/member/templates/member/club_form.html:16 #: apps/note/templates/note/transactiontemplate_form.html:15 #: apps/treasury/forms.py:93 apps/treasury/forms.py:147 -#: apps/treasury/templates/treasury/invoice_form.html:75 +#: apps/treasury/templates/treasury/invoice_form.html:74 #: apps/wei/templates/wei/bus_form.html:17 #: apps/wei/templates/wei/busteam_form.html:17 #: apps/wei/templates/wei/weiclub_form.html:17 @@ -311,23 +311,23 @@ msgstr "Retour à la page de l'activité" msgid "Submit" msgstr "Envoyer" -#: apps/activity/templates/activity/activity_list.html:13 +#: apps/activity/templates/activity/activity_list.html:12 msgid "Current activity" msgstr "Activité en cours" -#: apps/activity/templates/activity/activity_list.html:25 +#: apps/activity/templates/activity/activity_list.html:24 msgid "Upcoming activities" msgstr "Activités à venir" -#: apps/activity/templates/activity/activity_list.html:32 +#: apps/activity/templates/activity/activity_list.html:31 msgid "There is no planned activity." msgstr "Il n'y a pas d'activité prévue." -#: apps/activity/templates/activity/activity_list.html:39 +#: apps/activity/templates/activity/activity_list.html:38 msgid "New activity" msgstr "Nouvelle activité" -#: apps/activity/templates/activity/activity_list.html:46 +#: apps/activity/templates/activity/activity_list.html:45 msgid "All activities" msgstr "Toutes les activités" @@ -534,7 +534,7 @@ msgstr "Vous pouvez créditer la note de l'utisateur avant l'adhésion." msgid "Credit amount" msgstr "Montant à créditer" -#: apps/member/forms.py:141 apps/note/templates/note/transaction_form.html:139 +#: apps/member/forms.py:141 apps/note/templates/note/transaction_form.html:140 #: apps/registration/forms.py:91 apps/treasury/forms.py:139 #: apps/wei/forms/registration.py:106 msgid "Bank" @@ -549,14 +549,14 @@ msgid "Roles" msgstr "Rôles" #: apps/member/models.py:38 -#: apps/member/templates/member/includes/profile_info.html:32 +#: apps/member/templates/member/includes/profile_info.html:34 #: apps/registration/templates/registration/future_profile_detail.html:40 #: apps/wei/templates/wei/weimembership_form.html:44 msgid "phone number" msgstr "numéro de téléphone" #: apps/member/models.py:45 -#: apps/member/templates/member/includes/profile_info.html:26 +#: apps/member/templates/member/includes/profile_info.html:28 #: apps/registration/templates/registration/future_profile_detail.html:34 #: apps/wei/templates/wei/weimembership_form.html:38 msgid "section" @@ -643,14 +643,14 @@ msgid "Year of entry to the school (None if not ENS student)" msgstr "Année d'entrée dans l'école (None si non-étudiant·e de l'ENS)" #: apps/member/models.py:83 -#: apps/member/templates/member/includes/profile_info.html:36 +#: apps/member/templates/member/includes/profile_info.html:38 #: apps/registration/templates/registration/future_profile_detail.html:37 #: apps/wei/templates/wei/weimembership_form.html:41 msgid "address" msgstr "adresse" #: apps/member/models.py:90 -#: apps/member/templates/member/includes/profile_info.html:43 +#: apps/member/templates/member/includes/profile_info.html:45 #: apps/registration/templates/registration/future_profile_detail.html:43 #: apps/wei/templates/wei/weimembership_form.html:47 msgid "paid" @@ -721,10 +721,10 @@ msgid "Activate your Note Kfet account" msgstr "Activez votre compte Note Kfet" #: apps/member/models.py:203 -#: apps/member/templates/member/includes/club_info.html:54 -#: apps/member/templates/member/includes/profile_info.html:29 +#: apps/member/templates/member/includes/club_info.html:55 +#: apps/member/templates/member/includes/profile_info.html:31 #: apps/registration/templates/registration/future_profile_detail.html:22 -#: apps/wei/templates/wei/base.html:71 +#: apps/wei/templates/wei/base.html:70 #: apps/wei/templates/wei/weimembership_form.html:20 msgid "email" msgstr "courriel" @@ -838,40 +838,40 @@ msgstr "" "Ce club a pour parent·s %(clubs)s. Un coût supplémentaire de %(pretty_fee)s " "peut être ajouté pour adhérer automatiquement à ce·s club·s." -#: apps/member/templates/member/base.html:18 +#: apps/member/templates/member/base.html:17 #: apps/registration/templates/registration/future_profile_detail.html:12 msgid "Account #" msgstr "Compte n°" -#: apps/member/templates/member/base.html:49 -#: apps/member/templates/member/base.html:63 apps/member/views.py:59 +#: apps/member/templates/member/base.html:48 +#: apps/member/templates/member/base.html:62 apps/member/views.py:59 #: apps/registration/templates/registration/future_profile_detail.html:48 #: apps/wei/templates/wei/weimembership_form.html:117 msgid "Update Profile" msgstr "Modifier le profil" -#: apps/member/templates/member/base.html:53 -#: apps/member/templates/member/base.html:68 +#: apps/member/templates/member/base.html:52 +#: apps/member/templates/member/base.html:67 msgid "View Profile" msgstr "Voir le profil" -#: apps/member/templates/member/base.html:58 +#: apps/member/templates/member/base.html:57 msgid "Add member" msgstr "Ajouter un membre" -#: apps/member/templates/member/base.html:73 -#: apps/member/templates/member/base.html:94 -#: apps/member/templates/member/base.html:115 +#: apps/member/templates/member/base.html:72 +#: apps/member/templates/member/base.html:93 +#: apps/member/templates/member/base.html:114 msgid "Lock note" msgstr "Verrouiller la note" -#: apps/member/templates/member/base.html:77 -#: apps/member/templates/member/base.html:127 -#: apps/member/templates/member/base.html:139 +#: apps/member/templates/member/base.html:76 +#: apps/member/templates/member/base.html:126 +#: apps/member/templates/member/base.html:138 msgid "Unlock note" msgstr "Déverrouiller la note" -#: apps/member/templates/member/base.html:100 +#: apps/member/templates/member/base.html:99 msgid "" "Are you sure you want to lock this note? This will prevent any transaction " "that would be performed, until the note is unlocked." @@ -879,7 +879,7 @@ msgstr "" "Êtes-vous sûr de vouloir verrouiller cette note ? Cela empêchera toute " "transaction qui devrait être faite, jusqu'à ce qu'elle soit déverrouillée." -#: apps/member/templates/member/base.html:105 +#: apps/member/templates/member/base.html:104 msgid "" "If you use the force mode, the user won't be able to unlock the note by " "itself." @@ -887,16 +887,16 @@ msgstr "" "Si vous verrouillez la note de force, l'utilisateur ne pourra plus la " "déverrouiller lui-même." -#: apps/member/templates/member/base.html:111 -#: apps/member/templates/member/base.html:138 apps/treasury/forms.py:95 +#: apps/member/templates/member/base.html:110 +#: apps/member/templates/member/base.html:137 apps/treasury/forms.py:95 msgid "Close" msgstr "Fermer" -#: apps/member/templates/member/base.html:113 +#: apps/member/templates/member/base.html:112 msgid "Force mode" msgstr "Verrouiller de force" -#: apps/member/templates/member/base.html:133 +#: apps/member/templates/member/base.html:132 msgid "" "Are you sure you want to unlock this note? Transactions will be re-enabled." msgstr "" @@ -916,7 +916,7 @@ msgid "Add" msgstr "Ajouter" #: apps/member/templates/member/club_detail.html:13 -#: apps/permission/templates/permission/all_rights.html:33 +#: apps/permission/templates/permission/all_rights.html:32 msgid "Club managers" msgstr "Bureau du club" @@ -934,16 +934,16 @@ msgstr "Historique des transactions" msgid "Create club" msgstr "Créer un club" -#: apps/member/templates/member/club_members.html:16 +#: apps/member/templates/member/club_members.html:19 msgid "Display only active memberships" msgstr "N'afficher que les adhésions encore valides" -#: apps/member/templates/member/club_members.html:20 +#: apps/member/templates/member/club_members.html:23 msgid "Filter roles:" msgstr "Filtrer par rôle :" -#: apps/member/templates/member/club_members.html:33 -#: apps/wei/templates/wei/weimembership_list.html:14 +#: apps/member/templates/member/club_members.html:36 +#: apps/wei/templates/wei/weimembership_list.html:17 msgid "There is no membership found with this pattern." msgstr "Il n'y a pas d'adhésion trouvée avec cette entrée." @@ -956,27 +956,27 @@ msgid "days" msgstr "jours" #: apps/member/templates/member/includes/club_info.html:31 -#: apps/wei/templates/wei/base.html:41 +#: apps/wei/templates/wei/base.html:40 msgid "membership fee" msgstr "cotisation pour adhérer" #: apps/member/templates/member/includes/club_info.html:43 -#: apps/member/templates/member/includes/profile_info.html:40 -#: apps/treasury/templates/treasury/sogecredit_detail.html:19 -#: apps/wei/templates/wei/base.html:61 +#: apps/member/templates/member/includes/profile_info.html:42 +#: apps/treasury/templates/treasury/sogecredit_detail.html:18 +#: apps/wei/templates/wei/base.html:60 msgid "balance" msgstr "solde du compte" #: apps/member/templates/member/includes/club_info.html:47 -#: apps/member/templates/member/includes/profile_info.html:19 -#: apps/note/models/notes.py:273 apps/wei/templates/wei/base.html:67 +#: apps/member/templates/member/includes/profile_info.html:20 +#: apps/note/models/notes.py:273 apps/wei/templates/wei/base.html:66 msgid "aliases" msgstr "alias" -#: apps/member/templates/member/includes/club_info.html:50 -#: apps/member/templates/member/includes/profile_info.html:22 -msgid "Edit aliases" -msgstr "Éditer les alias" +#: apps/member/templates/member/includes/club_info.html:51 +#: apps/member/templates/member/includes/profile_info.html:24 +msgid "Manage aliases" +msgstr "Gérer les alias" #: apps/member/templates/member/includes/profile_info.html:7 #: apps/registration/templates/registration/future_profile_detail.html:19 @@ -988,11 +988,11 @@ msgstr "pseudo" msgid "password" msgstr "mot de passe" -#: apps/member/templates/member/includes/profile_info.html:14 +#: apps/member/templates/member/includes/profile_info.html:15 msgid "Change password" msgstr "Changer le mot de passe" -#: apps/member/templates/member/includes/profile_info.html:50 +#: apps/member/templates/member/includes/profile_info.html:52 #: apps/member/views.py:318 msgid "Manage auth token" msgstr "Gérer les jetons d'authentification" @@ -1025,7 +1025,7 @@ msgstr "Cliquez ici pour renvoyer un lien de validation." msgid "View my memberships" msgstr "Voir mes adhésions" -#: apps/member/templates/member/profile_update.html:19 +#: apps/member/templates/member/profile_update.html:18 msgid "Save Changes" msgstr "Sauvegarder les changements" @@ -1130,7 +1130,7 @@ msgstr "Source" msgid "Destination" msgstr "Destination" -#: apps/note/forms.py:72 apps/note/templates/note/transaction_form.html:118 +#: apps/note/forms.py:72 apps/note/templates/note/transaction_form.html:119 msgid "Reason" msgstr "Raison" @@ -1322,7 +1322,7 @@ msgid "transaction" msgstr "Transaction" #: apps/note/models/transactions.py:160 -#: apps/treasury/templates/treasury/sogecredit_detail.html:23 +#: apps/treasury/templates/treasury/sogecredit_detail.html:22 msgid "transactions" msgstr "Transactions" @@ -1401,41 +1401,41 @@ msgid "No reason specified" msgstr "Pas de motif spécifié" #: apps/note/tables.py:143 apps/note/tables.py:177 apps/treasury/tables.py:39 -#: apps/treasury/templates/treasury/invoice_confirm_delete.html:28 -#: apps/treasury/templates/treasury/sogecredit_detail.html:60 +#: apps/treasury/templates/treasury/invoice_confirm_delete.html:30 +#: apps/treasury/templates/treasury/sogecredit_detail.html:59 #: apps/wei/tables.py:76 apps/wei/tables.py:103 -#: apps/wei/templates/wei/weiregistration_confirm_delete.html:28 +#: apps/wei/templates/wei/weiregistration_confirm_delete.html:31 msgid "Delete" msgstr "Supprimer" #: apps/note/tables.py:171 apps/note/templates/note/conso_form.html:132 #: apps/wei/tables.py:47 apps/wei/tables.py:48 -#: apps/wei/templates/wei/base.html:90 -#: apps/wei/templates/wei/bus_detail.html:17 -#: apps/wei/templates/wei/busteam_detail.html:17 -#: apps/wei/templates/wei/busteam_detail.html:37 +#: apps/wei/templates/wei/base.html:89 +#: apps/wei/templates/wei/bus_detail.html:20 +#: apps/wei/templates/wei/busteam_detail.html:20 +#: apps/wei/templates/wei/busteam_detail.html:40 msgid "Edit" msgstr "Éditer" -#: apps/note/templates/note/conso_form.html:33 +#: apps/note/templates/note/conso_form.html:32 msgid "Consum" msgstr "Consommer" -#: apps/note/templates/note/conso_form.html:44 -#: apps/note/templates/note/transaction_form.html:64 -#: apps/note/templates/note/transaction_form.html:91 +#: apps/note/templates/note/conso_form.html:43 +#: apps/note/templates/note/transaction_form.html:65 +#: apps/note/templates/note/transaction_form.html:92 msgid "Name or alias..." msgstr "Pseudo ou alias ..." -#: apps/note/templates/note/conso_form.html:53 +#: apps/note/templates/note/conso_form.html:52 msgid "Select consumptions" msgstr "Sélection des consommations" -#: apps/note/templates/note/conso_form.html:62 +#: apps/note/templates/note/conso_form.html:61 msgid "Consume!" msgstr "Consommer !" -#: apps/note/templates/note/conso_form.html:76 +#: apps/note/templates/note/conso_form.html:73 msgid "Highlighted buttons" msgstr "Boutons mis en avant" @@ -1448,7 +1448,7 @@ msgid "Double consumptions" msgstr "Consommations doubles" #: apps/note/templates/note/conso_form.html:154 -#: apps/note/templates/note/transaction_form.html:158 +#: apps/note/templates/note/transaction_form.html:159 msgid "Recent transactions history" msgstr "Historique des transactions récentes" @@ -1462,45 +1462,45 @@ msgstr "Historique des transactions récentes" msgid "Mail generated by the Note Kfet on the" msgstr "Mail généré par la Note Kfet le" -#: apps/note/templates/note/transaction_form.html:53 -#: apps/note/templates/note/transaction_form.html:173 +#: apps/note/templates/note/transaction_form.html:54 +#: apps/note/templates/note/transaction_form.html:174 msgid "Select emitters" msgstr "Sélection des émetteurs" -#: apps/note/templates/note/transaction_form.html:68 +#: apps/note/templates/note/transaction_form.html:69 msgid "I am the emitter" msgstr "Je suis l'émetteur" -#: apps/note/templates/note/transaction_form.html:80 -#: apps/note/templates/note/transaction_form.html:175 +#: apps/note/templates/note/transaction_form.html:81 +#: apps/note/templates/note/transaction_form.html:176 msgid "Select receivers" msgstr "Sélection des destinataires" -#: apps/note/templates/note/transaction_form.html:103 +#: apps/note/templates/note/transaction_form.html:104 msgid "Action" msgstr "Action" -#: apps/note/templates/note/transaction_form.html:111 +#: apps/note/templates/note/transaction_form.html:112 #: apps/treasury/forms.py:141 apps/treasury/tables.py:67 #: apps/treasury/tables.py:135 #: apps/treasury/templates/treasury/remittance_form.html:23 msgid "Amount" msgstr "Montant" -#: apps/note/templates/note/transaction_form.html:127 +#: apps/note/templates/note/transaction_form.html:128 #: apps/treasury/models.py:51 msgid "Name" msgstr "Nom" -#: apps/note/templates/note/transaction_form.html:172 +#: apps/note/templates/note/transaction_form.html:173 msgid "Select emitter" msgstr "Sélection de l'émetteur" -#: apps/note/templates/note/transaction_form.html:174 +#: apps/note/templates/note/transaction_form.html:175 msgid "Select receiver" msgstr "Sélection du destinataire" -#: apps/note/templates/note/transaction_form.html:176 +#: apps/note/templates/note/transaction_form.html:177 msgid "Transfer type" msgstr "Type de transfert" @@ -1520,23 +1520,23 @@ msgstr "Obsolète depuis" msgid "Current price" msgstr "Prix actuel" -#: apps/note/templates/note/transactiontemplate_list.html:9 +#: apps/note/templates/note/transactiontemplate_list.html:13 msgid "Name of the button..." msgstr "Nom du bouton ..." -#: apps/note/templates/note/transactiontemplate_list.html:11 +#: apps/note/templates/note/transactiontemplate_list.html:15 msgid "New button" msgstr "Nouveau bouton" -#: apps/note/templates/note/transactiontemplate_list.html:18 +#: apps/note/templates/note/transactiontemplate_list.html:22 msgid "buttons listing " msgstr "Liste des boutons" -#: apps/note/templates/note/transactiontemplate_list.html:69 +#: apps/note/templates/note/transactiontemplate_list.html:73 msgid "button successfully deleted " msgstr "Le bouton a bien été supprimé" -#: apps/note/templates/note/transactiontemplate_list.html:73 +#: apps/note/templates/note/transactiontemplate_list.html:77 msgid "Unable to delete button " msgstr "Impossible de supprimer le bouton " @@ -1623,7 +1623,7 @@ msgstr "" "l'utilisateur est expirée." #: apps/permission/models.py:183 -#: apps/permission/templates/permission/all_rights.html:90 +#: apps/permission/templates/permission/all_rights.html:89 msgid "permanent" msgstr "permanent" @@ -1676,44 +1676,44 @@ msgstr "" "Vous n'avez pas la permission de supprimer cette instance du modèle " "{app_label}.{model_name}." -#: apps/permission/templates/permission/all_rights.html:13 +#: apps/permission/templates/permission/all_rights.html:12 msgid "Users that have surnormal rights" msgstr "Liste des utilisateurs ayant des droits surnormaux" -#: apps/permission/templates/permission/all_rights.html:17 +#: apps/permission/templates/permission/all_rights.html:16 msgid "Superusers have all rights on everything, to manage the website." msgstr "" "Les super-utilisateurs ont tous les droits sur tout, afin de gérer le site." -#: apps/permission/templates/permission/all_rights.html:22 +#: apps/permission/templates/permission/all_rights.html:21 msgid "Superusers" msgstr "Super-utilisateurs" -#: apps/permission/templates/permission/all_rights.html:46 +#: apps/permission/templates/permission/all_rights.html:45 msgid "Roles description" msgstr "Description de tous les rôles" -#: apps/permission/templates/permission/all_rights.html:53 +#: apps/permission/templates/permission/all_rights.html:52 msgid "Filter with roles that I have in at least one club" msgstr "Filtrer les rôles que je possède dans au moins un club" -#: apps/permission/templates/permission/all_rights.html:70 +#: apps/permission/templates/permission/all_rights.html:69 msgid "Owned" msgstr "Possédé" -#: apps/permission/templates/permission/all_rights.html:81 +#: apps/permission/templates/permission/all_rights.html:80 msgid "Own this role in the clubs" msgstr "Possède ce rôle dans les clubs" -#: apps/permission/templates/permission/all_rights.html:87 +#: apps/permission/templates/permission/all_rights.html:86 msgid "Mask:" msgstr "Masque :" -#: apps/permission/templates/permission/all_rights.html:87 +#: apps/permission/templates/permission/all_rights.html:86 msgid "Query:" msgstr "Requête :" -#: apps/permission/templates/permission/all_rights.html:93 +#: apps/permission/templates/permission/all_rights.html:92 msgid "No associated permission" msgstr "Pas de permission associée" @@ -1772,23 +1772,23 @@ msgstr "Adhérer au club BDE" msgid "Join Kfet Club" msgstr "Adhérer au club Kfet" -#: apps/registration/templates/registration/email_validation_complete.html:6 +#: apps/registration/templates/registration/email_validation_complete.html:9 msgid "Your email have successfully been validated." msgstr "Votre adresse e-mail a bien été validée." -#: apps/registration/templates/registration/email_validation_complete.html:8 +#: apps/registration/templates/registration/email_validation_complete.html:11 #, python-format msgid "You can now <a href=\"%(login_url)s\">log in</a>." msgstr "Vous pouvez désormais <a href=\"%(login_url)s\">vous connecter</a>." -#: apps/registration/templates/registration/email_validation_complete.html:10 +#: apps/registration/templates/registration/email_validation_complete.html:13 msgid "" "You must pay now your membership in the Kfet to complete your registration." msgstr "" "Vous devez désormais payer votre adhésion à la Kfet pour compléter votre " "inscription." -#: apps/registration/templates/registration/email_validation_complete.html:13 +#: apps/registration/templates/registration/email_validation_complete.html:16 msgid "" "The link was invalid. The token may have expired. Please send us an email to " "activate your account." @@ -1796,18 +1796,18 @@ msgstr "" "Le lien est invalide. Le jeton a sans doute expiré. Merci de nous contacter " "pour activer votre compte." -#: apps/registration/templates/registration/email_validation_email_sent.html:5 +#: apps/registration/templates/registration/email_validation_email_sent.html:8 msgid "Account activation" msgstr "Activation du compte" -#: apps/registration/templates/registration/email_validation_email_sent.html:8 +#: apps/registration/templates/registration/email_validation_email_sent.html:11 msgid "" "An email has been sent. Please click on the link to activate your account." msgstr "" "Un email vient de vous être envoyé. Merci de cliquer sur le lien de " "validation pour activer votre compte." -#: apps/registration/templates/registration/email_validation_email_sent.html:12 +#: apps/registration/templates/registration/email_validation_email_sent.html:15 msgid "" "You must also go to the Kfet to pay your membership. The WEI registration " "includes the BDE membership." @@ -1816,7 +1816,7 @@ msgstr "" "L'inscription au WEI inclut l'adhésion au BDE." #: apps/registration/templates/registration/future_profile_detail.html:49 -#: apps/wei/templates/wei/weiregistration_confirm_delete.html:8 +#: apps/wei/templates/wei/weiregistration_confirm_delete.html:11 msgid "Delete registration" msgstr "Supprimer l'inscription" @@ -1830,7 +1830,7 @@ msgstr "Valider le compte" msgid "Validate registration" msgstr "Valider l'inscription" -#: apps/registration/templates/registration/future_user_list.html:11 +#: apps/registration/templates/registration/future_user_list.html:9 msgid "New user" msgstr "Nouvel utilisateur" @@ -1945,9 +1945,9 @@ msgstr "Vous ne pouvez pas changer le type de la remise." #: apps/treasury/forms.py:129 apps/treasury/models.py:252 #: apps/treasury/tables.py:97 apps/treasury/tables.py:105 -#: apps/treasury/templates/treasury/invoice_list.html:17 -#: apps/treasury/templates/treasury/remittance_list.html:17 -#: apps/treasury/templates/treasury/sogecredit_list.html:17 +#: apps/treasury/templates/treasury/invoice_list.html:16 +#: apps/treasury/templates/treasury/remittance_list.html:16 +#: apps/treasury/templates/treasury/sogecredit_list.html:16 msgid "Remittance" msgstr "Remise" @@ -1996,7 +1996,7 @@ msgid "tex source" msgstr "Fichier TeX source" #: apps/treasury/models.py:89 -#: apps/treasury/templates/treasury/invoice_form.html:23 +#: apps/treasury/templates/treasury/invoice_form.html:22 msgid "This invoice is locked and can no longer be edited." msgstr "Cette facture est verrouillée et ne peut plus être éditée." @@ -2077,7 +2077,7 @@ msgstr "" "note. Merci de lui demander de recharger sa note avant d'invalider ce crédit." #: apps/treasury/models.py:355 -#: apps/treasury/templates/treasury/sogecredit_detail.html:11 +#: apps/treasury/templates/treasury/sogecredit_detail.html:10 msgid "Credit from the Société générale" msgstr "Crédit de la Société générale" @@ -2090,9 +2090,9 @@ msgid "Invoice #{:d}" msgstr "Facture n°{:d}" #: apps/treasury/tables.py:25 -#: apps/treasury/templates/treasury/invoice_list.html:14 -#: apps/treasury/templates/treasury/remittance_list.html:14 -#: apps/treasury/templates/treasury/sogecredit_list.html:14 +#: apps/treasury/templates/treasury/invoice_list.html:13 +#: apps/treasury/templates/treasury/remittance_list.html:13 +#: apps/treasury/templates/treasury/sogecredit_list.html:13 msgid "Invoice" msgstr "Facture" @@ -2108,27 +2108,27 @@ msgstr "Voir" msgid "Yes" msgstr "Oui" -#: apps/treasury/templates/treasury/invoice_confirm_delete.html:8 +#: apps/treasury/templates/treasury/invoice_confirm_delete.html:10 #: apps/treasury/views.py:166 msgid "Delete invoice" msgstr "Supprimer la facture" -#: apps/treasury/templates/treasury/invoice_confirm_delete.html:13 +#: apps/treasury/templates/treasury/invoice_confirm_delete.html:15 msgid "This invoice is locked and can't be deleted." msgstr "Cette facture est verrouillée et ne peut pas être supprimée." -#: apps/treasury/templates/treasury/invoice_confirm_delete.html:19 +#: apps/treasury/templates/treasury/invoice_confirm_delete.html:21 msgid "" "Are you sure you want to delete this invoice? This action can't be undone." msgstr "" "Êtes-vous sûr de vouloir supprimer cette facture ? Cette action ne pourra " "pas être annulée." -#: apps/treasury/templates/treasury/invoice_confirm_delete.html:26 +#: apps/treasury/templates/treasury/invoice_confirm_delete.html:28 msgid "Return to invoices list" msgstr "Retour à la liste des factures" -#: apps/treasury/templates/treasury/invoice_form.html:16 +#: apps/treasury/templates/treasury/invoice_form.html:15 msgid "" "Warning: the LaTeX template is saved with this object. Updating the invoice " "implies regenerate it. Be careful if you manipulate old invoices." @@ -2137,21 +2137,21 @@ msgstr "" "facture implique la regénérer. Faites attention si vous manipulez de " "vieilles factures." -#: apps/treasury/templates/treasury/invoice_form.html:70 +#: apps/treasury/templates/treasury/invoice_form.html:69 msgid "Add product" msgstr "Ajouter produit" -#: apps/treasury/templates/treasury/invoice_form.html:71 +#: apps/treasury/templates/treasury/invoice_form.html:70 msgid "Remove product" msgstr "Retirer produit" -#: apps/treasury/templates/treasury/invoice_list.html:20 -#: apps/treasury/templates/treasury/remittance_list.html:20 -#: apps/treasury/templates/treasury/sogecredit_list.html:20 +#: apps/treasury/templates/treasury/invoice_list.html:19 +#: apps/treasury/templates/treasury/remittance_list.html:19 +#: apps/treasury/templates/treasury/sogecredit_list.html:19 msgid "Société générale credits" msgstr "Crédits de la Société générale" -#: apps/treasury/templates/treasury/invoice_list.html:32 +#: apps/treasury/templates/treasury/invoice_list.html:31 msgid "New invoice" msgstr "Nouvelle facture" @@ -2171,47 +2171,47 @@ msgstr "Transactions liées" msgid "There is no transaction linked with this remittance." msgstr "Il n'y a pas de transaction liée à cette remise." -#: apps/treasury/templates/treasury/remittance_list.html:28 +#: apps/treasury/templates/treasury/remittance_list.html:27 msgid "Opened remittances" msgstr "Remises ouvertes" -#: apps/treasury/templates/treasury/remittance_list.html:35 +#: apps/treasury/templates/treasury/remittance_list.html:34 msgid "There is no opened remittance." msgstr "Il n'y a pas de remise ouverte." -#: apps/treasury/templates/treasury/remittance_list.html:40 +#: apps/treasury/templates/treasury/remittance_list.html:39 msgid "New remittance" msgstr "Nouvelle remise" -#: apps/treasury/templates/treasury/remittance_list.html:46 +#: apps/treasury/templates/treasury/remittance_list.html:45 msgid "Transfers without remittances" msgstr "Transactions sans remise associée" -#: apps/treasury/templates/treasury/remittance_list.html:53 +#: apps/treasury/templates/treasury/remittance_list.html:52 msgid "There is no transaction without any linked remittance." msgstr "Il n'y a pas de transactions sans remise associée." -#: apps/treasury/templates/treasury/remittance_list.html:61 +#: apps/treasury/templates/treasury/remittance_list.html:60 msgid "Transfers with opened remittances" msgstr "Transactions associées à une remise ouverte" -#: apps/treasury/templates/treasury/remittance_list.html:68 +#: apps/treasury/templates/treasury/remittance_list.html:67 msgid "There is no transaction with an opened linked remittance." msgstr "Il n'y a pas de transaction associée à une remise ouverte." -#: apps/treasury/templates/treasury/remittance_list.html:76 +#: apps/treasury/templates/treasury/remittance_list.html:75 msgid "Closed remittances" msgstr "Remises fermées" -#: apps/treasury/templates/treasury/remittance_list.html:83 +#: apps/treasury/templates/treasury/remittance_list.html:82 msgid "There is no closed remittance yet." msgstr "Il n'y a pas encore de remise fermée." -#: apps/treasury/templates/treasury/sogecredit_detail.html:30 +#: apps/treasury/templates/treasury/sogecredit_detail.html:29 msgid "total amount" msgstr "montant total" -#: apps/treasury/templates/treasury/sogecredit_detail.html:36 +#: apps/treasury/templates/treasury/sogecredit_detail.html:35 msgid "" "Warning: Validating this credit implies that all membership transactions " "will be validated." @@ -2219,7 +2219,7 @@ msgstr "" "Attention : Valider ce crédit implique que les transactions d'adhésion " "seront validées." -#: apps/treasury/templates/treasury/sogecredit_detail.html:37 +#: apps/treasury/templates/treasury/sogecredit_detail.html:36 msgid "" "If you delete this credit, there all membership transactions will be also " "validated, but no credit will be operated." @@ -2228,7 +2228,7 @@ msgstr "" "d'adhésion seront aussi validées, mais il n'y aura pas de transaction de " "crédit créée." -#: apps/treasury/templates/treasury/sogecredit_detail.html:38 +#: apps/treasury/templates/treasury/sogecredit_detail.html:37 msgid "" "If this credit is validated, then the user won't be able to ask for a credit " "from the Société générale." @@ -2236,15 +2236,15 @@ msgstr "" "Si ce crédit est validé, alors l'utilisateur ne pourra plus demander d'être " "crédité par la Société générale à l'avenir." -#: apps/treasury/templates/treasury/sogecredit_detail.html:39 +#: apps/treasury/templates/treasury/sogecredit_detail.html:38 msgid "If you think there is an error, please contact the \"respos info\"." msgstr "Si vous pensez qu'il y a une erreur, merci de contacter un respo info." -#: apps/treasury/templates/treasury/sogecredit_detail.html:45 +#: apps/treasury/templates/treasury/sogecredit_detail.html:44 msgid "This credit is already validated." msgstr "Ce crédit a déjà été validé." -#: apps/treasury/templates/treasury/sogecredit_detail.html:50 +#: apps/treasury/templates/treasury/sogecredit_detail.html:49 msgid "" "Warning: if you don't validate this credit, the note of the user doesn't " "have enough money to pay its memberships." @@ -2252,26 +2252,26 @@ msgstr "" "Attention : si vous ne validez pas ce crédit, la note de l'utilisateur n'a " "pas assez d'argent pour payer les adhésions." -#: apps/treasury/templates/treasury/sogecredit_detail.html:51 +#: apps/treasury/templates/treasury/sogecredit_detail.html:50 msgid "Please ask the user to credit its note before deleting this credit." msgstr "" "Merci de demander à l'utilisateur de recharger sa note avant de supprimer la " "demande de crédit." -#: apps/treasury/templates/treasury/sogecredit_detail.html:58 +#: apps/treasury/templates/treasury/sogecredit_detail.html:57 #: apps/wei/tables.py:59 apps/wei/tables.py:60 apps/wei/tables.py:99 msgid "Validate" msgstr "Valider" -#: apps/treasury/templates/treasury/sogecredit_detail.html:66 +#: apps/treasury/templates/treasury/sogecredit_detail.html:65 msgid "Return to credit list" msgstr "Retour à la liste des crédits" -#: apps/treasury/templates/treasury/sogecredit_list.html:35 +#: apps/treasury/templates/treasury/sogecredit_list.html:34 msgid "Filter with unvalidated credits only" msgstr "Filtrer avec uniquement les crédits non valides" -#: apps/treasury/templates/treasury/sogecredit_list.html:45 +#: apps/treasury/templates/treasury/sogecredit_list.html:44 msgid "There is no matched user that have asked for a Société générale credit." msgstr "" "Il n'y a pas d'utilisateur trouvé ayant demandé un crédit de la Société " @@ -2367,15 +2367,15 @@ msgstr "Cette équipe n'appartient pas à ce bus." msgid "Choose a word:" msgstr "Choisissez un mot :" -#: apps/wei/models.py:24 apps/wei/templates/wei/base.html:37 +#: apps/wei/models.py:24 apps/wei/templates/wei/base.html:36 msgid "year" msgstr "année" -#: apps/wei/models.py:28 apps/wei/templates/wei/base.html:31 +#: apps/wei/models.py:28 apps/wei/templates/wei/base.html:30 msgid "date start" msgstr "début" -#: apps/wei/models.py:32 apps/wei/templates/wei/base.html:34 +#: apps/wei/models.py:32 apps/wei/templates/wei/base.html:33 msgid "date end" msgstr "fin" @@ -2513,8 +2513,8 @@ msgstr "adhésions au WEI" msgid "Year" msgstr "Année" -#: apps/wei/tables.py:165 apps/wei/templates/wei/bus_detail.html:29 -#: apps/wei/templates/wei/busteam_detail.html:47 +#: apps/wei/tables.py:165 apps/wei/templates/wei/bus_detail.html:32 +#: apps/wei/templates/wei/busteam_detail.html:50 msgid "Teams" msgstr "Équipes" @@ -2526,73 +2526,73 @@ msgstr "Nombre de membres" msgid "members" msgstr "adhérents" -#: apps/wei/templates/wei/base.html:45 +#: apps/wei/templates/wei/base.html:44 msgid "WEI fee (paid students)" msgstr "Prix du WEI (élèves)" -#: apps/wei/templates/wei/base.html:48 apps/wei/templates/wei/base.html:55 +#: apps/wei/templates/wei/base.html:47 apps/wei/templates/wei/base.html:54 msgid "The BDE membership is included in the WEI registration." msgstr "L'adhésion au BDE est offerte avec l'inscription au WEI." -#: apps/wei/templates/wei/base.html:52 +#: apps/wei/templates/wei/base.html:51 msgid "WEI fee (unpaid students)" msgstr "Prix du WEI (étudiants)" -#: apps/wei/templates/wei/base.html:77 +#: apps/wei/templates/wei/base.html:76 msgid "WEI list" msgstr "Liste des WEI" -#: apps/wei/templates/wei/base.html:82 apps/wei/views.py:506 +#: apps/wei/templates/wei/base.html:81 apps/wei/views.py:506 msgid "Register 1A" msgstr "Inscrire un 1A" -#: apps/wei/templates/wei/base.html:86 apps/wei/views.py:573 +#: apps/wei/templates/wei/base.html:85 apps/wei/views.py:573 msgid "Register 2A+" msgstr "Inscrire un 2A+" -#: apps/wei/templates/wei/base.html:94 +#: apps/wei/templates/wei/base.html:93 msgid "Add bus" msgstr "Ajouter un bus" -#: apps/wei/templates/wei/base.html:98 +#: apps/wei/templates/wei/base.html:97 msgid "View WEI" msgstr "Voir le WEI" -#: apps/wei/templates/wei/bus_detail.html:19 -#: apps/wei/templates/wei/busteam_detail.html:19 +#: apps/wei/templates/wei/bus_detail.html:22 +#: apps/wei/templates/wei/busteam_detail.html:22 msgid "Add team" msgstr "Ajouter une équipe" -#: apps/wei/templates/wei/bus_detail.html:42 +#: apps/wei/templates/wei/bus_detail.html:45 msgid "Members" msgstr "Membres" -#: apps/wei/templates/wei/bus_detail.html:51 -#: apps/wei/templates/wei/busteam_detail.html:57 -#: apps/wei/templates/wei/weimembership_list.html:26 +#: apps/wei/templates/wei/bus_detail.html:54 +#: apps/wei/templates/wei/busteam_detail.html:60 +#: apps/wei/templates/wei/weimembership_list.html:29 msgid "View as PDF" msgstr "Télécharger au format PDF" -#: apps/wei/templates/wei/survey.html:8 -#: apps/wei/templates/wei/survey_closed.html:8 -#: apps/wei/templates/wei/survey_end.html:8 apps/wei/views.py:978 +#: apps/wei/templates/wei/survey.html:11 +#: apps/wei/templates/wei/survey_closed.html:11 +#: apps/wei/templates/wei/survey_end.html:11 apps/wei/views.py:978 #: apps/wei/views.py:1032 apps/wei/views.py:1042 msgid "Survey WEI" msgstr "Questionnaire WEI" -#: apps/wei/templates/wei/survey.html:20 +#: apps/wei/templates/wei/survey.html:23 msgid "Next" msgstr "Suivant" -#: apps/wei/templates/wei/survey_closed.html:12 +#: apps/wei/templates/wei/survey_closed.html:15 msgid "The inscription for this WEI are now closed." msgstr "Les inscriptions pour le WEI sont fermées." -#: apps/wei/templates/wei/survey_closed.html:16 +#: apps/wei/templates/wei/survey_closed.html:19 msgid "Return to WEI detail" msgstr "Retour aux détails du WEI" -#: apps/wei/templates/wei/survey_end.html:12 +#: apps/wei/templates/wei/survey_end.html:15 msgid "The survey is now ended. Your answers have been saved." msgstr "" "Le sondage est désormais terminé, vos réponses ont bien été enregistrées." @@ -2617,11 +2617,11 @@ msgstr "Membres du WEI" msgid "Unvalidated registrations" msgstr "Inscriptions non validées" -#: apps/wei/templates/wei/weiclub_list.html:10 apps/wei/views.py:76 +#: apps/wei/templates/wei/weiclub_list.html:14 apps/wei/views.py:76 msgid "Create WEI" msgstr "Créer un WEI" -#: apps/wei/templates/wei/weiclub_list.html:18 +#: apps/wei/templates/wei/weiclub_list.html:22 msgid "WEI listing" msgstr "Liste des WEI" @@ -2666,7 +2666,7 @@ msgid "preferred roles" msgstr "rôles préférés" #: apps/wei/templates/wei/weimembership_form.html:115 -#: apps/wei/templates/wei/weiregistration_confirm_delete.html:27 +#: apps/wei/templates/wei/weiregistration_confirm_delete.html:30 msgid "Update registration" msgstr "Modifier l'inscription" @@ -2734,15 +2734,15 @@ msgstr "" "L'adhésion va être faite automatiquement, l'inscription au WEI inclut le " "coût d'adhésion." -#: apps/wei/templates/wei/weimembership_list.html:20 +#: apps/wei/templates/wei/weimembership_list.html:23 msgid "View unvalidated registrations..." msgstr "Voir les inscriptions non validées ..." -#: apps/wei/templates/wei/weiregistration_confirm_delete.html:13 +#: apps/wei/templates/wei/weiregistration_confirm_delete.html:16 msgid "This registration is already validated and can't be deleted." msgstr "L'inscription a déjà été validée et ne peut pas être supprimée." -#: apps/wei/templates/wei/weiregistration_confirm_delete.html:20 +#: apps/wei/templates/wei/weiregistration_confirm_delete.html:23 #, python-format msgid "" "Are you sure you want to delete the registration of %(user)s for the WEI " @@ -2751,11 +2751,11 @@ msgstr "" "Êtes-vous sûr de vouloir supprimer l'inscription de %(user)s pour le WEI " "%(wei_name)s ? Cette action ne pourra pas être annulée." -#: apps/wei/templates/wei/weiregistration_list.html:14 +#: apps/wei/templates/wei/weiregistration_list.html:17 msgid "There is no pre-registration found with this pattern." msgstr "Il n'y a pas de pré-inscription en attente avec cette entrée." -#: apps/wei/templates/wei/weiregistration_list.html:20 +#: apps/wei/templates/wei/weiregistration_list.html:23 msgid "View validated memberships..." msgstr "Voir les adhésions validées ..." @@ -2867,11 +2867,11 @@ msgstr "Anglais" msgid "French" msgstr "Français" -#: note_kfet/templates/400.html:11 +#: note_kfet/templates/400.html:10 msgid "Bad request" msgstr "Requête invalide" -#: note_kfet/templates/400.html:15 +#: note_kfet/templates/400.html:14 msgid "" "Sorry, your request was bad. Don't know what could be wrong. An email has " "been sent to webmasters with the details of the error. You can now drink a " @@ -2881,23 +2881,23 @@ msgstr "" "Un e-mail a été envoyé aux responsables de la plateforme avec les détails de " "cette erreur. Vous pouvez désormais allez boire un coca." -#: note_kfet/templates/403.html:11 +#: note_kfet/templates/403.html:10 msgid "Permission denied" msgstr "Accès refusé" -#: note_kfet/templates/403.html:14 +#: note_kfet/templates/403.html:13 msgid "You don't have the right to perform this request." msgstr "Vous n'avez pas la permission d'exécuter cette requête." -#: note_kfet/templates/403.html:16 note_kfet/templates/404.html:20 +#: note_kfet/templates/403.html:15 note_kfet/templates/404.html:19 msgid "Exception message:" msgstr "Message d'erreur :" -#: note_kfet/templates/404.html:11 +#: note_kfet/templates/404.html:10 msgid "Page not found" msgstr "Page inexistante" -#: note_kfet/templates/404.html:15 +#: note_kfet/templates/404.html:14 #, python-format msgid "" "The requested path <code>%(request_path)s</code> was not found on the server." @@ -2905,11 +2905,11 @@ msgstr "" "Le chemin demandé <code>%(request_path)s</code> n'a pas été trouvé sur le " "serveur." -#: note_kfet/templates/500.html:11 +#: note_kfet/templates/500.html:10 msgid "Server error" msgstr "Erreur du serveur" -#: note_kfet/templates/500.html:15 +#: note_kfet/templates/500.html:14 msgid "" "Sorry, an error occurred when processing your request. An email has been " "sent to webmasters with the detail of the error, and this will be fixed " @@ -2920,7 +2920,7 @@ msgstr "" "erreur, qui sera corrigée rapidement. Vous pouvez désormais aller boire une " "bière." -#: note_kfet/templates/autocomplete_model.html:11 +#: note_kfet/templates/autocomplete_model.html:14 msgid "Reset" msgstr "Réinitialiser" @@ -2948,11 +2948,11 @@ 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_search.html:16 +#: note_kfet/templates/base_search.html:15 msgid "Search by attribute such as name…" msgstr "Chercher par un attribut tel que le nom …" -#: note_kfet/templates/base_search.html:24 +#: note_kfet/templates/base_search.html:23 msgid "There is no results." msgstr "Il n'y a pas de résultat." @@ -2971,22 +2971,22 @@ msgstr "" "la version %(VERSION)s et la dernière version est %(LAST_VERSION)s. Merci de " "vous mettre à jour." -#: note_kfet/templates/registration/logged_out.html:14 +#: note_kfet/templates/registration/logged_out.html:13 msgid "Thanks for spending some quality time with the Web site today." msgstr "Merci d'avoir utilisé la Note Kfet." -#: note_kfet/templates/registration/logged_out.html:15 +#: note_kfet/templates/registration/logged_out.html:14 msgid "Log in again" msgstr "Se connecter à nouveau" #: note_kfet/templates/registration/login.html:6 -#: note_kfet/templates/registration/login.html:16 -#: note_kfet/templates/registration/login.html:39 -#: note_kfet/templates/registration/password_reset_complete.html:16 +#: note_kfet/templates/registration/login.html:15 +#: note_kfet/templates/registration/login.html:38 +#: note_kfet/templates/registration/password_reset_complete.html:15 msgid "Log in" msgstr "Se connecter" -#: note_kfet/templates/registration/login.html:21 +#: note_kfet/templates/registration/login.html:20 #, python-format msgid "" "You are authenticated as %(username)s, but are not authorized to access this " @@ -2997,7 +2997,7 @@ msgstr "" "d'accéder à cette page. Voulez-vous essayer avec un autre compte, ou avec un " "masque de permissions plus fort ?" -#: note_kfet/templates/registration/login.html:31 +#: note_kfet/templates/registration/login.html:30 msgid "" "You must be logged with a staff account with the higher mask to access " "Django Admin." @@ -3005,32 +3005,32 @@ msgstr "" "Vous devez être connecté avec un compte staff avec le masque le plus haut " "pour accéder à Django Admin." -#: note_kfet/templates/registration/login.html:41 +#: note_kfet/templates/registration/login.html:40 msgid "Forgotten your password or username?" msgstr "Mot de passe ou pseudo oublié ?" -#: note_kfet/templates/registration/password_change_done.html:14 +#: note_kfet/templates/registration/password_change_done.html:13 msgid "Your password was changed." msgstr "Votre mot de passe a bien été changé." -#: note_kfet/templates/registration/password_change_form.html:15 +#: note_kfet/templates/registration/password_change_form.html:14 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." msgstr "" -#: note_kfet/templates/registration/password_change_form.html:17 -#: note_kfet/templates/registration/password_reset_confirm.html:18 +#: note_kfet/templates/registration/password_change_form.html:16 +#: note_kfet/templates/registration/password_reset_confirm.html:17 msgid "Change my password" msgstr "Changer mon mot de passe" -#: note_kfet/templates/registration/password_reset_complete.html:14 +#: note_kfet/templates/registration/password_reset_complete.html:13 msgid "Your password has been set. You may go ahead and log in now." msgstr "" "Votre mot de passe a été enregistré. Vous pouvez vous connecter dès à " "présent." -#: note_kfet/templates/registration/password_reset_confirm.html:15 +#: note_kfet/templates/registration/password_reset_confirm.html:14 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -3038,7 +3038,7 @@ msgstr "" "Entrer votre nouveau mot de passe, et le confirmer en le renseignant une " "seconde fois." -#: note_kfet/templates/registration/password_reset_confirm.html:22 +#: note_kfet/templates/registration/password_reset_confirm.html:21 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -3046,7 +3046,7 @@ msgstr "" "Le lien de reinitialisation du mot de passe est invalide, il a peut-être été " "déjà utilisé. Faites une nouvelle demande." -#: note_kfet/templates/registration/password_reset_done.html:14 +#: note_kfet/templates/registration/password_reset_done.html:13 msgid "" "We've emailed you instructions for setting your password, if an account " "exists with the email you entered. You should receive them shortly." @@ -3054,7 +3054,7 @@ msgstr "" "Nous vous avons envoyé par mail les instructions pour changer votre mot de " "passe." -#: note_kfet/templates/registration/password_reset_done.html:15 +#: note_kfet/templates/registration/password_reset_done.html:14 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." @@ -3062,7 +3062,7 @@ msgstr "" "Si vous ne recevez pas d'email, vérifiez que vous avez bien utilisé " "l'adresse associé à votre compte, et regarder également le dossier spam." -#: note_kfet/templates/registration/password_reset_form.html:14 +#: note_kfet/templates/registration/password_reset_form.html:13 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -3070,17 +3070,17 @@ msgstr "" "Mot de passe oublié ? Entrez votre adresse mail ci-dessous, et vous recevrez " "les instructions pour choisir un nouveau mot de passe." -#: note_kfet/templates/registration/password_reset_form.html:19 +#: note_kfet/templates/registration/password_reset_form.html:18 msgid "Reset my password" msgstr "Réinitialiser mon mot de passe" #: note_kfet/templates/registration/signup.html:6 -#: note_kfet/templates/registration/signup.html:12 -#: note_kfet/templates/registration/signup.html:28 +#: note_kfet/templates/registration/signup.html:11 +#: note_kfet/templates/registration/signup.html:27 msgid "Sign up" msgstr "Inscription" -#: note_kfet/templates/registration/signup.html:16 +#: note_kfet/templates/registration/signup.html:15 msgid "" "If you already signed up, your registration is taken into account. The BDE " "must validate your account before your can log in. You have to go to the " diff --git a/note_kfet/templates/400.html b/note_kfet/templates/400.html index 8b96e81753c633a4877e028dd752bf9c1c23e335..89d7ba85b931b308bc6408fcfc229efda05789a8 100644 --- a/note_kfet/templates/400.html +++ b/note_kfet/templates/400.html @@ -3,7 +3,6 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} {% load i18n %} -{% block contenttitle %}{% endblock %} {% block content %} <div class="card text-white bg-secondary"> diff --git a/note_kfet/templates/403.html b/note_kfet/templates/403.html index 1019904315d6bfd55a49cf3477a4e82da49ff8c2..5256e32d6c2f3d141e207e344ecfc0427cdd7cf8 100644 --- a/note_kfet/templates/403.html +++ b/note_kfet/templates/403.html @@ -3,7 +3,6 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} {% load i18n %} -{% block contenttitle %}{% endblock %} {% block content %} <div class="card text-white bg-secondary"> diff --git a/note_kfet/templates/404.html b/note_kfet/templates/404.html index 435bb7ecfbe41dbfc65151ac2dae1e4baf0e57a3..03b816584d7cc80986b34d21d04e9f5cb9b22618 100644 --- a/note_kfet/templates/404.html +++ b/note_kfet/templates/404.html @@ -3,7 +3,6 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} {% load i18n %} -{% block contenttitle %}{% endblock %} {% block content %} <div class="card text-white bg-secondary"> diff --git a/note_kfet/templates/500.html b/note_kfet/templates/500.html index ba4b587597142e12647d7ca8658066b0fbee304a..fb7d1c69435c8af0b00fc788266db91286da4458 100644 --- a/note_kfet/templates/500.html +++ b/note_kfet/templates/500.html @@ -3,7 +3,6 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} {% load i18n %} -{% block contenttitle %}{% endblock %} {% block content %} <div class="card text-white bg-secondary"> diff --git a/note_kfet/templates/autocomplete_model.html b/note_kfet/templates/autocomplete_model.html index 0aeca361b177a7a3b2e5dc9ef2955ca13306027e..0e5d17cdaf402e82e1b4385c64d2a6cc19f96697 100644 --- a/note_kfet/templates/autocomplete_model.html +++ b/note_kfet/templates/autocomplete_model.html @@ -1,4 +1,7 @@ {% load i18n %} +{% comment %} +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} <input type="hidden" name="{{ widget.name }}" {% if widget.attrs.model_pk %}value="{{ widget.attrs.model_pk }}"{% endif %} id="{{ widget.attrs.id }}_pk"> <input type="text" diff --git a/note_kfet/templates/base.html b/note_kfet/templates/base.html index a784f8e6303effa4c455a068dbfa1278f8819914..df38eac9f9f847eddcea3d66eeea9168c092c9d4 100644 --- a/note_kfet/templates/base.html +++ b/note_kfet/templates/base.html @@ -163,7 +163,6 @@ SPDX-License-Identifier: GPL-3.0-or-later {% trans "Your e-mail address is not validated. Please check your mail inbox and click on the validation link." %} </div> {% endif %} - {% block contenttitle %}<h1 class="text-white">{{ title }}</h1>{% endblock %} <div class="alert alert-warning alert-dismissible"> <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button> Attention : la Note Kfet 2020 est en phase de beta. Des fonctionnalités pourront être rajoutées d'ici à la version diff --git a/note_kfet/templates/base_search.html b/note_kfet/templates/base_search.html index b9016005d47910c8a24f9536c961fce531a786b8..f526c0e16ff85baba7fa80ae5858d591ba494d59 100644 --- a/note_kfet/templates/base_search.html +++ b/note_kfet/templates/base_search.html @@ -4,7 +4,6 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} {% load render_table from django_tables2 %} {% load i18n perms %} -{% block contenttitle %}{% endblock %} {% block content %} <div class="card bg-light"> diff --git a/note_kfet/templates/registration/logged_out.html b/note_kfet/templates/registration/logged_out.html index 80dfc93eacd690007e337ac3bfe4df12085f72fa..b81c143ad42d549326f670e93ffe711dd175e5f4 100644 --- a/note_kfet/templates/registration/logged_out.html +++ b/note_kfet/templates/registration/logged_out.html @@ -3,7 +3,6 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} {% load i18n %} -{% block contenttitle %}{% endblock %} {% block content %} <div class="card bg-light"> diff --git a/note_kfet/templates/registration/login.html b/note_kfet/templates/registration/login.html index 87ccbd3ca23945440d2882a585c441bc4dba3c41..b30c9fb6c4ed416bb28b71d54ead66c62000af7c 100644 --- a/note_kfet/templates/registration/login.html +++ b/note_kfet/templates/registration/login.html @@ -4,7 +4,6 @@ SPDX-License-Identifier: GPL-2.0-or-later {% endcomment %} {% load i18n crispy_forms_tags static %} {% block title %}{% trans "Log in" %}{% endblock %} -{% block contenttitle %}{% endblock %} {% block extracss %} <link rel="stylesheet" href="{% static "registration/css/login.css" %}"> diff --git a/note_kfet/templates/registration/password_change_done.html b/note_kfet/templates/registration/password_change_done.html index 6e949134e3b346d8d6768baacc0e5368aefc7c59..bcc1a0fdc941d8c81a4d6c0f9adddbe282e6227e 100644 --- a/note_kfet/templates/registration/password_change_done.html +++ b/note_kfet/templates/registration/password_change_done.html @@ -3,7 +3,6 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} {% load i18n %} -{% block contenttitle %}{% endblock %} {% block content %} <div class="card bg-light"> diff --git a/note_kfet/templates/registration/password_change_form.html b/note_kfet/templates/registration/password_change_form.html index f594cbe119c719414d214ea0ebb99db6251f9526..45f7729f2443a4b9f32b32b41c92ce724431abcb 100644 --- a/note_kfet/templates/registration/password_change_form.html +++ b/note_kfet/templates/registration/password_change_form.html @@ -3,7 +3,6 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} {% load i18n crispy_forms_tags %} -{% block contenttitle %}{% endblock %} {% block content %} <div class="card bg-light"> diff --git a/note_kfet/templates/registration/password_reset_complete.html b/note_kfet/templates/registration/password_reset_complete.html index 46e823f7b417fe8ff3e83ad65bdc2c125447447b..7e8dd743559e3c3ef22e074d1bdd5f80a24354fa 100644 --- a/note_kfet/templates/registration/password_reset_complete.html +++ b/note_kfet/templates/registration/password_reset_complete.html @@ -3,7 +3,6 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} {% load i18n %} -{% block contenttitle %}{% endblock %} {% block content %} <div class="card bg-light"> diff --git a/note_kfet/templates/registration/password_reset_confirm.html b/note_kfet/templates/registration/password_reset_confirm.html index c55d56b55f6152ec4586f1b6a064169155e7953d..e52762c95a36fc468018b83b7117c5c3374e36e0 100644 --- a/note_kfet/templates/registration/password_reset_confirm.html +++ b/note_kfet/templates/registration/password_reset_confirm.html @@ -3,7 +3,6 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} {% load i18n crispy_forms_tags %} -{% block contenttitle %}{% endblock %} {% block content %} <div class="card bg-light"> diff --git a/note_kfet/templates/registration/password_reset_done.html b/note_kfet/templates/registration/password_reset_done.html index 56271ae0422c14cf2b2a33ccb699f866ae591426..1f22b6d655d596c532b50737ed12c1fdddff9195 100644 --- a/note_kfet/templates/registration/password_reset_done.html +++ b/note_kfet/templates/registration/password_reset_done.html @@ -3,7 +3,6 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} {% load i18n %} -{% block contenttitle %}{% endblock %} {% block content %} <div class="card bg-light"> diff --git a/note_kfet/templates/registration/password_reset_form.html b/note_kfet/templates/registration/password_reset_form.html index 3f2d2f0f3f615431dc509528ce188f23b151b606..639aefe23a4603a5f2a6363dd4e45b115d9cce4b 100644 --- a/note_kfet/templates/registration/password_reset_form.html +++ b/note_kfet/templates/registration/password_reset_form.html @@ -3,7 +3,6 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} {% load i18n crispy_forms_tags %} -{% block contenttitle %}{% endblock %} {% block content %} <div class="card bg-light"> diff --git a/note_kfet/templates/registration/signup.html b/note_kfet/templates/registration/signup.html index bde985a6edb20a09a2f3c3e1f14d2ac3b78c2010..268ba7fff1f334d6bae2629c04602c2aed96432d 100644 --- a/note_kfet/templates/registration/signup.html +++ b/note_kfet/templates/registration/signup.html @@ -4,7 +4,6 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} {% load i18n crispy_forms_tags %} {% block title %}{% trans "Sign up" %}{% endblock %} -{% block contenttitle %}{% endblock %} {% block content %} <div class="card bg-light">