From 96dcc2d36ed197d192dd9ccba092c75224bd9c13 Mon Sep 17 00:00:00 2001
From: kaiyou <pierre@jaury.eu>
Date: Thu, 19 Mar 2020 13:27:26 +0100
Subject: [PATCH] Update translations

---
 .../en_US/LC_MESSAGES/messages.po             | 393 +++++++++++----
 .../fr_FR/LC_MESSAGES/messages.po             | 460 +++++++++++++-----
 .../nl_NL/LC_MESSAGES/messages.po             | 414 ++++++++++++----
 messages.pot                                  | 342 +++++++++----
 4 files changed, 1237 insertions(+), 372 deletions(-)

diff --git a/hiboo/translations/en_US/LC_MESSAGES/messages.po b/hiboo/translations/en_US/LC_MESSAGES/messages.po
index 101eba23..9d8c77d0 100644
--- a/hiboo/translations/en_US/LC_MESSAGES/messages.po
+++ b/hiboo/translations/en_US/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-11-24 12:00+0100\n"
+"POT-Creation-Date: 2020-03-19 13:27+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en\n"
@@ -19,39 +19,59 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.7.0\n"
 
-#: hiboo/models.py:152
+#: hiboo/models.py:153
 msgid "Profile creation is impossible"
 msgstr ""
 
-#: hiboo/models.py:153
+#: hiboo/models.py:154
 msgid "Profile creation is reserved to managers"
 msgstr ""
 
-#: hiboo/models.py:154
+#: hiboo/models.py:155
 msgid "Profile creation must be validated"
 msgstr ""
 
-#: hiboo/models.py:155
+#: hiboo/models.py:156
 msgid "Additional profiles must be validated"
 msgstr ""
 
-#: hiboo/models.py:156
+#: hiboo/models.py:157
 msgid "No validation is required"
 msgstr ""
 
-#: hiboo/models.py:217
+#: hiboo/models.py:184
+msgid "unclaimed"
+msgstr ""
+
+#: hiboo/models.py:185
+msgid "requested"
+msgstr ""
+
+#: hiboo/models.py:186
+msgid "active"
+msgstr ""
+
+#: hiboo/models.py:187
+msgid "blocked"
+msgstr ""
+
+#: hiboo/models.py:188
+msgid "deleted"
+msgstr ""
+
+#: hiboo/models.py:227
 msgid "signed up for this account"
 msgstr ""
 
-#: hiboo/models.py:218
+#: hiboo/models.py:228
 msgid "created the profile {this.profile.username} on {this.service.name}"
 msgstr ""
 
-#: hiboo/models.py:219
+#: hiboo/models.py:229
 msgid "changed your password"
 msgstr ""
 
-#: hiboo/models.py:220
+#: hiboo/models.py:230
 msgid "{this.value} the profile {this.profile.username} on {this.service.name}"
 msgstr ""
 
@@ -62,7 +82,7 @@ msgstr ""
 #: hiboo/account/forms.py:8 hiboo/account/forms.py:14 hiboo/profile/forms.py:8
 #: hiboo/profile/forms.py:18 hiboo/profile/templates/profile_details.html:12
 #: hiboo/user/templates/user_details.html:12
-#: hiboo/user/templates/user_details.html:35
+#: hiboo/user/templates/user_details.html:38
 #: hiboo/user/templates/user_list.html:12
 #: hiboo/user/templates/user_pick.html:12
 msgid "Username"
@@ -73,7 +93,7 @@ msgid "Password"
 msgstr ""
 
 #: hiboo/account/forms.py:10 hiboo/account/templates/account_signin.html:3
-#: hiboo/templates/base.html:42 hiboo/templates/sidebar.html:31
+#: hiboo/templates/base.html:42 hiboo/templates/sidebar.html:36
 msgid "Sign in"
 msgstr ""
 
@@ -81,9 +101,9 @@ msgstr ""
 msgid "Confirm password"
 msgstr ""
 
-#: hiboo/account/forms.py:22 hiboo/account/templates/account_signin.html:20
+#: hiboo/account/forms.py:22 hiboo/account/templates/account_signin.html:22
 #: hiboo/account/templates/account_signup.html:3
-#: hiboo/templates/sidebar.html:26
+#: hiboo/templates/sidebar.html:31
 msgid "Sign up"
 msgstr ""
 
@@ -99,10 +119,72 @@ msgstr ""
 msgid "Confirm new password"
 msgstr ""
 
-#: hiboo/account/forms.py:30 hiboo/templates/sidebar.html:15
+#: hiboo/account/forms.py:30 hiboo/templates/sidebar.html:20
 msgid "Change password"
 msgstr ""
 
+#: hiboo/account/forms.py:34
+msgid "Email address"
+msgstr ""
+
+#: hiboo/account/forms.py:35
+msgid "Matrix ID"
+msgstr ""
+
+#: hiboo/account/forms.py:36 hiboo/account/templates/account_contact.html:3
+msgid "Update contact info"
+msgstr ""
+
+#: hiboo/account/login.py:18
+msgid "Wrong credentials"
+msgstr ""
+
+#: hiboo/account/login.py:36
+msgid "A user with the same username exists already"
+msgstr ""
+
+#: hiboo/account/login.py:46
+msgid "Signed up using the Web form"
+msgstr ""
+
+#: hiboo/account/login.py:48
+msgid "User created successfully"
+msgstr ""
+
+#: hiboo/account/settings.py:20
+msgid "Successfully reset your password"
+msgstr ""
+
+#: hiboo/account/settings.py:23
+msgid "Wrong credentials, check your old password"
+msgstr ""
+
+#: hiboo/account/settings.py:36
+msgid "Successfully updated your contact info"
+msgstr ""
+
+#: hiboo/account/templates/account_contact.html:7
+msgid "Contact information"
+msgstr ""
+
+#: hiboo/account/templates/account_contact.html:8
+msgid ""
+"There is no requirement for you to provide us with your contact "
+"information. Those can be useful though."
+msgstr ""
+
+#: hiboo/account/templates/account_contact.html:9
+msgid ""
+"If you lose access to your account, we might use this information to "
+"check that your are indeed who you pretend to be."
+msgstr ""
+
+#: hiboo/account/templates/account_contact.html:10
+msgid ""
+"Also, if we notice unusual behavior on your account, we may use this "
+"information to contact you instead of immediately blocking your account."
+msgstr ""
+
 #: hiboo/account/templates/account_home.html:3
 #: hiboo/account/templates/account_profiles.html:3
 #: hiboo/templates/sidebar.html:5
@@ -137,72 +219,105 @@ msgstr ""
 msgid "registered user"
 msgstr ""
 
+#: hiboo/account/templates/account_home.html:33
+#: hiboo/account/templates/account_signin.html:8
+msgid "Authentication manager"
+msgstr ""
+
+#: hiboo/account/templates/account_home.html:34
+msgid "This is Hiboo, our account and authentication manager."
+msgstr ""
+
+#: hiboo/account/templates/account_home.html:35
+msgid ""
+"Hiboo is designed so you only have to remember one password and can use "
+"your many accounts on every application associated with it."
+msgstr ""
+
+#: hiboo/account/templates/account_home.html:36
+msgid ""
+"If you wish to sign into one of the applications, simply open your "
+"browser and go to the application: you will automatically be redirected "
+"back to Hiboo and will be able to pick the profile you desire."
+msgstr ""
+
+#: hiboo/account/templates/account_home.html:37
+#: hiboo/account/templates/account_signin.html:14
+msgid ""
+"<strong>If you are having trouble</strong>, please refer to the "
+"documentation, then contact the administrator of this service directly, "
+"using the contact button in the left panel."
+msgstr ""
+
 #: hiboo/account/templates/account_profiles.html:4
 msgid "my profiles"
 msgstr ""
 
-#: hiboo/account/templates/account_profiles.html:14
+#: hiboo/account/templates/account_profiles.html:13
 #: hiboo/profile/templates/profile_list.html:16
 #: hiboo/service/templates/service_list.html:13
-#: hiboo/user/templates/user_details.html:34
+#: hiboo/user/templates/user_details.html:37
 msgid "Service"
 msgstr ""
 
-#: hiboo/account/templates/account_profiles.html:16
+#: hiboo/account/templates/account_profiles.html:14
 #: hiboo/profile/templates/profile_list.html:18
 msgid "Profile username"
 msgstr ""
 
-#: hiboo/account/templates/account_profiles.html:17
-#: hiboo/profile/templates/profile_list.html:19
-msgid "Owned by"
-msgstr ""
-
-#: hiboo/account/templates/account_profiles.html:18
-#: hiboo/profile/templates/profile_details.html:21
+#: hiboo/account/templates/account_profiles.html:15
+#: hiboo/profile/templates/profile_details.html:22
 #: hiboo/profile/templates/profile_list.html:20
-#: hiboo/user/templates/user_details.html:36
+#: hiboo/user/templates/user_details.html:39
 msgid "Status"
 msgstr ""
 
-#: hiboo/account/templates/account_profiles.html:19
+#: hiboo/account/templates/account_profiles.html:16
 #: hiboo/profile/templates/profile_list.html:21
 #: hiboo/user/templates/user_list.html:13
 #: hiboo/user/templates/user_pick.html:13
 msgid "Created on"
 msgstr ""
 
-#: hiboo/account/templates/account_signin.html:4
-msgid "to access your account"
+#: hiboo/account/templates/account_profiles.html:17 hiboo/profile/forms.py:9
+msgid "Comment"
 msgstr ""
 
-#: hiboo/account/templates/account_signin.html:8
-msgid "Authentication manager"
+#: hiboo/account/templates/account_signin.html:4
+msgid "to access your account"
 msgstr ""
 
 #: hiboo/account/templates/account_signin.html:9
 msgid ""
-"<strong>You were redirected for authentication</strong>. This is our "
-"account manager, designed so you only have to authenticate once."
+"<strong>You were directed here for authentication</strong>. This is our "
+"account manager, designed so you only have to remember one password and "
+"authenticate once."
 msgstr ""
 
 #: hiboo/account/templates/account_signin.html:10
 msgid ""
-"It handles accounts for our services and allows you to own multiple "
-"profiles on each service."
+"It handles accounts for our applications and allows you to own and use "
+"multiple profiles on each application."
 msgstr ""
 
 #: hiboo/account/templates/account_signin.html:11
 msgid ""
-"You can now sign in to your account. If you do not own one already (which"
-" is probable if this is your first time here), please sign up first."
+"<strong>If you are seing this page for the first time</strong>, then you "
+"must first create your master account and password: please click the "
+"\"Sign up\" button for this."
 msgstr ""
 
 #: hiboo/account/templates/account_signin.html:12
 msgid ""
-"If you used to have an account on the application you are authenticating "
-"for, no panic necessary: you will be able to claim it once logged into "
-"Hiboo!"
+"If you already have an account or when you are signed up, please sign in "
+"using the form below."
+msgstr ""
+
+#: hiboo/account/templates/account_signin.html:13
+msgid ""
+"If you used to own an account on the application that redirected you "
+"here, do not panic: you will be able to claim it once logged in, using "
+"the \"claim\" button!"
 msgstr ""
 
 #: hiboo/account/templates/account_signup.html:4
@@ -235,27 +350,51 @@ msgstr ""
 msgid ""
 "Please (please!) use a decent password and memorize it. We do not wish to"
 " collect data on who you are. That also means it is dificult for us to "
-"verify who you are and reset your password."
+"verify who you are and reset your password in case you forget it."
 msgstr ""
 
-#: hiboo/profile/forms.py:9
-msgid "Comment"
+#: hiboo/profile/admin.py:41
+msgid "Profile status was successfully changed"
 msgstr ""
 
-#: hiboo/profile/forms.py:10 hiboo/profile/templates/profile_list.html:50
-#: hiboo/profile/templates/profile_pick.html:68
-#: hiboo/profile/templates/profile_pick.html:72
+#: hiboo/profile/forms.py:10 hiboo/profile/templates/profile_list.html:49
+#: hiboo/profile/templates/profile_pick.html:66
+#: hiboo/profile/templates/profile_pick.html:70
 msgid "Create profile"
 msgstr ""
 
 #: hiboo/profile/forms.py:20 hiboo/profile/templates/profile_claim.html:4
-#: hiboo/profile/templates/profile_pick.html:65
+#: hiboo/profile/templates/profile_pick.html:63
 msgid "Claim profile"
 msgstr ""
 
+#: hiboo/profile/login.py:34 hiboo/profile/login.py:41
+msgid "You cannot request a profile for this service"
+msgstr ""
+
+#: hiboo/profile/login.py:45
+msgid "Your reached the maximum number of profiles"
+msgstr ""
+
+#: hiboo/profile/login.py:49
+msgid "Your profile creation requires approval"
+msgstr ""
+
+#: hiboo/profile/login.py:64
+msgid "A profile with that username exists already"
+msgstr ""
+
+#: hiboo/profile/login.py:100
+msgid "Successfully claimed the profile!"
+msgstr ""
+
+#: hiboo/profile/login.py:103
+msgid "Wrong username or password"
+msgstr ""
+
 #: hiboo/profile/templates/profile_claim.html:5
 #: hiboo/profile/templates/profile_create.html:6
-#: hiboo/profile/templates/profile_pick.html:7
+#: hiboo/profile/templates/profile_pick.html:5
 #, python-format
 msgid "for the service %(service_name)s"
 msgstr ""
@@ -324,104 +463,111 @@ msgstr ""
 msgid "UUID"
 msgstr ""
 
-#: hiboo/profile/templates/profile_details.html:24
+#: hiboo/profile/templates/profile_details.html:25
 #: hiboo/user/templates/user_details.html:18
 msgid "Created at"
 msgstr ""
 
-#: hiboo/profile/templates/profile_details.html:40
+#: hiboo/profile/templates/profile_details.html:41
 msgid "Block profile"
 msgstr ""
 
-#: hiboo/profile/templates/profile_details.html:42
+#: hiboo/profile/templates/profile_details.html:43
 msgid "Unblock profile"
 msgstr ""
 
-#: hiboo/profile/templates/profile_list.html:22
-#: hiboo/service/templates/service_list.html:18
-msgid "Actions"
+#: hiboo/profile/templates/profile_list.html:19
+msgid "Owned by"
 msgstr ""
 
-#: hiboo/profile/templates/profile_pick.html:6
+#: hiboo/profile/templates/profile_pick.html:4
 msgid "Pick a profile"
 msgstr ""
 
-#: hiboo/profile/templates/profile_pick.html:22
+#: hiboo/profile/templates/profile_pick.html:20
 msgid "Blocked"
 msgstr ""
 
-#: hiboo/profile/templates/profile_pick.html:24
+#: hiboo/profile/templates/profile_pick.html:22
 msgid "Awaiting approval"
 msgstr ""
 
-#: hiboo/profile/templates/profile_pick.html:32
+#: hiboo/profile/templates/profile_pick.html:30
 #, python-format
 msgid "Created on %(created_on)s"
 msgstr ""
 
-#: hiboo/profile/templates/profile_pick.html:33
+#: hiboo/profile/templates/profile_pick.html:31
 msgid "Not shared with anyone"
 msgstr ""
 
-#: hiboo/profile/templates/profile_pick.html:41
-msgid "Here come profiles!"
+#: hiboo/profile/templates/profile_pick.html:39
+msgid "Pick your profile"
 msgstr ""
 
-#: hiboo/profile/templates/profile_pick.html:43
+#: hiboo/profile/templates/profile_pick.html:41
 msgid ""
-"This service relies on profiles, which are just as many identities that "
-"you can have with your single account."
+"Every service is associated with profiles, which are just as many "
+"identities that you can associate to your master account."
 msgstr ""
 
-#: hiboo/profile/templates/profile_pick.html:44
+#: hiboo/profile/templates/profile_pick.html:42
 msgid ""
 "You may think of profiles as a way to switch between a personal and a "
 "business account, or to use the service under different identities for "
 "diffrent activities."
 msgstr ""
 
-#: hiboo/profile/templates/profile_pick.html:45
+#: hiboo/profile/templates/profile_pick.html:43
 msgid ""
 "Profiles were introduced in order to offer flexibility and security "
 "against stalkers and other sorts of online violence."
 msgstr ""
 
-#: hiboo/profile/templates/profile_pick.html:48
+#: hiboo/profile/templates/profile_pick.html:46
 msgid ""
-"However, profile creation on this services are currently locked down. You"
-" may only use existing profiles if you have some."
+"However, profile creation on this services is currently locked down. You "
+"may only use existing profiles if you have any."
 msgstr ""
 
-#: hiboo/profile/templates/profile_pick.html:50
+#: hiboo/profile/templates/profile_pick.html:48
 msgid ""
 "This service is not currently open for profile registration. In order to "
 "get new profiles, you must ask a service administrator."
 msgstr ""
 
-#: hiboo/profile/templates/profile_pick.html:52
+#: hiboo/profile/templates/profile_pick.html:50
 msgid ""
 "You may request new profiles. Your requests will be submitted to "
 "validation."
 msgstr ""
 
-#: hiboo/profile/templates/profile_pick.html:54
+#: hiboo/profile/templates/profile_pick.html:52
 #, python-format
 msgid ""
 "You may create up to %(max_profiles)s profiles. Further profile requests "
 "will be submitted to validation."
 msgstr ""
 
-#: hiboo/profile/templates/profile_pick.html:56
+#: hiboo/profile/templates/profile_pick.html:54
 #, python-format
 msgid ""
 "You may create up to %(max_profiles)s profiles. Please contact the "
 "service administrator if you have any specific needs."
 msgstr ""
 
-#: hiboo/profile/templates/profile_pick.html:70
+#: hiboo/profile/templates/profile_pick.html:68
 msgid "Request profile"
 msgstr ""
 
+#: hiboo/service/admin.py:34
+msgid "Service successfully created"
+msgstr ""
+
+#: hiboo/service/admin.py:51
+msgid "Service successfully updated"
+msgstr ""
+
 #: hiboo/service/forms.py:10 hiboo/service/templates/service_details.html:13
 msgid "Service name"
 msgstr ""
@@ -447,10 +593,14 @@ msgid "Maximum profile count"
 msgstr ""
 
 #: hiboo/service/forms.py:19
+msgid "Profile usenrame regex"
+msgstr ""
+
+#: hiboo/service/forms.py:20
 msgid "Disable per-profile username"
 msgstr ""
 
-#: hiboo/service/forms.py:20 hiboo/sso/forms.py:16 hiboo/sso/forms.py:42
+#: hiboo/service/forms.py:21 hiboo/sso/forms.py:16 hiboo/sso/forms.py:48
 msgid "Submit"
 msgstr ""
 
@@ -464,7 +614,7 @@ msgstr ""
 msgid "pick a protocol"
 msgstr ""
 
-#: hiboo/service/templates/protocol_pick.html:16
+#: hiboo/service/templates/protocol_pick.html:14
 msgid "Create "
 msgstr ""
 
@@ -513,6 +663,10 @@ msgstr ""
 msgid "Max profiles"
 msgstr ""
 
+#: hiboo/service/templates/service_list.html:18
+msgid "Actions"
+msgstr ""
+
 #: hiboo/sso/forms.py:8
 msgid "SP entity id"
 msgstr ""
@@ -585,6 +739,18 @@ msgstr ""
 msgid "Id token and token"
 msgstr ""
 
+#: hiboo/sso/forms.py:43
+msgid "Enabled special claim mappings"
+msgstr ""
+
+#: hiboo/sso/forms.py:44
+msgid "Mask the profile uuid"
+msgstr ""
+
+#: hiboo/sso/forms.py:45
+msgid "Return the actual user email"
+msgstr ""
+
 #: hiboo/sso/templates/protocol_oidc.html:2
 msgid ""
 "OpenID Connect (OIDC) is JWT based authentication and authorization "
@@ -659,7 +825,7 @@ msgstr ""
 msgid "Toggle navigation"
 msgstr ""
 
-#: hiboo/templates/base.html:35 hiboo/templates/sidebar.html:20
+#: hiboo/templates/base.html:35 hiboo/templates/sidebar.html:25
 msgid "Sign out"
 msgstr ""
 
@@ -680,7 +846,7 @@ msgstr ""
 msgid "Your are about to %(action)s. Do you wish to confirm that action?"
 msgstr ""
 
-#: hiboo/templates/macros.html:53
+#: hiboo/templates/macros.html:55
 msgid "Close"
 msgstr ""
 
@@ -692,27 +858,31 @@ msgstr ""
 msgid "My profiles"
 msgstr ""
 
-#: hiboo/templates/sidebar.html:37
+#: hiboo/templates/sidebar.html:15
+msgid "My contact info"
+msgstr ""
+
+#: hiboo/templates/sidebar.html:42
 msgid "Admin"
 msgstr ""
 
-#: hiboo/templates/sidebar.html:40
+#: hiboo/templates/sidebar.html:45
 msgid "Services"
 msgstr ""
 
-#: hiboo/templates/sidebar.html:45
+#: hiboo/templates/sidebar.html:50
 msgid "Users"
 msgstr ""
 
-#: hiboo/templates/sidebar.html:50
+#: hiboo/templates/sidebar.html:55
 msgid "About"
 msgstr ""
 
-#: hiboo/templates/sidebar.html:53
+#: hiboo/templates/sidebar.html:58
 msgid "User guide"
 msgstr ""
 
-#: hiboo/templates/sidebar.html:58
+#: hiboo/templates/sidebar.html:63
 msgid "Admin guide"
 msgstr ""
 
@@ -850,3 +1020,58 @@ msgstr ""
 #~ msgid "Create a profile"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "<strong>You were redirected for "
+#~ "authentication</strong>. This is our account"
+#~ " manager, designed so you only have"
+#~ " to authenticate once."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "It handles accounts for our services "
+#~ "and allows you to own multiple "
+#~ "profiles on each service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can now sign in to your "
+#~ "account. If you do not own one "
+#~ "already (which is probable if this "
+#~ "is your first time here), please "
+#~ "sign up first."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you used to have an account "
+#~ "on the application you are "
+#~ "authenticating for, no panic necessary: "
+#~ "you will be able to claim it "
+#~ "once logged into Hiboo!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Please (please!) use a decent password"
+#~ " and memorize it. We do not "
+#~ "wish to collect data on who you"
+#~ " are. That also means it is "
+#~ "dificult for us to verify who you"
+#~ " are and reset your password."
+#~ msgstr ""
+
+#~ msgid "Here come profiles!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This service relies on profiles, which"
+#~ " are just as many identities that "
+#~ "you can have with your single "
+#~ "account."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "However, profile creation on this "
+#~ "services are currently locked down. You"
+#~ " may only use existing profiles if"
+#~ " you have some."
+#~ msgstr ""
+
diff --git a/hiboo/translations/fr_FR/LC_MESSAGES/messages.po b/hiboo/translations/fr_FR/LC_MESSAGES/messages.po
index 0c2b7fda..7a851438 100644
--- a/hiboo/translations/fr_FR/LC_MESSAGES/messages.po
+++ b/hiboo/translations/fr_FR/LC_MESSAGES/messages.po
@@ -7,52 +7,71 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-11-24 12:00+0100\n"
+"POT-Creation-Date: 2020-03-19 13:27+0100\n"
 "PO-Revision-Date: 2019-11-24 11:03+0000\n"
 "Last-Translator: kaiyou <pierre@jaury.eu>\n"
-"Language-Team: French <https://translate.tedomum.net/projects/hiboo/main/fr/>"
-"\n"
 "Language: fr_FR\n"
+"Language-Team: French "
+"<https://translate.tedomum.net/projects/hiboo/main/fr/>\n"
+"Plural-Forms: nplurals=2; plural=n > 1\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 3.3\n"
 "Generated-By: Babel 2.7.0\n"
 
-#: hiboo/models.py:152
+#: hiboo/models.py:153
 msgid "Profile creation is impossible"
 msgstr "La création de profil est impossible"
 
-#: hiboo/models.py:153
+#: hiboo/models.py:154
 msgid "Profile creation is reserved to managers"
 msgstr "La création de profil est réservées aux gestionnaires"
 
-#: hiboo/models.py:154
+#: hiboo/models.py:155
 msgid "Profile creation must be validated"
 msgstr "Les profils créés doivents être validés"
 
-#: hiboo/models.py:155
+#: hiboo/models.py:156
 msgid "Additional profiles must be validated"
 msgstr "Les profils additionnels doivent être validés"
 
-#: hiboo/models.py:156
+#: hiboo/models.py:157
 msgid "No validation is required"
 msgstr "Aucune validation n'est requise"
 
-#: hiboo/models.py:217
+#: hiboo/models.py:184
+msgid "unclaimed"
+msgstr ""
+
+#: hiboo/models.py:185
+msgid "requested"
+msgstr ""
+
+#: hiboo/models.py:186
+msgid "active"
+msgstr ""
+
+#: hiboo/models.py:187
+msgid "blocked"
+msgstr ""
+
+#: hiboo/models.py:188
+msgid "deleted"
+msgstr ""
+
+#: hiboo/models.py:227
 msgid "signed up for this account"
 msgstr "a créé ce compte"
 
-#: hiboo/models.py:218
+#: hiboo/models.py:228
 msgid "created the profile {this.profile.username} on {this.service.name}"
 msgstr "a créé le profil {this.profile.username} sur {this.service.name}"
 
-#: hiboo/models.py:219
+#: hiboo/models.py:229
 msgid "changed your password"
 msgstr "a changé votre mot de passe"
 
-#: hiboo/models.py:220
+#: hiboo/models.py:230
 msgid "{this.value} the profile {this.profile.username} on {this.service.name}"
 msgstr "{this.value} le profil {this.profile.username} sur {this.service.name}"
 
@@ -63,7 +82,7 @@ msgstr "Confirmer"
 #: hiboo/account/forms.py:8 hiboo/account/forms.py:14 hiboo/profile/forms.py:8
 #: hiboo/profile/forms.py:18 hiboo/profile/templates/profile_details.html:12
 #: hiboo/user/templates/user_details.html:12
-#: hiboo/user/templates/user_details.html:35
+#: hiboo/user/templates/user_details.html:38
 #: hiboo/user/templates/user_list.html:12
 #: hiboo/user/templates/user_pick.html:12
 msgid "Username"
@@ -74,7 +93,7 @@ msgid "Password"
 msgstr "Mot de passe"
 
 #: hiboo/account/forms.py:10 hiboo/account/templates/account_signin.html:3
-#: hiboo/templates/base.html:42 hiboo/templates/sidebar.html:31
+#: hiboo/templates/base.html:42 hiboo/templates/sidebar.html:36
 msgid "Sign in"
 msgstr "Se connecter"
 
@@ -82,9 +101,9 @@ msgstr "Se connecter"
 msgid "Confirm password"
 msgstr "Confirmer le mot de passe"
 
-#: hiboo/account/forms.py:22 hiboo/account/templates/account_signin.html:20
+#: hiboo/account/forms.py:22 hiboo/account/templates/account_signin.html:22
 #: hiboo/account/templates/account_signup.html:3
-#: hiboo/templates/sidebar.html:26
+#: hiboo/templates/sidebar.html:31
 msgid "Sign up"
 msgstr "S'enregistrer"
 
@@ -100,10 +119,72 @@ msgstr "Nouveau mot de passe"
 msgid "Confirm new password"
 msgstr "Confirmer le nouveau mot de passe"
 
-#: hiboo/account/forms.py:30 hiboo/templates/sidebar.html:15
+#: hiboo/account/forms.py:30 hiboo/templates/sidebar.html:20
 msgid "Change password"
 msgstr "Changer le mot de passe"
 
+#: hiboo/account/forms.py:34
+msgid "Email address"
+msgstr ""
+
+#: hiboo/account/forms.py:35
+msgid "Matrix ID"
+msgstr ""
+
+#: hiboo/account/forms.py:36 hiboo/account/templates/account_contact.html:3
+msgid "Update contact info"
+msgstr ""
+
+#: hiboo/account/login.py:18
+msgid "Wrong credentials"
+msgstr ""
+
+#: hiboo/account/login.py:36
+msgid "A user with the same username exists already"
+msgstr ""
+
+#: hiboo/account/login.py:46
+msgid "Signed up using the Web form"
+msgstr ""
+
+#: hiboo/account/login.py:48
+msgid "User created successfully"
+msgstr ""
+
+#: hiboo/account/settings.py:20
+msgid "Successfully reset your password"
+msgstr ""
+
+#: hiboo/account/settings.py:23
+msgid "Wrong credentials, check your old password"
+msgstr ""
+
+#: hiboo/account/settings.py:36
+msgid "Successfully updated your contact info"
+msgstr ""
+
+#: hiboo/account/templates/account_contact.html:7
+msgid "Contact information"
+msgstr ""
+
+#: hiboo/account/templates/account_contact.html:8
+msgid ""
+"There is no requirement for you to provide us with your contact "
+"information. Those can be useful though."
+msgstr ""
+
+#: hiboo/account/templates/account_contact.html:9
+msgid ""
+"If you lose access to your account, we might use this information to "
+"check that your are indeed who you pretend to be."
+msgstr ""
+
+#: hiboo/account/templates/account_contact.html:10
+msgid ""
+"Also, if we notice unusual behavior on your account, we may use this "
+"information to contact you instead of immediately blocking your account."
+msgstr ""
+
 #: hiboo/account/templates/account_home.html:3
 #: hiboo/account/templates/account_profiles.html:3
 #: hiboo/templates/sidebar.html:5
@@ -138,83 +219,106 @@ msgstr "administrateur"
 msgid "registered user"
 msgstr "utilisateur"
 
+#: hiboo/account/templates/account_home.html:33
+#: hiboo/account/templates/account_signin.html:8
+msgid "Authentication manager"
+msgstr "Gestionnaire de comptes"
+
+#: hiboo/account/templates/account_home.html:34
+msgid "This is Hiboo, our account and authentication manager."
+msgstr ""
+
+#: hiboo/account/templates/account_home.html:35
+msgid ""
+"Hiboo is designed so you only have to remember one password and can use "
+"your many accounts on every application associated with it."
+msgstr ""
+
+#: hiboo/account/templates/account_home.html:36
+msgid ""
+"If you wish to sign into one of the applications, simply open your "
+"browser and go to the application: you will automatically be redirected "
+"back to Hiboo and will be able to pick the profile you desire."
+msgstr ""
+
+#: hiboo/account/templates/account_home.html:37
+#: hiboo/account/templates/account_signin.html:14
+msgid ""
+"<strong>If you are having trouble</strong>, please refer to the "
+"documentation, then contact the administrator of this service directly, "
+"using the contact button in the left panel."
+msgstr ""
+
 #: hiboo/account/templates/account_profiles.html:4
 msgid "my profiles"
 msgstr "mes profils"
 
-#: hiboo/account/templates/account_profiles.html:14
+#: hiboo/account/templates/account_profiles.html:13
 #: hiboo/profile/templates/profile_list.html:16
 #: hiboo/service/templates/service_list.html:13
-#: hiboo/user/templates/user_details.html:34
+#: hiboo/user/templates/user_details.html:37
 msgid "Service"
 msgstr "Service"
 
-#: hiboo/account/templates/account_profiles.html:16
+#: hiboo/account/templates/account_profiles.html:14
 #: hiboo/profile/templates/profile_list.html:18
 msgid "Profile username"
 msgstr "Nom de profil"
 
-#: hiboo/account/templates/account_profiles.html:17
-#: hiboo/profile/templates/profile_list.html:19
-msgid "Owned by"
-msgstr "Propriétaire"
-
-#: hiboo/account/templates/account_profiles.html:18
-#: hiboo/profile/templates/profile_details.html:21
+#: hiboo/account/templates/account_profiles.html:15
+#: hiboo/profile/templates/profile_details.html:22
 #: hiboo/profile/templates/profile_list.html:20
-#: hiboo/user/templates/user_details.html:36
+#: hiboo/user/templates/user_details.html:39
 msgid "Status"
 msgstr "Statut"
 
-#: hiboo/account/templates/account_profiles.html:19
+#: hiboo/account/templates/account_profiles.html:16
 #: hiboo/profile/templates/profile_list.html:21
 #: hiboo/user/templates/user_list.html:13
 #: hiboo/user/templates/user_pick.html:13
 msgid "Created on"
 msgstr "Crée le"
 
+#: hiboo/account/templates/account_profiles.html:17 hiboo/profile/forms.py:9
+msgid "Comment"
+msgstr "Commentaire"
+
 #: hiboo/account/templates/account_signin.html:4
 msgid "to access your account"
 msgstr "pour accéder à votre compte"
 
-#: hiboo/account/templates/account_signin.html:8
-msgid "Authentication manager"
-msgstr "Gestionnaire de comptes"
-
 #: hiboo/account/templates/account_signin.html:9
 msgid ""
-"<strong>You were redirected for authentication</strong>. This is our "
-"account manager, designed so you only have to authenticate once."
+"<strong>You were directed here for authentication</strong>. This is our "
+"account manager, designed so you only have to remember one password and "
+"authenticate once."
 msgstr ""
-"<strong>Vous avez été redirigé pour vous authentifier</strong>. Ce site "
-"est notre gestionnaire de comptes, conçu pour que vous n'ayez plus qu'un "
-"mot de passe à saisir."
 
 #: hiboo/account/templates/account_signin.html:10
 msgid ""
-"It handles accounts for our services and allows you to own multiple "
-"profiles on each service."
+"It handles accounts for our applications and allows you to own and use "
+"multiple profiles on each application."
 msgstr ""
-"Il gère l'accès à nos services et vous permet de disposer de plusieurs "
-"profils sur chaque service."
 
 #: hiboo/account/templates/account_signin.html:11
 msgid ""
-"You can now sign in to your account. If you do not own one already (which"
-" is probable if this is your first time here), please sign up first."
+"<strong>If you are seing this page for the first time</strong>, then you "
+"must first create your master account and password: please click the "
+"\"Sign up\" button for this."
 msgstr ""
-"Vous pouvez vous connecter à votre compte. Si vous n'en disposez pas (ce "
-"qui est probable si vous lisez ce message pour la première fois), vous "
-"devrez en créer un."
 
 #: hiboo/account/templates/account_signin.html:12
 msgid ""
-"If you used to have an account on the application you are authenticating "
-"for, no panic necessary: you will be able to claim it once logged into "
-"Hiboo!"
+"If you already have an account or when you are signed up, please sign in "
+"using the form below."
+msgstr ""
+
+#: hiboo/account/templates/account_signin.html:13
+msgid ""
+"If you used to own an account on the application that redirected you "
+"here, do not panic: you will be able to claim it once logged in, using "
+"the \"claim\" button!"
 msgstr ""
-"Si vous aviez déjà un compte sur l'application à laquelle vous tentez "
-"d'accéder, pas de panique : vous pourrez le récupérer une fois connecté !"
 
 #: hiboo/account/templates/account_signup.html:4
 msgid "for a new account"
@@ -253,31 +357,51 @@ msgstr ""
 msgid ""
 "Please (please!) use a decent password and memorize it. We do not wish to"
 " collect data on who you are. That also means it is dificult for us to "
-"verify who you are and reset your password."
+"verify who you are and reset your password in case you forget it."
 msgstr ""
-"Merci de choisir un mot de passe suffisamment complexe et de le "
-"mémoriser. Nous ne souhaitons pas recueillir vos informations "
-"personnelles. Cela implique qu'il nous est difficile de vérifier qui vous"
-" êtes et de réinitialiser votre mot de passe si vous l'oubliez."
 
-#: hiboo/profile/forms.py:9
-msgid "Comment"
-msgstr "Commentaire"
+#: hiboo/profile/admin.py:41
+msgid "Profile status was successfully changed"
+msgstr ""
 
-#: hiboo/profile/forms.py:10 hiboo/profile/templates/profile_list.html:50
-#: hiboo/profile/templates/profile_pick.html:68
-#: hiboo/profile/templates/profile_pick.html:72
+#: hiboo/profile/forms.py:10 hiboo/profile/templates/profile_list.html:49
+#: hiboo/profile/templates/profile_pick.html:66
+#: hiboo/profile/templates/profile_pick.html:70
 msgid "Create profile"
 msgstr "Créer un profil"
 
 #: hiboo/profile/forms.py:20 hiboo/profile/templates/profile_claim.html:4
-#: hiboo/profile/templates/profile_pick.html:65
+#: hiboo/profile/templates/profile_pick.html:63
 msgid "Claim profile"
 msgstr "Récupérer un profil"
 
+#: hiboo/profile/login.py:34 hiboo/profile/login.py:41
+msgid "You cannot request a profile for this service"
+msgstr ""
+
+#: hiboo/profile/login.py:45
+msgid "Your reached the maximum number of profiles"
+msgstr ""
+
+#: hiboo/profile/login.py:49
+msgid "Your profile creation requires approval"
+msgstr ""
+
+#: hiboo/profile/login.py:64
+msgid "A profile with that username exists already"
+msgstr ""
+
+#: hiboo/profile/login.py:100
+msgid "Successfully claimed the profile!"
+msgstr ""
+
+#: hiboo/profile/login.py:103
+msgid "Wrong username or password"
+msgstr ""
+
 #: hiboo/profile/templates/profile_claim.html:5
 #: hiboo/profile/templates/profile_create.html:6
-#: hiboo/profile/templates/profile_pick.html:7
+#: hiboo/profile/templates/profile_pick.html:5
 #, python-format
 msgid "for the service %(service_name)s"
 msgstr "pour le service %(service_name)s"
@@ -357,58 +481,55 @@ msgstr "Propriétaire"
 msgid "UUID"
 msgstr "UUID"
 
-#: hiboo/profile/templates/profile_details.html:24
+#: hiboo/profile/templates/profile_details.html:25
 #: hiboo/user/templates/user_details.html:18
 msgid "Created at"
 msgstr "Créé le"
 
-#: hiboo/profile/templates/profile_details.html:40
+#: hiboo/profile/templates/profile_details.html:41
 msgid "Block profile"
 msgstr "Bloquer le profil"
 
-#: hiboo/profile/templates/profile_details.html:42
+#: hiboo/profile/templates/profile_details.html:43
 msgid "Unblock profile"
 msgstr "Débloquer le profil"
 
-#: hiboo/profile/templates/profile_list.html:22
-#: hiboo/service/templates/service_list.html:18
-msgid "Actions"
-msgstr "Actions"
+#: hiboo/profile/templates/profile_list.html:19
+msgid "Owned by"
+msgstr "Propriétaire"
 
-#: hiboo/profile/templates/profile_pick.html:6
+#: hiboo/profile/templates/profile_pick.html:4
 msgid "Pick a profile"
 msgstr "Choisir un profil"
 
-#: hiboo/profile/templates/profile_pick.html:22
+#: hiboo/profile/templates/profile_pick.html:20
 msgid "Blocked"
 msgstr "Bloqué"
 
-#: hiboo/profile/templates/profile_pick.html:24
+#: hiboo/profile/templates/profile_pick.html:22
 msgid "Awaiting approval"
 msgstr "En attente de validation"
 
-#: hiboo/profile/templates/profile_pick.html:32
+#: hiboo/profile/templates/profile_pick.html:30
 #, python-format
 msgid "Created on %(created_on)s"
 msgstr "Créé le %(created_on)s"
 
-#: hiboo/profile/templates/profile_pick.html:33
+#: hiboo/profile/templates/profile_pick.html:31
 msgid "Not shared with anyone"
 msgstr "Non partagé"
 
-#: hiboo/profile/templates/profile_pick.html:41
-msgid "Here come profiles!"
-msgstr "Voici les profils !"
+#: hiboo/profile/templates/profile_pick.html:39
+msgid "Pick your profile"
+msgstr ""
 
-#: hiboo/profile/templates/profile_pick.html:43
+#: hiboo/profile/templates/profile_pick.html:41
 msgid ""
-"This service relies on profiles, which are just as many identities that "
-"you can have with your single account."
+"Every service is associated with profiles, which are just as many "
+"identities that you can associate to your master account."
 msgstr ""
-"Ce service supporte les profils. Les profils sont des identités "
-"différentes que vous pouvez utiliser avec un unique compte."
 
-#: hiboo/profile/templates/profile_pick.html:44
+#: hiboo/profile/templates/profile_pick.html:42
 msgid ""
 "You may think of profiles as a way to switch between a personal and a "
 "business account, or to use the service under different identities for "
@@ -418,7 +539,7 @@ msgstr ""
 "profil personnel et un profil professionnel, ou d'utiliser le service "
 "sous différentes identités pour différentes activités."
 
-#: hiboo/profile/templates/profile_pick.html:45
+#: hiboo/profile/templates/profile_pick.html:43
 msgid ""
 "Profiles were introduced in order to offer flexibility and security "
 "against stalkers and other sorts of online violence."
@@ -426,16 +547,13 @@ msgstr ""
 "Les profils sont conçus pour offrir un degré de liberté et de sécurité "
 "contre le harcèlement et autres types de violence en ligne."
 
-#: hiboo/profile/templates/profile_pick.html:48
+#: hiboo/profile/templates/profile_pick.html:46
 msgid ""
-"However, profile creation on this services are currently locked down. You"
-" may only use existing profiles if you have some."
+"However, profile creation on this services is currently locked down. You "
+"may only use existing profiles if you have any."
 msgstr ""
-"Cependant, la création de profils sur ce service est actuellement "
-"verrouillée. Vous pouvez uniquement utiliser vos profils existants si "
-"vous en disposez."
 
-#: hiboo/profile/templates/profile_pick.html:50
+#: hiboo/profile/templates/profile_pick.html:48
 msgid ""
 "This service is not currently open for profile registration. In order to "
 "get new profiles, you must ask a service administrator."
@@ -443,7 +561,7 @@ msgstr ""
 "La création de profils n'est pas autorisée sur ce service. Pour obtenir "
 "de nouveaux profils, vous devez contacter un administrateur."
 
-#: hiboo/profile/templates/profile_pick.html:52
+#: hiboo/profile/templates/profile_pick.html:50
 msgid ""
 "You may request new profiles. Your requests will be submitted to "
 "validation."
@@ -451,7 +569,7 @@ msgstr ""
 "Vous pouvez demander la création de nouveaux profils. Vos requêtes seront"
 " soumises à validation."
 
-#: hiboo/profile/templates/profile_pick.html:54
+#: hiboo/profile/templates/profile_pick.html:52
 #, python-format
 msgid ""
 "You may create up to %(max_profiles)s profiles. Further profile requests "
@@ -460,7 +578,7 @@ msgstr ""
 "Vous pouvez créer jusqu'à %(max_profiles)s profils. Au délà, vos requêtes"
 " seront soumises à validation."
 
-#: hiboo/profile/templates/profile_pick.html:56
+#: hiboo/profile/templates/profile_pick.html:54
 #, python-format
 msgid ""
 "You may create up to %(max_profiles)s profiles. Please contact the "
@@ -469,10 +587,18 @@ msgstr ""
 "Vous pouvez créer jusqu'à %(max_profiles)s profils. Contactez un "
 "administrateur si vous avez des besoins spécifiques."
 
-#: hiboo/profile/templates/profile_pick.html:70
+#: hiboo/profile/templates/profile_pick.html:68
 msgid "Request profile"
 msgstr "Demander un profil"
 
+#: hiboo/service/admin.py:34
+msgid "Service successfully created"
+msgstr ""
+
+#: hiboo/service/admin.py:51
+msgid "Service successfully updated"
+msgstr ""
+
 #: hiboo/service/forms.py:10 hiboo/service/templates/service_details.html:13
 msgid "Service name"
 msgstr "Nom du service"
@@ -498,10 +624,14 @@ msgid "Maximum profile count"
 msgstr "Nombre maximum de profils"
 
 #: hiboo/service/forms.py:19
+msgid "Profile usenrame regex"
+msgstr ""
+
+#: hiboo/service/forms.py:20
 msgid "Disable per-profile username"
 msgstr "Désactiver les nom de profil personnalisés"
 
-#: hiboo/service/forms.py:20 hiboo/sso/forms.py:16 hiboo/sso/forms.py:42
+#: hiboo/service/forms.py:21 hiboo/sso/forms.py:16 hiboo/sso/forms.py:48
 msgid "Submit"
 msgstr "Valider"
 
@@ -515,7 +645,7 @@ msgstr "Créer un service"
 msgid "pick a protocol"
 msgstr "choisir un protocole"
 
-#: hiboo/service/templates/protocol_pick.html:16
+#: hiboo/service/templates/protocol_pick.html:14
 msgid "Create "
 msgstr "Créer "
 
@@ -564,6 +694,10 @@ msgstr "Politique"
 msgid "Max profiles"
 msgstr "Maximum de profils"
 
+#: hiboo/service/templates/service_list.html:18
+msgid "Actions"
+msgstr "Actions"
+
 #: hiboo/sso/forms.py:8
 msgid "SP entity id"
 msgstr "Entity id du SP"
@@ -636,6 +770,18 @@ msgstr "Uniquement les id token"
 msgid "Id token and token"
 msgstr "Tokens et id tokens"
 
+#: hiboo/sso/forms.py:43
+msgid "Enabled special claim mappings"
+msgstr ""
+
+#: hiboo/sso/forms.py:44
+msgid "Mask the profile uuid"
+msgstr ""
+
+#: hiboo/sso/forms.py:45
+msgid "Return the actual user email"
+msgstr ""
+
 #: hiboo/sso/templates/protocol_oidc.html:2
 msgid ""
 "OpenID Connect (OIDC) is JWT based authentication and authorization "
@@ -716,7 +862,7 @@ msgstr ""
 msgid "Toggle navigation"
 msgstr "Afficher la navigation"
 
-#: hiboo/templates/base.html:35 hiboo/templates/sidebar.html:20
+#: hiboo/templates/base.html:35 hiboo/templates/sidebar.html:25
 msgid "Sign out"
 msgstr "Se déconnecter"
 
@@ -739,7 +885,7 @@ msgstr ""
 "Vous êtes sur le point de %(action)s. Souhaitez-vous confirmer cette "
 "action ?"
 
-#: hiboo/templates/macros.html:53
+#: hiboo/templates/macros.html:55
 msgid "Close"
 msgstr "Fermer"
 
@@ -751,27 +897,31 @@ msgstr "Compte"
 msgid "My profiles"
 msgstr "Mes profils"
 
-#: hiboo/templates/sidebar.html:37
+#: hiboo/templates/sidebar.html:15
+msgid "My contact info"
+msgstr ""
+
+#: hiboo/templates/sidebar.html:42
 msgid "Admin"
 msgstr "Administration"
 
-#: hiboo/templates/sidebar.html:40
+#: hiboo/templates/sidebar.html:45
 msgid "Services"
 msgstr "Services"
 
-#: hiboo/templates/sidebar.html:45
+#: hiboo/templates/sidebar.html:50
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: hiboo/templates/sidebar.html:50
+#: hiboo/templates/sidebar.html:55
 msgid "About"
 msgstr "A propos"
 
-#: hiboo/templates/sidebar.html:53
+#: hiboo/templates/sidebar.html:58
 msgid "User guide"
 msgstr "Guide utilisateur"
 
-#: hiboo/templates/sidebar.html:58
+#: hiboo/templates/sidebar.html:63
 msgid "Admin guide"
 msgstr "Guide administrateur"
 
@@ -912,3 +1062,93 @@ msgstr "Choisir un utilisateur"
 
 #~ msgid "Create a profile"
 #~ msgstr "Créer un profil"
+
+#~ msgid ""
+#~ "<strong>You were redirected for "
+#~ "authentication</strong>. This is our account"
+#~ " manager, designed so you only have"
+#~ " to authenticate once."
+#~ msgstr ""
+#~ "<strong>Vous avez été redirigé pour vous"
+#~ " authentifier</strong>. Ce site est notre"
+#~ " gestionnaire de comptes, conçu pour "
+#~ "que vous n'ayez plus qu'un mot de"
+#~ " passe à saisir."
+
+#~ msgid ""
+#~ "It handles accounts for our services "
+#~ "and allows you to own multiple "
+#~ "profiles on each service."
+#~ msgstr ""
+#~ "Il gère l'accès à nos services et"
+#~ " vous permet de disposer de plusieurs"
+#~ " profils sur chaque service."
+
+#~ msgid ""
+#~ "You can now sign in to your "
+#~ "account. If you do not own one "
+#~ "already (which is probable if this "
+#~ "is your first time here), please "
+#~ "sign up first."
+#~ msgstr ""
+#~ "Vous pouvez vous connecter à votre "
+#~ "compte. Si vous n'en disposez pas "
+#~ "(ce qui est probable si vous lisez"
+#~ " ce message pour la première fois),"
+#~ " vous devrez en créer un."
+
+#~ msgid ""
+#~ "If you used to have an account "
+#~ "on the application you are "
+#~ "authenticating for, no panic necessary: "
+#~ "you will be able to claim it "
+#~ "once logged into Hiboo!"
+#~ msgstr ""
+#~ "Si vous aviez déjà un compte sur"
+#~ " l'application à laquelle vous tentez "
+#~ "d'accéder, pas de panique : vous "
+#~ "pourrez le récupérer une fois connecté"
+#~ " !"
+
+#~ msgid ""
+#~ "Please (please!) use a decent password"
+#~ " and memorize it. We do not "
+#~ "wish to collect data on who you"
+#~ " are. That also means it is "
+#~ "dificult for us to verify who you"
+#~ " are and reset your password."
+#~ msgstr ""
+#~ "Merci de choisir un mot de passe"
+#~ " suffisamment complexe et de le "
+#~ "mémoriser. Nous ne souhaitons pas "
+#~ "recueillir vos informations personnelles. Cela"
+#~ " implique qu'il nous est difficile de"
+#~ " vérifier qui vous êtes et de "
+#~ "réinitialiser votre mot de passe si "
+#~ "vous l'oubliez."
+
+#~ msgid "Here come profiles!"
+#~ msgstr "Voici les profils !"
+
+#~ msgid ""
+#~ "This service relies on profiles, which"
+#~ " are just as many identities that "
+#~ "you can have with your single "
+#~ "account."
+#~ msgstr ""
+#~ "Ce service supporte les profils. Les "
+#~ "profils sont des identités différentes "
+#~ "que vous pouvez utiliser avec un "
+#~ "unique compte."
+
+#~ msgid ""
+#~ "However, profile creation on this "
+#~ "services are currently locked down. You"
+#~ " may only use existing profiles if"
+#~ " you have some."
+#~ msgstr ""
+#~ "Cependant, la création de profils sur"
+#~ " ce service est actuellement verrouillée."
+#~ " Vous pouvez uniquement utiliser vos "
+#~ "profils existants si vous en disposez."
+
diff --git a/hiboo/translations/nl_NL/LC_MESSAGES/messages.po b/hiboo/translations/nl_NL/LC_MESSAGES/messages.po
index 82a7bf48..a03d2a3e 100644
--- a/hiboo/translations/nl_NL/LC_MESSAGES/messages.po
+++ b/hiboo/translations/nl_NL/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-11-24 12:00+0100\n"
+"POT-Creation-Date: 2020-03-19 13:27+0100\n"
 "PO-Revision-Date: 2019-11-13 22:18+0100\n"
 "Last-Translator: \n"
 "Language: nl\n"
@@ -18,39 +18,59 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.7.0\n"
 
-#: hiboo/models.py:152
+#: hiboo/models.py:153
 msgid "Profile creation is impossible"
 msgstr "Profiel maken is onmogelijk"
 
-#: hiboo/models.py:153
+#: hiboo/models.py:154
 msgid "Profile creation is reserved to managers"
 msgstr "Het maken van profielen is voorbehouden aan managers"
 
-#: hiboo/models.py:154
+#: hiboo/models.py:155
 msgid "Profile creation must be validated"
 msgstr "Het maken van profielen moet worden gevalideerd"
 
-#: hiboo/models.py:155
+#: hiboo/models.py:156
 msgid "Additional profiles must be validated"
 msgstr "Aanvullende profielen moeten worden gevalideerd"
 
-#: hiboo/models.py:156
+#: hiboo/models.py:157
 msgid "No validation is required"
 msgstr "Geen validatie vereist"
 
-#: hiboo/models.py:217
+#: hiboo/models.py:184
+msgid "unclaimed"
+msgstr ""
+
+#: hiboo/models.py:185
+msgid "requested"
+msgstr ""
+
+#: hiboo/models.py:186
+msgid "active"
+msgstr ""
+
+#: hiboo/models.py:187
+msgid "blocked"
+msgstr ""
+
+#: hiboo/models.py:188
+msgid "deleted"
+msgstr ""
+
+#: hiboo/models.py:227
 msgid "signed up for this account"
 msgstr "aangemeld voor dit account"
 
-#: hiboo/models.py:218
+#: hiboo/models.py:228
 msgid "created the profile {this.profile.username} on {this.service.name}"
 msgstr "heeft het profiel {this.profile.username} gemaakt op {this.service.name}"
 
-#: hiboo/models.py:219
+#: hiboo/models.py:229
 msgid "changed your password"
 msgstr "wachtwoord veranderd"
 
-#: hiboo/models.py:220
+#: hiboo/models.py:230
 msgid "{this.value} the profile {this.profile.username} on {this.service.name}"
 msgstr ""
 
@@ -61,7 +81,7 @@ msgstr ""
 #: hiboo/account/forms.py:8 hiboo/account/forms.py:14 hiboo/profile/forms.py:8
 #: hiboo/profile/forms.py:18 hiboo/profile/templates/profile_details.html:12
 #: hiboo/user/templates/user_details.html:12
-#: hiboo/user/templates/user_details.html:35
+#: hiboo/user/templates/user_details.html:38
 #: hiboo/user/templates/user_list.html:12
 #: hiboo/user/templates/user_pick.html:12
 msgid "Username"
@@ -72,7 +92,7 @@ msgid "Password"
 msgstr "Wachtwoord"
 
 #: hiboo/account/forms.py:10 hiboo/account/templates/account_signin.html:3
-#: hiboo/templates/base.html:42 hiboo/templates/sidebar.html:31
+#: hiboo/templates/base.html:42 hiboo/templates/sidebar.html:36
 msgid "Sign in"
 msgstr "Aanmelden"
 
@@ -80,9 +100,9 @@ msgstr "Aanmelden"
 msgid "Confirm password"
 msgstr "Bevestig wachtwoord"
 
-#: hiboo/account/forms.py:22 hiboo/account/templates/account_signin.html:20
+#: hiboo/account/forms.py:22 hiboo/account/templates/account_signin.html:22
 #: hiboo/account/templates/account_signup.html:3
-#: hiboo/templates/sidebar.html:26
+#: hiboo/templates/sidebar.html:31
 msgid "Sign up"
 msgstr "Aanmelden"
 
@@ -98,10 +118,72 @@ msgstr "Nieuw wachtwoord"
 msgid "Confirm new password"
 msgstr "Bevestig nieuw wachtwoord"
 
-#: hiboo/account/forms.py:30 hiboo/templates/sidebar.html:15
+#: hiboo/account/forms.py:30 hiboo/templates/sidebar.html:20
 msgid "Change password"
 msgstr "Wachtwoord wijzigen"
 
+#: hiboo/account/forms.py:34
+msgid "Email address"
+msgstr ""
+
+#: hiboo/account/forms.py:35
+msgid "Matrix ID"
+msgstr ""
+
+#: hiboo/account/forms.py:36 hiboo/account/templates/account_contact.html:3
+msgid "Update contact info"
+msgstr ""
+
+#: hiboo/account/login.py:18
+msgid "Wrong credentials"
+msgstr ""
+
+#: hiboo/account/login.py:36
+msgid "A user with the same username exists already"
+msgstr ""
+
+#: hiboo/account/login.py:46
+msgid "Signed up using the Web form"
+msgstr ""
+
+#: hiboo/account/login.py:48
+msgid "User created successfully"
+msgstr ""
+
+#: hiboo/account/settings.py:20
+msgid "Successfully reset your password"
+msgstr ""
+
+#: hiboo/account/settings.py:23
+msgid "Wrong credentials, check your old password"
+msgstr ""
+
+#: hiboo/account/settings.py:36
+msgid "Successfully updated your contact info"
+msgstr ""
+
+#: hiboo/account/templates/account_contact.html:7
+msgid "Contact information"
+msgstr ""
+
+#: hiboo/account/templates/account_contact.html:8
+msgid ""
+"There is no requirement for you to provide us with your contact "
+"information. Those can be useful though."
+msgstr ""
+
+#: hiboo/account/templates/account_contact.html:9
+msgid ""
+"If you lose access to your account, we might use this information to "
+"check that your are indeed who you pretend to be."
+msgstr ""
+
+#: hiboo/account/templates/account_contact.html:10
+msgid ""
+"Also, if we notice unusual behavior on your account, we may use this "
+"information to contact you instead of immediately blocking your account."
+msgstr ""
+
 #: hiboo/account/templates/account_home.html:3
 #: hiboo/account/templates/account_profiles.html:3
 #: hiboo/templates/sidebar.html:5
@@ -136,72 +218,105 @@ msgstr ""
 msgid "registered user"
 msgstr ""
 
+#: hiboo/account/templates/account_home.html:33
+#: hiboo/account/templates/account_signin.html:8
+msgid "Authentication manager"
+msgstr ""
+
+#: hiboo/account/templates/account_home.html:34
+msgid "This is Hiboo, our account and authentication manager."
+msgstr ""
+
+#: hiboo/account/templates/account_home.html:35
+msgid ""
+"Hiboo is designed so you only have to remember one password and can use "
+"your many accounts on every application associated with it."
+msgstr ""
+
+#: hiboo/account/templates/account_home.html:36
+msgid ""
+"If you wish to sign into one of the applications, simply open your "
+"browser and go to the application: you will automatically be redirected "
+"back to Hiboo and will be able to pick the profile you desire."
+msgstr ""
+
+#: hiboo/account/templates/account_home.html:37
+#: hiboo/account/templates/account_signin.html:14
+msgid ""
+"<strong>If you are having trouble</strong>, please refer to the "
+"documentation, then contact the administrator of this service directly, "
+"using the contact button in the left panel."
+msgstr ""
+
 #: hiboo/account/templates/account_profiles.html:4
 msgid "my profiles"
 msgstr ""
 
-#: hiboo/account/templates/account_profiles.html:14
+#: hiboo/account/templates/account_profiles.html:13
 #: hiboo/profile/templates/profile_list.html:16
 #: hiboo/service/templates/service_list.html:13
-#: hiboo/user/templates/user_details.html:34
+#: hiboo/user/templates/user_details.html:37
 msgid "Service"
 msgstr "Service"
 
-#: hiboo/account/templates/account_profiles.html:16
+#: hiboo/account/templates/account_profiles.html:14
 #: hiboo/profile/templates/profile_list.html:18
 msgid "Profile username"
 msgstr ""
 
-#: hiboo/account/templates/account_profiles.html:17
-#: hiboo/profile/templates/profile_list.html:19
-msgid "Owned by"
-msgstr ""
-
-#: hiboo/account/templates/account_profiles.html:18
-#: hiboo/profile/templates/profile_details.html:21
+#: hiboo/account/templates/account_profiles.html:15
+#: hiboo/profile/templates/profile_details.html:22
 #: hiboo/profile/templates/profile_list.html:20
-#: hiboo/user/templates/user_details.html:36
+#: hiboo/user/templates/user_details.html:39
 msgid "Status"
 msgstr ""
 
-#: hiboo/account/templates/account_profiles.html:19
+#: hiboo/account/templates/account_profiles.html:16
 #: hiboo/profile/templates/profile_list.html:21
 #: hiboo/user/templates/user_list.html:13
 #: hiboo/user/templates/user_pick.html:13
 msgid "Created on"
 msgstr ""
 
+#: hiboo/account/templates/account_profiles.html:17 hiboo/profile/forms.py:9
+msgid "Comment"
+msgstr "Commentaar"
+
 #: hiboo/account/templates/account_signin.html:4
 msgid "to access your account"
 msgstr "om toegang te krijgen tot uw account"
 
-#: hiboo/account/templates/account_signin.html:8
-msgid "Authentication manager"
-msgstr ""
-
 #: hiboo/account/templates/account_signin.html:9
 msgid ""
-"<strong>You were redirected for authentication</strong>. This is our "
-"account manager, designed so you only have to authenticate once."
+"<strong>You were directed here for authentication</strong>. This is our "
+"account manager, designed so you only have to remember one password and "
+"authenticate once."
 msgstr ""
 
 #: hiboo/account/templates/account_signin.html:10
 msgid ""
-"It handles accounts for our services and allows you to own multiple "
-"profiles on each service."
+"It handles accounts for our applications and allows you to own and use "
+"multiple profiles on each application."
 msgstr ""
 
 #: hiboo/account/templates/account_signin.html:11
 msgid ""
-"You can now sign in to your account. If you do not own one already (which"
-" is probable if this is your first time here), please sign up first."
+"<strong>If you are seing this page for the first time</strong>, then you "
+"must first create your master account and password: please click the "
+"\"Sign up\" button for this."
 msgstr ""
 
 #: hiboo/account/templates/account_signin.html:12
 msgid ""
-"If you used to have an account on the application you are authenticating "
-"for, no panic necessary: you will be able to claim it once logged into "
-"Hiboo!"
+"If you already have an account or when you are signed up, please sign in "
+"using the form below."
+msgstr ""
+
+#: hiboo/account/templates/account_signin.html:13
+msgid ""
+"If you used to own an account on the application that redirected you "
+"here, do not panic: you will be able to claim it once logged in, using "
+"the \"claim\" button!"
 msgstr ""
 
 #: hiboo/account/templates/account_signup.html:4
@@ -234,31 +349,51 @@ msgstr ""
 msgid ""
 "Please (please!) use a decent password and memorize it. We do not wish to"
 " collect data on who you are. That also means it is dificult for us to "
-"verify who you are and reset your password."
+"verify who you are and reset your password in case you forget it."
 msgstr ""
-"Gebruik alsjeblieft een goed wachtwoord en onthoud het. We willen geen "
-"gegevens verzamelen over wie je bent. Dat betekent ook dat het voor ons "
-"moeilijk is om te verifiëren wie u bent en uw wachtwoord opnieuw in te "
-"stellen."
 
-#: hiboo/profile/forms.py:9
-msgid "Comment"
-msgstr "Commentaar"
+#: hiboo/profile/admin.py:41
+msgid "Profile status was successfully changed"
+msgstr ""
 
-#: hiboo/profile/forms.py:10 hiboo/profile/templates/profile_list.html:50
-#: hiboo/profile/templates/profile_pick.html:68
-#: hiboo/profile/templates/profile_pick.html:72
+#: hiboo/profile/forms.py:10 hiboo/profile/templates/profile_list.html:49
+#: hiboo/profile/templates/profile_pick.html:66
+#: hiboo/profile/templates/profile_pick.html:70
 msgid "Create profile"
 msgstr "Maak een profiel aan"
 
 #: hiboo/profile/forms.py:20 hiboo/profile/templates/profile_claim.html:4
-#: hiboo/profile/templates/profile_pick.html:65
+#: hiboo/profile/templates/profile_pick.html:63
 msgid "Claim profile"
 msgstr ""
 
+#: hiboo/profile/login.py:34 hiboo/profile/login.py:41
+msgid "You cannot request a profile for this service"
+msgstr ""
+
+#: hiboo/profile/login.py:45
+msgid "Your reached the maximum number of profiles"
+msgstr ""
+
+#: hiboo/profile/login.py:49
+msgid "Your profile creation requires approval"
+msgstr ""
+
+#: hiboo/profile/login.py:64
+msgid "A profile with that username exists already"
+msgstr ""
+
+#: hiboo/profile/login.py:100
+msgid "Successfully claimed the profile!"
+msgstr ""
+
+#: hiboo/profile/login.py:103
+msgid "Wrong username or password"
+msgstr ""
+
 #: hiboo/profile/templates/profile_claim.html:5
 #: hiboo/profile/templates/profile_create.html:6
-#: hiboo/profile/templates/profile_pick.html:7
+#: hiboo/profile/templates/profile_pick.html:5
 #, python-format
 msgid "for the service %(service_name)s"
 msgstr "voor de service %(service_name)s"
@@ -333,63 +468,62 @@ msgstr ""
 msgid "UUID"
 msgstr "UUID"
 
-#: hiboo/profile/templates/profile_details.html:24
+#: hiboo/profile/templates/profile_details.html:25
 #: hiboo/user/templates/user_details.html:18
 msgid "Created at"
 msgstr ""
 
-#: hiboo/profile/templates/profile_details.html:40
+#: hiboo/profile/templates/profile_details.html:41
 msgid "Block profile"
 msgstr ""
 
-#: hiboo/profile/templates/profile_details.html:42
+#: hiboo/profile/templates/profile_details.html:43
 msgid "Unblock profile"
 msgstr ""
 
-#: hiboo/profile/templates/profile_list.html:22
-#: hiboo/service/templates/service_list.html:18
-msgid "Actions"
+#: hiboo/profile/templates/profile_list.html:19
+msgid "Owned by"
 msgstr ""
 
-#: hiboo/profile/templates/profile_pick.html:6
+#: hiboo/profile/templates/profile_pick.html:4
 msgid "Pick a profile"
 msgstr "Kies een profiel"
 
-#: hiboo/profile/templates/profile_pick.html:22
+#: hiboo/profile/templates/profile_pick.html:20
 msgid "Blocked"
 msgstr "Geblokkeerd"
 
-#: hiboo/profile/templates/profile_pick.html:24
+#: hiboo/profile/templates/profile_pick.html:22
 msgid "Awaiting approval"
 msgstr "In afwachting van goedkeuring"
 
-#: hiboo/profile/templates/profile_pick.html:32
+#: hiboo/profile/templates/profile_pick.html:30
 #, python-format
 msgid "Created on %(created_on)s"
 msgstr "Gemaakt op %(created_on)s"
 
-#: hiboo/profile/templates/profile_pick.html:33
+#: hiboo/profile/templates/profile_pick.html:31
 msgid "Not shared with anyone"
 msgstr "Met niemand gedeeld"
 
-#: hiboo/profile/templates/profile_pick.html:41
-msgid "Here come profiles!"
-msgstr "Hier komen profielen!"
+#: hiboo/profile/templates/profile_pick.html:39
+msgid "Pick your profile"
+msgstr ""
 
-#: hiboo/profile/templates/profile_pick.html:43
+#: hiboo/profile/templates/profile_pick.html:41
 msgid ""
-"This service relies on profiles, which are just as many identities that "
-"you can have with your single account."
+"Every service is associated with profiles, which are just as many "
+"identities that you can associate to your master account."
 msgstr ""
 
-#: hiboo/profile/templates/profile_pick.html:44
+#: hiboo/profile/templates/profile_pick.html:42
 msgid ""
 "You may think of profiles as a way to switch between a personal and a "
 "business account, or to use the service under different identities for "
 "diffrent activities."
 msgstr ""
 
-#: hiboo/profile/templates/profile_pick.html:45
+#: hiboo/profile/templates/profile_pick.html:43
 msgid ""
 "Profiles were introduced in order to offer flexibility and security "
 "against stalkers and other sorts of online violence."
@@ -397,15 +531,13 @@ msgstr ""
 "Profielen werden geïntroduceerd om flexibiliteit en veiligheid te bieden "
 "tegen stalkers en andere vormen van online geweld."
 
-#: hiboo/profile/templates/profile_pick.html:48
+#: hiboo/profile/templates/profile_pick.html:46
 msgid ""
-"However, profile creation on this services are currently locked down. You"
-" may only use existing profiles if you have some."
+"However, profile creation on this services is currently locked down. You "
+"may only use existing profiles if you have any."
 msgstr ""
-"Het maken van profielen op deze services is momenteel echter vergrendeld."
-" Je mag alleen bestaande profielen gebruiken als je er een hebt."
 
-#: hiboo/profile/templates/profile_pick.html:50
+#: hiboo/profile/templates/profile_pick.html:48
 msgid ""
 "This service is not currently open for profile registration. In order to "
 "get new profiles, you must ask a service administrator."
@@ -413,7 +545,7 @@ msgstr ""
 "Deze service is momenteel niet open voor profielregistratie. Om nieuwe "
 "profielen te krijgen, moet u een servicebeheerder vragen."
 
-#: hiboo/profile/templates/profile_pick.html:52
+#: hiboo/profile/templates/profile_pick.html:50
 msgid ""
 "You may request new profiles. Your requests will be submitted to "
 "validation."
@@ -421,7 +553,7 @@ msgstr ""
 "U kunt nieuwe profielen aanvragen. Uw verzoeken worden ter validatie "
 "ingediend."
 
-#: hiboo/profile/templates/profile_pick.html:54
+#: hiboo/profile/templates/profile_pick.html:52
 #, python-format
 msgid ""
 "You may create up to %(max_profiles)s profiles. Further profile requests "
@@ -430,7 +562,7 @@ msgstr ""
 "U kunt maximaal %(max_profiles)s profielen maken. Verdere "
 "profielverzoeken worden ter validatie voorgelegd."
 
-#: hiboo/profile/templates/profile_pick.html:56
+#: hiboo/profile/templates/profile_pick.html:54
 #, python-format
 msgid ""
 "You may create up to %(max_profiles)s profiles. Please contact the "
@@ -439,10 +571,18 @@ msgstr ""
 "U kunt maximaal %(max_profiles)s profielen maken. Neem contact op met de "
 "servicebeheerder als u specifieke behoeften hebt."
 
-#: hiboo/profile/templates/profile_pick.html:70
+#: hiboo/profile/templates/profile_pick.html:68
 msgid "Request profile"
 msgstr ""
 
+#: hiboo/service/admin.py:34
+msgid "Service successfully created"
+msgstr ""
+
+#: hiboo/service/admin.py:51
+msgid "Service successfully updated"
+msgstr ""
+
 #: hiboo/service/forms.py:10 hiboo/service/templates/service_details.html:13
 msgid "Service name"
 msgstr "Service naam"
@@ -468,10 +608,14 @@ msgid "Maximum profile count"
 msgstr "Maximaal profielaantal"
 
 #: hiboo/service/forms.py:19
+msgid "Profile usenrame regex"
+msgstr ""
+
+#: hiboo/service/forms.py:20
 msgid "Disable per-profile username"
 msgstr ""
 
-#: hiboo/service/forms.py:20 hiboo/sso/forms.py:16 hiboo/sso/forms.py:42
+#: hiboo/service/forms.py:21 hiboo/sso/forms.py:16 hiboo/sso/forms.py:48
 msgid "Submit"
 msgstr "Voorleggen"
 
@@ -485,7 +629,7 @@ msgstr "Maak een service aan"
 msgid "pick a protocol"
 msgstr "kies een protocol"
 
-#: hiboo/service/templates/protocol_pick.html:16
+#: hiboo/service/templates/protocol_pick.html:14
 msgid "Create "
 msgstr "Creëren "
 
@@ -534,6 +678,10 @@ msgstr "Het beleid"
 msgid "Max profiles"
 msgstr "Max profielen"
 
+#: hiboo/service/templates/service_list.html:18
+msgid "Actions"
+msgstr ""
+
 #: hiboo/sso/forms.py:8
 msgid "SP entity id"
 msgstr "SP entiteits-ID"
@@ -606,6 +754,18 @@ msgstr ""
 msgid "Id token and token"
 msgstr ""
 
+#: hiboo/sso/forms.py:43
+msgid "Enabled special claim mappings"
+msgstr ""
+
+#: hiboo/sso/forms.py:44
+msgid "Mask the profile uuid"
+msgstr ""
+
+#: hiboo/sso/forms.py:45
+msgid "Return the actual user email"
+msgstr ""
+
 #: hiboo/sso/templates/protocol_oidc.html:2
 msgid ""
 "OpenID Connect (OIDC) is JWT based authentication and authorization "
@@ -686,7 +846,7 @@ msgstr ""
 msgid "Toggle navigation"
 msgstr "Schakel navigatie in"
 
-#: hiboo/templates/base.html:35 hiboo/templates/sidebar.html:20
+#: hiboo/templates/base.html:35 hiboo/templates/sidebar.html:25
 msgid "Sign out"
 msgstr "Afmelden"
 
@@ -707,7 +867,7 @@ msgstr ""
 msgid "Your are about to %(action)s. Do you wish to confirm that action?"
 msgstr ""
 
-#: hiboo/templates/macros.html:53
+#: hiboo/templates/macros.html:55
 msgid "Close"
 msgstr "Dichtbij"
 
@@ -719,27 +879,31 @@ msgstr "Account"
 msgid "My profiles"
 msgstr ""
 
-#: hiboo/templates/sidebar.html:37
+#: hiboo/templates/sidebar.html:15
+msgid "My contact info"
+msgstr ""
+
+#: hiboo/templates/sidebar.html:42
 msgid "Admin"
 msgstr "Beheerder"
 
-#: hiboo/templates/sidebar.html:40
+#: hiboo/templates/sidebar.html:45
 msgid "Services"
 msgstr "Diensten"
 
-#: hiboo/templates/sidebar.html:45
+#: hiboo/templates/sidebar.html:50
 msgid "Users"
 msgstr ""
 
-#: hiboo/templates/sidebar.html:50
+#: hiboo/templates/sidebar.html:55
 msgid "About"
 msgstr "Over"
 
-#: hiboo/templates/sidebar.html:53
+#: hiboo/templates/sidebar.html:58
 msgid "User guide"
 msgstr "Gebruikershandleiding"
 
-#: hiboo/templates/sidebar.html:58
+#: hiboo/templates/sidebar.html:63
 msgid "Admin guide"
 msgstr "Admin gids"
 
@@ -895,3 +1059,69 @@ msgstr ""
 #~ msgid "Create a profile"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "<strong>You were redirected for "
+#~ "authentication</strong>. This is our account"
+#~ " manager, designed so you only have"
+#~ " to authenticate once."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "It handles accounts for our services "
+#~ "and allows you to own multiple "
+#~ "profiles on each service."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can now sign in to your "
+#~ "account. If you do not own one "
+#~ "already (which is probable if this "
+#~ "is your first time here), please "
+#~ "sign up first."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If you used to have an account "
+#~ "on the application you are "
+#~ "authenticating for, no panic necessary: "
+#~ "you will be able to claim it "
+#~ "once logged into Hiboo!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Please (please!) use a decent password"
+#~ " and memorize it. We do not "
+#~ "wish to collect data on who you"
+#~ " are. That also means it is "
+#~ "dificult for us to verify who you"
+#~ " are and reset your password."
+#~ msgstr ""
+#~ "Gebruik alsjeblieft een goed wachtwoord "
+#~ "en onthoud het. We willen geen "
+#~ "gegevens verzamelen over wie je bent."
+#~ " Dat betekent ook dat het voor "
+#~ "ons moeilijk is om te verifiëren "
+#~ "wie u bent en uw wachtwoord "
+#~ "opnieuw in te stellen."
+
+#~ msgid "Here come profiles!"
+#~ msgstr "Hier komen profielen!"
+
+#~ msgid ""
+#~ "This service relies on profiles, which"
+#~ " are just as many identities that "
+#~ "you can have with your single "
+#~ "account."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "However, profile creation on this "
+#~ "services are currently locked down. You"
+#~ " may only use existing profiles if"
+#~ " you have some."
+#~ msgstr ""
+#~ "Het maken van profielen op deze "
+#~ "services is momenteel echter vergrendeld. "
+#~ "Je mag alleen bestaande profielen "
+#~ "gebruiken als je er een hebt."
+
diff --git a/messages.pot b/messages.pot
index 2a5dca99..fd51a99d 100644
--- a/messages.pot
+++ b/messages.pot
@@ -1,14 +1,14 @@
 # Translations template for PROJECT.
-# Copyright (C) 2019 ORGANIZATION
+# Copyright (C) 2020 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-11-24 12:00+0100\n"
+"POT-Creation-Date: 2020-03-19 13:27+0100\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"
@@ -17,39 +17,59 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.7.0\n"
 
-#: hiboo/models.py:152
+#: hiboo/models.py:153
 msgid "Profile creation is impossible"
 msgstr ""
 
-#: hiboo/models.py:153
+#: hiboo/models.py:154
 msgid "Profile creation is reserved to managers"
 msgstr ""
 
-#: hiboo/models.py:154
+#: hiboo/models.py:155
 msgid "Profile creation must be validated"
 msgstr ""
 
-#: hiboo/models.py:155
+#: hiboo/models.py:156
 msgid "Additional profiles must be validated"
 msgstr ""
 
-#: hiboo/models.py:156
+#: hiboo/models.py:157
 msgid "No validation is required"
 msgstr ""
 
-#: hiboo/models.py:217
+#: hiboo/models.py:184
+msgid "unclaimed"
+msgstr ""
+
+#: hiboo/models.py:185
+msgid "requested"
+msgstr ""
+
+#: hiboo/models.py:186
+msgid "active"
+msgstr ""
+
+#: hiboo/models.py:187
+msgid "blocked"
+msgstr ""
+
+#: hiboo/models.py:188
+msgid "deleted"
+msgstr ""
+
+#: hiboo/models.py:227
 msgid "signed up for this account"
 msgstr ""
 
-#: hiboo/models.py:218
+#: hiboo/models.py:228
 msgid "created the profile {this.profile.username} on {this.service.name}"
 msgstr ""
 
-#: hiboo/models.py:219
+#: hiboo/models.py:229
 msgid "changed your password"
 msgstr ""
 
-#: hiboo/models.py:220
+#: hiboo/models.py:230
 msgid "{this.value} the profile {this.profile.username} on {this.service.name}"
 msgstr ""
 
@@ -60,7 +80,7 @@ msgstr ""
 #: hiboo/account/forms.py:8 hiboo/account/forms.py:14 hiboo/profile/forms.py:8
 #: hiboo/profile/forms.py:18 hiboo/profile/templates/profile_details.html:12
 #: hiboo/user/templates/user_details.html:12
-#: hiboo/user/templates/user_details.html:35
+#: hiboo/user/templates/user_details.html:38
 #: hiboo/user/templates/user_list.html:12
 #: hiboo/user/templates/user_pick.html:12
 msgid "Username"
@@ -71,7 +91,7 @@ msgid "Password"
 msgstr ""
 
 #: hiboo/account/forms.py:10 hiboo/account/templates/account_signin.html:3
-#: hiboo/templates/base.html:42 hiboo/templates/sidebar.html:31
+#: hiboo/templates/base.html:42 hiboo/templates/sidebar.html:36
 msgid "Sign in"
 msgstr ""
 
@@ -79,9 +99,9 @@ msgstr ""
 msgid "Confirm password"
 msgstr ""
 
-#: hiboo/account/forms.py:22 hiboo/account/templates/account_signin.html:20
+#: hiboo/account/forms.py:22 hiboo/account/templates/account_signin.html:22
 #: hiboo/account/templates/account_signup.html:3
-#: hiboo/templates/sidebar.html:26
+#: hiboo/templates/sidebar.html:31
 msgid "Sign up"
 msgstr ""
 
@@ -97,10 +117,72 @@ msgstr ""
 msgid "Confirm new password"
 msgstr ""
 
-#: hiboo/account/forms.py:30 hiboo/templates/sidebar.html:15
+#: hiboo/account/forms.py:30 hiboo/templates/sidebar.html:20
 msgid "Change password"
 msgstr ""
 
+#: hiboo/account/forms.py:34
+msgid "Email address"
+msgstr ""
+
+#: hiboo/account/forms.py:35
+msgid "Matrix ID"
+msgstr ""
+
+#: hiboo/account/forms.py:36 hiboo/account/templates/account_contact.html:3
+msgid "Update contact info"
+msgstr ""
+
+#: hiboo/account/login.py:18
+msgid "Wrong credentials"
+msgstr ""
+
+#: hiboo/account/login.py:36
+msgid "A user with the same username exists already"
+msgstr ""
+
+#: hiboo/account/login.py:46
+msgid "Signed up using the Web form"
+msgstr ""
+
+#: hiboo/account/login.py:48
+msgid "User created successfully"
+msgstr ""
+
+#: hiboo/account/settings.py:20
+msgid "Successfully reset your password"
+msgstr ""
+
+#: hiboo/account/settings.py:23
+msgid "Wrong credentials, check your old password"
+msgstr ""
+
+#: hiboo/account/settings.py:36
+msgid "Successfully updated your contact info"
+msgstr ""
+
+#: hiboo/account/templates/account_contact.html:7
+msgid "Contact information"
+msgstr ""
+
+#: hiboo/account/templates/account_contact.html:8
+msgid ""
+"There is no requirement for you to provide us with your contact "
+"information. Those can be useful though."
+msgstr ""
+
+#: hiboo/account/templates/account_contact.html:9
+msgid ""
+"If you lose access to your account, we might use this information to "
+"check that your are indeed who you pretend to be."
+msgstr ""
+
+#: hiboo/account/templates/account_contact.html:10
+msgid ""
+"Also, if we notice unusual behavior on your account, we may use this "
+"information to contact you instead of immediately blocking your account."
+msgstr ""
+
 #: hiboo/account/templates/account_home.html:3
 #: hiboo/account/templates/account_profiles.html:3
 #: hiboo/templates/sidebar.html:5
@@ -135,72 +217,105 @@ msgstr ""
 msgid "registered user"
 msgstr ""
 
+#: hiboo/account/templates/account_home.html:33
+#: hiboo/account/templates/account_signin.html:8
+msgid "Authentication manager"
+msgstr ""
+
+#: hiboo/account/templates/account_home.html:34
+msgid "This is Hiboo, our account and authentication manager."
+msgstr ""
+
+#: hiboo/account/templates/account_home.html:35
+msgid ""
+"Hiboo is designed so you only have to remember one password and can use "
+"your many accounts on every application associated with it."
+msgstr ""
+
+#: hiboo/account/templates/account_home.html:36
+msgid ""
+"If you wish to sign into one of the applications, simply open your "
+"browser and go to the application: you will automatically be redirected "
+"back to Hiboo and will be able to pick the profile you desire."
+msgstr ""
+
+#: hiboo/account/templates/account_home.html:37
+#: hiboo/account/templates/account_signin.html:14
+msgid ""
+"<strong>If you are having trouble</strong>, please refer to the "
+"documentation, then contact the administrator of this service directly, "
+"using the contact button in the left panel."
+msgstr ""
+
 #: hiboo/account/templates/account_profiles.html:4
 msgid "my profiles"
 msgstr ""
 
-#: hiboo/account/templates/account_profiles.html:14
+#: hiboo/account/templates/account_profiles.html:13
 #: hiboo/profile/templates/profile_list.html:16
 #: hiboo/service/templates/service_list.html:13
-#: hiboo/user/templates/user_details.html:34
+#: hiboo/user/templates/user_details.html:37
 msgid "Service"
 msgstr ""
 
-#: hiboo/account/templates/account_profiles.html:16
+#: hiboo/account/templates/account_profiles.html:14
 #: hiboo/profile/templates/profile_list.html:18
 msgid "Profile username"
 msgstr ""
 
-#: hiboo/account/templates/account_profiles.html:17
-#: hiboo/profile/templates/profile_list.html:19
-msgid "Owned by"
-msgstr ""
-
-#: hiboo/account/templates/account_profiles.html:18
-#: hiboo/profile/templates/profile_details.html:21
+#: hiboo/account/templates/account_profiles.html:15
+#: hiboo/profile/templates/profile_details.html:22
 #: hiboo/profile/templates/profile_list.html:20
-#: hiboo/user/templates/user_details.html:36
+#: hiboo/user/templates/user_details.html:39
 msgid "Status"
 msgstr ""
 
-#: hiboo/account/templates/account_profiles.html:19
+#: hiboo/account/templates/account_profiles.html:16
 #: hiboo/profile/templates/profile_list.html:21
 #: hiboo/user/templates/user_list.html:13
 #: hiboo/user/templates/user_pick.html:13
 msgid "Created on"
 msgstr ""
 
-#: hiboo/account/templates/account_signin.html:4
-msgid "to access your account"
+#: hiboo/account/templates/account_profiles.html:17 hiboo/profile/forms.py:9
+msgid "Comment"
 msgstr ""
 
-#: hiboo/account/templates/account_signin.html:8
-msgid "Authentication manager"
+#: hiboo/account/templates/account_signin.html:4
+msgid "to access your account"
 msgstr ""
 
 #: hiboo/account/templates/account_signin.html:9
 msgid ""
-"<strong>You were redirected for authentication</strong>. This is our "
-"account manager, designed so you only have to authenticate once."
+"<strong>You were directed here for authentication</strong>. This is our "
+"account manager, designed so you only have to remember one password and "
+"authenticate once."
 msgstr ""
 
 #: hiboo/account/templates/account_signin.html:10
 msgid ""
-"It handles accounts for our services and allows you to own multiple "
-"profiles on each service."
+"It handles accounts for our applications and allows you to own and use "
+"multiple profiles on each application."
 msgstr ""
 
 #: hiboo/account/templates/account_signin.html:11
 msgid ""
-"You can now sign in to your account. If you do not own one already (which"
-" is probable if this is your first time here), please sign up first."
+"<strong>If you are seing this page for the first time</strong>, then you "
+"must first create your master account and password: please click the "
+"\"Sign up\" button for this."
 msgstr ""
 
 #: hiboo/account/templates/account_signin.html:12
 msgid ""
-"If you used to have an account on the application you are authenticating "
-"for, no panic necessary: you will be able to claim it once logged into "
-"Hiboo!"
+"If you already have an account or when you are signed up, please sign in "
+"using the form below."
+msgstr ""
+
+#: hiboo/account/templates/account_signin.html:13
+msgid ""
+"If you used to own an account on the application that redirected you "
+"here, do not panic: you will be able to claim it once logged in, using "
+"the \"claim\" button!"
 msgstr ""
 
 #: hiboo/account/templates/account_signup.html:4
@@ -233,27 +348,51 @@ msgstr ""
 msgid ""
 "Please (please!) use a decent password and memorize it. We do not wish to"
 " collect data on who you are. That also means it is dificult for us to "
-"verify who you are and reset your password."
+"verify who you are and reset your password in case you forget it."
 msgstr ""
 
-#: hiboo/profile/forms.py:9
-msgid "Comment"
+#: hiboo/profile/admin.py:41
+msgid "Profile status was successfully changed"
 msgstr ""
 
-#: hiboo/profile/forms.py:10 hiboo/profile/templates/profile_list.html:50
-#: hiboo/profile/templates/profile_pick.html:68
-#: hiboo/profile/templates/profile_pick.html:72
+#: hiboo/profile/forms.py:10 hiboo/profile/templates/profile_list.html:49
+#: hiboo/profile/templates/profile_pick.html:66
+#: hiboo/profile/templates/profile_pick.html:70
 msgid "Create profile"
 msgstr ""
 
 #: hiboo/profile/forms.py:20 hiboo/profile/templates/profile_claim.html:4
-#: hiboo/profile/templates/profile_pick.html:65
+#: hiboo/profile/templates/profile_pick.html:63
 msgid "Claim profile"
 msgstr ""
 
+#: hiboo/profile/login.py:34 hiboo/profile/login.py:41
+msgid "You cannot request a profile for this service"
+msgstr ""
+
+#: hiboo/profile/login.py:45
+msgid "Your reached the maximum number of profiles"
+msgstr ""
+
+#: hiboo/profile/login.py:49
+msgid "Your profile creation requires approval"
+msgstr ""
+
+#: hiboo/profile/login.py:64
+msgid "A profile with that username exists already"
+msgstr ""
+
+#: hiboo/profile/login.py:100
+msgid "Successfully claimed the profile!"
+msgstr ""
+
+#: hiboo/profile/login.py:103
+msgid "Wrong username or password"
+msgstr ""
+
 #: hiboo/profile/templates/profile_claim.html:5
 #: hiboo/profile/templates/profile_create.html:6
-#: hiboo/profile/templates/profile_pick.html:7
+#: hiboo/profile/templates/profile_pick.html:5
 #, python-format
 msgid "for the service %(service_name)s"
 msgstr ""
@@ -322,104 +461,111 @@ msgstr ""
 msgid "UUID"
 msgstr ""
 
-#: hiboo/profile/templates/profile_details.html:24
+#: hiboo/profile/templates/profile_details.html:25
 #: hiboo/user/templates/user_details.html:18
 msgid "Created at"
 msgstr ""
 
-#: hiboo/profile/templates/profile_details.html:40
+#: hiboo/profile/templates/profile_details.html:41
 msgid "Block profile"
 msgstr ""
 
-#: hiboo/profile/templates/profile_details.html:42
+#: hiboo/profile/templates/profile_details.html:43
 msgid "Unblock profile"
 msgstr ""
 
-#: hiboo/profile/templates/profile_list.html:22
-#: hiboo/service/templates/service_list.html:18
-msgid "Actions"
+#: hiboo/profile/templates/profile_list.html:19
+msgid "Owned by"
 msgstr ""
 
-#: hiboo/profile/templates/profile_pick.html:6
+#: hiboo/profile/templates/profile_pick.html:4
 msgid "Pick a profile"
 msgstr ""
 
-#: hiboo/profile/templates/profile_pick.html:22
+#: hiboo/profile/templates/profile_pick.html:20
 msgid "Blocked"
 msgstr ""
 
-#: hiboo/profile/templates/profile_pick.html:24
+#: hiboo/profile/templates/profile_pick.html:22
 msgid "Awaiting approval"
 msgstr ""
 
-#: hiboo/profile/templates/profile_pick.html:32
+#: hiboo/profile/templates/profile_pick.html:30
 #, python-format
 msgid "Created on %(created_on)s"
 msgstr ""
 
-#: hiboo/profile/templates/profile_pick.html:33
+#: hiboo/profile/templates/profile_pick.html:31
 msgid "Not shared with anyone"
 msgstr ""
 
-#: hiboo/profile/templates/profile_pick.html:41
-msgid "Here come profiles!"
+#: hiboo/profile/templates/profile_pick.html:39
+msgid "Pick your profile"
 msgstr ""
 
-#: hiboo/profile/templates/profile_pick.html:43
+#: hiboo/profile/templates/profile_pick.html:41
 msgid ""
-"This service relies on profiles, which are just as many identities that "
-"you can have with your single account."
+"Every service is associated with profiles, which are just as many "
+"identities that you can associate to your master account."
 msgstr ""
 
-#: hiboo/profile/templates/profile_pick.html:44
+#: hiboo/profile/templates/profile_pick.html:42
 msgid ""
 "You may think of profiles as a way to switch between a personal and a "
 "business account, or to use the service under different identities for "
 "diffrent activities."
 msgstr ""
 
-#: hiboo/profile/templates/profile_pick.html:45
+#: hiboo/profile/templates/profile_pick.html:43
 msgid ""
 "Profiles were introduced in order to offer flexibility and security "
 "against stalkers and other sorts of online violence."
 msgstr ""
 
-#: hiboo/profile/templates/profile_pick.html:48
+#: hiboo/profile/templates/profile_pick.html:46
 msgid ""
-"However, profile creation on this services are currently locked down. You"
-" may only use existing profiles if you have some."
+"However, profile creation on this services is currently locked down. You "
+"may only use existing profiles if you have any."
 msgstr ""
 
-#: hiboo/profile/templates/profile_pick.html:50
+#: hiboo/profile/templates/profile_pick.html:48
 msgid ""
 "This service is not currently open for profile registration. In order to "
 "get new profiles, you must ask a service administrator."
 msgstr ""
 
-#: hiboo/profile/templates/profile_pick.html:52
+#: hiboo/profile/templates/profile_pick.html:50
 msgid ""
 "You may request new profiles. Your requests will be submitted to "
 "validation."
 msgstr ""
 
-#: hiboo/profile/templates/profile_pick.html:54
+#: hiboo/profile/templates/profile_pick.html:52
 #, python-format
 msgid ""
 "You may create up to %(max_profiles)s profiles. Further profile requests "
 "will be submitted to validation."
 msgstr ""
 
-#: hiboo/profile/templates/profile_pick.html:56
+#: hiboo/profile/templates/profile_pick.html:54
 #, python-format
 msgid ""
 "You may create up to %(max_profiles)s profiles. Please contact the "
 "service administrator if you have any specific needs."
 msgstr ""
 
-#: hiboo/profile/templates/profile_pick.html:70
+#: hiboo/profile/templates/profile_pick.html:68
 msgid "Request profile"
 msgstr ""
 
+#: hiboo/service/admin.py:34
+msgid "Service successfully created"
+msgstr ""
+
+#: hiboo/service/admin.py:51
+msgid "Service successfully updated"
+msgstr ""
+
 #: hiboo/service/forms.py:10 hiboo/service/templates/service_details.html:13
 msgid "Service name"
 msgstr ""
@@ -445,10 +591,14 @@ msgid "Maximum profile count"
 msgstr ""
 
 #: hiboo/service/forms.py:19
+msgid "Profile usenrame regex"
+msgstr ""
+
+#: hiboo/service/forms.py:20
 msgid "Disable per-profile username"
 msgstr ""
 
-#: hiboo/service/forms.py:20 hiboo/sso/forms.py:16 hiboo/sso/forms.py:42
+#: hiboo/service/forms.py:21 hiboo/sso/forms.py:16 hiboo/sso/forms.py:48
 msgid "Submit"
 msgstr ""
 
@@ -462,7 +612,7 @@ msgstr ""
 msgid "pick a protocol"
 msgstr ""
 
-#: hiboo/service/templates/protocol_pick.html:16
+#: hiboo/service/templates/protocol_pick.html:14
 msgid "Create "
 msgstr ""
 
@@ -511,6 +661,10 @@ msgstr ""
 msgid "Max profiles"
 msgstr ""
 
+#: hiboo/service/templates/service_list.html:18
+msgid "Actions"
+msgstr ""
+
 #: hiboo/sso/forms.py:8
 msgid "SP entity id"
 msgstr ""
@@ -583,6 +737,18 @@ msgstr ""
 msgid "Id token and token"
 msgstr ""
 
+#: hiboo/sso/forms.py:43
+msgid "Enabled special claim mappings"
+msgstr ""
+
+#: hiboo/sso/forms.py:44
+msgid "Mask the profile uuid"
+msgstr ""
+
+#: hiboo/sso/forms.py:45
+msgid "Return the actual user email"
+msgstr ""
+
 #: hiboo/sso/templates/protocol_oidc.html:2
 msgid ""
 "OpenID Connect (OIDC) is JWT based authentication and authorization "
@@ -657,7 +823,7 @@ msgstr ""
 msgid "Toggle navigation"
 msgstr ""
 
-#: hiboo/templates/base.html:35 hiboo/templates/sidebar.html:20
+#: hiboo/templates/base.html:35 hiboo/templates/sidebar.html:25
 msgid "Sign out"
 msgstr ""
 
@@ -678,7 +844,7 @@ msgstr ""
 msgid "Your are about to %(action)s. Do you wish to confirm that action?"
 msgstr ""
 
-#: hiboo/templates/macros.html:53
+#: hiboo/templates/macros.html:55
 msgid "Close"
 msgstr ""
 
@@ -690,27 +856,31 @@ msgstr ""
 msgid "My profiles"
 msgstr ""
 
-#: hiboo/templates/sidebar.html:37
+#: hiboo/templates/sidebar.html:15
+msgid "My contact info"
+msgstr ""
+
+#: hiboo/templates/sidebar.html:42
 msgid "Admin"
 msgstr ""
 
-#: hiboo/templates/sidebar.html:40
+#: hiboo/templates/sidebar.html:45
 msgid "Services"
 msgstr ""
 
-#: hiboo/templates/sidebar.html:45
+#: hiboo/templates/sidebar.html:50
 msgid "Users"
 msgstr ""
 
-#: hiboo/templates/sidebar.html:50
+#: hiboo/templates/sidebar.html:55
 msgid "About"
 msgstr ""
 
-#: hiboo/templates/sidebar.html:53
+#: hiboo/templates/sidebar.html:58
 msgid "User guide"
 msgstr ""
 
-#: hiboo/templates/sidebar.html:58
+#: hiboo/templates/sidebar.html:63
 msgid "Admin guide"
 msgstr ""
 
-- 
GitLab