7 files changed, 64 insertions, 18 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index cc814cc4..c7186c34 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -52,12 +52,50 @@ New password: 'Nouveau mot de passe'
 Repeat new password: 'Confirmez votre nouveau mot de passe'
 Username: "Nom d'utilisateur"
+# Tagging rules
+Tagging rules: "Règles de tag automatiques"
+What does « tagging rules » mean?: "Que signifient les règles de tag automatiques ?"
+"They are rules used by Wallabag to automatically tag new entries.<br />Each time a new entry is added, all the tagging rules will be used to add the tags you configured, thus saving you the trouble to manually classify your entries.": "Ce sont des règles utilisées par wallabag pour classer automatiquement vos nouveaux articles.<br />À chaque fois qu'un nouvel article est ajouté, toutes les règles de tag automatiques seront utilisées afin d'ajouter les tags que vous avez configuré, vous épargnant ainsi l'effort de classifier vos articles manuellement."
+How do I use them?: "Comment les utiliser ?"
+"Let assume you want to tag new entries as « <i>short reading</i> » when the reading time is inferior to 3 minutes.<br />In that case, you should put « readingTime &lt;= 3 » in the <i>Rule</i> field and « <i>short reading</i> » in the <i>Tags</i> field.<br />Several tags can added simultaneously by separating them by a comma: « <i>short reading, must read</i> »<br />Complex rules can be written by using predefined operators: if « <i>readingTime &gt;= 5 AND domainName = \"github.com\"</i> » then tag as « <i>long reading, github </i> »": "Imaginons que voulez attribuer aux nouveaux articles le tag « <i>lecture courte</i> » lorsque le temps de lecture est inférieur à 3 minutes.<br />Dans ce cas, vous devriez mettre « readingTime &lt;= 3 » dans le champ <i>Règle</i> et « <i>lecture courte</i> » dans le champ <i>Tag</i>.<br />Plusieurs tags peuvent être ajoutés simultanément en les séparant par des virgules : « <i>lecture courte, à lire</i> »<br />Des règles complexes peuvent être créées en utilisant des opérateurs prédéfinis: si « <i>readingTime &gt;= 5 AND domainName = \"github.com\"</i> » alors attribuer les tags « <i>lecteur longue, github </i> »"
+Which variables and operators can I use to write rules?: "Quelles variables et opérateurs puis-je utiliser pour écrire des règles ?"
+The following variables and operators can be used to create tagging rules:: "Les variables et opérateurs suivants peuvent être utilisés pour écrire des règles de tag automatiques :"
+Variable: "Variable"
+Meaning: "Signification"
+Operator: "Opérateur"
+Title of the entry: "Titre de l'article"
+Less than…: "Moins que…"
+URL of the entry: "URL de l'article"
+Strictly less than…: "Strictement moins que…"
+Whether the entry is archived or not: "Si l'article est archivé ou non"
+Greater than…: "Plus que…"
+Whether the entry is starred or not: "Si l'article est favori ou non"
+Strictly greater than…: "Strictement plus que…"
+The entry's content: "Le contenu de l'article"
+Equal to…: "Égal à…"
+The entry's language: "La langue de l'article"
+Not equal to…: "Différent de…"
+The entry's mime-type: "Le Type MIME de l'article"
+One rule or another: "Une règle ou l'autre"
+The estimated entry's reading time, in minutes: "Le temps de lecture estimé de l'article, en minutes"
+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 <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches \"football\"</code>": "Teste si un <i>sujet</i> correspond à une <i>recherche</i> (non sensible à la casse).<br />Exemple : <code>title matches \"football\"</code>"
+Rule: "Règle"
 # 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'
+"{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.": "{0} Il n'y a pas d'articles.|{1} Il y a un article.|]1,Inf[ Il y a %count% articles."
+http://website: "http://siteweb"
+# Edit entry
+Edit an entry: "Éditer un article"
+Title: "Titre"
+Is public: "Public"
 # Filters
 Filters: 'Filtres'
@@ -75,8 +113,10 @@ Creation date: 'Date de création'
 dd/mm/yyyy: 'dd/mm/aaaa'
 Clear: 'Effacer'
 Filter: 'Filtrer'
+website.com: "siteweb.com"
 # About
+About: "À propos"
 Who is behind wallabag: "L'équipe derrière wallabag"
 Getting help: "Besoin d'aide"
 Helping wallabag: "Aider wallabag"
@@ -95,6 +135,10 @@ or: "ou"
 "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"
+Take wallabag with you: "Emportez wallabag avec vous"
+Social: "Social"
+powered by: "propulsé par"
 # Howto
 Form: "Formulaire"
@@ -134,8 +178,13 @@ Edit title: "Modifier le titre"
 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."
 "This importer will import all your Pocket data. Pocket doesn't allow us to retrieve content from their service, so the readable content of each article will be re-fetched by wallabag.": "Cet outil va importer toutes vos données de Pocket. Pocket ne nous autorise pas à récupérer le contenu depuis leur service, donc wallabag doit reparcourir chaque article pour récupérer son contenu."
 "This importer will import all your wallabag v1 articles. On your config page, click on \"JSON export\" in the \"Export your wallabag data\" section. You will have a \"wallabag-export-1-xxxx-xx-xx.json\" file.": "Cet outil va importer toutes vos données de wallabag v1. Sur votre page de configuration de wallabag v1, cliquez sur \"Export JSON\" dans la section \"Exporter vos données de wallabag\". Vous allez récupérer un fichier \"wallabag-export-1-xxxx-xx-xx.json\"."
+"This importer will import all your wallabag v2 articles. Go to All articles, then, on the export sidebar, click on \"JSON\". You will have a \"All articles.json\" file.": "Cet outil va importer toutes vos articles d'une autre instance de wallabag v2. Allez dans tous vos articles, puis, sur la barre latérale, cliquez sur \"JSON\". Vous allez récupérer un fichier \"All articles.json\""
 "You can import your data from your Pocket account. You just have to click on the below button and authorize the application to connect to getpocket.com.": "Vous pouvez importer vos données depuis votre compte Pocket. Vous n'avez qu'à cliquer sur le bouton ci-dessous et à autoriser wallabag à se connecter à getpocket.com."
-Connect to Pocket and import data: "Se connecter à Pocket et importer les données."
+Import > Pocket: "Import > Pocket"
+Pocket import isn't configured.: "L'import à partir de Pocket n'est pas configuré."
+You need to define %keyurls% a pocket_consumer_key %keyurle%.: "Vous devez définir %keyurls% une clé pour l'API Pocket %keyurle%."
+Your server admin needs to define an API Key for Pocket.: L'administrateur de votre serveur doit définir une clé pour l'API Pocket."
+Connect to Pocket and import data: "Se connecter à Pocket et importer les données"
 Please select your wallabag export and click on the below button to upload and import it.: "Choisissez le fichier de votre export wallabag v1 et cliquez sur le bouton ci-dessous pour l'importer."
 File: "Fichier"
 Upload file: "Importer le fichier"
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 1cae90a4..e388f2c8 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
@@ -238,21 +238,14 @@
                                <h5>{% trans %}What does « tagging rules » mean?{% endtrans %}</h5>
                                <p class="help">
                                    {% trans %}
-                                    They are rules used by Wallabag to automatically tag new entries.<br />
+                                    They are rules used by Wallabag to automatically tag new entries.<br />Each time a new entry is added, all the tagging rules will be used to add the tags you configured, thus saving you the trouble to manually classify your entries.
-                                    Each time a new entry is added, all the tagging rules will be used to add
-                                    the tags you configured, thus saving you the trouble to manually classify
-                                    your entries.
                                    {% endtrans %}
                                </p>
                                <h5>{% trans %}How do I use them?{% endtrans %}</h5>
                                <p class="help">
                                    {% trans %}
-                                    Let assume you want to tag new entries as « <i>short reading</i> » when the reading time is inferior to 3 minutes.<br />
+                                    Let assume you want to tag new entries as « <i>short reading</i> » when the reading time is inferior to 3 minutes.<br />In that case, you should put « readingTime &lt;= 3 » in the <i>Rule</i> field and « <i>short reading</i> » in the <i>Tags</i> field.<br />Several tags can added simultaneously by separating them by a comma: « <i>short reading, must read</i> »<br />Complex rules can be written by using predefined operators: if « <i>readingTime &gt;= 5 AND domainName = "github.com"</i> » then tag as « <i>long reading, github </i> »
-                                    In that case, you should put « readingTime &lt;= 3 » in the <i>Rule</i> field and « <i>short reading</i> » in the <i>Tags</i>
-                                    field.<br />
-                                    Several tags can added simultaneously by separating them by a comma: « <i>short reading, must read</i> »<br />
-                                    Complex rules can be written by using predefined operators: if « <i>readingTime &gt;= 5 AND domainName = "github.com"</i> » then tag as « <i>long reading, github </i> »
                                    {% endtrans %}
                                </p>
@@ -290,7 +283,7 @@
                                                <td>{% trans %}Greater than…{% endtrans %}</td>
                                            </tr>
                                            <tr>
-                                                <td>isStared</td>
+                                                <td>isStarred</td>
                                                <td>{% trans %}Whether the entry is starred or not{% endtrans %}</td>
                                                <td>&gt;</td>
                                                <td>{% trans %}Strictly greater than…{% endtrans %}</td>
@@ -325,8 +318,7 @@
                                                <td>matches</td>
                                                <td>
                                                    {% trans %}
-                                                    Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />
+                                                    Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>
-                                                    Example: <code>title matches "football"</code>
                                                    {% endtrans %}
                                                </td>
                                            </tr>
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 3b7698f3..ac17ccee 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
@@ -162,7 +162,7 @@
                </div>
                <div class="input-field col s12">
-                    {{ form_widget(form.domainName, {'type': 'text', 'attr' : {'placeholder': 'website.com'} }) }}
+                    {{ form_widget(form.domainName, {'type': 'text', 'attr' : {'placeholder': 'website.com' | trans} }) }}
                    <label for="entry_filter_domainName">{% trans %}Domain name{% endtrans %}</label>
                </div>
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 47e3bc78..2de53106 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
@@ -8,7 +8,7 @@
            <span class="black-text">{{ form_errors(form.url) }}</span>
        {% endif %}
-        {{ form_widget(form.url, { 'attr': {'autocomplete': 'off', 'placeholder': 'http://website'} }) }}
+        {{ form_widget(form.url, { 'attr': {'autocomplete': 'off', 'placeholder': 'http://website' | trans} }) }}
    <div class="hidden">{{ form_rest(form) }}</div>
 </form>
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 dff9e612..d7bfa7ae 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -115,7 +115,7 @@
        <div class="footer-copyright">
            <div class="container">
                <p>{% trans %}powered by{% endtrans %} <a target="_blank" href="https://wallabag.org" class="grey-text text-lighten-4">wallabag</a></p>
-                <a class="grey-text text-lighten-4 right" href="{{ path('about') }}">{% trans %}about{% endtrans %}</a>
+                <a class="grey-text text-lighten-4 right" href="{{ path('about') }}">{% trans %}About{% endtrans %}</a>
            </div>
        </div>
    </footer>
diff --git a/src/Wallabag/ImportBundle/Import/WallabagV2Import.php b/src/Wallabag/ImportBundle/Import/WallabagV2Import.php
index c5c0d5a7..7125eabc 100644
--- a/src/Wallabag/ImportBundle/Import/WallabagV2Import.php
+++ b/src/Wallabag/ImportBundle/Import/WallabagV2Import.php
@@ -27,7 +27,7 @@ class WallabagV2Import extends WallabagV1Import implements ImportInterface
     */
    public function getDescription()
    {
-        return 'This importer will import all your wallabag v2 articles. On the export sidebar, click on "JSON". You will have a "Unread articles.json" file.';
+        return 'This importer will import all your wallabag v2 articles. Go to All articles, then, on the export sidebar, click on "JSON". You will have a "All articles.json" file.';
    }
    /**
diff --git a/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig b/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
index e0e36f38..8aa5da97 100644
--- a/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
+++ b/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
@@ -7,7 +7,12 @@
        <div class="card-panel settings">
            {% if not has_consumer_key %}
                <div class="card-panel red darken-1">
-                    {% trans %}Pocket import isn't configured. You need to define pocket_consumer_key.{% endtrans %}
+                    {% trans %}Pocket import isn't configured.{% endtrans %}
+                    {% if is_granted('ROLE_SUPER_ADMIN') %}
+                        {% trans with {'%keyurls%': '<a href="' ~ path('craue_config_settings_modify') ~ '#set-import">', '%keyurle%':'</a>'} %}You need to define %keyurls% a pocket_consumer_key %keyurle%.{% endtrans %}
+                    {% else %}
+                        {% trans %}Your server admin needs to define an API Key for Pocket.{% endtrans %}
+                    {% endif %}
                </div>
            {% endif %}