diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index bb0a4f53..33e1de58 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -9,9 +9,14 @@ This document describes changes between each past release.
### Changed
- **BREAKING CHANGE** Use a hashed ``ADMIN_PASSWORD`` instead of a clear text one, ``./budget/manage.py generate_password_hash`` can be used to generate a proper password HASH (#236)
-- **BREAKING CHANGE** Turn the WSGI file into a python module, renamed from budget/ihatemoney.wsgi to budget/wsgi.py. Please update your Apache configuration !
+- **BREAKING CHANGE** Turn the WSGI file into a python module, renamed from budget/ihatemoney.wsgi to budget/wsgi.py. Please update your Apache configuration!
- Changed the recommended gunicorn configuration to use the wsgi module as an entrypoint
+
+### Removed
+
+- Remove unused option in the setup script
+
1.0 (2017-06-20)
----------------
diff --git a/budget/templates/list_bills.html b/budget/templates/list_bills.html
index a9af4def..4029bc95 100644
--- a/budget/templates/list_bills.html
+++ b/budget/templates/list_bills.html
@@ -66,7 +66,7 @@
{% if member.activated %}
+
diff --git a/budget/translations/fr/LC_MESSAGES/messages.mo b/budget/translations/fr/LC_MESSAGES/messages.mo
index c824b18a..210852b0 100644
Binary files a/budget/translations/fr/LC_MESSAGES/messages.mo and b/budget/translations/fr/LC_MESSAGES/messages.mo differ
diff --git a/budget/translations/fr/LC_MESSAGES/messages.po b/budget/translations/fr/LC_MESSAGES/messages.po
index 609846ff..0f3339ef 100644
--- a/budget/translations/fr/LC_MESSAGES/messages.po
+++ b/budget/translations/fr/LC_MESSAGES/messages.po
@@ -214,8 +214,8 @@ msgstr "Le membre '%(name)s' a été désactivé"
#: web.py:314
#, python-format
-msgid "User '%(name)s' has been removed"
-msgstr "Le membre '%(name)s' a été supprimé"
+msgid "User '%(name)s' has been deactivated. It will still appear in the users list until its balance becomes zero."
+msgstr "Le membre '%(name)s' a été désactivé. Il continuera d'apparaître jusqu'à ce que sa balance devienne égale à zéro."
#: web.py:331
msgid "The bill has been added"
@@ -291,6 +291,10 @@ msgstr "Annuler"
msgid "Edit the project"
msgstr "Éditer le projet"
+#: templates/list_bills.html:70
+msgid "deactivate"
+msgstr "désactiver"
+
#: templates/forms.html:69 templates/list_bills.html:70
#: templates/list_bills.html:114
msgid "delete"
diff --git a/budget/web.py b/budget/web.py
index ff157b64..f4961cbf 100644
--- a/budget/web.py
+++ b/budget/web.py
@@ -388,7 +388,9 @@ def remove_member(member_id):
member = g.project.remove_member(member_id)
if member:
if member.activated == False:
- flash(_("User '%(name)s' has been deactivated", name=member.name))
+ flash(_("User '%(name)s' has been deactivated. It will still "
+ "appear in the users list until its balance "
+ "becomes zero.", name=member.name))
else:
flash(_("User '%(name)s' has been removed", name=member.name))
return redirect(url_for(".list_bills"))
diff --git a/setup.py b/setup.py
index 2aed3bd9..c70a31d2 100644
--- a/setup.py
+++ b/setup.py
@@ -59,9 +59,6 @@ setup(name='ihatemoney',
author_email='alexis@notmyidea.org',
url='https://github.com/spiral-project/ihatemoney',
packages=find_packages(),
- package_data={'': ['*.rst', '*.py', '*.yaml', '*.po', '*.mo', '*.html',
- '*.css', '*.js', '*.eot', '*.svg', '*.woff', '*.txt',
- '*.png', '*.ini', '*.cfg']},
include_package_data=True,
zip_safe=False,
install_requires=REQUIREMENTS,