diff --git a/po/fr.po b/po/fr.po
index 1043eb0..818560d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -131,37 +131,8 @@ msgid ""
 "l'IFEF. Il peut contenir seulement des lettres et des chiffres."
 msgstr ""
 
-#: ../extra/modules/root.ptl:78
-msgid "Password"
-msgstr "Mot de passe"
-
-#: ../extra/modules/root.ptl:80
-msgid "A password will be mailed to you."
-msgstr "Un mot de passe vous sera envoyé par courriel."
-
-#: ../extra/modules/root.ptl:87 ../extra/modules/root.ptl:109
-msgid "Vous etes"
-msgstr "Vous êtes"
-
-#: ../extra/modules/root.ptl:123
-msgid "Vous devez choisir une classification"
-msgstr ""
-
-#: ../extra/modules/root.ptl:150
-msgid "J'accepte les conditions d'utilisation"
-msgstr ""
-
-#: ../extra/modules/root.ptl:159
-msgid "Submit"
-msgstr "Valider"
-
-#: ../extra/modules/root.ptl:160
-msgid "Cancel"
-msgstr "Annuler"
 
 #: ../extra/modules/root.ptl:180 ../extra/modules/root.ptl:181
-=======
-#: ../extra/modules/root.ptl:76
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -190,7 +161,6 @@ msgid "Cancel"
 msgstr "Annuler"
 
 #: ../extra/modules/root.ptl:178 ../extra/modules/root.ptl:179
->>>>>>> Update translation:po/fr.po
 msgid "Registration"
 msgstr "Inscription"
 
diff --git a/po/ifef.pot b/po/ifef.pot
index 2e489a4..25e93fa 100644
--- a/po/ifef.pot
+++ b/po/ifef.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-15 16:22+0000\n"
+"POT-Creation-Date: 2011-01-04 00:45+0000\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"
@@ -16,34 +16,52 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../extra/ifef.py:15 ../extra/modules/afterjobs.ptl:32
+#: ../extra/ifef.py:16 ../extra/modules/afterjobs.ptl:32
 msgid "Neogia registration jobs"
 msgstr ""
 
-#: ../extra/modules/admin_settings.py:15
+#: ../extra/modules/admin_settings.py:18
 msgid "Customized stylesheet URL"
 msgstr ""
 
-#: ../extra/modules/admin_settings.py:17
+#: ../extra/modules/admin_settings.py:20
 msgid "The URL must be https if authentic also use https"
 msgstr ""
 
-#: ../extra/modules/admin_settings.py:19
+#: ../extra/modules/admin_settings.py:22
 msgid "Prefix URL of the HTTP_REFERER"
 msgstr ""
 
-#: ../extra/modules/admin_settings.py:21
+#: ../extra/modules/admin_settings.py:24
 msgid "Used to find which service initiated a request to Authentic"
 msgstr ""
 
-#: ../extra/modules/admin_settings.py:24
+#: ../extra/modules/admin_settings.py:27
 msgid "Custom theme"
 msgstr ""
 
-#: ../extra/modules/admin_settings.py:26
+#: ../extra/modules/admin_settings.py:29
 msgid "Theme to use when an interaction is initated by this service"
 msgstr ""
 
+#: ../extra/modules/admin_settings.py:32
+msgid "Custom domain"
+msgstr ""
+
+#: ../extra/modules/admin_settings.py:34
+msgid ""
+"If the IdP is published on this domain, the used theme will the custom theme "
+"for this service."
+msgstr ""
+
+#: ../extra/modules/admin_settings.py:37
+msgid "Registration fields"
+msgstr ""
+
+#: ../extra/modules/admin_settings.py:40
+msgid "List of specific fields to show on the registration page."
+msgstr ""
+
 #: ../extra/modules/configuration.py:6
 msgid "XMLRPC Neogia registration URL"
 msgstr ""
@@ -122,80 +140,49 @@ msgid ""
 "familial"
 msgstr ""
 
-#: ../extra/modules/root.ptl:72
+#: ../extra/modules/root.ptl:89
 msgid "Username"
 msgstr ""
 
-#: ../extra/modules/root.ptl:72
+#: ../extra/modules/root.ptl:91
 msgid ""
 "C'est cet identifiant qui vous permettra de vous connecter au portail de "
 "l'IFEF. Il peut contenir seulement des lettres et des chiffres."
 msgstr ""
 
-#: ../extra/modules/root.ptl:78
+#: ../extra/modules/root.ptl:98
 msgid "Password"
 msgstr ""
 
-#: ../extra/modules/root.ptl:80
+#: ../extra/modules/root.ptl:100
 msgid "A password will be mailed to you."
 msgstr ""
 
-#: ../extra/modules/root.ptl:87 ../extra/modules/root.ptl:109
+#: ../extra/modules/root.ptl:112 ../extra/modules/root.ptl:134
 msgid "Vous etes"
 msgstr ""
 
-#: ../extra/modules/root.ptl:123
+#: ../extra/modules/root.ptl:149
 msgid "Vous devez choisir une classification"
 msgstr ""
 
-#: ../extra/modules/root.ptl:150
+#: ../extra/modules/root.ptl:177
 msgid "J'accepte les conditions d'utilisation"
 msgstr ""
 
-#: ../extra/modules/root.ptl:159
+#: ../extra/modules/root.ptl:186
 msgid "Submit"
 msgstr ""
 
-#: ../extra/modules/root.ptl:160
+#: ../extra/modules/root.ptl:187
 msgid "Cancel"
 msgstr ""
 
-#: ../extra/modules/root.ptl:180 ../extra/modules/root.ptl:181
-=======
-#: ../extra/modules/root.ptl:76
-msgid "Password"
-msgstr ""
-
-#: ../extra/modules/root.ptl:78
-msgid "A password will be mailed to you."
-msgstr ""
-
-#: ../extra/modules/root.ptl:85 ../extra/modules/root.ptl:107
-msgid "Vous etes"
-msgstr ""
-
-#: ../extra/modules/root.ptl:121
-msgid "Vous devez choisir une classification"
-msgstr ""
-
-#: ../extra/modules/root.ptl:148
-msgid "J'accepte les conditions d'utilisation"
-msgstr ""
-
-#: ../extra/modules/root.ptl:157
-msgid "Submit"
-msgstr ""
-
-#: ../extra/modules/root.ptl:158
-msgid "Cancel"
-msgstr ""
-
-#: ../extra/modules/root.ptl:178 ../extra/modules/root.ptl:179
->>>>>>> Update translation:po/ifef.pot
+#: ../extra/modules/root.ptl:207 ../extra/modules/root.ptl:208
 msgid "Registration"
 msgstr ""
 
-#: ../extra/modules/root.ptl:219
+#: ../extra/modules/root.ptl:249
 #, python-format
 msgid "Log on %s"
 msgstr ""