From 4f0dfac6a6269f1fbe9af5dc4ecbd8aaa43348ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 30 Sep 2015 08:36:30 +0200 Subject: add french translation --- .../Resources/translations/messages.fr.yml | 41 ++++++++++++++++++++++ .../views/themes/material/Config/index.html.twig | 33 +++++++++-------- 2 files changed, 59 insertions(+), 15 deletions(-) create mode 100644 src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml (limited to 'src/Wallabag') diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml new file mode 100644 index 00000000..84144705 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml @@ -0,0 +1,41 @@ +# Menu +unread: 'Non lus' +starred: 'Favoris' +archive: 'Lus' +all: 'Tous les articles' +tags: 'Tags' +config: 'Configuration' +howto: 'Aide' +logout: 'Déconnexion' + +# Header +Back to unread articles: 'Retour aux articles non lus' +Add a new entry: 'Sauvegarder un nouvel article' +Search: 'Rechercher' +Filter entries: 'Filtrer les articles' +Enter your search here: 'Saisissez votre terme de recherche' + +# Config screen +Settings: 'Paramètres' +User information: 'Mon compte' +Password: 'Mot de passe' +RSS: 'RSS' +Add a user: 'Créer un compte' +Theme: 'Thème' +Items per page: "Nombre d'articles par page" +Language: 'Langue' +Save: 'Enregistrer' +RSS token: 'Jeton RSS' +Name: 'Nom' +Email: 'Adresse e-mail' +No token: 'Aucun jeton généré' +Reset your token: 'Réinitialisez votre jeton' +Create your token: 'Créez votre jeton' +Rss limit: "Nombre d'articles dans un flux RSS" +RSS links: 'URL de vos flux RSS' +"RSS feeds provided by wallabag allow you to read your saved articles with your favourite RSS reader. You need to generate a token first.": "Les flux RSS fournis par wallabag vous permettent de lire vos articles sauvegardés dans votre lecteur de flux préféré. Pour pouvoir les utiliser, vous devez d'abord créer un jeton." +Old password: 'Mot de passe actuel' +New password: 'Nouveau mot de passe' +Repeat new password: 'Confirmez votre nouveau mot de passe' +Username: "Nom d'utilisateur" + diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index 3ec31a02..156bc05f 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig @@ -1,6 +1,6 @@ {% extends "WallabagCoreBundle::layout.html.twig" %} -{% block title %}{% trans %}Config{% endtrans %}{% endblock %} +{% block title %}{% trans %}config{% endtrans %}{% endblock %} {% block content %} @@ -11,7 +11,7 @@
    -
  • {% trans %}Wallabag{% endtrans %}
    • +
  • {% trans %}Settings{% endtrans %}
  • {% trans %}RSS{% endtrans %}
  • {% trans %}User information{% endtrans %}
  • {% trans %}Password{% endtrans %}
    • @@ -62,33 +62,36 @@
    - + {% trans %}RSS feeds provided by wallabag allow you to read your saved articles with your favourite RSS reader. You need to generate a token first.{% endtrans %} +
    +
    + +
    +
    +
    {% if rss.token %} {{ rss.token }} {% else %} - No token + {% trans %}No token{% endtrans %} {% endif %} - – - Regenerate ? + – {% if rss.token %}{% trans %}Reset your token{% endtrans %}{% else %}{% trans %}Create your token{% endtrans %}{% endif %}
    - + {% if rss.token %}
    - - {% if rss.token %} + - {% else %} - You need to generate a token first. - {% endif %} +
    + {% endif %}
    -- cgit v1.2.3 From 4aafa7f0df1302dc0984ad942fef3c3be7bffd0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 30 Sep 2015 18:09:18 +0200 Subject: french translation --- .../Resources/translations/messages.fr.yml | 65 ++++++++++++++++++++++ .../views/themes/material/Config/index.html.twig | 2 +- .../views/themes/material/Entry/entries.html.twig | 14 ++--- .../material/Security/forgotPassword.html.twig | 5 +- .../views/themes/material/Static/about.html.twig | 6 +- .../views/themes/material/Static/howto.html.twig | 2 +- .../views/themes/material/layout.html.twig | 2 +- 7 files changed, 80 insertions(+), 16 deletions(-) (limited to 'src/Wallabag') diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index 84144705..1286847c 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml @@ -1,3 +1,11 @@ +#Login +Keep me logged in: 'Rester connecté' +Forgot your password?: 'Mot de passe oublié ?' +Login: 'Se connecter' +Back to login: 'Revenir au formulaire de connexion' +Send: 'Envoyer' +"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." + # Menu unread: 'Non lus' starred: 'Favoris' @@ -7,6 +15,8 @@ tags: 'Tags' config: 'Configuration' howto: 'Aide' logout: 'Déconnexion' +Filtered: 'Articles filtrés' +About: 'À propos' # Header Back to unread articles: 'Retour aux articles non lus' @@ -39,3 +49,58 @@ New password: 'Nouveau mot de passe' Repeat new password: 'Confirmez votre nouveau mot de passe' Username: "Nom d'utilisateur" +# Entries +'estimated reading time': 'durée de lecture' +original: original +Toggle mark as read: 'Marquer comme lu/non lu' +Toggle favorite: 'Marquer comme favori' +Delete: 'Supprimer' + +# Filters +Filters: 'Filtres' +Status: 'Statut' +Archived: 'Lu' +Starred: 'Favori' +Preview picture: 'Photo' +Has a preview picture: 'A une photo' +Reading time in minutes: 'Durée de lecture en minutes' +from: 'de' +to: 'à' +website.com: 'website.com' +Domain name: 'Nom de domaine' +Creation date: 'Date de création' +dd/mm/yyyy: 'dd/mm/aaaa' +Clear: 'Effacer' +Filter: 'Filtrer' + +# About +Who is behind wallabag: "L'équipe derrière wallabag" +Getting help: "Besoin d'aide" +Helping wallabag: "Aider wallabag" +Developed by: "Développé par" +website: "Site web" +And many others contributors ♥: "Et plein de contributeurs ♥" +on GitHub: "sur GitHub" +Project website: "Site web du projet" +License: "Licence" +Version: "Version" +Documentation: "Documentation" +Bug reports: "Rapport de bugs" +On our support website: "Sur notre site de support" +or: "ou" +"wallabag is free and opensource. You can help us:": "wallabag est gratuit et opensource. Vous pouvez nous aider :" +"by contributing to the project:": "en contribuant au projet :" +an issue lists all our needs: "un ticket recense tous nos besoins" +via Paypal: "via Paypal" +via Flattr: "via Flattr" + +# Howto +Form: Formulaire +Thanks to this form: "Grâce à ce formulaire" +Browser addons: "Extensions de navigateur" +Mobile apps: "Applications smartphone" +Bookmarklet: "Bookmarklet" +Standard Firefox Add-On: "Extension Firefox" +Chrome Extension: "Extension Chrome" +download the application: "téléchargez l'application" +"Drag & drop this link to your bookmarks bar:": "Glissez et déposez ce lien dans votre barre de favoris :" diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index 156bc05f..0ff21f22 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig @@ -169,7 +169,7 @@ diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig index ff69e821..a1d4746e 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig @@ -4,13 +4,13 @@ {% set currentRoute = app.request.attributes.get('_route') %} {% if currentRoute == 'starred' %} - {% trans %}Starred{% endtrans %} + {% trans %}starred{% endtrans %} {% elseif currentRoute == 'archive' %} - {% trans %}Archive{% endtrans %} + {% trans %}archive{% endtrans %} {% elseif currentRoute == 'all' %} {% trans %}Filtered{% endtrans %} {% else %} - {% trans %}Unread{% endtrans %} + {% trans %}unread{% endtrans %} {% endif %} {% endblock %} @@ -49,9 +49,9 @@ {{ entry.title|raw|striptags|slice(0, 42) }} {% if entry.readingTime > 0 %} -
    {% trans %}estimated reading time: {% endtrans %} {{ entry.readingTime }} min
    +
    {% trans %}estimated reading time{% endtrans %}: {{ entry.readingTime }} min
    {% else %} -
    {% trans %}estimated reading time: {% endtrans %} < 1 min
    +
    {% trans %}estimated reading time{% endtrans %}: < 1 min
    {% endif %} {% if entry.previewPicture is null %} @@ -66,9 +66,9 @@ {{ entry.title|raw }} {% if entry.readingTime > 0 %} -
    {% trans %}estimated reading time: {% endtrans %} {{ entry.readingTime }} min
    +
    {% trans %}estimated reading time{% endtrans %}: {{ entry.readingTime }} min
    {% else %} -
    {% trans %}estimated reading time: {% endtrans %} < 1 min
    +
    {% trans %}estimated reading time{% endtrans %}: < 1 min
    {% endif %}

    {{ entry.content|striptags|slice(0, 300) }}…

    diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/forgotPassword.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/forgotPassword.html.twig index 9750f8ba..7d916237 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/forgotPassword.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/forgotPassword.html.twig @@ -9,12 +9,11 @@ {% block content %}
    -

    {% trans %}Forgot password{% endtrans %}

    +
    wallabag logo
    - -

    {% trans %}Enter your email address below and we'll send you password reset instructions.{% endtrans %}

     +

    {% trans %}Enter your email address below and we'll send you password reset instructions.{% endtrans %}

     {% if form_errors(form) %} {{ form_errors(form) }} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig index 5de71d77..ef1fe916 100755 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig @@ -22,7 +22,7 @@
    Nicolas Lœuillet — {% trans %}website{% endtrans %}
    Thomas Citharel — {% trans %}website{% endtrans %}
    Jérémy Benoist — {% trans %}website{% endtrans %}
    -
    {% trans %}And many others contributors ♥{% endtrans %} {% trans %}on Github{% endtrans %}
    +
    {% trans %}And many others contributors ♥{% endtrans %} {% trans %}on GitHub{% endtrans %}
    {% trans %}Project website{% endtrans %}
    https://www.wallabag.org
    {% trans %}License{% endtrans %}: MIT
    @@ -37,14 +37,14 @@
    deutsch
    {% trans %}Bug reports{% endtrans %}
    -
    {% trans %}On our support website{% endtrans %} {% trans %}or{% endtrans %} {% trans %}on Github{% endtrans %}
    +
    {% trans %}On our support website{% endtrans %} {% trans %}or{% endtrans %} {% trans %}on GitHub{% endtrans %}
    {% trans %}wallabag is free and opensource. You can help us:{% endtrans %}
    -
    by contributing to the project: an issue lists all our needs
    +
    {% trans %}by contributing to the project:{% endtrans %} {% trans %}an issue lists all our needs{% endtrans %}
    {% trans %}via Paypal{% endtrans %}
    {% trans %}via Flattr{% endtrans %}
    diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig index 6f98ba99..78591172 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig @@ -1,6 +1,6 @@ {% extends "WallabagCoreBundle::layout.html.twig" %} -{% block title %}{% trans %}Howto{% endtrans %}{% endblock %} +{% block title %}{% trans %}howto{% endtrans %}{% endblock %} {% block content %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig index a4b1d030..2d1d3ded 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig @@ -108,7 +108,7 @@

    {% trans %}powered by{% endtrans %} wallabag

    - {% trans %}about{% endtrans %} + {% trans %}About{% endtrans %}
    -- cgit v1.2.3 From 8e417206d5333b1156548b27a707500674f49ca6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 30 Sep 2015 18:17:40 +0200 Subject: flash messages translation --- .../CoreBundle/Resources/translations/messages.fr.yml | 11 +++++++++++ .../Resources/views/themes/material/layout.html.twig | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'src/Wallabag') diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index 1286847c..4946344d 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml @@ -104,3 +104,14 @@ Standard Firefox Add-On: "Extension Firefox" Chrome Extension: "Extension Chrome" download the application: "téléchargez l'application" "Drag & drop this link to your bookmarks bar:": "Glissez et déposez ce lien dans votre barre de favoris :" + +# Flash messages +Information updated: "Vos informations personnelles ont bien été mises à jour" +Config saved: "Les paramètres de wallabag ont bien été mis à jour" +RSS information updated: "La configuration des flux RSS a bien été mise à jour" +Password updated: "Votre mot de passe a bien été mis à jour" +Entry starred: "Article ajouté dans les favoris" +Entry unstarred: "Article retiré des favoris" +Entry archived: "Article marqué comme lu" +Entry unarchived: "Article marqué comme non lu" +Entry deleted: "Article supprimé" diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig index 2d1d3ded..7614fcd3 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig @@ -21,7 +21,7 @@ {% block messages %} {% for flashMessage in app.session.flashbag.get('notice') %} {% endfor %} {% endblock %} -- cgit v1.2.3 From cfb28c9da0ff648d34ae0602eaec55a8362504dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 1 Oct 2015 09:26:52 +0200 Subject: french translation --- src/Wallabag/CoreBundle/Filter/EntryFilterType.php | 2 +- .../CoreBundle/Repository/EntryRepository.php | 4 +-- .../Resources/translations/messages.fr.yml | 13 +++++++ .../views/themes/material/Entry/entry.html.twig | 4 +-- .../views/themes/material/layout.html.twig | 40 ++-------------------- .../Tests/Controller/EntryControllerTest.php | 1 - src/Wallabag/CoreBundle/Twig/WallabagExtension.php | 2 +- 7 files changed, 21 insertions(+), 45 deletions(-) (limited to 'src/Wallabag') diff --git a/src/Wallabag/CoreBundle/Filter/EntryFilterType.php b/src/Wallabag/CoreBundle/Filter/EntryFilterType.php index f40c1c2d..2e6d6ff7 100644 --- a/src/Wallabag/CoreBundle/Filter/EntryFilterType.php +++ b/src/Wallabag/CoreBundle/Filter/EntryFilterType.php @@ -15,7 +15,7 @@ class EntryFilterType extends AbstractType private $repository; /** - * Repository & user are used to get a list of language entries for this user + * Repository & user are used to get a list of language entries for this user. * * @param EntityRepository $entryRepository * @param User $user diff --git a/src/Wallabag/CoreBundle/Repository/EntryRepository.php b/src/Wallabag/CoreBundle/Repository/EntryRepository.php index 2286317c..57bf8024 100644 --- a/src/Wallabag/CoreBundle/Repository/EntryRepository.php +++ b/src/Wallabag/CoreBundle/Repository/EntryRepository.php @@ -163,9 +163,9 @@ class EntryRepository extends EntityRepository } /** - * Used only in test case to get the right entry associated to the right user + * Used only in test case to get the right entry associated to the right user. * - * @param string $username + * @param string $username * * @return Entry */ diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index 4946344d..aced4d83 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml @@ -24,6 +24,7 @@ Add a new entry: 'Sauvegarder un nouvel article' Search: 'Rechercher' Filter entries: 'Filtrer les articles' Enter your search here: 'Saisissez votre terme de recherche' +Save new entry: 'Sauvegarder un nouvel article' # Config screen Settings: 'Paramètres' @@ -115,3 +116,15 @@ Entry unstarred: "Article retiré des favoris" Entry archived: "Article marqué comme lu" Entry unarchived: "Article marqué comme non lu" Entry deleted: "Article supprimé" + +# Entry +Mark as read: 'Marquer comme lu' +Favorite: 'Mettre en favori' +back: 'Retour' +original article: 'Article original' +Add a tag: 'Ajouter un tag' +Share: 'Partager' +Download: 'Télécharger' +Does this article appear wrong?: "Est-ce que cet article s'affiche mal ?" +Problems?: 'Un problème ?' +Edit title: "Modifier le titre" diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig index 3b4c7053..d3cef895 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig @@ -54,7 +54,7 @@
  • - {% trans %}Toggle mark as read{% endtrans %} + {% trans %}Mark as read{% endtrans %}
    • @@ -62,7 +62,7 @@
  • - {% trans %}Toggle favorite{% endtrans %} + {% trans %}Favorite{% endtrans %}
    • diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig index 7614fcd3..22d00a1e 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig @@ -42,10 +42,11 @@
  • {% trans %}unread{% endtrans %}
  • {% trans %}starred{% endtrans %}
  • {% trans %}archive{% endtrans %}
    • -
  • {% trans %}all{% endtrans %}
    • +
  • {% trans %}all{% endtrans %}
  • {% trans %}tags{% endtrans %}
  • {% trans %}config{% endtrans %}
  • {% trans %}howto{% endtrans %}
    • +
  • {% trans %}About{% endtrans %}
  • {% trans %}logout{% endtrans %}
@@ -76,40 +77,3 @@
{% endblock %} - -{% block footer %} - -{% endblock %} diff --git a/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php index e9c85a17..2862417e 100644 --- a/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php +++ b/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php @@ -3,7 +3,6 @@ namespace Wallabag\CoreBundle\Tests\Controller; use Wallabag\CoreBundle\Tests\WallabagCoreTestCase; -use Doctrine\ORM\AbstractQuery; class EntryControllerTest extends WallabagCoreTestCase { diff --git a/src/Wallabag/CoreBundle/Twig/WallabagExtension.php b/src/Wallabag/CoreBundle/Twig/WallabagExtension.php index f8328860..6b860c96 100644 --- a/src/Wallabag/CoreBundle/Twig/WallabagExtension.php +++ b/src/Wallabag/CoreBundle/Twig/WallabagExtension.php @@ -13,7 +13,7 @@ class WallabagExtension extends \Twig_Extension public function removeWww($url) { - return preg_replace('/^www\./i', '',$url); + return preg_replace('/^www\./i', '', $url); } public function getName() -- cgit v1.2.3 From 4e9f656ecbfb89449e44a56d82ca36812a61fc73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 1 Oct 2015 11:38:59 +0200 Subject: restore footer --- .../views/themes/material/layout.html.twig | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'src/Wallabag') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig index 22d00a1e..10dede8a 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig @@ -77,3 +77,40 @@
{% endblock %} + +{% block footer %} + +{% endblock %} -- cgit v1.2.3