diff --git a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo
index bf5f69e..24747ff 100644
Binary files a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo and b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo differ
diff --git a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po
index 119fb06..5498a04 100644
--- a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po
+++ b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po
@@ -4,16 +4,15 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-02-25 15:17+0300\n"
"PO-Revision-Date: \n"
-"Last-Translator: Maryana \n"
+"Last-Translator: tcit \n"
"Language-Team: \n"
-"Language: \n"
+"Language: en\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
-"X-Poedit-Language: English\n"
+"X-Generator: Poedit 1.6.4\n"
"X-Poedit-Basepath: .\n"
-"X-Poedit-SearchPath-0: /home/mariroz/_DEV/web/wallabag/wallabag-master-testing\n"
+"testing\n"
msgid "wallabag, a read it later open source system"
msgstr "wallabag, a read it later open source system"
@@ -84,8 +83,12 @@ msgstr "A more recent development version is available."
msgid "Feeds"
msgstr "Feeds"
-msgid "Your feed token is currently empty and must first be generated to enable feeds. Click here to generate it."
-msgstr "Your feed token is currently empty and must first be generated to enable feeds. Click here to generate it."
+msgid ""
+"Your feed token is currently empty and must first be generated to enable "
+"feeds. Click here to generate it."
+msgstr ""
+"Your feed token is currently empty and must first be generated to enable "
+"feeds. Click here to generate it."
msgid "Unread feed"
msgstr "Unread feed"
@@ -102,8 +105,12 @@ msgstr "Your token:"
msgid "Your user id:"
msgstr "Your user id:"
-msgid "You can regenerate your token: generate!."
-msgstr "You can regenerate your token: generate!."
+msgid ""
+"You can regenerate your token: generate!"
+"."
+msgstr ""
+"You can regenerate your token: generate!"
+"."
msgid "Change your theme"
msgstr "Change your theme"
@@ -135,8 +142,10 @@ msgstr "Repeat your new password:"
msgid "Import"
msgstr "Import"
-msgid "Please execute the import script locally as it can take a very long time."
-msgstr "Please execute the import script locally as it can take a very long time."
+msgid ""
+"Please execute the import script locally as it can take a very long time."
+msgstr ""
+"Please execute the import script locally as it can take a very long time."
msgid "More info in the official documentation:"
msgstr "More info in the official documentation:"
@@ -184,8 +193,12 @@ msgstr "return to article"
msgid "plop"
msgstr "plop"
-msgid "You can check your configuration here."
-msgstr "You can check your configuration here."
+msgid ""
+"You can check your configuration "
+"here."
+msgstr ""
+"You can check your configuration "
+"here."
msgid "favoris"
msgstr "favoris"
@@ -247,8 +260,14 @@ msgstr "installation"
msgid "install your wallabag"
msgstr "install your wallabag"
-msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to read the documentation on wallabag website."
-msgstr "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to read the documentation on wallabag website."
+msgid ""
+"wallabag is still not installed. Please fill the below form to install it. "
+"Don't hesitate to read the documentation "
+"on wallabag website."
+msgstr ""
+"wallabag is still not installed. Please fill the below form to install it. "
+"Don't hesitate to read the documentation "
+"on wallabag website."
msgid "Login"
msgstr "Login"
@@ -401,7 +420,8 @@ msgid "a more recent development version is available."
msgstr "a more recent development version is available."
msgid "Please execute the import script locally, it can take a very long time."
-msgstr "Please execute the import script locally, it can take a very long time."
+msgstr ""
+"Please execute the import script locally, it can take a very long time."
msgid "More infos in the official doc:"
msgstr "More infos in the official doc:"
@@ -448,8 +468,12 @@ msgstr "in demo mode, you can't update your password"
msgid "your password has been updated"
msgstr "your password has been updated"
-msgid "the two fields have to be filled & the password must be the same in the two fields"
-msgstr "the two fields have to be filled & the password must be the same in the two fields"
+msgid ""
+"the two fields have to be filled & the password must be the same in the two "
+"fields"
+msgstr ""
+"the two fields have to be filled & the password must be the same in the two "
+"fields"
msgid "still using the \""
msgstr "still using the \""
@@ -505,6 +529,46 @@ msgstr "Cache deleted."
msgid "Oops, it seems you don't have PHP 5."
msgstr "Oops, it seems you don't have PHP 5."
+msgid "Add user"
+msgstr "Add user"
+
+msgid "Add a new user :"
+msgstr "Add a new user :"
+
+msgid "Login for new user"
+msgstr "Login for new user"
+
+msgid "Password for new user"
+msgstr "Password for new user"
+
+msgid "Email for new user (not required)"
+msgstr "Email for new user (not required)"
+
+msgid "Send"
+msgstr "Send"
+
+msgid "Delete account"
+msgstr "Delete account"
+
+msgid "You can delete your account by entering your password and validating."
+msgstr "You can delete your account by entering your password and validating."
+
+msgid "Be careful, data will be erased forever (that is a very long time)."
+msgstr "Be careful, data will be erased forever (that is a very long time)."
+
+msgid "Type here your password"
+msgstr "Type here your password"
+
+msgid "You are the only user, you cannot delete your own account."
+msgstr "You are the only user, you cannot delete your own account."
+
+msgid ""
+"To completely remove wallabag, delete the wallabag folder on your web server "
+"(and eventual databases)."
+msgstr ""
+"To completely remove wallabag, delete the wallabag folder on your web server "
+"(and eventual databases)."
+
#~ msgid "poche it!"
#~ msgstr "poche it!"
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 b625e34..d0f0461 100644
Binary files a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo and b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo differ
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 0343bfe..e4e2ce5 100644
--- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
+++ b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
@@ -4,7 +4,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-05-10 20:09+0100\n"
"PO-Revision-Date: \n"
-"Last-Translator: Gilles Wittezaële \n"
+"Last-Translator: tcit \n"
"Language-Team: \n"
"Language: fr_FR\n"
"MIME-Version: 1.0\n"
@@ -12,7 +12,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-KeywordsList: _;gettext;gettext_noop\n"
"X-Poedit-SourceCharset: UTF-8\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.6.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
msgid "wallabag, a read it later open source system"
@@ -298,6 +298,9 @@ msgstr "Nom d'utilisateur"
msgid "Password for new user"
msgstr "Mot de passe du nouvel utilisateur"
+msgid "Email for new user (not required)"
+msgstr "E-mail pour le nouvel utilisateur (facultatif)"
+
msgid "Send"
msgstr "Envoyer"
@@ -320,10 +323,12 @@ msgstr ""
"Vous êtes l'unique utilisateur, vous ne pouvez pas supprimer votre compte."
msgid ""
-"To completely remove wallabag, delete the wallabag folder on your web server."
+"To completely remove wallabag, delete the wallabag folder on your web server "
+"(and eventual databases)."
msgstr ""
"Pour désinstaller complètement wallabag, supprimez le répertoire "
-"wallabag de votre serveur Web."
+"wallabag de votre serveur Web (ainsi que les bases de données "
+"éventuelles)."
msgid "Save a link"
msgstr "Ajouter un lien"
diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig
index 0ae67bc..12934c8 100755
--- a/themes/baggy/config.twig
+++ b/themes/baggy/config.twig
@@ -142,7 +142,7 @@
-
+
@@ -167,5 +167,5 @@
{% else %}
{% trans "You are the only user, you cannot delete your own account." %}
- {% trans "To completely remove wallabag, delete the wallabag folder on your web server." %}
{% endif %}
+ {% trans "To completely remove wallabag, delete the wallabag folder on your web server (and eventual databases)." %}
{% trans "You are the only user, you cannot delete your own account." %}
- {% trans "To completely remove wallabag, delete the wallabag folder on your web server." %}
{% endif %}
+ {% trans "To completely remove wallabag, delete the wallabag folder on your web server (and eventual databases)." %}{% endif %}
{% endblock %}
diff --git a/themes/default/config.twig b/themes/default/config.twig
index 160f604..72c5d6f 100755
--- a/themes/default/config.twig
+++ b/themes/default/config.twig
@@ -162,5 +162,5 @@
{% else %}
{% trans "You are the only user, you cannot delete your own account." %}
- {% trans "To completely remove wallabag, delete the wallabag folder on your web server." %}
{% endif %}
+ {% trans "To completely remove wallabag, delete the wallabag folder on your web server (and eventual databases)." %}{% endif %}
{% endblock %}