aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--app/Resources/FOSUserBundle/translations/FOSUserBundle.fr.yml2
-rw-r--r--docs/en/developer/translate.rst5
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml2
-rw-r--r--src/Wallabag/UserBundle/Resources/views/themes/baggy/layout.html.twig2
-rw-r--r--src/Wallabag/UserBundle/Resources/views/themes/material/layout.html.twig2
5 files changed, 10 insertions, 3 deletions
diff --git a/app/Resources/FOSUserBundle/translations/FOSUserBundle.fr.yml b/app/Resources/FOSUserBundle/translations/FOSUserBundle.fr.yml
new file mode 100644
index 00000000..1ccad137
--- /dev/null
+++ b/app/Resources/FOSUserBundle/translations/FOSUserBundle.fr.yml
@@ -0,0 +1,2 @@
1Login: "Se connecter"
2Enter your email address below and we'll send you password reset instructions.: "Renseignez votre adresse email, nous vous enverrons les instructions pour réinitialiser votre mot de passe."
diff --git a/docs/en/developer/translate.rst b/docs/en/developer/translate.rst
index ff2b8f0e..138d128c 100644
--- a/docs/en/developer/translate.rst
+++ b/docs/en/developer/translate.rst
@@ -8,7 +8,10 @@ You can find translation files here: https://github.com/wallabag/wallabag/tree/v
8 8
9You have to create ``messages.CODE.yml`` and ``validators.CODE.yml``, where CODE is the the ISO 639-1 code of your language (`see wikipedia <https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes>`__). 9You have to create ``messages.CODE.yml`` and ``validators.CODE.yml``, where CODE is the the ISO 639-1 code of your language (`see wikipedia <https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes>`__).
10 10
11There is still one file to translate: https://github.com/wallabag/wallabag/tree/v2/app/Resources/CraueConfigBundle/translations. 11Other files to translate:
12
13- https://github.com/wallabag/wallabag/tree/v2/app/Resources/CraueConfigBundle/translations.
14- https://github.com/wallabag/wallabag/tree/v2/app/Resources/FOSUserBundle/translations.
12 15
13You have to create ``CraueConfigBundle.CODE.yml``. 16You have to create ``CraueConfigBundle.CODE.yml``.
14 17
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index c42ac6d3..54161646 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -5,6 +5,7 @@ Login: 'Se connecter'
5Back to login: 'Revenir au formulaire de connexion' 5Back to login: 'Revenir au formulaire de connexion'
6Send: 'Envoyer' 6Send: 'Envoyer'
7"Enter your email address below and we'll send you password reset instructions.": "Saisissez votre adresse e-mail ci-dessous, nous vous enverrons les instructions pour réinitialiser votre mot de passe." 7"Enter your email address below and we'll send you password reset instructions.": "Saisissez votre adresse e-mail ci-dessous, nous vous enverrons les instructions pour réinitialiser votre mot de passe."
8Register: 'Créer un compte'
8 9
9# Menu 10# Menu
10unread: 'Non lus' 11unread: 'Non lus'
@@ -54,6 +55,7 @@ New password: 'Nouveau mot de passe'
54Repeat new password: 'Confirmez votre nouveau mot de passe' 55Repeat new password: 'Confirmez votre nouveau mot de passe'
55Username: "Nom d'utilisateur" 56Username: "Nom d'utilisateur"
56Two factor authentication: Double authentification 57Two factor authentication: Double authentification
58Enabling two factor authentication means you'll receive an email with a code on every new untrusted connexion: Activer l'authentification double-facteur veut dire que vous allez recevoir un code par email à chaque nouvelle connexion non approuvée.
57 59
58# Tagging rules 60# Tagging rules
59Tagging rules: "Règles de tag automatiques" 61Tagging rules: "Règles de tag automatiques"
diff --git a/src/Wallabag/UserBundle/Resources/views/themes/baggy/layout.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/baggy/layout.html.twig
index ff5b6583..7517c27c 100644
--- a/src/Wallabag/UserBundle/Resources/views/themes/baggy/layout.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/themes/baggy/layout.html.twig
@@ -1,6 +1,6 @@
1{% extends "WallabagCoreBundle::layout.html.twig" %} 1{% extends "WallabagCoreBundle::layout.html.twig" %}
2 2
3{% block title %}Welcome on wallabag!{% endblock %} 3{% block title %}{% trans %}Welcome on wallabag!{% endtrans %}{% endblock %}
4 4
5{% block body_class %}login{% endblock %} 5{% block body_class %}login{% endblock %}
6 6
diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/layout.html.twig
index 9247a2c0..c355d3bf 100644
--- a/src/Wallabag/UserBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/themes/material/layout.html.twig
@@ -1,6 +1,6 @@
1{% extends "WallabagCoreBundle::layout.html.twig" %} 1{% extends "WallabagCoreBundle::layout.html.twig" %}
2 2
3{% block title %}Welcome on wallabag!{% endblock %} 3{% block title %}{% trans %}Welcome on wallabag!{% endtrans %}{% endblock %}
4 4
5{% block body_class %}login{% endblock %} 5{% block body_class %}login{% endblock %}
6 6