Merge pull request #1021 from wallabag/register

working on registration support

4 files changed, 29 insertions, 6 deletions

diff --git a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo
index 02523125..f2c8a0f6 100644
--- a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo
+++ b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo
diff --git a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po
index 75dad661..73589e20 100644
--- a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po
+++ b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po
@@ -369,8 +369,8 @@ msgstr "Mark all the entries as read"
 msgid "Return home"
 msgstr "Return home"
 
-msgid "Back to top"
-msgstr "Back to top"
+msgid "back"
+msgstr "back"
 
 msgid "Mark as read"
 msgstr "Mark as read"
@@ -435,6 +435,9 @@ msgstr "Save a Link"
 msgid "back to home"
 msgstr "Back to Home"
 
+msgid "back to login"
+msgstr "back to login"
+
 msgid "toggle mark as read"
 msgstr "Toggle mark as read"
 
@@ -673,6 +676,9 @@ msgstr "Hi, %1$s"
 msgid "Someone just created a wallabag account for you on %1$s."
 msgstr "Someone just created a wallabag account for you on %1$s."
 
+msgid "You've just created a wallabag account on %1$s"
+msgstr "You've just created a wallabag account on %1$s"
+
 msgid "Your login is %1$s."
 msgstr "Your login is %1$s."
 
@@ -702,8 +708,12 @@ msgstr ""
 "The new user %1$s has been sent an email at %2$s. You may have to check spam "
 "folder."
 
-msgid "A problem has been encountered while sending the confirmation email"
-msgstr "A problem has been encountered while sending an confirmation email"
+msgid ""
+"A problem has been encountered while sending the confirmation email, but the "
+"user was created."
+msgstr ""
+"A problem has been encountered while sending an confirmation email, but the "
+"user was created."
 
 msgid "The server did not authorize sending a confirmation email"
 msgstr "The server did not authorize sending a confirmation email"
diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
index b3b2f6fe..1f1995b8 100644
--- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
+++ b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
index 948a8356..526a44a3 100644
--- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
+++ b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
@@ -67,6 +67,9 @@ msgstr "Se connecter"
 msgid "back to home"
 msgstr "retour à l'accueil"
 
+msgid "back"
+msgstr "retour"
+
 msgid "favorites"
 msgstr "favoris"
 
@@ -357,6 +360,9 @@ msgstr "Tweet"
 msgid "Email"
 msgstr "E-mail"
 
+msgid "Email (not required)"
+msgstr "E-mail (non requis)"
+
 msgid "shaarli"
 msgstr "Shaarli"
 
@@ -800,6 +806,9 @@ msgid "Someone just created a wallabag account for you on %1$s."
 msgstr ""
 "Quelqu'un vient juste de créer un compte wallabag pour vous à l'adresse %1$s."
 
+msgid "You've just created a wallabag account on %1$s"
+msgstr "Vous venez juste de vous créer un compte wallabag sur %1$s"
+
 msgid "Your login is %1$s."
 msgstr "Votre identifiant is %1$s."
 
@@ -832,8 +841,12 @@ msgstr ""
 msgid "A problem has been encountered while sending the confirmation email"
 msgstr "Un problème a été rencontré lors de l'envoi de l'email de confirmation"
 
-msgid "The server did not authorize sending a confirmation email"
-msgstr "Le serveur n'autorise pas l'envoi d'un email de confirmation"
+msgid ""
+"The server did not authorize sending a confirmation email, but the user was "
+"created."
+msgstr ""
+"Le serveur n'autorise pas l'envoi d'un email de confirmation, mais "
+"l'utilisateur a été créé."
 
 msgid ""
 "The user was created, but no email was sent because email was not filled in"