From daa2b7e7c3e7315d9ebab9d86ee8f158bc17d4b1 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Fri, 12 Feb 2016 16:58:30 +0100 Subject: [PATCH] More translations --- .../Resources/translations/messages.fr.yml | 13 ++++++ .../Resources/views/_bookmarklet.html.twig | 2 +- .../themes/baggy/Entry/new_form.html.twig | 17 ++++---- .../views/themes/baggy/Static/howto.html.twig | 2 +- .../views/themes/baggy/Tag/new_form.html.twig | 17 ++++---- .../themes/material/Entry/entry.html.twig | 40 ++++++++++++++++--- .../themes/material/Entry/new_form.html.twig | 15 ++++--- .../themes/material/Static/howto.html.twig | 6 +-- .../themes/material/Tag/new_form.html.twig | 15 ++++--- 9 files changed, 81 insertions(+), 46 deletions(-) diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index b66ef538..16e8fe09 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml @@ -27,6 +27,7 @@ Search: 'Rechercher' Filter entries: 'Filtrer les articles' Enter your search here: 'Saisissez votre terme de recherche' Save new entry: 'Sauvegarder un nouvel article' +Export: Exporter # Config screen Settings: 'Paramètres' @@ -52,6 +53,7 @@ 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" +Two factor authentication: Double authentification # Tagging rules Tagging rules: "Règles de tag automatiques" @@ -83,6 +85,7 @@ One rule and another: "Une règle et l'autre" The domain name of the entry: "Le nom de domaine de l'article" "Tests that a subject is matches a search (case-insensitive).
Example: title matches \"football\"": "Teste si un sujet correspond à une recherche (non sensible à la casse).
Exemple : title matches \"football\"" Rule: "Règle" +FAQ: "FAQ" # Entries 'estimated reading time': 'durée de lecture' @@ -98,6 +101,10 @@ Edit an entry: "Éditer un article" Title: "Titre" Is public: "Public" +# tag +Tags: Tags +"{0} There is no tag.|{1} There is one tag.|]1,Inf[ There are %count% tags.": "{0} Il n'y a pas de tag.|{1} IL y a un tag.|]1,Inf[ Il y a %count% tags." + # Filters Filters: 'Filtres' Status: 'Statut' @@ -177,6 +184,8 @@ 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" +Reload content: Recharger le contenu +Tag added: Tag ajouté # Import Welcome on wallabag importer. Please select your previous service that you want to migrate.: "Bienvenue dans l'outil de migration de wallabag. Choisissez ci-dessous le service depuis lequel vous souhaitez migrer." @@ -193,8 +202,12 @@ Please select your wallabag export and click on the below button to upload and i File: "Fichier" Upload file: "Importer le fichier" Import contents: "Importer les contenus" +Import: "Importer" +Import > Wallabag v1: "Importer > Wallabag v1" +Import > Wallabag v2: "Importer > Wallabag v2" # Quickstart +Quickstart: Pour bien débuter Welcome on wallabag!: "Bienvenue sur wallabag !" We'll accompany you to visit wallabag and show you some features which can interess you.: "Nous allons vous accompagner pour vous faire faire le tour de la maison et vous présenter quelques fonctionnalités qui pourraient vous intéresser pour vous approprier cet outil." Follow us!: "Suivez-nous !" diff --git a/src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig b/src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig index c8fb5612..966a84db 100644 --- a/src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig @@ -1 +1 @@ -{% trans %}bag it!{% endtrans %} +bag it! diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new_form.html.twig index d182d552..fa0a9f53 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new_form.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new_form.html.twig @@ -1,15 +1,14 @@
+ {% if form_errors(form) %} + {{ form_errors(form) }} + {% endif %} - {% if form_errors(form) %} - {{ form_errors(form) }} - {% endif %} + {% if form_errors(form.url) %} + {{ form_errors(form.url) }} + {% endif %} - {% if form_errors(form.url) %} - {{ form_errors(form.url) }} - {% endif %} - - {{ form_label(form.url) }} - {{ form_widget(form.url) }} + {{ form_label(form.url) }} + {{ form_widget(form.url) }}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig index 6a320692..e32264f3 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig @@ -16,7 +16,7 @@

{% trans %}Mobile Apps{% endtrans %}

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/new_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/new_form.html.twig index 0b5a530d..ade7f56d 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/new_form.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/new_form.html.twig @@ -1,15 +1,14 @@
+ {% if form_errors(form) %} + {{ form_errors(form) }} + {% endif %} - {% if form_errors(form) %} - {{ form_errors(form) }} - {% endif %} + {% if form_errors(form.label) %} + {{ form_errors(form.label) }} + {% endif %} - {% if form_errors(form.label) %} - {{ form_errors(form.label) }} - {% endif %} - - {{ form_widget(form.label, { 'attr': {'autocomplete': 'off'} }) }} - {{ form_widget(form.save, { 'attr': {'class': 'btn waves-effect waves-light'}, 'label': 'add tag' }) }} + {{ form_widget(form.label, { 'attr': {'autocomplete': 'off'} }) }} + {{ form_widget(form.save, { 'attr': {'class': 'btn waves-effect waves-light'}, 'label': 'add tag' }) }}
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 6f8c3674..7dea1b7f 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 @@ -97,11 +97,41 @@
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig index 2de53106..f1e56412 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig @@ -1,14 +1,13 @@
+ {% if form_errors(form) %} + {{ form_errors(form) }} + {% endif %} - {% if form_errors(form) %} - {{ form_errors(form) }} - {% endif %} + {% if form_errors(form.url) %} + {{ form_errors(form.url) }} + {% endif %} - {% if form_errors(form.url) %} - {{ form_errors(form.url) }} - {% endif %} - - {{ form_widget(form.url, { 'attr': {'autocomplete': 'off', 'placeholder': 'http://website' | trans} }) }} + {{ form_widget(form.url, { 'attr': {'autocomplete': 'off', 'placeholder': 'http://website'} }) }}
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 63b51aaa..e2795409 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 @@ -18,12 +18,10 @@ -
{% trans %}Thanks to this form{% endtrans %}
-
-
-
{% trans %}Drag & drop this link to your bookmarks bar:{% endtrans %} {% include 'WallabagCoreBundle::_bookmarklet.html.twig' %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/new_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/new_form.html.twig index 0534a4cc..79310307 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/new_form.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/new_form.html.twig @@ -1,14 +1,13 @@
+ {% if form_errors(form) %} + {{ form_errors(form) }} + {% endif %} - {% if form_errors(form) %} - {{ form_errors(form) }} - {% endif %} + {% if form_errors(form.label) %} + {{ form_errors(form.label) }} + {% endif %} - {% if form_errors(form.label) %} - {{ form_errors(form.label) }} - {% endif %} - - {{ form_widget(form.label, { 'attr': {'autocomplete': 'off'} }) }} + {{ form_widget(form.label, { 'attr': {'autocomplete': 'off'} }) }}
-- 2.41.0