33 files changed, 1503 insertions, 312 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/config/parameters.yml b/src/Wallabag/CoreBundle/Resources/config/parameters.yml
index 6068e84c..4948f385 100644
--- a/src/Wallabag/CoreBundle/Resources/config/parameters.yml
+++ b/src/Wallabag/CoreBundle/Resources/config/parameters.yml
@@ -1,8 +1,9 @@
 parameters:
    addons_url:
-        firefox: https://addons.mozilla.org/firefox/addon/wallabag-v2/
+        firefox: https://addons.mozilla.org/firefox/addon/wallabagger/
-        chrome: https://chrome.google.com/webstore/detail/wallabagit/peehlcgckcnclnjlndmoddifcicdnabm
+        chrome: https://chrome.google.com/webstore/detail/wallabagger/gbmgphmejlcoihgedabhgjdkcahacjlj
+        opera: https://addons.opera.com/en/extensions/details/wallabagger/?display=en
        f_droid: https://f-droid.org/app/fr.gaulupeau.apps.InThePoche
        google_play: https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche
-        ios: https://itunes.apple.com/app/wallabag/id828331015?mt=8
+        ios: https://itunes.apple.com/app/wallabag-2/id1170800946?mt=8
        windows: https://www.microsoft.com/store/apps/wallabag/9nblggh11646
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml
index ed66d2be..fadd5e49 100644
--- a/src/Wallabag/CoreBundle/Resources/config/services.yml
+++ b/src/Wallabag/CoreBundle/Resources/config/services.yml
@@ -30,7 +30,7 @@ services:
            - "@doctrine"
    wallabag_core.subscriber.table_prefix:
-        class: Wallabag\CoreBundle\Subscriber\TablePrefixSubscriber
+        class: Wallabag\CoreBundle\Event\Subscriber\TablePrefixSubscriber
        arguments:
            - "%database_table_prefix%"
        tags:
@@ -41,11 +41,44 @@ services:
        arguments:
            -
                error_message: '%wallabag_core.fetching_error_message%'
+            - "@wallabag_core.guzzle.http_client"
+            - "@wallabag_core.graby.config_builder"
        calls:
            - [ setLogger, [ "@logger" ] ]
        tags:
            - { name: monolog.logger, channel: graby }
+    wallabag_core.graby.config_builder:
+        class: Graby\SiteConfig\ConfigBuilder
+        arguments:
+            - {}
+            - "@logger"
+    wallabag_core.guzzle.http_client:
+        class: GuzzleHttp\ClientInterface
+        factory: ["@wallabag_core.guzzle.http_client_factory", buildHttpClient]
+    wallabag_core.guzzle_authenticator.config_builder:
+        class: Wallabag\CoreBundle\GuzzleSiteAuthenticator\GrabySiteConfigBuilder
+        arguments:
+            - "@wallabag_core.graby.config_builder"
+            - "%sites_credentials%"
+    # service alias override
+    bd_guzzle_site_authenticator.site_config_builder:
+        alias: wallabag_core.guzzle_authenticator.config_builder
+    wallabag_core.guzzle.http_client_factory:
+        class: Wallabag\CoreBundle\Helper\HttpClientFactory
+        arguments:
+            - "@bd_guzzle_site_authenticator.authenticator_subscriber"
+            - "@wallabag_core.guzzle.cookie_jar"
+            - '@=service(''craue_config'').get(''restricted_access'')'
+    wallabag_core.guzzle.cookie_jar:
+        class: GuzzleHttp\Cookie\FileCookieJar
+        arguments: ["%kernel.cache_dir%/cookiejar.json"]
    wallabag_core.content_proxy:
        class: Wallabag\CoreBundle\Helper\ContentProxy
        arguments:
@@ -53,6 +86,7 @@ services:
            - "@wallabag_core.rule_based_tagger"
            - "@wallabag_core.tag_repository"
            - "@logger"
+            - '%wallabag_core.fetching_error_message%'
    wallabag_core.rule_based_tagger:
        class: Wallabag\CoreBundle\Helper\RuleBasedTagger
@@ -94,6 +128,7 @@ services:
        class: Wallabag\CoreBundle\Helper\Redirect
        arguments:
            - "@router"
+            - "@security.token_storage"
    wallabag_core.helper.prepare_pager_for_entries:
        class: Wallabag\CoreBundle\Helper\PreparePagerForEntries
@@ -109,9 +144,38 @@ services:
                host: '%redis_host%'
                port: '%redis_port%'
                path: '%redis_path%'
+                password: '%redis_password%'
    wallabag_core.exception_controller:
        class: Wallabag\CoreBundle\Controller\ExceptionController
        arguments:
            - '@twig'
            - '%kernel.debug%'
+    wallabag_core.subscriber.sqlite_cascade_delete:
+        class: Wallabag\CoreBundle\Event\Subscriber\SQLiteCascadeDeleteSubscriber
+        arguments:
+            - "@doctrine"
+        tags:
+            - { name: doctrine.event_subscriber }
+    wallabag_core.subscriber.download_images:
+        class: Wallabag\CoreBundle\Event\Subscriber\DownloadImagesSubscriber
+        arguments:
+            - "@doctrine.orm.default_entity_manager"
+            - "@wallabag_core.entry.download_images"
+            - '@=service(''craue_config'').get(''download_images_enabled'')'
+            - "@logger"
+        tags:
+            - { name: kernel.event_subscriber }
+    wallabag_core.entry.download_images:
+        class: Wallabag\CoreBundle\Helper\DownloadImages
+        arguments:
+            - "@wallabag_core.entry.download_images.client"
+            - "%kernel.root_dir%/../web/assets/images"
+            - '@=service(''craue_config'').get(''wallabag_url'')'
+            - "@logger"
+    wallabag_core.entry.download_images.client:
+        class: GuzzleHttp\Client
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index a1bee173..5d9e85e4 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -25,7 +25,7 @@ menu:
        # internal_settings: 'Internal Settings'
        # import: 'Import'
        howto: 'KUow-to'
-        # developer: 'Developer'
+        # developer: 'API clients management'
        logout: 'Log ud'
        about: 'Om'
        search: 'Søg'
@@ -70,7 +70,12 @@ config:
            # 200_word: 'I read ~200 words per minute'
            # 300_word: 'I read ~300 words per minute'
            # 400_word: 'I read ~400 words per minute'
+        action_mark_as_read:
+            # label: 'Where do you to be redirected after mark an article as read?'
+            # redirect_homepage: 'To the homepage'
+            # redirect_current_page: 'To the current page'
        pocket_consumer_key_label: Brugers nøgle til Pocket for at importere materialer
+        # android_configuration: Configure your Android application
        # help_theme: "wallabag is customizable. You can choose your prefered theme here."
        # help_items_per_page: "You can change the number of articles displayed on each page."
        # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article."
@@ -94,6 +99,18 @@ config:
        email_label: 'Emailadresse'
        # twoFactorAuthentication_label: 'Two factor authentication'
        # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
+        delete:
+            # title: Delete my account (a.k.a danger zone)
+            # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out.
+            # confirm: Are you really sure? (THIS CAN'T BE UNDONE)
+            # button: Delete my account
+    reset:
+        # title: Reset area (a.k.a danger zone)
+        # description: By hiting buttons below you'll have ability to remove some informations from your account. Be aware that these actions are IRREVERSIBLE.
+        # annotations: Remove ALL annotations
+        # tags: Remove ALL tags
+        # entries: Remove ALL entries
+        # confirm: Are you really really sure? (THIS CAN'T BE UNDONE)
    form_password:
        # description: "You can change your password here. Your new password should by at least 8 characters long."
        old_password_label: 'Gammel adgangskode'
@@ -145,15 +162,16 @@ entry:
        # archived: 'Archived entries'
        # filtered: 'Filtered entries'
        # filtered_tags: 'Filtered by tags:'
+        # filtered_search: 'Filtered by search:'
        # untagged: 'Untagged entries'
    list:
        # number_on_the_page: '{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.'
        reading_time: 'estimeret læsetid'
        reading_time_minutes: 'estimeret læsetid: %readingTime% min'
-        reading_time_less_one_minute: 'estimeret læsetid: <small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute: 'estimeret læsetid: &lt; 1 min'
        # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags'
        reading_time_minutes_short: '%readingTime% min'
-        reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute_short: '&lt; 1 min'
        original_article: 'original'
        toogle_as_read: 'Marker som læst'
        toogle_as_star: 'Skift favoritstatus'
@@ -168,6 +186,7 @@ entry:
        preview_picture_label: 'Har et vist billede'
        preview_picture_help: 'Forhåndsvis billede'
        language_label: 'Sprog'
+        # http_status_label: 'HTTP status'
        reading_time:
            label: 'Læsetid i minutter'
            from: 'fra'
@@ -209,6 +228,8 @@ entry:
        placeholder: 'http://website.com'
        form_new:
            url_label: Url
+    search:
+        # placeholder: 'What are you looking for?'
    edit:
        # page_title: 'Edit an entry'
        # title_label: 'Title'
@@ -252,6 +273,9 @@ about:
 howto:
    page_title: 'How-to'
    # page_description: 'There are several ways to save an article:'
+    tab_menu:
+        # add_link: "Add a link"
+        # shortcuts: "Use shortcuts"
    top_menu:
        browser_addons: 'Browserudvidelser'
        mobile_apps: 'Apps'
@@ -261,6 +285,7 @@ howto:
    browser_addons:
        firefox: 'Standardudvidelse til Firefox'
        chrome: 'Chrome-udvidelse'
+        opera: 'Opera-udvidelse'
    mobile_apps:
        android:
            via_f_droid: 'via F-Droid'
@@ -269,6 +294,33 @@ howto:
        # windows: 'on the Microsoft Store'
    bookmarklet:
        description: 'Træk dette link til din bogmærkeliste:'
+    shortcuts:
+        # page_description: Here are the shortcuts available in wallabag.
+        # shortcut: Shortcut
+        # action: Action
+        # all_pages_title: Shortcuts available in all pages
+        # go_unread: Go to unread
+        # go_starred: Go to starred
+        # go_archive: Go to archive
+        # go_all: Go to all entries
+        # go_tags: Go to tags
+        # go_config: Go to config
+        # go_import: Go to import
+        # go_developers: Go to developers
+        # go_howto: Go to howto (this page!)
+        # go_logout: Logout
+        # list_title: Shortcuts available in listing pages
+        # search: Display the search form
+        # article_title: Shortcuts available in entry view
+        # open_original: Open original URL of the entry
+        # toggle_favorite: Toggle star status for the entry
+        # toggle_archive: Toggle read status for the entry
+        # delete: Delete the entry
+        # material_title: Shortcuts available with Material theme only
+        # add_link: Add a new link
+        # hide_form: Hide the current form (search or new link)
+        # arrows_navigation: Navigate through articles
+        # open_article: Display the selected entry
 quickstart:
    # page_title: 'Quickstart'
@@ -329,6 +381,9 @@ tag:
    list:
        # number_on_the_page: '{0} There is no tag.|{1} There is one tag.|]1,Inf[ There are %count% tags.'
        # see_untagged_entries: 'See untagged entries'
+    new:
+        # add: 'Add'
+        # placeholder: 'You can add several tags, separated by a comma.'
 import:
    # page_title: 'Import'
@@ -362,6 +417,7 @@ import:
    #     how_to: 'Please select your Readability export and click on the below button to upload and import it.'
    worker:
        # enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:"
+        # download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We <strong>strongly recommend</strong> to enable asynchronous import to avoid errors."
    # firefox:
    #    page_title: 'Import > Firefox'
    #    description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file."
@@ -374,9 +430,13 @@ import:
    #     page_title: 'Import > Instapaper'
    #     description: 'This importer will import all your Instapaper articles. On the settings (https://www.instapaper.com/user) page, click on "Download .CSV file" in the "Export" section. A CSV file will be downloaded (like "instapaper-export.csv").'
    #     how_to: 'Please select your Instapaper export and click on the below button to upload and import it.'
+    pinboard:
+        # page_title: "Import > Pinboard"
+        # description: 'This importer will import all your Instapaper articles. On the backup (https://pinboard.in/settings/backup) page, click on "JSON" in the "Bookmarks" section. A JSON file will be downloaded (like "pinboard_export").'
+        # how_to: 'Please select your Pinboard export and click on the below button to upload and import it.'
 developer:
-    # page_title: 'Developer'
+    # page_title: 'API clients management'
    # welcome_message: 'Welcome to the wallabag API'
    # documentation: 'Documentation'
    # how_to_first_app: 'How to create my first application'
@@ -397,7 +457,7 @@ developer:
    #     warn_message_2: "If you remove it, every app configured with that client won't be able to auth on your wallabag."
    #     action: 'Remove this client'
    # client:
-    #     page_title: 'Developer > New client'
+    #     page_title: 'API clients management > New client'
    #     page_description: 'You are about to create a new client. Please fill the field below for the redirect URI of your application.'
    #     form:
    #         name_label: 'Name of the client'
@@ -405,7 +465,7 @@ developer:
    #         save_label: 'Create a new client'
    #     action_back: 'Back'
    # client_parameter:
-    #     page_title: 'Developer > Client parameters'
+    #     page_title: 'API clients management > Client parameters'
    #     page_description: 'Here are your client parameters.'
    #     field_name: 'Client name'
    #     field_id: 'Client ID'
@@ -444,7 +504,6 @@ user:
        plain_password_label: '????'
        email_label: 'Emailadresse'
        # enabled_label: 'Enabled'
-        # locked_label: 'Locked'
        # last_login_label: 'Last login'
        # twofactor_label: Two factor authentication
        # save: Save
@@ -465,8 +524,10 @@ flashes:
            rss_updated: 'RSS-oplysninger opdateret'
            # tagging_rules_updated: 'Tagging rules updated'
            # tagging_rules_deleted: 'Tagging rule deleted'
-            # user_added: 'User "%username%" added'
            # rss_token_updated: 'RSS token updated'
+            # annotations_reset: Annotations reset
+            # tags_reset: Tags reset
+            # entries_reset: Entries reset
    entry:
        notice:
            # entry_already_saved: 'Entry already saved on %date%'
@@ -496,3 +557,8 @@ flashes:
        notice:
            # client_created: 'New client created.'
            # client_deleted: 'Client deleted'
+    user:
+        notice:
+            # added: 'User "%username%" added'
+            # updated: 'User "%username%" updated'
+            # deleted: 'User "%username%" deleted'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index c9625d06..f1952a3e 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -25,7 +25,7 @@ menu:
        internal_settings: 'Interne Einstellungen'
        import: 'Importieren'
        howto: 'How-To'
-        developer: 'Entwickler'
+        developer: 'API-Client-Verwaltung'
        logout: 'Abmelden'
        about: 'Über'
        search: 'Suche'
@@ -70,12 +70,17 @@ config:
            200_word: 'Ich lese ~200 Wörter pro Minute'
            300_word: 'Ich lese ~300 Wörter pro Minute'
            400_word: 'Ich lese ~400 Wörter pro Minute'
+        action_mark_as_read:
+            label: 'Wohin soll nach dem Gelesenmarkieren eines Artikels weitergeleitet werden?'
+            redirect_homepage: 'Zur Homepage'
+            redirect_current_page: 'Zur aktuellen Seite'
        pocket_consumer_key_label: Consumer-Key für Pocket, um Inhalte zu importieren
-        # help_theme: "wallabag is customizable. You can choose your prefered theme here."
+        android_configuration: Konfiguriere deine Android Application
-        # help_items_per_page: "You can change the number of articles displayed on each page."
+        help_theme: "wallabag ist anpassbar. Du kannst dein bevorzugtes Theme hier auswählen."
-        # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article."
+        help_items_per_page: "Du kannst die Nummer von Artikeln pro Seite anpassen."
-        # help_language: "You can change the language of wallabag interface."
+        help_reading_speed: "wallabag berechnet eine Lesezeit pro Artikel. Hier kannst du definieren, ob du ein schneller oder langsamer Leser bist. wallabag wird die Lesezeiten danach neu berechnen."
-        # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account."
+        help_language: "Du kannst die Sprache der wallabag-Oberfläche ändern."
+        help_pocket_consumer_key: "Nötig für den Pocket-Import. Du kannst ihn in deinem Pocket account einrichten."
    form_rss:
        description: 'Die RSS-Feeds von wallabag erlauben es dir, deine gespeicherten Artikel mit deinem bevorzugten RSS-Reader zu lesen. Vorher musst du jedoch einen Token erstellen.'
        token_label: 'RSS-Token'
@@ -93,9 +98,21 @@ config:
        name_label: 'Name'
        email_label: 'E-Mail-Adresse'
        twoFactorAuthentication_label: 'Zwei-Faktor-Authentifizierung'
-        # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
+        help_twoFactorAuthentication: "Wenn du 2FA aktivierst, wirst du bei jedem Login einen Code per E-Mail bekommen."
+        delete:
+            title: Lösche mein Konto (a.k.a Gefahrenzone)
+            description: Wenn du dein Konto löschst, werden ALL deine Artikel, ALL deine Tags, ALL deine Anmerkungen und dein Konto dauerhaft gelöscht (kann NICHT RÜCKGÄNGIG gemacht werden). Du wirst anschließend ausgeloggt.
+            confirm: Bist du wirklich sicher? (DIES KANN NICHT RÜCKGÄNGIG GEMACHT WERDEN)
+            button: Lösche mein Konto
+    reset:
+        title: Zurücksetzen (a.k.a Gefahrenzone)
+        description: Beim Nutzen der folgenden Schaltflächenhast du die Möglichkeit, einige Informationen von deinem Konto zu entfernen. Sei dir bewusst, dass dies NICHT RÜCKGÄNGIG zu machen ist.
+        annotations: Entferne ALLE Annotationen
+        tags: Entferne ALLE Tags
+        entries: Entferne ALLE Einträge
+        confirm: Bist du wirklich sicher? (DIES KANN NICHT RÜCKGÄNGIG GEMACHT WERDEN)
    form_password:
-        # description: "You can change your password here. Your new password should by at least 8 characters long."
+        description: "Hier kannst du dein Kennwort ändern. Dieses sollte mindestens acht Zeichen enthalten."
        old_password_label: 'Altes Kennwort'
        new_password_label: 'Neues Kennwort'
        repeat_new_password_label: 'Neues Kennwort wiederholen'
@@ -145,15 +162,16 @@ entry:
        archived: 'Archivierte Einträge'
        filtered: 'Gefilterte Einträge'
        filtered_tags: 'Gefiltert nach Tags:'
+        filtered_search: 'Gefiltert nach Suche:'
        untagged: 'Nicht getaggte Einträge'
    list:
        number_on_the_page: '{0} Es gibt keine Einträge.|{1} Es gibt einen Eintrag.|]1,Inf[ Es gibt %count% Einträge.'
        reading_time: 'geschätzte Lesezeit'
        reading_time_minutes: 'geschätzte Lesezeit: %readingTime% min'
-        reading_time_less_one_minute: 'geschätzte Lesezeit: <small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute: 'geschätzte Lesezeit: &lt; 1 min'
        number_of_tags: '{1}und ein anderer Tag|]1,Inf[und %count% andere Tags'
        reading_time_minutes_short: '%readingTime% min'
-        reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute_short: '&lt; 1 min'
        original_article: 'Original'
        toogle_as_read: 'Gelesen-Status ändern'
        toogle_as_star: 'Favoriten-Status ändern'
@@ -168,6 +186,7 @@ entry:
        preview_picture_label: 'Vorschaubild vorhanden'
        preview_picture_help: 'Vorschaubild'
        language_label: 'Sprache'
+        http_status_label: 'HTTP-Status'
        reading_time:
            label: 'Lesezeit in Minuten'
            from: 'von'
@@ -209,6 +228,8 @@ entry:
        placeholder: 'https://website.de'
        form_new:
            url_label: URL
+    search:
+        placeholder: 'Wonach suchst du?'
    edit:
        page_title: 'Eintrag bearbeiten'
        title_label: 'Titel'
@@ -252,6 +273,9 @@ about:
 howto:
    page_title: 'How-To'
    page_description: 'Es gibt mehrere Möglichkeiten, einen Artikel zu speichern:'
+    tab_menu:
+        add_link: "Link hinzufügen"
+        shortcuts: "Tastenkürzel nutzen"
    top_menu:
        browser_addons: 'Browser-Erweiterungen'
        mobile_apps: 'Apps'
@@ -261,6 +285,7 @@ howto:
    browser_addons:
        firefox: 'Firefox-Erweiterung'
        chrome: 'Chrome-Erweiterung'
+        opera: 'Opera-Erweiterung'
    mobile_apps:
        android:
            via_f_droid: 'via F-Droid'
@@ -269,6 +294,33 @@ howto:
        windows: 'im Microsoft-Store'
    bookmarklet:
        description: 'Ziehe diesen Link in deine Lesezeichenleiste:'
+    shortcuts:
+        page_description: Dies sind die verfügbaren Tastenkürzel in wallabag.
+        shortcut: Tastenkürzel
+        action: Aktion
+        all_pages_title: Tastenkürzel auf allen Seiten
+        go_unread: Zu ungelesen gehen
+        go_starred: Zu Favoriten gehen
+        go_archive: Zu archivierten gehen
+        go_all: Zu allen Artikel gehen
+        go_tags: Zu den Tags gehen
+        go_config: Einstellungen öffnen
+        go_import: Import-Sektion öffnen
+        go_developers: Zur Entwickler-Seite gehen
+        go_howto: Zum Howto gehen (diese Seite!)
+        go_logout: Abmelden
+        list_title: Tastenkürzel verfügbar auf den Listen-Seiten
+        search: Suche
+        article_title: Tastenkürzel verfügbar auf der Artikel-Seite
+        open_original: Original-Artikel öffnen
+        toggle_favorite: Favorit-Status für den Artikel ändern
+        toggle_archive: Archiviert-Status für den Artikel ändern
+        delete: Artikel löschen
+        material_title: Tastenkürzel des Material-Theme
+        add_link: Neuen Link hinzufügen
+        hide_form: Aktuelles Formular verstecken (Suche oder neuer Link)
+        arrows_navigation: Durch Artikel navigieren
+        open_article: Gewählten Artikel anzeigen
 quickstart:
    page_title: 'Schnelleinstieg'
@@ -329,6 +381,9 @@ tag:
    list:
        number_on_the_page: '{0} Es gibt keine Tags.|{1} Es gibt einen Tag.|]1,Inf[ Es gibt %count% Tags.'
        see_untagged_entries: 'Zeige nicht getaggte Einträge'
+    new:
+        add: 'Hinzufügen'
+        placeholder: 'Du kannst verschiedene Tags, getrennt von einem Komma, hinzufügen.'
 import:
    page_title: 'Importieren'
@@ -362,6 +417,7 @@ import:
        how_to: 'Bitte wähle deinen Readability Export aus und klicke den unteren Button für das Hochladen und Importieren dessen.'
    worker:
        enabled: "Der Import erfolgt asynchron. Sobald der Import gestartet ist, wird diese Aufgabe extern abgearbeitet. Der aktuelle Service dafür ist:"
+        download_images_warning: "Du hast das Herunterladen von Bildern für deine Artikel aktiviert. Verbunden mit dem klassischen Import kann es ewig dauern fortzufahren (oder sogar fehlschlagen). Wir <strong>empfehlen</strong> den asynchronen Import zu aktivieren, um Fehler zu vermeiden."
    firefox:
        page_title: 'Aus Firefox importieren'
        description: "Dieser Import wird all deine Lesezeichen aus Firefox importieren. Gehe zu deinen Lesezeichen (Strg+Shift+O), dann auf \"Importen und Sichern\", wähle \"Sichern…\". Du erhälst eine .json Datei."
@@ -374,9 +430,13 @@ import:
        page_title: 'Aus Instapaper importieren'
        description: 'Dieser Import wird all deine Instapaper Artikel importieren. Auf der Einstellungsseite (https://www.instapaper.com/user) klickst du auf "Download .CSV Datei" in dem Abschnitt "Export". Eine CSV Datei wird heruntergeladen (z.B. "instapaper-export.csv").'
        how_to: "Bitte wähle deine Instapaper Sicherungsdatei aus und klicke den nachfolgenden Button zum Importieren."
+    pinboard:
+        page_title: "Aus Pinboard importieren"
+        description: 'Dieser Import wird all deine Pinboard Artikel importieren. Auf der Seite Backup (https://pinboard.in/settings/backup) klickst du auf "JSON" in dem Abschnitt "Lesezeichen". Eine JSON Datei wird dann heruntergeladen (z.B. "pinboard_export").'
+        how_to: 'Bitte wähle deinen Pinboard Export aus und klicke den nachfolgenden Button zum Importieren.'
 developer:
-    page_title: 'Entwickler'
+    page_title: 'API-Client-Verwaltung'
    welcome_message: 'Willkomen zur wallabag API'
    documentation: 'Dokumentation'
    how_to_first_app: 'Wie erstelle ich meine erste Anwendung'
@@ -397,7 +457,7 @@ developer:
        warn_message_2: "Wenn du ihn entfernst, hat keine der damit konfigurierten Anwendungen mehr die Möglichkeit, sich in deinen wallabag-Konto anzumelden."
        action: 'Client entfernen'
    client:
-        page_title: 'Entwickler > Neuer Client'
+        page_title: 'API-Client-Verwaltung > Neuer Client'
        page_description: 'Du bist dabei, einen neuen Client zu erstellen. Fülle das nachfolgende Feld für die Weiterleitungs-URIs deiner Anwendung aus.'
        form:
            name_label: 'Name des Clients'
@@ -405,7 +465,7 @@ developer:
            save_label: 'Neuen Client erstellen'
        action_back: 'Zurück'
    client_parameter:
-        page_title: 'Entwickler > Client-Parameter'
+        page_title: 'API-Client-Verwaltung > Client-Parameter'
        page_description: 'Dies sind deine Client-Parameter.'
        field_name: 'Client Name'
        field_id: 'Client-ID'
@@ -413,7 +473,7 @@ developer:
        back: 'Zurück'
        read_howto: 'Lese des How-To zu "Wie erstelle ich meine erste Anwendung"'
    howto:
-        page_title: 'Entwickler > Wie erstelle ich meine erste Anwendung'
+        page_title: 'API-Client-Verwaltung > Wie erstelle ich meine erste Anwendung'
        description:
            paragraph_1: 'Die folgenden Befehle machen Gebrauch von der <a href="https://github.com/jkbrzt/httpie">HTTPie-Bibliothek</a>. Stelle sicher, dass sie auf deinem System installiert ist, bevor du fortfährst.'
            paragraph_2: 'Du benötigst einen Token, damit deine Anwendung mit der wallabag-API kommunizieren kann.'
@@ -444,7 +504,6 @@ user:
        plain_password_label: '????'
        email_label: 'E-Mail-Adresse'
        enabled_label: 'Aktiviert'
-        locked_label: 'Gesperrt'
        last_login_label: 'Letzter Login'
        twofactor_label: Zwei-Faktor-Authentifizierung
        save: Speichern
@@ -453,7 +512,7 @@ user:
        back_to_list: Zurück zur Liste
 error:
-    # page_title: An error occurred
+    page_title: Ein Fehler ist aufgetreten
 flashes:
    config:
@@ -465,8 +524,10 @@ flashes:
            rss_updated: 'RSS-Informationen aktualisiert'
            tagging_rules_updated: 'Tagging-Regeln aktualisiert'
            tagging_rules_deleted: 'Tagging-Regel gelöscht'
-            user_added: 'Benutzer "%username%" erstellt'
            rss_token_updated: 'RSS-Token aktualisiert'
+            annotations_reset: Anmerkungen zurücksetzen
+            tags_reset: Tags zurücksetzen
+            entries_reset: Einträge zurücksetzen
    entry:
        notice:
            entry_already_saved: 'Eintrag bereits am %date% gespeichert'
@@ -496,3 +557,8 @@ flashes:
        notice:
            client_created: 'Neuer Client erstellt.'
            client_deleted: 'Client gelöscht'
+    user:
+        notice:
+            added: 'Benutzer "%username%" hinzugefügt'
+            updated: 'Benutzer "%username%" aktualisiert'
+            deleted: 'Benutzer "%username%" gelöscht'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index 139cdc24..8e7e3c2c 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -25,7 +25,7 @@ menu:
        internal_settings: 'Internal Settings'
        import: 'Import'
        howto: 'How to'
-        developer: 'Developer'
+        developer: 'API clients management'
        logout: 'Logout'
        about: 'About'
        search: 'Search'
@@ -70,7 +70,12 @@ config:
            200_word: 'I read ~200 words per minute'
            300_word: 'I read ~300 words per minute'
            400_word: 'I read ~400 words per minute'
+        action_mark_as_read:
+            label: 'Where do you want to be redirected after mark an article as read?'
+            redirect_homepage: 'To the homepage'
+            redirect_current_page: 'To the current page'
        pocket_consumer_key_label: Consumer key for Pocket to import contents
+        android_configuration: Configure your Android application
        help_theme: "wallabag is customizable. You can choose your prefered theme here."
        help_items_per_page: "You can change the number of articles displayed on each page."
        help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article."
@@ -94,6 +99,18 @@ config:
        email_label: 'Email'
        twoFactorAuthentication_label: 'Two factor authentication'
        help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
+        delete:
+            title: Delete my account (a.k.a danger zone)
+            description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out.
+            confirm: Are you really sure? (THIS CAN'T BE UNDONE)
+            button: Delete my account
+    reset:
+        title: Reset area (a.k.a danger zone)
+        description: By hitting buttons below you'll have ability to remove some information from your account. Be aware that these actions are IRREVERSIBLE.
+        annotations: Remove ALL annotations
+        tags: Remove ALL tags
+        entries: Remove ALL entries
+        confirm: Are you really sure? (THIS CAN'T BE UNDONE)
    form_password:
        description: "You can change your password here. Your new password should by at least 8 characters long."
        old_password_label: 'Current password'
@@ -145,15 +162,16 @@ entry:
        archived: 'Archived entries'
        filtered: 'Filtered entries'
        filtered_tags: 'Filtered by tags:'
+        filtered_search: 'Filtered by search:'
        untagged: 'Untagged entries'
    list:
        number_on_the_page: '{0} There are no entries.|{1} There is one entry.|]1,Inf[ There are %count% entries.'
        reading_time: 'estimated reading time'
        reading_time_minutes: 'estimated reading time: %readingTime% min'
-        reading_time_less_one_minute: 'estimated reading time: <small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute: 'estimated reading time: &lt; 1 min'
        number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags'
        reading_time_minutes_short: '%readingTime% min'
-        reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute_short: '&lt; 1 min'
        original_article: 'original'
        toogle_as_read: 'Toggle mark as read'
        toogle_as_star: 'Toggle starred'
@@ -168,6 +186,7 @@ entry:
        preview_picture_label: 'Has a preview picture'
        preview_picture_help: 'Preview picture'
        language_label: 'Language'
+        http_status_label: 'HTTP status'
        reading_time:
            label: 'Reading time in minutes'
            from: 'from'
@@ -209,6 +228,8 @@ entry:
        placeholder: 'http://website.com'
        form_new:
            url_label: Url
+    search:
+        placeholder: 'What are you looking for?'
    edit:
        page_title: 'Edit an entry'
        title_label: 'Title'
@@ -251,6 +272,9 @@ about:
 howto:
    page_title: 'How to'
+    tab_menu:
+        add_link: "Add a link"
+        shortcuts: "Use shortcuts"
    page_description: 'There are several ways to save an article:'
    top_menu:
        browser_addons: 'Browser addons'
@@ -259,8 +283,9 @@ howto:
    form:
        description: 'Thanks to this form'
    browser_addons:
-        firefox: 'Standard Firefox Add-On'
+        firefox: 'Firefox addon'
-        chrome: 'Chrome Extension'
+        chrome: 'Chrome addon'
+        opera: 'Opera addon'
    mobile_apps:
        android:
            via_f_droid: 'via F-Droid'
@@ -269,6 +294,33 @@ howto:
        windows: 'on the Microsoft Store'
    bookmarklet:
        description: 'Drag & drop this link to your bookmarks bar:'
+    shortcuts:
+        page_description: Here are the shortcuts available in wallabag.
+        shortcut: Shortcut
+        action: Action
+        all_pages_title: Shortcuts available in all pages
+        go_unread: Go to unread
+        go_starred: Go to starred
+        go_archive: Go to archive
+        go_all: Go to all entries
+        go_tags: Go to tags
+        go_config: Go to config
+        go_import: Go to import
+        go_developers: Go to developers
+        go_howto: Go to howto (this page!)
+        go_logout: Logout
+        list_title: Shortcuts available in listing pages
+        search: Display the search form
+        article_title: Shortcuts available in entry view
+        open_original: Open original URL of the entry
+        toggle_favorite: Toggle star status for the entry
+        toggle_archive: Toggle read status for the entry
+        delete: Delete the entry
+        material_title: Shortcuts available with Material theme only
+        add_link: Add a new link
+        hide_form: Hide the current form (search or new link)
+        arrows_navigation: Navigate through articles
+        open_article: Display the selected entry
 quickstart:
    page_title: 'Quickstart'
@@ -329,6 +381,9 @@ tag:
    list:
        number_on_the_page: '{0} There are no tags.|{1} There is one tag.|]1,Inf[ There are %count% tags.'
        see_untagged_entries: 'See untagged entries'
+    new:
+        add: 'Add'
+        placeholder: 'You can add several tags, separated by a comma.'
 import:
    page_title: 'Import'
@@ -362,6 +417,7 @@ import:
        how_to: 'Please select your Readability export and click on the below button to upload and import it.'
    worker:
        enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:"
+        download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We <strong>strongly recommend</strong> to enable asynchronous import to avoid errors."
    firefox:
        page_title: 'Import > Firefox'
        description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file."
@@ -374,9 +430,13 @@ import:
        page_title: 'Import > Instapaper'
        description: 'This importer will import all your Instapaper articles. On the settings (https://www.instapaper.com/user) page, click on "Download .CSV file" in the "Export" section. A CSV file will be downloaded (like "instapaper-export.csv").'
        how_to: 'Please select your Instapaper export and click on the below button to upload and import it.'
+    pinboard:
+        page_title: "Import > Pinboard"
+        description: 'This importer will import all your Pinboard articles. On the backup (https://pinboard.in/settings/backup) page, click on "JSON" in the "Bookmarks" section. A JSON file will be downloaded (like "pinboard_export").'
+        how_to: 'Please select your Pinboard export and click on the below button to upload and import it.'
 developer:
-    page_title: 'Developer'
+    page_title: 'API clients management'
    welcome_message: 'Welcome to the wallabag API'
    documentation: 'Documentation'
    how_to_first_app: 'How to create my first application'
@@ -397,7 +457,7 @@ developer:
        warn_message_2: "If you remove it, every app configured with that client won't be able to auth on your wallabag."
        action: 'Remove the client %name%'
    client:
-        page_title: 'Developer > New client'
+        page_title: 'API clients management > New client'
        page_description: 'You are about to create a new client. Please fill the field below for the redirect URI of your application.'
        form:
            name_label: 'Name of the client'
@@ -405,7 +465,7 @@ developer:
            save_label: 'Create a new client'
        action_back: 'Back'
    client_parameter:
-        page_title: 'Developer > Client parameters'
+        page_title: 'API clients management > Client parameters'
        page_description: 'Here are your client parameters.'
        field_name: 'Client name'
        field_id: 'Client ID'
@@ -413,7 +473,7 @@ developer:
        back: 'Back'
        read_howto: 'Read the howto "Create my first application"'
    howto:
-        page_title: 'Developer > How to create my first application'
+        page_title: 'API clients management > How to create my first application'
        description:
            paragraph_1: 'The following commands make use of the <a href="https://github.com/jkbrzt/httpie">HTTPie library</a>. Make sure it is installed on your system before using it.'
            paragraph_2: 'You need a token to communicate between your 3rd application and wallabag API.'
@@ -444,7 +504,6 @@ user:
        plain_password_label: '????'
        email_label: 'Email'
        enabled_label: 'Enabled'
-        locked_label: 'Locked'
        last_login_label: 'Last login'
        twofactor_label: Two factor authentication
        save: Save
@@ -466,6 +525,9 @@ flashes:
            tagging_rules_updated: 'Tagging rules updated'
            tagging_rules_deleted: 'Tagging rule deleted'
            rss_token_updated: 'RSS token updated'
+            annotations_reset: Annotations reset
+            tags_reset: Tags reset
+            entries_reset: Entries reset
    entry:
        notice:
            entry_already_saved: 'Entry already saved on %date%'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index 70e64bec..8ae1c400 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -25,7 +25,7 @@ menu:
        internal_settings: 'Configuración interna'
        import: 'Importar'
        howto: 'Ayuda'
-        developer: 'Promotor'
+        # developer: 'API clients management'
        logout: 'Desconectarse'
        about: 'Acerca de'
        search: 'Buscar'
@@ -70,7 +70,12 @@ config:
            200_word: 'Leo ~200 palabras por minuto'
            300_word: 'Leo ~300 palabras por minuto'
            400_word: 'Leo ~400 palabras por minuto'
+        action_mark_as_read:
+            # label: 'Where do you to be redirected after mark an article as read?'
+            # redirect_homepage: 'To the homepage'
+            # redirect_current_page: 'To the current page'
        # pocket_consumer_key_label: Consumer key for Pocket to import contents
+        # android_configuration: Configure your Android application
        # help_theme: "wallabag is customizable. You can choose your prefered theme here."
        # help_items_per_page: "You can change the number of articles displayed on each page."
        # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article."
@@ -94,6 +99,18 @@ config:
        email_label: 'Direccion e-mail'
        twoFactorAuthentication_label: 'Autentificación de dos factores'
        # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
+        delete:
+            # title: Delete my account (a.k.a danger zone)
+            # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out.
+            # confirm: Are you really sure? (THIS CAN'T BE UNDONE)
+            # button: Delete my account
+    reset:
+        # title: Reset area (a.k.a danger zone)
+        # description: By hiting buttons below you'll have ability to remove some informations from your account. Be aware that these actions are IRREVERSIBLE.
+        # annotations: Remove ALL annotations
+        # tags: Remove ALL tags
+        # entries: Remove ALL entries
+        # confirm: Are you really really sure? (THIS CAN'T BE UNDONE)
    form_password:
        # description: "You can change your password here. Your new password should by at least 8 characters long."
        old_password_label: 'Contraseña actual'
@@ -145,15 +162,16 @@ entry:
        archived: 'Artículos archivados'
        filtered: 'Artículos filtrados'
        # filtered_tags: 'Filtered by tags:'
+        # filtered_search: 'Filtered by search:'
        # untagged: 'Untagged entries'
    list:
        number_on_the_page: '{0} No hay artículos.|{1} Hay un artículo.|]1,Inf[ Hay %count% artículos.'
        reading_time: 'tiempo estimado de lectura'
        reading_time_minutes: 'tiempo estimado de lectura: %readingTime% min'
-        reading_time_less_one_minute: 'tiempo estimado de lectura: <small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute: 'tiempo estimado de lectura: &lt; 1 min'
        # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags'
        reading_time_minutes_short: '%readingTime% min'
-        reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute_short: '&lt; 1 min'
        original_article: 'original'
        toogle_as_read: 'Marcar como leído/ no leído'
        toogle_as_star: 'Marcar como favorito/ no favorito'
@@ -168,6 +186,7 @@ entry:
        preview_picture_label: 'Hay una foto'
        preview_picture_help: 'Foto de preview'
        language_label: 'Idioma'
+        # http_status_label: 'HTTP status'
        reading_time:
            label: 'Duración de lectura en minutos'
            from: 'de'
@@ -209,6 +228,8 @@ entry:
        placeholder: 'http://website.com'
        form_new:
            url_label: Url
+    search:
+        # placeholder: 'What are you looking for?'
    edit:
        page_title: 'Editar un artículo'
        title_label: 'Título'
@@ -252,6 +273,9 @@ about:
 howto:
    page_title: 'Ayuda'
    page_description: 'Hay muchas maneras para guardar un artículo:'
+    tab_menu:
+        # add_link: "Add a link"
+        # shortcuts: "Use shortcuts"
    top_menu:
        browser_addons: 'Extensiones de navigador'
        mobile_apps: 'Aplicaciones para smartphone'
@@ -261,6 +285,7 @@ howto:
    browser_addons:
        firefox: 'Extensión Firefox'
        chrome: 'Extensión Chrome'
+        opera: 'Extensión Opera'
    mobile_apps:
        android:
            via_f_droid: 'via F-Droid'
@@ -269,6 +294,33 @@ howto:
        windows: 'por la tienda de Microsoft'
    bookmarklet:
        description: 'Desplazar y soltar este link en la barra de marcadores :'
+    shortcuts:
+        # page_description: Here are the shortcuts available in wallabag.
+        # shortcut: Shortcut
+        # action: Action
+        # all_pages_title: Shortcuts available in all pages
+        # go_unread: Go to unread
+        # go_starred: Go to starred
+        # go_archive: Go to archive
+        # go_all: Go to all entries
+        # go_tags: Go to tags
+        # go_config: Go to config
+        # go_import: Go to import
+        # go_developers: Go to developers
+        # go_howto: Go to howto (this page!)
+        # go_logout: Logout
+        # list_title: Shortcuts available in listing pages
+        # search: Display the search form
+        # article_title: Shortcuts available in entry view
+        # open_original: Open original URL of the entry
+        # toggle_favorite: Toggle star status for the entry
+        # toggle_archive: Toggle read status for the entry
+        # delete: Delete the entry
+        # material_title: Shortcuts available with Material theme only
+        # add_link: Add a new link
+        # hide_form: Hide the current form (search or new link)
+        # arrows_navigation: Navigate through articles
+        # open_article: Display the selected entry
 quickstart:
    page_title: 'Comienzo rápido'
@@ -329,6 +381,9 @@ tag:
    list:
        number_on_the_page: '{0} No hay ninguna etiqueta.|{1} Hay una etiqueta.|]1,Inf[ Hay %count% etiquetas.'
        # see_untagged_entries: 'See untagged entries'
+    new:
+        # add: 'Add'
+        # placeholder: 'You can add several tags, separated by a comma.'
 import:
    page_title: 'Importar'
@@ -362,6 +417,7 @@ import:
        # how_to: 'Please select your Readability export and click on the below button to upload and import it.'
    worker:
        # enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:"
+        # download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We <strong>strongly recommend</strong> to enable asynchronous import to avoid errors."
    firefox:
       page_title: 'Importar > Firefox'
       # description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file."
@@ -374,9 +430,13 @@ import:
        page_title: 'Importar > Instapaper'
        # description: 'This importer will import all your Instapaper articles. On the settings (https://www.instapaper.com/user) page, click on "Download .CSV file" in the "Export" section. A CSV file will be downloaded (like "instapaper-export.csv").'
        # how_to: 'Please select your Instapaper export and click on the below button to upload and import it.'
+    pinboard:
+        page_title: "Importar > Pinboard"
+        # description: 'This importer will import all your Instapaper articles. On the backup (https://pinboard.in/settings/backup) page, click on "JSON" in the "Bookmarks" section. A JSON file will be downloaded (like "pinboard_export").'
+        # how_to: 'Please select your Pinboard export and click on the below button to upload and import it.'
 developer:
-    page_title: 'Promotor'
+    # page_title: 'API clients management'
    welcome_message: 'Bienvenido a wallabag API'
    documentation: 'Documentación'
    how_to_first_app: 'Cómo crear mi primera aplicación'
@@ -397,7 +457,7 @@ developer:
        warn_message_2: "Si lo elimine, cada aplicación configurada con ese cliente no se puede ser autorizada por su wallbag."
        action: 'Quite este cliente'
    client:
-        page_title: 'Promotor > Nuevo cliente'
+        # page_title: 'API clients management > Nuevo cliente'
        page_description: 'Va a crear un nuevo cliente. Por favor, llene el campo abajo para URI redirigido de su aplicación.'
        form:
            # name_label: 'Name of the client'
@@ -405,7 +465,7 @@ developer:
            save_label: 'Crear un nuevo cliente'
        action_back: 'Atrás'
    client_parameter:
-        page_title: 'Promotor > Parámetros del cliente'
+        # page_title: 'API clients management > Parámetros del cliente'
        page_description: 'Aquí hay sus parámetros del cliente.'
        # field_name: 'Client name'
        field_id: 'Identificación del cliente'
@@ -413,7 +473,7 @@ developer:
        back: 'Atrás'
        read_howto: 'Leer el howto "Crear mi primera aplicación"'
    howto:
-        page_title: 'Promotor > Cómo crear mi primera aplicación'
+        # page_title: 'API clients management > Cómo crear mi primera aplicación'
        description:
            paragraph_1: 'Los siguientes comandos se usan el <a href="https://github.com/jkbrzt/httpie">HTTPie library</a>. Esté seguro de que se instalen en sus sistema antes de usarlos.'
            paragraph_2: 'Necesita un token para comunicar entre su tercera aplicación y wallabag API.'
@@ -444,7 +504,6 @@ user:
        plain_password_label: '????'
        email_label: 'Email'
        # enabled_label: 'Enabled'
-        # locked_label: 'Locked'
        # last_login_label: 'Last login'
        # twofactor_label: Two factor authentication
        # save: Save
@@ -465,8 +524,10 @@ flashes:
            rss_updated: 'La configuración de los feeds RSS ha sido actualizada'
            tagging_rules_updated: 'Regla de etiquetado borrada'
            tagging_rules_deleted: 'Regla de etiquetado actualizada'
-            user_added: 'Usuario "%username%" añadido'
            rss_token_updated: 'RSS token actualizado'
+            # annotations_reset: Annotations reset
+            # tags_reset: Tags reset
+            # entries_reset: Entries reset
    entry:
        notice:
            entry_already_saved: 'Entrada ya guardada por %fecha%'
@@ -496,3 +557,8 @@ flashes:
        notice:
            client_created: 'Nuevo cliente creado.'
            client_deleted: 'Cliente suprimido'
+    user:
+        notice:
+            # added: 'User "%username%" added'
+            # updated: 'User "%username%" updated'
+            # deleted: 'User "%username%" deleted'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index 75359901..80500d19 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -25,7 +25,7 @@ menu:
        internal_settings: 'تنظیمات درونی'
        import: 'درون‌ریزی'
        howto: 'خودآموز'
-        developer: 'سازندگان'
+        # developer: 'API clients management'
        logout: 'خروج'
        about: 'درباره'
        search: 'جستجو'
@@ -70,7 +70,12 @@ config:
            200_word: 'من تقریباً ۲۰۰ واژه را در دقیقه می‌خوانم'
            300_word: 'من تقریباً ۳۰۰ واژه را در دقیقه می‌خوانم'
            400_word: 'من تقریباً ۴۰۰ واژه را در دقیقه می‌خوانم'
+        action_mark_as_read:
+            # label: 'Where do you to be redirected after mark an article as read?'
+            # redirect_homepage: 'To the homepage'
+            # redirect_current_page: 'To the current page'
        pocket_consumer_key_label: کلید کاربری Pocket برای درون‌ریزی مطالب
+        # android_configuration: Configure your Android application
        # help_theme: "wallabag is customizable. You can choose your prefered theme here."
        # help_items_per_page: "You can change the number of articles displayed on each page."
        # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article."
@@ -94,6 +99,18 @@ config:
        email_label: 'نشانی ایمیل'
        twoFactorAuthentication_label: 'تأیید ۲مرحله‌ای'
        # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
+        delete:
+            # title: Delete my account (a.k.a danger zone)
+            # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out.
+            # confirm: Are you really sure? (THIS CAN'T BE UNDONE)
+            # button: Delete my account
+    reset:
+        # title: Reset area (a.k.a danger zone)
+        # description: By hiting buttons below you'll have ability to remove some informations from your account. Be aware that these actions are IRREVERSIBLE.
+        # annotations: Remove ALL annotations
+        # tags: Remove ALL tags
+        # entries: Remove ALL entries
+        # confirm: Are you really really sure? (THIS CAN'T BE UNDONE)
    form_password:
        # description: "You can change your password here. Your new password should by at least 8 characters long."
        old_password_label: 'رمز قدیمی'
@@ -145,15 +162,16 @@ entry:
        archived: 'مقاله‌های بایگانی‌شده'
        filtered: 'مقاله‌های فیلترشده'
        # filtered_tags: 'Filtered by tags:'
+        # filtered_search: 'Filtered by search:'
        # untagged: 'Untagged entries'
    list:
        number_on_the_page: '{0} هیج مقاله‌ای نیست.|{1} یک مقاله هست.|]1,Inf[ %count% مقاله هست.'
        reading_time: 'زمان تخمینی برای خواندن'
        reading_time_minutes: 'زمان تخمینی برای خواندن: %readingTime% min'
-        reading_time_less_one_minute: 'زمان تخمینی برای خواندن: <small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute: 'زمان تخمینی برای خواندن: &lt; 1 min'
        # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags'
        reading_time_minutes_short: '%readingTime% min'
-        reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute_short: '&lt; 1 min'
        original_article: 'original'
        toogle_as_read: 'خوانده‌شده/خوانده‌نشده'
        toogle_as_star: 'برگزیده/نابرگزیده'
@@ -168,6 +186,7 @@ entry:
        preview_picture_label: 'دارای عکس پیش‌نمایش'
        preview_picture_help: 'پیش‌نمایش عکس'
        language_label: 'زبان'
+        # http_status_label: 'HTTP status'
        reading_time:
            label: 'زمان خواندن به دقیقه'
            from: 'از'
@@ -209,6 +228,8 @@ entry:
        placeholder: 'http://website.com'
        form_new:
            url_label: نشانی
+    search:
+        # placeholder: 'What are you looking for?'
    edit:
        page_title: 'ویرایش مقاله'
        title_label: 'عنوان'
@@ -252,6 +273,9 @@ about:
 howto:
    page_title: 'خودآموز'
    page_description: 'راه‌های زیادی برای ذخیرهٔ مقاله‌ها هست:'
+    tab_menu:
+        # add_link: "Add a link"
+        # shortcuts: "Use shortcuts"
    top_menu:
        browser_addons: 'افزونه برای مرورگرها'
        mobile_apps: 'برنامه‌های موبایل'
@@ -261,6 +285,7 @@ howto:
    browser_addons:
        firefox: 'افزونهٔ فایرفاکس'
        chrome: 'افزونهٔ کروم'
+        # opera: 'Opera addon'
    mobile_apps:
        android:
            via_f_droid: 'از راه F-Droid'
@@ -269,6 +294,33 @@ howto:
        windows: 'از راه Microsoft Store'
    bookmarklet:
        description: 'این پیوند را به نوار بوک‌مارک مرورگرتان بکشید:'
+    shortcuts:
+        # page_description: Here are the shortcuts available in wallabag.
+        # shortcut: Shortcut
+        # action: Action
+        # all_pages_title: Shortcuts available in all pages
+        # go_unread: Go to unread
+        # go_starred: Go to starred
+        # go_archive: Go to archive
+        # go_all: Go to all entries
+        # go_tags: Go to tags
+        # go_config: Go to config
+        # go_import: Go to import
+        # go_developers: Go to developers
+        # go_howto: Go to howto (this page!)
+        # go_logout: Logout
+        # list_title: Shortcuts available in listing pages
+        # search: Display the search form
+        # article_title: Shortcuts available in entry view
+        # open_original: Open original URL of the entry
+        # toggle_favorite: Toggle star status for the entry
+        # toggle_archive: Toggle read status for the entry
+        # delete: Delete the entry
+        # material_title: Shortcuts available with Material theme only
+        # add_link: Add a new link
+        # hide_form: Hide the current form (search or new link)
+        # arrows_navigation: Navigate through articles
+        # open_article: Display the selected entry
 quickstart:
    page_title: 'Quickstart'
@@ -279,6 +331,7 @@ quickstart:
        paragraph_2: 'ادامه دهید!'
    configure:
        title: 'برنامه را تنظیم کنید'
+        # description: 'In order to have an application which suits you, have a look into the configuration of wallabag.'
        language: 'زبان و نمای برنامه را تغییر دهید'
        rss: 'خوراک آر-اس-اس را فعال کنید'
        tagging_rules: 'قانون‌های برچسب‌گذاری خودکار مقاله‌هایتان را تعریف کنید'
@@ -328,6 +381,9 @@ tag:
    list:
        number_on_the_page: '{0} هیچ برچسبی نیست.|{1} یک برچسب هست.|]1,Inf[ %count% برچسب هست.'
        # see_untagged_entries: 'See untagged entries'
+    new:
+        # add: 'Add'
+        # placeholder: 'You can add several tags, separated by a comma.'
 import:
    page_title: 'درون‌ریزی'
@@ -361,6 +417,7 @@ import:
        # how_to: 'Please select your Readability export and click on the below button to upload and import it.'
    worker:
        # enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:"
+        # download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We <strong>strongly recommend</strong> to enable asynchronous import to avoid errors."
    firefox:
       page_title: 'درون‌ریزی > Firefox'
       # description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file."
@@ -373,9 +430,13 @@ import:
        page_title: 'درون‌ریزی > Instapaper'
        # description: 'This importer will import all your Instapaper articles. On the settings (https://www.instapaper.com/user) page, click on "Download .CSV file" in the "Export" section. A CSV file will be downloaded (like "instapaper-export.csv").'
        # how_to: 'Please select your Instapaper export and click on the below button to upload and import it.'
+    pinboard:
+        # page_title: "Import > Pinboard"
+        # description: 'This importer will import all your Instapaper articles. On the backup (https://pinboard.in/settings/backup) page, click on "JSON" in the "Bookmarks" section. A JSON file will be downloaded (like "pinboard_export").'
+        # how_to: 'Please select your Pinboard export and click on the below button to upload and import it.'
 developer:
-    # page_title: 'Developer'
+    # page_title: 'API clients management'
    # welcome_message: 'Welcome to the wallabag API'
    # documentation: 'Documentation'
    # how_to_first_app: 'How to create my first application'
@@ -396,7 +457,7 @@ developer:
    #     warn_message_2: "If you remove it, every app configured with that client won't be able to auth on your wallabag."
    #     action: 'Remove this client'
    # client:
-    #     page_title: 'Developer > New client'
+    #     page_title: 'API clients management > New client'
    #     page_description: 'You are about to create a new client. Please fill the field below for the redirect URI of your application.'
    #     form:
    #         name_label: 'Name of the client'
@@ -404,7 +465,7 @@ developer:
    #         save_label: 'Create a new client'
    #     action_back: 'بازگشت'
    # client_parameter:
-    #     page_title: 'Developer > Client parameters'
+    #     page_title: 'API clients management > Client parameters'
    #     page_description: 'Here are your client parameters.'
    #     field_name: 'Client name'
    #     field_id: 'Client ID'
@@ -412,7 +473,7 @@ developer:
    #     back: 'بازگشت'
    #     read_howto: 'Read the howto "Create my first application"'
    # howto:
-    #     page_title: 'Developer > How to create my first application'
+    #     page_title: 'API clients management > How to create my first application'
    #     description:
    #         paragraph_1: 'The following commands make use of the <a href="https://github.com/jkbrzt/httpie">HTTPie library</a>. Make sure it is installed on your system before using it.'
    #         paragraph_2: 'You need a token to communicate between your 3rd application and wallabag API.'
@@ -443,7 +504,6 @@ user:
        plain_password_label: '????'
        email_label: 'نشانی ایمیل'
        # enabled_label: 'Enabled'
-        # locked_label: 'Locked'
        # last_login_label: 'Last login'
        # twofactor_label: Two factor authentication
        # save: Save
@@ -464,8 +524,10 @@ flashes:
            rss_updated: 'اطلاعات آر-اس-اس به‌روز شد'
            tagging_rules_updated: 'برچسب‌گذاری خودکار به‌روز شد'
            tagging_rules_deleted: 'قانون برچسب‌گذاری پاک شد'
-            user_added: 'کابر "%username%" افزوده شد'
            rss_token_updated: 'کد آر-اس-اس به‌روز شد'
+            # annotations_reset: Annotations reset
+            # tags_reset: Tags reset
+            # entries_reset: Entries reset
    entry:
        notice:
            entry_already_saved: 'این مقاله در تاریخ %date% ذخیره شده بود'
@@ -495,3 +557,8 @@ flashes:
        notice:
            # client_created: 'New client created.'
            # client_deleted: 'Client deleted'
+    user:
+        notice:
+            # added: 'User "%username%" added'
+            # updated: 'User "%username%" updated'
+            # deleted: 'User "%username%" deleted'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index f2c9d8db..4f49f777 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -25,7 +25,7 @@ menu:
        internal_settings: "Configuration interne"
        import: "Importer"
        howto: "Aide"
-        developer: "Développeur"
+        developer: "Gestion des clients API"
        logout: "Déconnexion"
        about: "À propos"
        search: "Recherche"
@@ -46,7 +46,7 @@ footer:
        social: "Social"
        powered_by: "propulsé par"
        about: "À propos"
-    stats: Depuis le %user_creation% vous avez lu %nb_archives% articles. Ce qui fait %per_day% par jour !
+    stats: Depuis le %user_creation%, vous avez lu %nb_archives% articles. Ce qui fait %per_day% par jour !
 config:
    page_title: "Configuration"
@@ -70,7 +70,12 @@ config:
            200_word: "Je lis environ 200 mots par minute"
            300_word: "Je lis environ 300 mots par minute"
            400_word: "Je lis environ 400 mots par minute"
+        action_mark_as_read:
+            label: 'Où souhaitez-vous être redirigé après avoir marqué un article comme lu ?'
+            redirect_homepage: "À la page d'accueil"
+            redirect_current_page: 'À la page courante'
        pocket_consumer_key_label: Clé d’authentification Pocket pour importer les données
+        android_configuration: Configurez votre application Android
        help_theme: "L'affichage de wallabag est personnalisable. C'est ici que vous choisissez le thème que vous préférez."
        help_items_per_page: "Vous pouvez définir le nombre d'articles affichés sur chaque page."
        help_reading_speed: "wallabag calcule une durée de lecture pour chaque article. Vous pouvez définir ici, grâce à cette liste déroulante, si vous lisez plus ou moins vite. wallabag recalculera la durée de lecture de chaque article."
@@ -94,6 +99,18 @@ config:
        email_label: "Adresse courriel"
        twoFactorAuthentication_label: "Double authentification"
        help_twoFactorAuthentication: "Si vous activez 2FA, à chaque tentative de connexion à wallabag, vous recevrez un code par email."
+        delete:
+            title: Supprimer mon compte (attention danger !)
+            description: Si vous confirmez la suppression de votre compte, TOUS les articles, TOUS les tags, TOUTES les annotations et votre compte seront DÉFINITIVEMENT supprimé (c'est IRRÉVERSIBLE). Vous serez ensuite déconnecté.
+            confirm: Vous êtes vraiment sûr ? (C'EST IRRÉVERSIBLE)
+            button: 'Supprimer mon compte'
+    reset:
+        title: Réinitialisation (attention danger !)
+        description: En cliquant sur les boutons ci-dessous vous avez la possibilité de supprimer certaines informations de votre compte. Attention, ces actions sont IRRÉVERSIBLES !
+        annotations: Supprimer TOUTES les annotations
+        tags: Supprimer TOUS les tags
+        entries: Supprimer TOUS les articles
+        confirm: Êtes-vous vraiment vraiment sûr ? (C'EST IRRÉVERSIBLE)
    form_password:
        description: "Vous pouvez changer ici votre mot de passe. Le mot de passe doit contenir au moins 8 caractères."
        old_password_label: "Mot de passe actuel"
@@ -128,7 +145,7 @@ config:
                domainName: "Le nom de domaine de l’article"
            operator_description:
                label: "Opérateur"
-                less_than: "Moins que…..."
+                less_than: "Moins que…"
                strictly_less_than: "Strictement moins que…"
                greater_than: "Plus que…"
                strictly_greater_than: "Strictement plus que…"
@@ -145,15 +162,16 @@ entry:
        archived: "Articles lus"
        filtered: "Articles filtrés"
        filtered_tags: "Articles filtrés par tags :"
+        filtered_search: 'Articles filtrés par recherche :'
        untagged: "Article sans tag"
    list:
-        number_on_the_page: "{0} Il n’y a pas d’articles.|{1} Il y a un article.|]1,Inf[ Il y a %count% articles."
+        number_on_the_page: "{0} Il n’y a pas d’article.|{1} Il y a un article.|]1,Inf[ Il y a %count% articles."
        reading_time: "durée de lecture"
        reading_time_minutes: "durée de lecture: %readingTime% min"
-        reading_time_less_one_minute: "durée de lecture: <small class=\"inferieur\">&lt;</small> 1 min"
+        reading_time_less_one_minute: "durée de lecture: &lt; 1 min"
        number_of_tags: "{1}et un autre tag|]1,Inf[et %count% autres tags"
        reading_time_minutes_short: "%readingTime% min"
-        reading_time_less_one_minute_short: "<small class=\"inferieur\">&lt;</small> 1 min"
+        reading_time_less_one_minute_short: "&lt; 1 min"
        original_article: "original"
        toogle_as_read: "Marquer comme lu/non lu"
        toogle_as_star: "Marquer comme favori"
@@ -168,6 +186,7 @@ entry:
        preview_picture_label: "A une photo"
        preview_picture_help: "Photo"
        language_label: "Langue"
+        http_status_label: 'Statut HTTP'
        reading_time:
            label: "Durée de lecture en minutes"
            from: "de"
@@ -209,6 +228,8 @@ entry:
        placeholder: "http://website.com"
        form_new:
            url_label: "Adresse"
+    search:
+        placeholder: "Que recherchez-vous ?"
    edit:
        page_title: "Éditer un article"
        title_label: "Titre"
@@ -251,6 +272,9 @@ about:
 howto:
    page_title: "Aide"
+    tab_menu:
+        add_link: "Ajouter un lien"
+        shortcuts: "Utiliser les raccourcis"
    page_description: "Il y a plusieurs façon d’enregistrer un article :"
    top_menu:
        browser_addons: "Extensions de navigateur"
@@ -261,6 +285,7 @@ howto:
    browser_addons:
        firefox: "Extension Firefox"
        chrome: "Extension Chrome"
+        opera: "Extension Opera"
    mobile_apps:
        android:
            via_f_droid: "via F-Droid"
@@ -269,6 +294,33 @@ howto:
        windows: "sur Microsoft Store"
    bookmarklet:
        description: "Glissez et déposez ce lien dans votre barre de favoris :"
+    shortcuts:
+        page_description: Voici les raccourcis disponibles dans wallabag.
+        shortcut: Raccourci
+        action: Action
+        all_pages_title: Raccourcis disponibles dans toutes les pages
+        go_unread: Afficher les articles non lus
+        go_starred: Afficher les articles favoris
+        go_archive:  Afficher les articles lus
+        go_all: Afficher tous les articles
+        go_tags: Afficher les tags
+        go_config: Aller à la configuration
+        go_import: Aller aux imports
+        go_developers: Aller à la section Développeurs
+        go_howto: Afficher l'aide (cette page !)
+        go_logout: Se déconnecter
+        list_title: Raccourcis disponibles dans les pages de liste
+        search: Afficher le formulaire de recherche
+        article_title: Raccourcis disponibles quand on affiche un article
+        open_original: Ouvrir l'URL originale de l'article
+        toggle_favorite: Changer le statut Favori de l'article
+        toggle_archive: Changer le status Lu de l'article
+        delete: Supprimer l'article
+        material_title: Raccourcis disponibles avec le thème Material uniquement
+        add_link: Ajouter un nouvel article
+        hide_form: Masquer le formulaire courant (recherche ou nouvel article)
+        arrows_navigation: Naviguer à travers les articles
+        open_article: Afficher l'article sélectionné
 quickstart:
    page_title: "Pour bien débuter"
@@ -286,9 +338,9 @@ quickstart:
    admin:
        title: "Administration"
        description: "En tant qu’administrateur sur wallabag, vous avez des privilèges qui vous permettent de :"
-        new_user: "Créer un nouvel utilisateur"
+        new_user: "Créez un nouvel utilisateur"
-        analytics: "Configurer les statistiques"
+        analytics: "Configurez les statistiques"
-        sharing: "Activer des paramètres de partages"
+        sharing: "Activez des paramètres de partage"
        export: "Configurer les formats d’export"
        import: "Configurer l’import"
    first_steps:
@@ -297,22 +349,22 @@ quickstart:
        new_article: "Ajoutez votre premier article"
        unread_articles: "Et rangez-le !"
    migrate:
-        title: "Migrer depuis un service existant"
+        title: "Migrez depuis un service existant"
        description: "Vous êtes un ancien utilisateur d’un service existant ? Nous allons vous aider à récupérer vos données sur wallabag."
-        pocket: "Migrer depuis Pocket"
+        pocket: "Migrez depuis Pocket"
-        wallabag_v1: "Migrer depuis wallabag v1"
+        wallabag_v1: "Migrez depuis wallabag v1"
-        wallabag_v2: "Migrer depuis wallabag v2"
+        wallabag_v2: "Migrez depuis wallabag v2"
-        readability: "Migrer depuis Readability"
+        readability: "Migrez depuis Readability"
-        instapaper: "Migrer depuis Instapaper"
+        instapaper: "Migrez depuis Instapaper"
    developer:
        title: "Pour les développeurs"
        description: "Nous avons aussi pensé aux développeurs : Docker, API, traductions, etc."
-        create_application: "Créer votre application tierce"
+        create_application: "Créez votre application tierce"
-        use_docker: "Utiliser Docker pour installer wallabag"
+        use_docker: "Utilisez Docker pour installer wallabag"
    docs:
        title: "Documentation complète"
        description: "Il y a tellement de fonctionnalités dans wallabag. N’hésitez pas à lire le manuel pour les connaitre et apprendre comment les utiliser."
-        annotate: "Annoter votre article"
+        annotate: "Annotez votre article"
        export: "Convertissez vos articles en ePub ou en PDF"
        search_filters: "Apprenez à utiliser le moteur de recherche et les filtres pour retrouver l’article qui vous intéresse"
        fetching_errors: "Que faire si mon article n’est pas correctement récupéré ?"
@@ -329,6 +381,9 @@ tag:
    list:
        number_on_the_page: "{0} Il n’y a pas de tag.|{1} Il y a un tag.|]1,Inf[ Il y a %count% tags."
        see_untagged_entries: "Voir les articles sans tag"
+    new:
+        add: 'Ajouter'
+        placeholder: 'Vous pouvez ajouter plusieurs tags, séparés par une virgule.'
 import:
    page_title: "Importer"
@@ -362,9 +417,10 @@ import:
        how_to: "Choisissez le fichier de votre export Readability et cliquez sur le bouton ci-dessous pour l’importer."
    worker:
        enabled: "Les imports sont asynchrones. Une fois l’import commencé un worker externe traitera les messages un par un. Le service activé est :"
+        download_images_warning: "Vous avez configuré le téléchagement des images pour vos articles. Combiné à l'import classique, cette opération peut être très très longue (voire échouer). Nous vous conseillons <strong>vivement</strong> d'activer les imports asynchrones."
    firefox:
        page_title: "Import > Firefox"
-        description: "Cet outil va vous permettre d’importer tous vos marques-pages de Firefox. Ouvrez le panneau des marques-pages (Ctrl+Maj+O), puis dans « Importation et sauvegarde », choisissez « Sauvegarde... ». Vous allez récupérer un fichier .json. </p>"
+        description: "Cet outil va vous permettre d’importer tous vos marques-pages de Firefox. Ouvrez le panneau des marques-pages (Ctrl+Maj+O), puis dans « Importation et sauvegarde », choisissez « Sauvegarde… ». Vous allez récupérer un fichier .json. </p>"
        how_to: "Choisissez le fichier de sauvegarde de vos marques-page et cliquez sur le bouton pour l’importer. Soyez avertis que le processus peut prendre un temps assez long car tous les articles doivent être récupérés en ligne."
    chrome:
        page_title: "Import > Chrome"
@@ -374,9 +430,13 @@ import:
        page_title: "Import > Instapaper"
        description: "Sur la page des paramètres (https://www.instapaper.com/user), cliquez sur « Download .CSV file » dans la section « Export ». Un fichier CSV sera téléchargé (« instapaper-export.csv »)."
        how_to: "Choisissez le fichier de votre export Instapaper et cliquez sur le bouton ci-dessous pour l’importer."
+    pinboard:
+        page_title: "Import > Pinboard"
+        description: "Sur la page « Backup » (https://pinboard.in/settings/backup), cliquez sur « JSON » dans la section « Bookmarks ». Un fichier json (sans extension) sera téléchargé (« pinboard_export »)."
+        how_to: "Choisissez le fichier de votre export Pinboard et cliquez sur le bouton ci-dessous pour l’importer."
 developer:
-    page_title: "Développeur"
+    page_title: "Gestion des clients API"
    welcome_message: "Bienvenue sur l’API de wallabag"
    documentation: "Documentation"
    how_to_first_app: "Comment créer votre première application"
@@ -397,7 +457,7 @@ developer:
        warn_message_2: "Si vous supprimez le client %name%, toutes les applications qui l’utilisaient ne fonctionneront plus avec votre compte wallabag."
        action: "Supprimer le client %name%"
    client:
-        page_title: "Développeur > Nouveau client"
+        page_title: "Gestion des clients API > Nouveau client"
        page_description: "Vous allez créer un nouveau client. Merci de remplir l’adresse de redirection vers votre application."
        form:
            name_label: "Nom du client"
@@ -405,7 +465,7 @@ developer:
            save_label: "Créer un nouveau client"
        action_back: "Retour"
    client_parameter:
-        page_title: "Développeur > Les paramètres de votre client"
+        page_title: "Gestion des clients API > Les paramètres de votre client"
        page_description: "Voilà les paramètres de votre client"
        field_name: "Nom du client"
        field_id: "ID client"
@@ -413,7 +473,7 @@ developer:
        back: "Retour"
        read_howto: "Lire « comment créer ma première application »"
    howto:
-        page_title: "Développeur > Comment créer votre première application"
+        page_title: "Gestion des clients API > Comment créer votre première application"
        description:
            paragraph_1: "Les commandes suivantes utilisent la <a href=\"https://github.com/jkbrzt/httpie\">librarie HTTPie</a>. Assurez-vous qu’elle soit installée avant de l’utiliser."
            paragraph_2: "Vous avez besoin d’un token pour échanger entre votre application et l’API de wallabag."
@@ -444,7 +504,6 @@ user:
        plain_password_label: "Mot de passe en clair"
        email_label: "Adresse courriel"
        enabled_label: "Activé"
-        locked_label: "Bloqué"
        last_login_label: "Dernière connexion"
        twofactor_label: "Double authentification"
        save: "Sauvegarder"
@@ -465,8 +524,10 @@ flashes:
            rss_updated: "La configuration des flux RSS a bien été mise à jour"
            tagging_rules_updated: "Règles mises à jour"
            tagging_rules_deleted: "Règle supprimée"
-            user_added: "Utilisateur \"%username%\" ajouté"
            rss_token_updated: "Jeton RSS mis à jour"
+            annotations_reset: Annotations supprimées
+            tags_reset: Tags supprimés
+            entries_reset: Articles supprimés
    entry:
        notice:
            entry_already_saved: "Article déjà sauvegardé le %date%"
@@ -496,3 +557,8 @@ flashes:
        notice:
            client_created: "Nouveau client %name% créé"
            client_deleted: "Client %name% supprimé"
+    user:
+        notice:
+            added: 'Utilisateur "%username%" ajouté'
+            updated: 'Utilisateur "%username%" mis à jour'
+            deleted: 'Utilisateur "%username%" supprimé'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index b7d066ab..bb0ed48d 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -25,7 +25,7 @@ menu:
        internal_settings: 'Strumenti'
        import: 'Importa'
        howto: 'How to'
-        developer: 'Sviluppatori'
+        # developer: 'API clients management'
        logout: 'Logout'
        about: 'About'
        search: 'Cerca'
@@ -70,7 +70,12 @@ config:
            200_word: 'Leggo ~200 parole al minuto'
            300_word: 'Leggo ~300 parole al minuto'
            400_word: 'Leggo ~400 parole al minuto'
+        action_mark_as_read:
+            # label: 'Where do you to be redirected after mark an article as read?'
+            # redirect_homepage: 'To the homepage'
+            # redirect_current_page: 'To the current page'
        pocket_consumer_key_label: Consumer key per Pocket per importare i contenuti
+        # android_configuration: Configure your Android application
        # help_theme: "wallabag is customizable. You can choose your prefered theme here."
        # help_items_per_page: "You can change the number of articles displayed on each page."
        # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article."
@@ -94,6 +99,18 @@ config:
        email_label: 'E-mail'
        twoFactorAuthentication_label: 'Two factor authentication'
        # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
+        delete:
+            # title: Delete my account (a.k.a danger zone)
+            # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out.
+            # confirm: Are you really sure? (THIS CAN'T BE UNDONE)
+            # button: Delete my account
+    reset:
+        # title: Reset area (a.k.a danger zone)
+        # description: By hiting buttons below you'll have ability to remove some informations from your account. Be aware that these actions are IRREVERSIBLE.
+        # annotations: Remove ALL annotations
+        # tags: Remove ALL tags
+        # entries: Remove ALL entries
+        # confirm: Are you really really sure? (THIS CAN'T BE UNDONE)
    form_password:
        # description: "You can change your password here. Your new password should by at least 8 characters long."
        old_password_label: 'Password corrente'
@@ -145,15 +162,16 @@ entry:
        archived: 'Contenuti archiviati'
        filtered: 'Contenuti filtrati'
        # filtered_tags: 'Filtered by tags:'
+        # filtered_search: 'Filtered by search:'
        # untagged: 'Untagged entries'
    list:
        number_on_the_page: "{0} Non ci sono contenuti.|{1} C'è un contenuto.|]1,Inf[ Ci sono %count% contenuti."
        reading_time: 'tempo di lettura stimato'
        reading_time_minutes: 'tempo di lettura stimato: %readingTime% min'
-        reading_time_less_one_minute: 'tempo di lettura stimato: <small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute: 'tempo di lettura stimato: &lt; 1 min'
        # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags'
        reading_time_minutes_short: '%readingTime% min'
-        reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute_short: '&lt; 1 min'
        original_article: 'originale'
        toogle_as_read: 'Segna come da leggere'
        toogle_as_star: 'Segna come non preferito'
@@ -168,6 +186,7 @@ entry:
        preview_picture_label: "Ha un'immagine di anteprima"
        preview_picture_help: 'Immagine di anteprima'
        language_label: 'Lingua'
+        # http_status_label: 'HTTP status'
        reading_time:
            label: 'Tempo di lettura in minuti'
            from: 'da'
@@ -209,6 +228,8 @@ entry:
        placeholder: 'http://website.com'
        form_new:
            url_label: Url
+    search:
+        # placeholder: 'What are you looking for?'
    edit:
        page_title: 'Modifica voce'
        title_label: 'Titolo'
@@ -252,6 +273,9 @@ about:
 howto:
    page_title: 'How to'
    page_description: 'Ci sono diversi modi per salvare un contenuto:'
+    tab_menu:
+        # add_link: "Add a link"
+        # shortcuts: "Use shortcuts"
    top_menu:
        browser_addons: 'tramite addons del Browser'
        mobile_apps: 'tramite app Mobile'
@@ -261,6 +285,7 @@ howto:
    browser_addons:
        firefox: 'Add-On di Firefox'
        chrome: 'Estensione di Chrome'
+        opera: 'Estensione di Opera'
    mobile_apps:
        android:
            via_f_droid: 'via F-Droid'
@@ -269,6 +294,33 @@ howto:
        windows: 'sullo store di Microsoft'
    bookmarklet:
        description: 'Trascinando e rilasciando questo link sulla barra dei bookmark del tuo browser:'
+    shortcuts:
+        # page_description: Here are the shortcuts available in wallabag.
+        # shortcut: Shortcut
+        # action: Action
+        # all_pages_title: Shortcuts available in all pages
+        # go_unread: Go to unread
+        # go_starred: Go to starred
+        # go_archive: Go to archive
+        # go_all: Go to all entries
+        # go_tags: Go to tags
+        # go_config: Go to config
+        # go_import: Go to import
+        # go_developers: Go to developers
+        # go_howto: Go to howto (this page!)
+        # go_logout: Logout
+        # list_title: Shortcuts available in listing pages
+        # search: Display the search form
+        # article_title: Shortcuts available in entry view
+        # open_original: Open original URL of the entry
+        # toggle_favorite: Toggle star status for the entry
+        # toggle_archive: Toggle read status for the entry
+        # delete: Delete the entry
+        # material_title: Shortcuts available with Material theme only
+        # add_link: Add a new link
+        # hide_form: Hide the current form (search or new link)
+        # arrows_navigation: Navigate through articles
+        # open_article: Display the selected entry
 quickstart:
    page_title: 'Introduzione'
@@ -329,6 +381,9 @@ tag:
    list:
        number_on_the_page: "{0} Non ci sono tag.|{1} C'è un tag.|]1,Inf[ ci sono %count% tag."
        # see_untagged_entries: 'See untagged entries'
+    new:
+        # add: 'Add'
+        # placeholder: 'You can add several tags, separated by a comma.'
 import:
    page_title: 'Importa'
@@ -362,6 +417,7 @@ import:
        # how_to: 'Please select your Readability export and click on the below button to upload and import it.'
    worker:
        # enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:"
+        # download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We <strong>strongly recommend</strong> to enable asynchronous import to avoid errors."
    firefox:
       page_title: 'Importa da > Firefox'
       # description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file."
@@ -374,9 +430,13 @@ import:
        page_title: 'Importa da > Instapaper'
        # description: 'This importer will import all your Instapaper articles. On the settings (https://www.instapaper.com/user) page, click on "Download .CSV file" in the "Export" section. A CSV file will be downloaded (like "instapaper-export.csv").'
        # how_to: 'Please select your Instapaper export and click on the below button to upload and import it.'
+    pinboard:
+        page_title: "Importa da > Pinboard"
+        # description: 'This importer will import all your Instapaper articles. On the backup (https://pinboard.in/settings/backup) page, click on "JSON" in the "Bookmarks" section. A JSON file will be downloaded (like "pinboard_export").'
+        # how_to: 'Please select your Pinboard export and click on the below button to upload and import it.'
 developer:
-    page_title: 'Sviluppatori'
+    # page_title: 'API clients management'
    welcome_message: 'Benvenuto nelle API di wallabag'
    documentation: 'Documentazione'
    how_to_first_app: 'Come creare la mia prima applicazione'
@@ -397,7 +457,7 @@ developer:
        warn_message_2: "Se lo rimuovi, ogni app configurata con questo client non sarà più in grado di autenticarsi."
        action: 'Rimuovi questo client'
    client:
-        page_title: 'Sviluppatori > Nuovo client'
+        # page_title: 'API clients management > Nuovo client'
        page_description: 'Stai per creare un nuovo client. Compila i campi sottostanti per il redirect URI della tua applicazione.'
        form:
            # name_label: 'Name of the client'
@@ -405,7 +465,7 @@ developer:
            save_label: 'Crea un nuovo client'
        action_back: 'Indietro'
    client_parameter:
-        page_title: 'Sviluppatori > parametri Client'
+        # page_title: 'API clients management > parametri Client'
        page_description: 'Questi sono i tuoi parametri del client.'
        # field_name: 'Client name'
        field_id: 'Client ID'
@@ -413,7 +473,7 @@ developer:
        back: 'Indietro'
        read_howto: 'Leggi howto "Come creare la mia prima applicazione"'
    howto:
-        page_title: 'Sviluppatori > Come creare la mia prima applicazione'
+        # page_title: 'API clients management > Come creare la mia prima applicazione'
        description:
            paragraph_1: 'I seguenti comandi fanno uso della <a href="https://github.com/jkbrzt/httpie">libreria HTTPie</a>. Verifica che sia installata sul tuo sistema prima di utilizzarli.'
            paragraph_2: 'Hai bisogno di un token per far comunicare la tua applicazione di terze parti e le API di wallabag.'
@@ -444,7 +504,6 @@ user:
        plain_password_label: '????'
        email_label: 'E-mail'
        # enabled_label: 'Enabled'
-        # locked_label: 'Locked'
        # last_login_label: 'Last login'
        # twofactor_label: Two factor authentication
        # save: Save
@@ -465,8 +524,10 @@ flashes:
            rss_updated: 'Informazioni RSS aggiornate'
            tagging_rules_updated: 'Regole di tagging aggiornate'
            tagging_rules_deleted: 'Regola di tagging aggiornate'
-            user_added: 'Utente "%username%" aggiunto'
            rss_token_updated: 'RSS token aggiornato'
+            # annotations_reset: Annotations reset
+            # tags_reset: Tags reset
+            # entries_reset: Entries reset
    entry:
        notice:
            entry_already_saved: 'Contenuto già salvato in data %date%'
@@ -496,3 +557,8 @@ flashes:
        notice:
            client_created: 'Nuovo client creato.'
            client_deleted: 'Client eliminato'
+    user:
+        notice:
+            # added: 'User "%username%" added'
+            # updated: 'User "%username%" updated'
+            # deleted: 'User "%username%" deleted'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index 16ef1e5d..f6488565 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -25,13 +25,13 @@ menu:
        internal_settings: 'Configuracion interna'
        import: 'Importar'
        howto: 'Ajuda'
-        developer: 'Desvolopador'
+        developer: 'Gestion dels clients API'
        logout: 'Desconnexion'
        about: 'A prepaus'
        search: 'Cercar'
        save_link: 'Enregistrar un novèl article'
        back_to_unread: 'Tornar als articles pas legits'
-        # users_management: 'Users management'
+        users_management: 'Gestion dels utilizaires'
    top:
        add_new_entry: 'Enregistrar un novèl article'
        search: 'Cercar'
@@ -46,7 +46,7 @@ footer:
        social: 'Social'
        powered_by: 'propulsat per'
        about: 'A prepaus'
-    # stats: Since %user_creation% you read %nb_archives% articles. That is about %per_day% a day!
+    stats: "Dempuèi %user_creation% avètz legit %nb_archives% articles. Es a l'entorn de %per_day% per jorn !"
 config:
    page_title: 'Configuracion'
@@ -70,12 +70,17 @@ config:
            200_word: "Legissi a l'entorn de 200 mots per minuta"
            300_word: "Legissi a l'entorn de 300 mots per minuta"
            400_word: "Legissi a l'entorn de 400 mots per minuta"
+        action_mark_as_read:
+            label: 'Ont volètz èsser menat aprèp aver marcat un article coma legit ?'
+            redirect_homepage: "A la pagina d'acuèlh"
+            redirect_current_page: 'A la pagina actuala'
        pocket_consumer_key_label: Clau d'autentificacion Pocket per importar las donadas
-        # help_theme: "wallabag is customizable. You can choose your prefered theme here."
+        android_configuration: Configuratz vòstra aplicacion Android
-        # help_items_per_page: "You can change the number of articles displayed on each page."
+        help_theme: "wallabag es personalizable. Podètz causir vòstre tèma preferit aquí."
-        # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article."
+        help_items_per_page: "Podètz cambiar lo nombre d'articles afichats per pagina."
-        # help_language: "You can change the language of wallabag interface."
+        help_reading_speed: "wallabag calcula lo temps de lectura per cada article. Podètz lo definir aquí, gràcias a aquesta lista, se sètz un legeire rapid o lent. wallabag tornarà calcular lo temps de lectura per cada article."
-        # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account."
+        help_language: "Podètz cambiar la lenga de l'interfàcia de wallabag."
+        help_pocket_consumer_key: "Requesida per l'importacion de Pocket. Podètz la crear dins vòstre compte Pocket."
    form_rss:
        description: "Los fluxes RSS fornits per wallabag vos permeton de legir vòstres articles salvagardats dins vòstre lector de fluxes preferit. Per los poder emplegar, vos cal, d'en primièr crear un geton."
        token_label: 'Geton RSS'
@@ -93,9 +98,21 @@ config:
        name_label: 'Nom'
        email_label: 'Adreça de corrièl'
        twoFactorAuthentication_label: 'Dobla autentificacion'
-        # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
+        help_twoFactorAuthentication: "S'avètz activat 2FA, cada còp que volètz vos connectar a wallabag, recebretz un còdi per corrièl."
+        delete:
+            title: Suprimir mon compte (Mèfi zòna perilhosa)
+            description: Se confirmatz la supression de vòstre compte, TOTES vòstres articles, TOTAS vòstras etiquetas, TOTAS vòstras anotacions e vòstre compte seràn suprimits per totjorn. E aquò es IRREVERSIBLE. Puèi seretz desconnectat.
+            confirm: Sètz vertadièrament segur ? (ES IRREVERSIBLE)
+            button: Suprimir mon compte
+    reset:
+        title: Zòna de reïnicializacion (Mèfi zòna perilhosa)
+        description: En clicant sul boton çai-jos auretz la possibilitat de levar qualques informacions de vòstre compte. Mèfi que totas aquelas accions son IRREVERSIBLAS.
+        annotations: Levar TOTAS las anotacions
+        tags: Levar TOTAS las etiquetas
+        entries: Levar TOTES los articles
+        confirm: Sètz vertadièrament segur ? (ES IRREVERSIBLE)
    form_password:
-        # description: "You can change your password here. Your new password should by at least 8 characters long."
+        description: "Podètz cambiar vòstre senhal aquí. Vòstre senhal deu èsser long d'almens 8 caractèrs."
        old_password_label: 'Senhal actual'
        new_password_label: 'Senhal novèl'
        repeat_new_password_label: 'Confirmatz vòstre novèl senhal'
@@ -103,7 +120,7 @@ config:
        if_label: 'se'
        then_tag_as_label: 'alara atribuir las etiquetas'
        delete_rule_label: 'suprimir'
-        # edit_rule_label: 'edit'
+        edit_rule_label: 'modificar'
        rule_label: 'Règla'
        tags_label: 'Etiquetas'
        faq:
@@ -144,16 +161,17 @@ entry:
        starred: 'Articles favorits'
        archived: 'Articles legits'
        filtered: 'Articles filtrats'
-        filtered_tags: 'Filtats per etiquetas:'
+        filtered_tags: 'Articles filtrats per etiquetas :'
+        filtered_search: 'Articles filtrats per recèrca :'
        untagged: 'Articles sens etiqueta'
    list:
        number_on_the_page: "{0} I a pas cap d'article.|{1} I a un article.|]1,Inf[ I a %count% articles."
        reading_time: 'durada de lectura'
        reading_time_minutes: 'durada de lectura : %readingTime% min'
-        reading_time_less_one_minute: 'durada de lectura : <small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute: 'durada de lectura : &lt; 1 min'
        number_of_tags: '{1}e una autra etiqueta|]1,Inf[e %count% autras etiquetas'
        reading_time_minutes_short: '%readingTime% min'
-        reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute_short: '&lt; 1 min'
        original_article: 'original'
        toogle_as_read: 'Marcar coma legit/pas legit'
        toogle_as_star: 'Marcar coma favorit'
@@ -168,6 +186,7 @@ entry:
        preview_picture_label: 'A una fotò'
        preview_picture_help: 'Fotò'
        language_label: 'Lenga'
+        http_status_label: 'Estatut HTTP'
        reading_time:
            label: 'Durada de lectura en minutas'
            from: 'de'
@@ -209,6 +228,8 @@ entry:
        placeholder: 'http://website.com'
        form_new:
            url_label: Url
+    search:
+        placeholder: 'Qué cercatz ?'
    edit:
        page_title: 'Modificar un article'
        title_label: 'Títol'
@@ -216,7 +237,7 @@ entry:
        is_public_label: 'Public'
        save_label: 'Enregistrar'
    public:
-        # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
+        shared_by_wallabag: "Aqueste article es estat partejat per <a href='%wallabag_instance%'>wallabag</a>"
 about:
    page_title: 'A prepaus'
@@ -252,6 +273,9 @@ about:
 howto:
    page_title: 'Ajuda'
    page_description: "I a mai d'un biais d'enregistrar un article :"
+    tab_menu:
+        add_link: "Ajustar un ligam"
+        shortcuts: "Utilizar d'acorchis"
    top_menu:
        browser_addons: 'Extensions de navigator'
        mobile_apps: 'Aplicacions mobil'
@@ -261,6 +285,7 @@ howto:
    browser_addons:
        firefox: 'Extension Firefox'
        chrome: 'Extension Chrome'
+        opera: 'Extension Opera'
    mobile_apps:
        android:
            via_f_droid: 'via F-Droid'
@@ -269,17 +294,44 @@ howto:
        windows: 'sus Microsoft Store'
    bookmarklet:
        description: 'Lisatz-depausatz aqueste ligam dins vòstra barra de favorits :'
+    shortcuts:
+        page_description: Aquí son los acorchis disponibles dins wallabag.
+        shortcut: Acorchis
+        action: Accion
+        all_pages_title: Acorchis disponibles sus totas las paginas
+        go_unread: Anar als pas legits
+        go_starred: Anar als favorits
+        go_archive: Anar als archius
+        go_all: Anar a totes los articles
+        go_tags: Anar a las etiquetas
+        go_config: Anar a la config
+        go_import: Anar per importar
+        go_developers: Anar al canton desvolopaires
+        go_howto: Anar a l'ajuda (aquesta quita pagina !)
+        go_logout: Desconnexion
+        list_title: Acorchis disponibles dins las paginas de lista
+        search: Afichar lo formulari de recèrca
+        article_title: Acorchis disponibles dins la vista article
+        open_original: Dobrir l'URL originala de l'article
+        toggle_favorite: Cambiar l'estatut Favorit per l'article
+        toggle_archive: Cambiar l'estatut Legit per l'article
+        delete: Suprimir l'article
+        material_title: Acorchis solament disponibles amb lo tèma Material
+        add_link: Apondre un acorchi
+        hide_form: Rescondre lo formulari actual (recèrca o nòu ligam)
+        arrows_navigation: Navigar dins los articles
+        open_article: Afichar l'article seleccionat
 quickstart:
    page_title: 'Per ben començar'
-    # more: 'More…'
+    more: 'Mai…'
    intro:
        title: 'Benvenguda sus wallabag !'
        paragraph_1: "Anem vos guidar per far lo torn de la proprietat e vos presentar unas fonccionalitats que vos poirián interessar per vos apropriar aquesta aisina."
-        paragraph_2: 'Seguètz-nos '
+        paragraph_2: 'Seguètz-nos !'
    configure:
-        title: "Configuratz l'aplicacio"
+        title: "Configuratz l'aplicacion"
-        # description: 'In order to have an application which suits you, have a look into the configuration of wallabag.'
+        description: "Per fin d'aver una aplicacion que vos va ben, anatz veire la configuracion de wallabag."
        language: "Cambiatz la lenga e l'estil de l'aplicacion"
        rss: 'Activatz los fluxes RSS'
        tagging_rules: 'Escrivètz de règlas per classar automaticament vòstres articles'
@@ -293,7 +345,7 @@ quickstart:
        import: 'Configurar los impòrt'
    first_steps:
        title: 'Primièrs passes'
-        # description: "Now wallabag is well configured, it's time to archive the web. You can click on the top right sign + to add a link."
+        description: "Ara wallabag es ben configurat, es lo moment d'archivar lo web. Podètz clicar sul signe + a man drecha amont per ajustar un ligam."
        new_article: 'Ajustatz vòstre primièr article'
        unread_articles: 'E racaptatz-lo !'
    migrate:
@@ -305,14 +357,14 @@ quickstart:
        readability: 'Migrar dempuèi Readability'
        instapaper: 'Migrar dempuèi Instapaper'
    developer:
-        title: 'Pels desvolopadors'
+        title: 'Pels desvolopaires'
-        # description: 'We also thought to the developers: Docker, API, translations, etc.'
+        description: 'Avèm tanben pensat als desvolopaires : Docker, API, traduccions, etc.'
        create_application: 'Crear vòstra aplicacion tèrça'
-        # use_docker: 'Use Docker to install wallabag'
+        use_docker: 'Utilizar Docker per installar wallabag'
    docs:
        title: 'Documentacion complèta'
-        # description: "There are so much features in wallabag. Don't hesitate to read the manual to know them and to learn how to use them."
+        description: "I a un fum de fonccionalitats dins wallabag. Esitetz pas a legir lo manual per las conéisser e aprendre a las utilizar."
-        annotate: 'Anotatar vòstre article'
+        annotate: 'Anotar vòstre article'
        export: 'Convertissètz vòstres articles en ePub o en PDF'
        search_filters: "Aprenètz a utilizar lo motor de recèrca e los filtres per retrobar l'article que vos interèssa"
        fetching_errors: "Qué far se mon article es pas recuperat coma cal ?"
@@ -329,6 +381,9 @@ tag:
    list:
        number_on_the_page: "{0} I a pas cap d'etiquetas.|{1} I a una etiqueta.|]1,Inf[ I a %count% etiquetas."
        see_untagged_entries: "Afichar las entradas sens pas cap d'etiquetas"
+    new:
+        add: 'Ajustar'
+        placeholder: "Podètz ajustar mai qu'una etiqueta, separadas per de virgula."
 import:
    page_title: 'Importar'
@@ -355,13 +410,14 @@ import:
        how_to: "Causissètz lo fichièr de vòstra exportacion wallabag v1 e clicatz sul boton çai-jos per l'importar."
    wallabag_v2:
        page_title: 'Importar > Wallabag v2'
-        description: "Aquesta aisina importarà totas vòstras donadas d'una instància mai de wallabag v2. Anatz dins totes vòstres articles, puèi, sus la barra laterala, clicatz sus \"JSON\". Traparatz un fichièr \"All articles.json\""
+        description: "Aquesta aisina importarà totas vòstras donadas d'una instància mai de wallabag v2. Anatz dins totes vòstres articles, puèi, sus la barra laterala, clicatz sus \"JSON\". Traparatz un fichièr \"All articles.json\"."
    readability:
        page_title: 'Importar > Readability'
        description: "Aquesta aisina importarà totas vòstres articles de Readability. Sus la pagina de l'aisina (https://www.readability.com/tools/), clicatz sus \"Export your data\" dins la seccion \"Data Export\". Recebretz un corrièl per telecargar un json (qu'acaba pas amb un .json de fach)."
        how_to: "Mercés de seleccionar vòstre Readability fichièr e de clicar sul boton dejós per lo telecargar e l'importar."
    worker:
-        enabled: "L'importacion se fa de manièra asincròna. Un còp l'importacion lançada, una aisina externa s'ocuparà dels messatges un per un. Lo servici actual es : "
+        enabled: "L'importacion se fa de manièra asincròna. Un còp l'importacion lançada, una aisina extèrna s'ocuparà dels messatges un per un. Lo servici actual es : "
+        download_images_warning: "Avètz activat lo telecargament de los imatges de vòstres articles. Combinat amb l'importacion classica, aquò pòt tardar un long moment (o benlèu fracassar). <strong>Recomandem fòrtament</strong> l'activacion de l'importacion asincròna per evitar las errors."
    firefox:
        page_title: 'Importar > Firefox'
        description: "Aquesta aisina importarà totas vòstres favorits de Firefox. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file."
@@ -373,10 +429,14 @@ import:
    instapaper:
        page_title: 'Importar > Instapaper'
        description: "Aquesta aisina importarà totas vòstres articles d'Instapaper. Sus la pagina de paramètres (https://www.instapaper.com/user), clicatz sus \"Download .CSV file\" dins la seccion \"Export\". Un fichièr CSV serà telecargat (aital \"instapaper-export.csv\")."
-        how_to: "Mercés de causir vòstre fichièr Instapaper e de clicar sul boton dejós per lo telecargar e l'importar"
+        how_to: "Mercés de causir vòstre fichièr Instapaper e de clicar sul boton dejós per lo telecargar e l'importar."
+    pinboard:
+        page_title: "Importar > Pinboard"
+        description: 'Aquesta aisina importarà totas vòstres articles de Pinboard. Sus la pagina de salvagarda (https://pinboard.in/settings/backup) , clicatz sus "JSON" dins la seccion "Bookmarks". Se poirà telecargar un fichièr JSON (coma "pinboard_export").'
+        how_to: "Mercés de causir vòstre fichièr Pinboard e de clicar sul boton dejós per lo telecargar e l'importar."
 developer:
-    page_title: 'Desvolopaire'
+    page_title: 'Gestion dels clients API'
    welcome_message: "Benvenguda sus l'API de wallabag"
    documentation: 'Documentacion'
    how_to_first_app: 'Cossí crear vòstra primièra aplicacion'
@@ -391,13 +451,13 @@ developer:
        field_secret: 'Clé secreta'
        field_uris: 'URLs de redireccion'
        field_grant_types: 'Tipe de privilègi acordat'
-        no_client: 'Pas cap de client pel moment'
+        no_client: 'Pas cap de client pel moment.'
    remove:
        warn_message_1: 'Avètz la possibilitat de supriimr un client. Aquesta accion es IRREVERSIBLA !'
        warn_message_2: "Se suprimissètz un client, totas las aplicacions que l'emplegan foncionaràn pas mai amb vòstre compte wallabag."
        action: 'Suprimir aqueste client'
    client:
-        page_title: 'Desvlopador > Novèl client'
+        page_title: 'Gestion dels clients API > Novèl client'
        page_description: "Anatz crear un novèl client. Mercés de cumplir l'url de redireccion cap a vòstra aplicacion."
        form:
            name_label: "Nom del client"
@@ -405,15 +465,15 @@ developer:
            save_label: 'Crear un novèl client'
        action_back: 'Retorn'
    client_parameter:
-        page_title: 'Desvolopador > Los paramètres de vòstre client'
+        page_title: 'Gestion dels clients API > Los paramètres de vòstre client'
-        page_description: 'Vaquí los paramètres de vòstre client'
+        page_description: 'Vaquí los paramètres de vòstre client.'
        field_name: 'Nom del client'
        field_id: 'ID Client'
        field_secret: 'Clau secreta'
        back: 'Retour'
        read_howto: 'Legir "cossí crear ma primièra aplicacion"'
    howto:
-        page_title: 'Desvolopador > Cossí crear ma primièra aplicacion'
+        page_title: 'Gestion dels clients API > Cossí crear ma primièra aplicacion'
        description:
            paragraph_1: "Las comandas seguentas utilizan la <a href=\"https://github.com/jkbrzt/httpie\">bibliotèca HTTPie</a>. Asseguratz-vos que siasqueòu installadas abans de l'utilizar."
            paragraph_2: "Vos cal un geton per escambiar entre vòstra aplicacion e l'API de wallabar."
@@ -426,34 +486,33 @@ developer:
        back: 'Retorn'
 user:
-    # page_title: Users management
+    page_title: 'Gestion dels utilizaires'
-    # new_user: Create a new user
+    new_user: 'Crear un novèl utilizaire'
-    # edit_user: Edit an existing user
+    edit_user: 'Modificar un utilizaire existent'
-    # description: "Here you can manage all users (create, edit and delete)"
+    description: "Aquí podètz gerir totes los utilizaires (crear, modificar e suprimir)"
-    # list:
+    list:
-    #     actions: Actions
+         actions: 'Accions'
-    #     edit_action: Edit
+         edit_action: 'Modificar'
-    #     yes: Yes
+         yes: 'Òc'
-    #     no: No
+         no: 'Non'
-    #     create_new_one: Create a new user
+         create_new_one: 'Crear un novèl utilizaire'
    form:
        username_label: "Nom d'utilizaire"
-        # name_label: 'Name'
+        name_label: 'Nom'
        password_label: 'Senhal'
        repeat_new_password_label: 'Confirmatz vòstre novèl senhal'
        plain_password_label: 'Senhal en clar'
        email_label: 'Adreça de corrièl'
-        # enabled_label: 'Enabled'
+        enabled_label: 'Actiu'
-        # locked_label: 'Locked'
+        last_login_label: 'Darrièra connexion'
-        # last_login_label: 'Last login'
+        twofactor_label: 'Autentificacion doble-factor'
-        # twofactor_label: Two factor authentication
+        save: 'Enregistrar'
-        # save: Save
+        delete: 'Suprimir'
-        # delete: Delete
+        delete_confirm: 'Sètz segur ?'
-        # delete_confirm: Are you sure?
+        back_to_list: 'Tornar a la lista'
-        # back_to_list: Back to list
 error:
-    # page_title: An error occurred
+    page_title: Una error s'es produsida
 flashes:
    config:
@@ -465,8 +524,10 @@ flashes:
            rss_updated: 'La configuracion dels fluxes RSS es ben estada mesa a jorn'
            tagging_rules_updated: 'Règlas misa a jorn'
            tagging_rules_deleted: 'Règla suprimida'
-            user_added: 'Utilizaire "%username%" apondut'
            rss_token_updated: 'Geton RSS mes a jorn'
+            annotations_reset: Anotacions levadas
+            tags_reset: Etiquetas levadas
+            entries_reset: Articles levats
    entry:
        notice:
            entry_already_saved: 'Article ja salvargardat lo %date%'
@@ -477,15 +538,15 @@ flashes:
            entry_reloaded_failed: "L'article es estat cargat de nòu mai la recuperacion del contengut a fracassat"
            entry_archived: 'Article marcat coma legit'
            entry_unarchived: 'Article marcat coma pas legit'
-            entry_starred: 'Article apondut dins los favorits'
+            entry_starred: 'Article ajustat dins los favorits'
            entry_unstarred: 'Article quitat dels favorits'
            entry_deleted: 'Article suprimit'
    tag:
        notice:
-            tag_added: 'Etiqueta aponduda'
+            tag_added: 'Etiqueta ajustada'
    import:
        notice:
-            failed: "L'importacion a fracassat, mercés de tornar ensajar"
+            failed: "L'importacion a fracassat, mercés de tornar ensajar."
            failed_on_file: "Errorr pendent du tractament de l'import. Mercés de verificar vòstre fichièr."
            summary: "Rapòrt d'import: %imported% importats, %skipped% ja presents."
            summary_with_queue: "Rapòrt d'import : %queued% en espèra de tractament."
@@ -494,5 +555,10 @@ flashes:
            rabbit_enabled_not_installed: "RabbitMQ es capable d'importar de manièra asincròna mai sembla que <u>podèm pas nos conectar amb el</u>. Mercés de verificar la configuracion de RabbitMQ."
    developer:
        notice:
-            client_created: 'Novèl client creat'
+            client_created: 'Novèl client creat.'
            client_deleted: 'Client suprimit'
+    user:
+        notice:
+            added: 'Utilizaire "%username%" ajustat'
+            updated: 'Utilizaire "%username%" mes a jorn'
+            deleted: 'Utilizaire "%username%" suprimit'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index 73250cc0..00ddfddf 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -25,7 +25,7 @@ menu:
        internal_settings: 'Wewnętrzne ustawienia'
        import: 'Importuj'
        howto: 'Howto'
-        developer: 'Deweloper'
+        developer: 'Zarządzanie klientami API'
        logout: 'Wyloguj'
        about: 'O nas'
        search: 'Szukaj'
@@ -61,7 +61,7 @@ config:
        save: 'Zapisz'
    form_settings:
        theme_label: 'Temat'
-        items_per_page_label: 'Ilość elementóœ na stronie'
+        items_per_page_label: 'Ilość elementów na stronie'
        language_label: 'Język'
        reading_speed:
            label: 'Prędkość czytania'
@@ -70,12 +70,17 @@ config:
            200_word: 'Czytam ~200 słów na minutę'
            300_word: 'Czytam ~300 słów na minutę'
            400_word: 'Czytam ~400 słów na minutę'
+        action_mark_as_read:
+            label: 'Gdzie zostaniesz przekierowany po oznaczeniu artukuły jako przeczytanego'
+            redirect_homepage: 'do strony głównej'
+            redirect_current_page: 'do bieżącej strony'
        pocket_consumer_key_label: 'Klucz klienta Pocket do importu zawartości'
-        # help_theme: "wallabag is customizable. You can choose your prefered theme here."
+        android_configuration: Skonfiguruj swoją androidową aplikację
-        # help_items_per_page: "You can change the number of articles displayed on each page."
+        help_theme: "Dopasuj wallabag do swoich potrzeb. Tutaj możesz wybrać preferowany przez ciebie motyw."
-        # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article."
+        help_items_per_page: "Możesz zmienić ilość artykułów wyświetlanych na każdej stronie."
-        # help_language: "You can change the language of wallabag interface."
+        help_reading_speed: "wallabag oblicza czas czytania każdego artykułu. Dzięki tej liście możesz określić swoje tempo. Wallabag przeliczy ponownie czas potrzebny, na przeczytanie każdego z artykułów."
-        # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account."
+        help_language: "Możesz zmienić język interfejsu wallabag."
+        help_pocket_consumer_key: "Wymagane dla importu z Pocket. Możesz go stworzyć na swoim koncie Pocket."
    form_rss:
        description: 'Kanały RSS prowadzone przez wallabag pozwalają Ci na czytanie twoich zapisanych artykułów w twoium ulubionym czytniku RSS. Musisz najpierw wynegenerować tokena.‌'
        token_label: 'Token RSS'
@@ -93,9 +98,21 @@ config:
        name_label: 'Nazwa'
        email_label: 'Adres email'
        twoFactorAuthentication_label: 'Autoryzacja dwuetapowa'
-        # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
+        help_twoFactorAuthentication: "Jeżeli włączysz autoryzację dwuetapową. Za każdym razem, kiedy będziesz chciał się zalogować, dostaniesz kod na swój e-mail."
+        delete:
+            title: Usuń moje konto (niebezpieczna strefa !)
+            description: Jeżeli usuniesz swoje konto, wszystkie twoje artykuły, tagi, adnotacje, oraz konto zostaną trwale usunięte (operacja jest NIEODWRACALNA). Następnie zostaniesz wylogowany.
+            confirm: Jesteś pewien? (tej operacji NIE MOŻNA cofnąć)
+            button: Usuń moje konto
+    reset:
+        title: Reset (niebezpieczna strefa)
+        description: Poniższe przyciski pozwalają usunąć pewne informacje z twojego konta. Uważaj te operacje są NIEODWRACALNE.
+        annotations: Usuń WSZYSTKIE adnotacje
+        tags: Usuń WSZYSTKIE tagi
+        entries: usuń WSZYTSTKIE wpisy
+        confirm: Jesteś pewien? (tej operacji NIE MOŻNA cofnąć)
    form_password:
-        # description: "You can change your password here. Your new password should by at least 8 characters long."
+        description: "Tutaj możesz zmienić swoje hasło. Twoje nowe hasło powinno mieć conajmniej 8 znaków."
        old_password_label: 'Stare hasło'
        new_password_label: 'Nowe hasło'
        repeat_new_password_label: 'Powtórz nowe hasło'
@@ -145,15 +162,16 @@ entry:
        archived: 'Zarchiwizowane wpisy'
        filtered: 'Odfiltrowane wpisy'
        filtered_tags: 'Filtrowane po tagach:'
+        filtered_search: 'Filtrowanie po wyszukiwaniu:'
        untagged: 'Odtaguj wpisy'
    list:
        number_on_the_page: '{0} Nie ma wpisów.|{1} Jest jeden wpis.|]1,Inf[ Są %count% wpisy.'
        reading_time: 'szacunkowy czas czytania'
        reading_time_minutes: 'szacunkowy czas czytania: %readingTime% min'
-        reading_time_less_one_minute: 'szacunkowy czas czytania: <small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute: 'szacunkowy czas czytania: &lt; 1 min'
        number_of_tags: '{1} i inny tag|]1,Inf[i %count% innych tagów'
        reading_time_minutes_short: '%readingTime% min'
-        reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute_short: '&lt; 1 min'
        original_article: 'oryginał'
        toogle_as_read: 'Oznacz jako przeczytane'
        toogle_as_star: 'Oznacz jako ulubione'
@@ -168,6 +186,7 @@ entry:
        preview_picture_label: 'Posiada podgląd obrazu'
        preview_picture_help: 'Podgląd obrazu'
        language_label: 'Język'
+        http_status_label: 'Status HTTP'
        reading_time:
            label: 'Czas czytania w minutach'
            from: 'od'
@@ -209,6 +228,8 @@ entry:
        placeholder: 'http://website.com'
        form_new:
            url_label: Url
+    search:
+        placeholder: 'Czego szukasz?'
    edit:
        page_title: 'Edytuj wpis'
        title_label: 'Tytuł'
@@ -252,6 +273,9 @@ about:
 howto:
    page_title: 'Howto'
    page_description: 'Sposoby zapisania artykułu:'
+    tab_menu:
+        add_link: "Dodaj link"
+        shortcuts: "Użyj skrótów"
    top_menu:
        browser_addons: 'Wtyczki dla przeglądarki'
        mobile_apps: 'Aplikacje mobilne'
@@ -261,6 +285,7 @@ howto:
    browser_addons:
        firefox: 'Standardowe rozszerzenie dla Firefox'
        chrome: 'Rozszerzenie dla Chrome'
+        opera: 'Rozszerzenie dla Opera'
    mobile_apps:
        android:
            via_f_droid: 'w F-Droid'
@@ -269,6 +294,33 @@ howto:
        windows: 'w Microsoft Store'
    bookmarklet:
        description: 'Przeciągnij i upuść ten link na swój pasek zakładek'
+    shortcuts:
+        page_description: Tutaj znajdują się skróty dostępne w wallabag.
+        shortcut: Skrót
+        action: Akcja
+        all_pages_title: Skróty dostępne na wszystkich stronach
+        go_unread: Idź do nieprzeczytanych
+        go_starred: Idź do oznaczonych gwiazdką
+        go_archive: Idź do archiwum
+        go_all: Idź do wszystkich wpisów
+        go_tags: Idź do tagów
+        go_config: Idź do konfiguracji
+        go_import: Idź do importu
+        go_developers: Idź do deweloperów
+        go_howto: Idź do howto (tej strony!)
+        go_logout: Wyloguj
+        list_title: Skróty dostępne w spisie stron
+        search: Pokaż formularz wyszukiwania
+        article_title: Skróty dostępne w widoku artykułu
+        open_original: Otwórz oryginalny adres URL wpisu
+        toggle_favorite: Oznacz wpis gwiazdką
+        toggle_archive: Oznacz wpis jako przeczytany
+        delete: Usuń wpis
+        material_title: Skróty dostępne wyłącznie w motywie Material
+        add_link: Dodaj nowy link
+        hide_form: Ukryj obecny formularz (wyszukiwania lub nowego linku)
+        arrows_navigation: Nawiguj pomiędzy artykułami
+        open_article: Wyświetl zaznaczony wpis
 quickstart:
    page_title: 'Szybki start'
@@ -329,6 +381,9 @@ tag:
    list:
        number_on_the_page: '{0} Nie ma tagów.|{1} Jest jeden tag.|]1,Inf[ Są %count% tagi.'
        see_untagged_entries: 'Zobacz nieotagowane wpisy'
+    new:
+        add: 'Dodaj'
+        placeholder: 'Możesz dodać kilka tagów, oddzielając je przecinkami.'
 import:
    page_title: 'Import'
@@ -362,6 +417,7 @@ import:
        how_to: 'Wybierz swój plik eksportu z Readability i kliknij poniższy przycisk, aby go załadować.'
    worker:
        enabled: "Import jest wykonywany asynchronicznie. Od momentu rozpoczęcia importu, zewnętrzna usługa może zajmować się na raz tylko jednym zadaniem. Bieżącą usługą jest:"
+        download_images_warning: "Włączyłeś pobieranie obrazów dla swoich artykułów. W połączeniu z klasycznym importem, może to zająć dużo czasu (lub zakończyć się niepowodzeniem).<strong>Zdecydowanie zalecamy</strong> włączenie asynchronicznego importu, w celu uniknięcia błędów."
    firefox:
       page_title: 'Import > Firefox'
       description: "Ten importer zaimportuje wszystkie twoje zakładki z Firefoksa. Idź do twoich zakładek (Ctrl+Shift+O), następnie w \"Import i kopie zapasowe\", wybierz \"Utwórz kopię zapasową...\". Uzyskasz plik .json."
@@ -374,9 +430,13 @@ import:
        page_title: 'Import > Instapaper'
        description: 'Ten importer, zaimportuje wszystkie twoje artykuły z Instapaper. W ustawieniach (https://www.instapaper.com/user), kliknij na "Download .CSV file"  w sekcji "Export". Otrzymasz plik CSV.'
        how_to: 'Wybierz swój plik eksportu z Instapaper i kliknij poniższy przycisk, aby go załadować.'
+    pinboard:
+        page_title: "Import > Pinboard"
+        description: 'Ten importer, zaimportuje wszystkie twoje artykuły z Pinboard. W ustawieniach kopii zapasowej (https://pinboard.in/settings/backup), kliknij na "JSON" w sekcji "Bookmarks". Otrzymasz plik "pinboard_export".'
+        how_to: 'Wybierz swój plik eksportu z Pinboard i kliknij poniższy przycisk, aby go załadować.'
 developer:
-    page_title: 'Deweloper'
+    page_title: 'Zarządzanie klientami API'
    welcome_message: 'Witaj w API wallabag'
    documentation: 'Dokumentacja'
    how_to_first_app: 'Jak stworzyć moją pierwszą aplikację'
@@ -397,7 +457,7 @@ developer:
        warn_message_2: "Jeżeli go usuniesz, aplikacje skonfigurowane z tym klientem nię będa w stanie autoryzować twojego wallabag."
        action: 'Usuń tego klienta'
    client:
-        page_title: 'Deweloper > Nowy klient'
+        page_title: 'Zarządzanie klientami API > Nowy klient'
        page_description: 'Tworzysz nowego klienta. Wypełnij poniższe pole w celu przekierowania URI twojej aplikacji.'
        form:
            name_label: 'Nazwa klienta'
@@ -405,7 +465,7 @@ developer:
            save_label: 'Stwórz nowego klienta'
        action_back: 'Cofnij'
    client_parameter:
-        page_title: 'Deweloper > Parametry klienta'
+        page_title: 'Zarządzanie klientami API > Parametry klienta'
        page_description: 'Tutaj znajdują się parametry klienta.'
        field_name: 'Nazwa klienta'
        field_id: 'Client ID'
@@ -413,7 +473,7 @@ developer:
        back: 'Cofnij'
        read_howto: 'Przeczytaj jak "Stworzyć moją pierwszą aplikację"'
    howto:
-        page_title: 'Deweloper > Jak stworzyć moją pierwszą aplikację'
+        page_title: 'Zarządzanie klientami API > Jak stworzyć moją pierwszą aplikację'
        description:
            paragraph_1: 'Następujące komendy korzystają <a href="https://github.com/jkbrzt/httpie">Biblioteka HTTPie</a>. Upewnij się, czy zainstalowałeś ją w swoim systemie zanim z niej skorzystasz'
            paragraph_2: 'Potrzebujesz tokena w celu nawiązania komunikacji między swoją aplikacją a API wallabag.'
@@ -444,7 +504,6 @@ user:
        plain_password_label: 'Jawne hasło'
        email_label: 'Adres email'
        enabled_label: 'Włączony'
-        locked_label: 'Zablokowany'
        last_login_label: 'Ostatnie logowanie'
        twofactor_label: Autoryzacja dwuetapowa
        save: Zapisz
@@ -453,7 +512,7 @@ user:
        back_to_list: Powrót do listy
 error:
-    # page_title: An error occurred
+    page_title: Wystąpił błąd
 flashes:
    config:
@@ -465,8 +524,10 @@ flashes:
            rss_updated: 'Informacje RSS zaktualizowane'
            tagging_rules_updated: 'Reguły tagowania zaktualizowane'
            tagging_rules_deleted: 'Reguła tagowania usunięta'
-            user_added: 'Użytkownik "%username%" dodany'
            rss_token_updated: 'Token kanału RSS zaktualizowany'
+            annotations_reset: Zresetuj adnotacje
+            tags_reset: Zresetuj tagi
+            entries_reset: Zresetuj wpisy
    entry:
        notice:
            entry_already_saved: 'Wpis już został dodany %date%'
@@ -496,3 +557,8 @@ flashes:
        notice:
            client_created: 'Nowy klient utworzony.'
            client_deleted: 'Klient usunięty'
+    user:
+        notice:
+            added: 'Użytkownik "%username%" dodany'
+            updated: 'Użytkownik "%username%" zaktualizowany'
+            deleted: 'Użytkownik "%username%" usunięty'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
index a375ac7b..8a7cc6f8 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
@@ -25,7 +25,7 @@ menu:
        internal_settings: 'Configurações Internas'
        import: 'Importar'
        howto: 'How to'
-        developer: 'Desenvolvedor'
+        # developer: 'API clients management'
        logout: 'Sair'
        about: 'Sobre'
        search: 'Pesquisa'
@@ -70,7 +70,12 @@ config:
            200_word: 'Posso ler ~200 palavras por minuto'
            300_word: 'Posso ler ~300 palavras por minuto'
            400_word: 'Posso ler ~400 palavras por minuto'
+        action_mark_as_read:
+            # label: 'Where do you to be redirected after mark an article as read?'
+            # redirect_homepage: 'To the homepage'
+            # redirect_current_page: 'To the current page'
        pocket_consumer_key_label: 'Chave do consumidor do Pocket para importar conteúdo'
+        # android_configuration: Configure your Android application
        # help_theme: "wallabag is customizable. You can choose your prefered theme here."
        # help_items_per_page: "You can change the number of articles displayed on each page."
        # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article."
@@ -94,6 +99,18 @@ config:
        email_label: 'E-mail'
        twoFactorAuthentication_label: 'Autenticação de dois passos'
        # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
+        delete:
+            # title: Delete my account (a.k.a danger zone)
+            # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out.
+            # confirm: Are you really sure? (THIS CAN'T BE UNDONE)
+            # button: Delete my account
+    reset:
+        # title: Reset area (a.k.a danger zone)
+        # description: By hiting buttons below you'll have ability to remove some informations from your account. Be aware that these actions are IRREVERSIBLE.
+        # annotations: Remove ALL annotations
+        # tags: Remove ALL tags
+        # entries: Remove ALL entries
+        # confirm: Are you really really sure? (THIS CAN'T BE UNDONE)
    form_password:
        # description: "You can change your password here. Your new password should by at least 8 characters long."
        old_password_label: 'Senha atual'
@@ -145,15 +162,16 @@ entry:
        archived: 'Entradas arquivadas'
        filtered: 'Entradas filtradas'
        filtered_tags: 'Filtrar por tags:'
+        # filtered_search: 'Filtered by search:'
        untagged: 'Entradas sem tags'
    list:
        number_on_the_page: '{0} Não existem entradas.|{1} Existe uma entrada.|]1,Inf[ Existem %count% entradas.'
        reading_time: 'tempo estimado de leitura'
        reading_time_minutes: 'tempo estimado de leitura: %readingTime% min'
-        reading_time_less_one_minute: 'tempo estimado de leitura: <small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute: 'tempo estimado de leitura: &lt; 1 min'
        number_of_tags: '{1}e uma outra tag|]1,Inf[e %count% outras tags'
        reading_time_minutes_short: '%readingTime% min'
-        reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute_short: '&lt; 1 min'
        original_article: 'original'
        toogle_as_read: 'Marcar como lido'
        toogle_as_star: 'Marcar como destacado'
@@ -168,6 +186,7 @@ entry:
        preview_picture_label: 'Possui uma imagem de preview'
        preview_picture_help: 'Imagem de preview'
        language_label: 'Idioma'
+        # http_status_label: 'HTTP status'
        reading_time:
            label: 'Tempo de leitura em minutos'
            from: 'de'
@@ -209,6 +228,8 @@ entry:
        placeholder: 'http://website.com'
        form_new:
            url_label: Url
+    search:
+        # placeholder: 'What are you looking for?'
    edit:
        page_title: 'Editar uma entrada'
        title_label: 'Título'
@@ -252,6 +273,9 @@ about:
 howto:
    page_title: 'How to'
    page_description: 'Existem diferentes formas de salvar um artigo:'
+    tab_menu:
+        # add_link: "Add a link"
+        # shortcuts: "Use shortcuts"
    top_menu:
        browser_addons: 'Extensões de navegadores'
        mobile_apps: "App's móveis"
@@ -261,6 +285,7 @@ howto:
    browser_addons:
        firefox: 'Extensão padrão do Firefox'
        chrome: 'Extensão do Chrome'
+        opera: 'Extensão do Opera'
    mobile_apps:
        android:
            via_f_droid: 'via F-Droid'
@@ -269,6 +294,33 @@ howto:
        windows: 'na Microsoft Store'
    bookmarklet:
        description: 'Arraste e solve este link na sua barra de favoritos:'
+    shortcuts:
+        # page_description: Here are the shortcuts available in wallabag.
+        # shortcut: Shortcut
+        # action: Action
+        # all_pages_title: Shortcuts available in all pages
+        # go_unread: Go to unread
+        # go_starred: Go to starred
+        # go_archive: Go to archive
+        # go_all: Go to all entries
+        # go_tags: Go to tags
+        # go_config: Go to config
+        # go_import: Go to import
+        # go_developers: Go to developers
+        # go_howto: Go to howto (this page!)
+        # go_logout: Logout
+        # list_title: Shortcuts available in listing pages
+        # search: Display the search form
+        # article_title: Shortcuts available in entry view
+        # open_original: Open original URL of the entry
+        # toggle_favorite: Toggle star status for the entry
+        # toggle_archive: Toggle read status for the entry
+        # delete: Delete the entry
+        # material_title: Shortcuts available with Material theme only
+        # add_link: Add a new link
+        # hide_form: Hide the current form (search or new link)
+        # arrows_navigation: Navigate through articles
+        # open_article: Display the selected entry
 quickstart:
    page_title: 'Começo Rápido'
@@ -329,6 +381,9 @@ tag:
    list:
        number_on_the_page: '{0} Não existem tags.|{1} Uma tag.|]1,Inf[ Existem %count% tags.'
        see_untagged_entries: 'Ver entradas sem tags'
+    new:
+        # add: 'Add'
+        # placeholder: 'You can add several tags, separated by a comma.'
 import:
    page_title: 'Importar'
@@ -362,6 +417,7 @@ import:
        how_to: 'Por favor, selecione sua exportação do Readability e clique no botão abaixo para importá-la.'
    worker:
        enabled: "A importação é feita assíncronamente. Uma vez que a tarefa de importação é iniciada, um trabalho externo pode executar tarefas uma por vez. O serviço atual é:"
+        # download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We <strong>strongly recommend</strong> to enable asynchronous import to avoid errors."
    firefox:
        page_title: 'Importar > Firefox'
        description: "Com este importador você importa todos os favoritos de seu Firefox. Somente vá até seus favoritos (Ctrl+Maj+O), e em \"Importar e Backup\" e escolha \"Backup...\". Você terá então um arquivo .json."
@@ -374,9 +430,13 @@ import:
        page_title: 'Importar > Instapaper'
        description: 'Este importador pode importar todos os artigos do seu Instapaper. Nas página de configurações (https://www.instapaper.com/user), clique em "Download .CSV file" na seção "Export". Um arquivo CSV será baixado (algo como "instapaper-export.csv").'
        how_to: 'Por favor, selecione sua exportação do seu Instapaper e clique no botão abaixo para importá-la.'
+    pinboard:
+        # page_title: "Import > Pinboard"
+        # description: 'This importer will import all your Instapaper articles. On the backup (https://pinboard.in/settings/backup) page, click on "JSON" in the "Bookmarks" section. A JSON file will be downloaded (like "pinboard_export").'
+        # how_to: 'Please select your Pinboard export and click on the below button to upload and import it.'
 developer:
-    page_title: 'Desenvolvedor'
+    # page_title: 'API clients management'
    welcome_message: 'Bem-vindo a API do wallabag'
    documentation: 'Documentação'
    how_to_first_app: 'Como criar minha primeira aplicação'
@@ -397,7 +457,7 @@ developer:
        warn_message_2: 'Se você remover isso, todo o aplicativo configurado com este cliente não poderá se autenticar no seu wallabag.'
        action: 'Remover este cliente'
    client:
-        page_title: 'Desenvolvedor > Novo cliente'
+        # page_title: 'API clients management > Novo cliente'
        page_description: 'Você está prestes a criar um novo cliente. Por favor preencha o campo abaixo para a URI de redirecionamento de sua aplicação.'
        form:
            name_label: 'Nome do cliente'
@@ -405,7 +465,7 @@ developer:
            save_label: 'Criar um novo cliente'
        action_back: 'Voltar'
    client_parameter:
-        page_title: 'Desenvolvedor > Parâmetros de clientes'
+        # page_title: 'API clients management > Parâmetros de clientes'
        page_description: 'Aqui estão os parâmetros de seus clientes.'
        field_name: 'Nome do cliente'
        field_id: 'ID do cliente'
@@ -413,7 +473,7 @@ developer:
        back: 'Voltar'
        read_howto: 'Leia o how-to "Criar minha primeira aplicação"'
    howto:
-        page_title: 'Desenvolvedor > Criar minha primeira aplicação'
+        # page_title: 'API clients management > Criar minha primeira aplicação'
        description:
            paragraph_1: 'Os seguintes comandos fazem uso da <a href="https://github.com/jkbrzt/httpie">biblioteca HTTPie</a>. Tenha certeza que ela está instalada em seu servidor antes de usá-la.'
            paragraph_2: 'Você precisa de um token para a comunicação entre sua aplicação terceira e a API do wallabag.'
@@ -444,7 +504,6 @@ user:
        plain_password_label: '????'
        email_label: 'E-mail'
        enabled_label: 'Habilitado'
-        locked_label: 'Travado'
        last_login_label: 'Último login'
        twofactor_label: 'Autenticação de dois passos'
        save: 'Salvar'
@@ -452,17 +511,23 @@ user:
        delete_confirm: 'Tem certeza?'
        back_to_list: 'Voltar para a lista'
+error:
+    # page_title: An error occurred
 flashes:
    config:
        notice:
            config_saved: 'Configiração salva.'
            password_updated: 'Senha atualizada'
            password_not_updated_demo: 'Em modo de demonstração, você não pode alterar a senha deste usuário.'
-            user_updated: 'Informação atualizada'
+            # user_updated: 'Information updated'
            rss_updated: 'Informação de RSS atualizada'
            tagging_rules_updated: 'Regras de tags atualizadas'
            tagging_rules_deleted: 'Regra de tag apagada'
            rss_token_updated: 'Token RSS atualizado'
+            # annotations_reset: Annotations reset
+            # tags_reset: Tags reset
+            # entries_reset: Entries reset
    entry:
        notice:
            entry_already_saved: 'Entrada já foi salva em %date%'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index 7d8fcea3..52b6414f 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -25,7 +25,7 @@ menu:
        # internal_settings: 'Internal Settings'
        # import: 'Import'
        howto: 'Cum să'
-        # developer: 'Developer'
+        # developer: 'API clients management'
        logout: 'cum să'
        about: 'Despre'
        search: 'Căutare'
@@ -70,7 +70,12 @@ config:
            # 200_word: 'I read ~200 words per minute'
            # 300_word: 'I read ~300 words per minute'
            # 400_word: 'I read ~400 words per minute'
+        action_mark_as_read:
+            # label: 'Where do you to be redirected after mark an article as read?'
+            # redirect_homepage: 'To the homepage'
+            # redirect_current_page: 'To the current page'
        pocket_consumer_key_label: Cheie consumator pentru importarea contentului din Pocket
+        # android_configuration: Configure your Android application
        # help_theme: "wallabag is customizable. You can choose your prefered theme here."
        # help_items_per_page: "You can change the number of articles displayed on each page."
        # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article."
@@ -94,6 +99,18 @@ config:
        email_label: 'E-mail'
        # twoFactorAuthentication_label: 'Two factor authentication'
        # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
+        delete:
+            # title: Delete my account (a.k.a danger zone)
+            # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out.
+            # confirm: Are you really sure? (THIS CAN'T BE UNDONE)
+            # button: Delete my account
+    reset:
+        # title: Reset area (a.k.a danger zone)
+        # description: By hiting buttons below you'll have ability to remove some informations from your account. Be aware that these actions are IRREVERSIBLE.
+        # annotations: Remove ALL annotations
+        # tags: Remove ALL tags
+        # entries: Remove ALL entries
+        # confirm: Are you really really sure? (THIS CAN'T BE UNDONE)
    form_password:
        # description: "You can change your password here. Your new password should by at least 8 characters long."
        old_password_label: 'Parola veche'
@@ -145,15 +162,16 @@ entry:
        # archived: 'Archived entries'
        # filtered: 'Filtered entries'
        # filtered_tags: 'Filtered by tags:'
+        # filtered_search: 'Filtered by search:'
        # untagged: 'Untagged entries'
    list:
        # number_on_the_page: '{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.'
        reading_time: 'timp estimat de citire'
        reading_time_minutes: 'timp estimat de citire: %readingTime% min'
-        reading_time_less_one_minute: 'timp estimat de citire: <small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute: 'timp estimat de citire: &lt; 1 min'
        # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags'
        reading_time_minutes_short: '%readingTime% min'
-        reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute_short: '&lt; 1 min'
        original_article: 'original'
        toogle_as_read: 'Comută marcat ca citit'
        toogle_as_star: 'Comută marcat ca favorit'
@@ -168,6 +186,7 @@ entry:
        preview_picture_label: 'Are o imagine de previzualizare'
        preview_picture_help: 'Previzualizare imagine'
        language_label: 'Limbă'
+        # http_status_label: 'HTTP status'
        reading_time:
            label: 'Timp de citire în minute'
            from: 'de la'
@@ -209,6 +228,8 @@ entry:
        placeholder: 'http://website.com'
        form_new:
            url_label: Url
+    search:
+        # placeholder: 'What are you looking for?'
    edit:
        # page_title: 'Edit an entry'
        # title_label: 'Title'
@@ -252,6 +273,9 @@ about:
 howto:
    page_title: 'Cum să'
    # page_description: 'There are several ways to save an article:'
+    tab_menu:
+        # add_link: "Add a link"
+        # shortcuts: "Use shortcuts"
    top_menu:
        browser_addons: 'Add-On-uri de Browser'
        mobile_apps: 'Aplicații mobile'
@@ -261,6 +285,7 @@ howto:
    browser_addons:
        firefox: 'Add-On standard de Firefox'
        chrome: 'Extensie Chrome'
+        opera: 'Extensie Opera'
    mobile_apps:
        android:
            via_f_droid: 'prin F-Droid'
@@ -269,6 +294,33 @@ howto:
        windows: 'prin Microsoft Store'
    bookmarklet:
        description: 'Drag &amp; drop acest link în bara de bookmark-uri:'
+    shortcuts:
+        # page_description: Here are the shortcuts available in wallabag.
+        # shortcut: Shortcut
+        # action: Action
+        # all_pages_title: Shortcuts available in all pages
+        # go_unread: Go to unread
+        # go_starred: Go to starred
+        # go_archive: Go to archive
+        # go_all: Go to all entries
+        # go_tags: Go to tags
+        # go_config: Go to config
+        # go_import: Go to import
+        # go_developers: Go to developers
+        # go_howto: Go to howto (this page!)
+        # go_logout: Logout
+        # list_title: Shortcuts available in listing pages
+        # search: Display the search form
+        # article_title: Shortcuts available in entry view
+        # open_original: Open original URL of the entry
+        # toggle_favorite: Toggle star status for the entry
+        # toggle_archive: Toggle read status for the entry
+        # delete: Delete the entry
+        # material_title: Shortcuts available with Material theme only
+        # add_link: Add a new link
+        # hide_form: Hide the current form (search or new link)
+        # arrows_navigation: Navigate through articles
+        # open_article: Display the selected entry
 quickstart:
    # page_title: 'Quickstart'
@@ -329,6 +381,9 @@ tag:
    list:
        # number_on_the_page: '{0} There is no tag.|{1} There is one tag.|]1,Inf[ There are %count% tags.'
        # see_untagged_entries: 'See untagged entries'
+    new:
+        # add: 'Add'
+        # placeholder: 'You can add several tags, separated by a comma.'
 import:
    # page_title: 'Import'
@@ -362,6 +417,7 @@ import:
    #     how_to: 'Please select your Readability export and click on the below button to upload and import it.'
    worker:
        # enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:"
+        # download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We <strong>strongly recommend</strong> to enable asynchronous import to avoid errors."
    # firefox:
    #    page_title: 'Import > Firefox'
    #    description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file."
@@ -374,9 +430,13 @@ import:
    #     page_title: 'Import > Instapaper'
    #     description: 'This importer will import all your Instapaper articles. On the settings (https://www.instapaper.com/user) page, click on "Download .CSV file" in the "Export" section. A CSV file will be downloaded (like "instapaper-export.csv").'
    #     how_to: 'Please select your Instapaper export and click on the below button to upload and import it.'
+    pinboard:
+        # page_title: "Import > Pinboard"
+        # description: 'This importer will import all your Instapaper articles. On the backup (https://pinboard.in/settings/backup) page, click on "JSON" in the "Bookmarks" section. A JSON file will be downloaded (like "pinboard_export").'
+        # how_to: 'Please select your Pinboard export and click on the below button to upload and import it.'
 developer:
-    # page_title: 'Developer'
+    # page_title: 'API clients management'
    # welcome_message: 'Welcome to the wallabag API'
    # documentation: 'Documentation'
    # how_to_first_app: 'How to create my first application'
@@ -397,7 +457,7 @@ developer:
    #     warn_message_2: "If you remove it, every app configured with that client won't be able to auth on your wallabag."
    #     action: 'Remove this client'
    # client:
-    #     page_title: 'Developer > New client'
+    #     page_title: 'API clients management > New client'
    #     page_description: 'You are about to create a new client. Please fill the field below for the redirect URI of your application.'
    #     form:
    #         name_label: 'Name of the client'
@@ -405,7 +465,7 @@ developer:
    #         save_label: 'Create a new client'
    #     action_back: 'Back'
    # client_parameter:
-    #     page_title: 'Developer > Client parameters'
+    #     page_title: 'API clients management > Client parameters'
    #     page_description: 'Here are your client parameters.'
    #     field_name: 'Client name'
    #     field_id: 'Client ID'
@@ -413,7 +473,7 @@ developer:
    #     back: 'Back'
    #     read_howto: 'Read the howto "Create my first application"'
    # howto:
-    #     page_title: 'Developer > How to create my first application'
+    #     page_title: 'API clients management > How to create my first application'
    #     description:
    #         paragraph_1: 'The following commands make use of the <a href="https://github.com/jkbrzt/httpie">HTTPie library</a>. Make sure it is installed on your system before using it.'
    #         paragraph_2: 'You need a token to communicate between your 3rd application and wallabag API.'
@@ -444,7 +504,6 @@ user:
        plain_password_label: '????'
        email_label: 'E-mail'
        # enabled_label: 'Enabled'
-        # locked_label: 'Locked'
        # last_login_label: 'Last login'
        # twofactor_label: Two factor authentication
        # save: Save
@@ -465,8 +524,10 @@ flashes:
            rss_updated: 'Informație RSS actualizată'
            # tagging_rules_updated: 'Tagging rules updated'
            # tagging_rules_deleted: 'Tagging rule deleted'
-            # user_added: 'User "%username%" added'
            # rss_token_updated: 'RSS token updated'
+            # annotations_reset: Annotations reset
+            # tags_reset: Tags reset
+            # entries_reset: Entries reset
    entry:
        notice:
            # entry_already_saved: 'Entry already saved on %date%'
@@ -496,3 +557,8 @@ flashes:
        notice:
            # client_created: 'New client created.'
            # client_deleted: 'Client deleted'
+    user:
+        notice:
+            # added: 'User "%username%" added'
+            # updated: 'User "%username%" updated'
+            # deleted: 'User "%username%" deleted'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index 357aa2ae..bfb7e206 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -25,7 +25,7 @@ menu:
        # internal_settings: 'Internal Settings'
        import: 'İçe Aktar'
        howto: 'Yardım'
-        # developer: 'Developer'
+        # developer: 'API clients management'
        logout: 'Çıkış Yap'
        about: 'Hakkımızda'
        search: 'Ara'
@@ -70,7 +70,12 @@ config:
            # 200_word: 'I read ~200 words per minute'
            # 300_word: 'I read ~300 words per minute'
            # 400_word: 'I read ~400 words per minute'
+        action_mark_as_read:
+            # label: 'Where do you to be redirected after mark an article as read?'
+            # redirect_homepage: 'To the homepage'
+            # redirect_current_page: 'To the current page'
        # pocket_consumer_key_label: Consumer key for Pocket to import contents
+        # android_configuration: Configure your Android application
        # help_theme: "wallabag is customizable. You can choose your prefered theme here."
        # help_items_per_page: "You can change the number of articles displayed on each page."
        # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article."
@@ -94,6 +99,18 @@ config:
        email_label: 'E-posta'
        twoFactorAuthentication_label: 'İki adımlı doğrulama'
        # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
+        delete:
+            # title: Delete my account (a.k.a danger zone)
+            # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out.
+            # confirm: Are you really sure? (THIS CAN'T BE UNDONE)
+            # button: Delete my account
+    reset:
+        # title: Reset area (a.k.a danger zone)
+        # description: By hiting buttons below you'll have ability to remove some informations from your account. Be aware that these actions are IRREVERSIBLE.
+        # annotations: Remove ALL annotations
+        # tags: Remove ALL tags
+        # entries: Remove ALL entries
+        # confirm: Are you really really sure? (THIS CAN'T BE UNDONE)
    form_password:
        # description: "You can change your password here. Your new password should by at least 8 characters long."
        old_password_label: 'Eski şifre'
@@ -103,6 +120,7 @@ config:
        # if_label: 'if'
        # then_tag_as_label: 'then tag as'
        # delete_rule_label: 'delete'
+        # edit_rule_label: 'edit'
        rule_label: 'Kural'
        tags_label: 'Etiketler'
        faq:
@@ -144,15 +162,16 @@ entry:
        # archived: 'Archived entries'
        # filtered: 'Filtered entries'
        # filtered_tags: 'Filtered by tags:'
+        # filtered_search: 'Filtered by search:'
        # untagged: 'Untagged entries'
    list:
        number_on_the_page: '{0} Herhangi bir makale yok.|{1} Burada bir adet makale var.|]1,Inf[ Burada %count% adet makale var.'
        reading_time: 'tahmini okuma süresi'
        reading_time_minutes: 'tahmini okuma süresi: %readingTime% min'
-        reading_time_less_one_minute: 'tahmini okuma süresi: <small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute: 'tahmini okuma süresi: &lt; 1 min'
        # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags'
        reading_time_minutes_short: '%readingTime% min'
-        reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
+        reading_time_less_one_minute_short: '&lt; 1 min'
        original_article: 'orijinal'
        toogle_as_read: 'Okundu/okunmadı olarak işaretle'
        toogle_as_star: 'Favorilere ekle/çıkar'
@@ -167,6 +186,7 @@ entry:
        preview_picture_label: 'Resim önizlemesi varsa'
        preview_picture_help: 'Resim önizlemesi'
        language_label: 'Dil'
+        # http_status_label: 'HTTP status'
        reading_time:
            label: 'Dakika cinsinden okuma süresi'
            from: 'başlangıç'
@@ -208,6 +228,8 @@ entry:
        placeholder: 'http://website.com'
        form_new:
            url_label: Url
+    search:
+        # placeholder: 'What are you looking for?'
    edit:
        page_title: 'Makaleyi düzenle'
        title_label: 'Başlık'
@@ -251,6 +273,9 @@ about:
 howto:
    page_title: 'Yardım'
    # page_description: 'There are several ways to save an article:'
+    tab_menu:
+        # add_link: "Add a link"
+        # shortcuts: "Use shortcuts"
    top_menu:
        browser_addons: 'Tarayıcı eklentileri'
        mobile_apps: 'Mobil uygulamalar'
@@ -260,6 +285,7 @@ howto:
    browser_addons:
        firefox: 'Standart Firefox Eklentisi'
        chrome: 'Chrome Eklentisi'
+        opera: 'Opera Eklentisi'
    mobile_apps:
        android:
            # via_f_droid: 'via F-Droid'
@@ -268,6 +294,33 @@ howto:
        # windows: 'on the Microsoft Store'
    bookmarklet:
        description: "Bu bağlantı ile yer imlerinizi sürükleyip bırakarak wallabag'e ekleyebilirsiniz:"
+    shortcuts:
+        # page_description: Here are the shortcuts available in wallabag.
+        # shortcut: Shortcut
+        # action: Action
+        # all_pages_title: Shortcuts available in all pages
+        # go_unread: Go to unread
+        # go_starred: Go to starred
+        # go_archive: Go to archive
+        # go_all: Go to all entries
+        # go_tags: Go to tags
+        # go_config: Go to config
+        # go_import: Go to import
+        # go_developers: Go to developers
+        # go_howto: Go to howto (this page!)
+        # go_logout: Logout
+        # list_title: Shortcuts available in listing pages
+        # search: Display the search form
+        # article_title: Shortcuts available in entry view
+        # open_original: Open original URL of the entry
+        # toggle_favorite: Toggle star status for the entry
+        # toggle_archive: Toggle read status for the entry
+        # delete: Delete the entry
+        # material_title: Shortcuts available with Material theme only
+        # add_link: Add a new link
+        # hide_form: Hide the current form (search or new link)
+        # arrows_navigation: Navigate through articles
+        # open_article: Display the selected entry
 quickstart:
    page_title: 'Hızlı başlangıç'
@@ -328,6 +381,9 @@ tag:
    list:
        number_on_the_page: '{0} Herhangi bir etiket yok.|{1} Burada bir adet etiket var.|]1,Inf[ Burada %count% adet etiket var.'
        # see_untagged_entries: 'See untagged entries'
+    new:
+        # add: 'Add'
+        # placeholder: 'You can add several tags, separated by a comma.'
 import:
    page_title: 'İçe Aktar'
@@ -361,6 +417,7 @@ import:
        # how_to: 'Please select your Readability export and click on the below button to upload and import it.'
    worker:
        # enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:"
+        # download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We <strong>strongly recommend</strong> to enable asynchronous import to avoid errors."
    firefox:
       page_title: 'İçe Aktar > Firefox'
       # description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file."
@@ -373,9 +430,13 @@ import:
        page_title: 'İçe Aktar > Instapaper'
        # description: 'This importer will import all your Instapaper articles. On the settings (https://www.instapaper.com/user) page, click on "Download .CSV file" in the "Export" section. A CSV file will be downloaded (like "instapaper-export.csv").'
        # how_to: 'Please select your Instapaper export and click on the below button to upload and import it.'
+    pinboard:
+        # page_title: "Import > Pinboard"
+        # description: 'This importer will import all your Instapaper articles. On the backup (https://pinboard.in/settings/backup) page, click on "JSON" in the "Bookmarks" section. A JSON file will be downloaded (like "pinboard_export").'
+        # how_to: 'Please select your Pinboard export and click on the below button to upload and import it.'
 developer:
-    # page_title: 'Developer'
+    # page_title: 'API clients management'
    # welcome_message: 'Welcome to the wallabag API'
    # documentation: 'Documentation'
    # how_to_first_app: 'How to create my first application'
@@ -396,7 +457,7 @@ developer:
    #     warn_message_2: "If you remove it, every app configured with that client won't be able to auth on your wallabag."
    #     action: 'Remove this client'
    # client:
-    #     page_title: 'Developer > New client'
+    #     page_title: 'API clients management > New client'
    #     page_description: 'You are about to create a new client. Please fill the field below for the redirect URI of your application.'
    #     form:
    #        name_label: 'Name of the client'
@@ -404,7 +465,7 @@ developer:
    #         save_label: 'Create a new client'
    #     action_back: 'Back'
    # client_parameter:
-    #     page_title: 'Developer > Client parameters'
+    #     page_title: 'API clients management > Client parameters'
    #     page_description: 'Here are your client parameters.'
    #     field_name: 'Client name'
    #     field_id: 'Client ID'
@@ -412,7 +473,7 @@ developer:
    #     back: 'Back'
    #     read_howto: 'Read the howto "Create my first application"'
    # howto:
-    #     page_title: 'Developer > How to create my first application'
+    #     page_title: 'API clients management > How to create my first application'
    #     description:
    #         paragraph_1: 'The following commands make use of the <a href="https://github.com/jkbrzt/httpie">HTTPie library</a>. Make sure it is installed on your system before using it.'
    #         paragraph_2: 'You need a token to communicate between your 3rd application and wallabag API.'
@@ -443,7 +504,6 @@ user:
        plain_password_label: '????'
        email_label: 'E-posta'
        # enabled_label: 'Enabled'
-        # locked_label: 'Locked'
        # last_login_label: 'Last login'
        # twofactor_label: Two factor authentication
        # save: Save
@@ -464,8 +524,10 @@ flashes:
            rss_updated: 'RSS bilgiler güncellendi'
            tagging_rules_updated: 'Tagging rules updated'
            tagging_rules_deleted: 'Tagging rule deleted'
-            user_added: 'User "%username%" added'
            rss_token_updated: 'RSS token updated'
+            # annotations_reset: Annotations reset
+            # tags_reset: Tags reset
+            # entries_reset: Entries reset
    entry:
        notice:
            entry_already_saved: 'Entry already saved on %date%'
@@ -495,3 +557,8 @@ flashes:
        notice:
            # client_created: 'New client created.'
            # client_deleted: 'Client deleted'
+    user:
+        notice:
+            # added: 'User "%username%" added'
+            # updated: 'User "%username%" updated'
+            # deleted: 'User "%username%" deleted'
diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
index a1a9a136..289458d4 100644
--- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
@@ -41,6 +41,8 @@
            {% block css %}
            {% endblock %}
            {% block scripts %}
+            <script src="{{ asset('bundles/fosjsrouting/js/router.js') }}"></script>
+            <script src="{{ path('fos_js_routing_js', { callback: 'fos.Router.setData' }) }}"></script>
            {% endblock %}
            <title>{% block title %}{% endblock %} – wallabag</title>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
index 98b0e119..3548f590 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
@@ -47,6 +47,14 @@
        <fieldset class="w500p inline">
            <div class="row">
+                {{ form_label(form.config.action_mark_as_read) }}
+                {{ form_errors(form.config.action_mark_as_read) }}
+                {{ form_widget(form.config.action_mark_as_read) }}
+            </div>
+        </fieldset>
+        <fieldset class="w500p inline">
+            <div class="row">
                {{ form_label(form.config.language) }}
                {{ form_errors(form.config.language) }}
                {{ form_widget(form.config.language) }}
@@ -71,6 +79,19 @@
            </a>
        </fieldset>
+        <fieldset class="w500p inline">
+            <div class="row">
+                <h3>{{ 'config.form_settings.android_configuration'|trans }}</h3>
+                <a href="wallabag://{{ app.user.username }}@{{ wallabag_url }}" >Touch here to prefill your Android application</a>
+                <br/>
+                <img id="androidQrcode" />
+                <script>
+                    const imgBase64 = jrQrcode.getQrBase64('wallabag://{{ app.user.username }}@{{ wallabag_url }}');
+                    document.getElementById('androidQrcode').src = imgBase64;
+                </script>
+            </div>
+        </fieldset>
        {{ form_rest(form.config) }}
    </form>
@@ -164,10 +185,41 @@
        </fieldset>
        {% endif %}
+        <h2>{{ 'config.reset.title'|trans }}</h2>
+        <fieldset class="w500p inline">
+            <p>{{ 'config.reset.description'|trans }}</p>
+            <ul>
+                <li>
+                    <a href="{{ path('config_reset', { type: 'annotations'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red">
+                        {{ 'config.reset.annotations'|trans }}
+                    </a>
+                </li>
+                <li>
+                    <a href="{{ path('config_reset', { type: 'tags'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red">
+                        {{ 'config.reset.tags'|trans }}
+                    </a>
+                </li>
+                <li>
+                    <a href="{{ path('config_reset', { type: 'entries'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red">
+                        {{ 'config.reset.entries'|trans }}
+                    </a>
+                </li>
+            </ul>
+        </fieldset>
        {{ form_widget(form.user._token) }}
        {{ form_widget(form.user.save) }}
    </form>
+    {% if enabled_users > 1 %}
+        <h2>{{ 'config.form_user.delete.title'|trans }}</h2>
+        <p>{{ 'config.form_user.delete.description'|trans }}</p>
+        <a href="{{ path('delete_account') }}" onclick="return confirm('{{ 'config.form_user.delete.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red delete-account">
+            {{ 'config.form_user.delete.button'|trans }}
+        </a>
+    {% endif %}
    <h2>{{ 'config.tab_menu.password'|trans }}</h2>
    {{ form_start(form.pwd) }}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
index 4679714e..859b166b 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
@@ -1,20 +1,25 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
 {% block title %}
-    {% set currentTag = '' %}
+    {% set filter = '' %}
    {% if tag is defined %}
-        {% set currentTag = tag %}
+        {% set filter = tag %}
    {% endif %}
-    {% include "@WallabagCore/themes/common/Entry/_title.html.twig" with {'currentTag': currentTag} %}
+    {% if searchTerm is defined and searchTerm is not empty %}
+        {% set filter = searchTerm %}
+    {% endif %}
+    {% include "@WallabagCore/themes/common/Entry/_title.html.twig" with {'filter': filter} %}
 {% endblock %}
 {% block content %}
+    {% set listMode = app.user.config.listMode %}
    <div class="results">
        <div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div>
        <div class="pagination">
-            <i class="btn-clickable download-btn material-icons md-36">file_download</i>
+            <a href="{{ path('switch_view_mode') }}"><i class="listMode-btn material-icons md-36">{% if listMode == 0 %}list{% else %}view_module{% endif %}</i></a>
-            <i class="btn-clickable filter-btn material-icons md-36">filter_list</i>
+            <i class="btn-clickable download-btn material-icons md-36 js-export-action">file_download</i>
+            <i class="btn-clickable filter-btn material-icons md-36 js-filters-action">filter_list</i>
            {% if entries.getNbPages > 1 %}
                {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
            {% endif %}
@@ -22,7 +27,7 @@
    </div>
    {% for entry in entries %}
-        <div id="entry-{{ entry.id|e }}" class="entry">
+        <div id="entry-{{ entry.id|e }}" class="{% if listMode == 0 %}entry{% else %}listmode entry{% endif %}">
            <h2><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|e|raw }}">{{ entry.title|e|raw }}</a></h2>
            {% set readingTime = entry.readingTime / app.user.config.readingSpeed %}
@@ -47,13 +52,13 @@
                <li><a title="{{ 'entry.list.delete'|trans }}" class="tool delete icon-trash icon" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{{ 'entry.list.delete'|trans }}</span></a></li>
                <li><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.list.original_article'|trans }} : {{ entry.title|e }}" class="tool link icon-link icon"><span>{{ entry.domainName|removeWww }}</span></a></li>
            </ul>
-            {% if entry.previewPicture is null %}
+            {% if (entry.previewPicture is null or listMode == 1) %}
                <ul class="card-entry-tags">
                    {% for tag in entry.tags %}
                        <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li>
                    {% endfor %}
                </ul>
-                <p>{{ entry.content|striptags|slice(0, 300) }}&hellip;</p>
+                <p {% if listMode == 1 %}class="hide"{% endif %}>{{ entry.content|striptags|slice(0, 300) }}&hellip;</p>
            {% else %}
                <ul class="card-entry-labels">
                {% for tag in entry.tags | slice(0, 3) %}
@@ -131,6 +136,13 @@
                </div>
            </div>
+            <div id="filter-http-status" class="filter-group">
+                {{ form_label(form.httpStatus) }}
+                <div class="input-field ">
+                    {{ form_widget(form.httpStatus) }}
+                </div>
+            </div>
            <div id="filter-reading-time" class="filter-group">
                <div class="">
                    {{ form_label(form.readingTime) }}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
index 8ca194f6..a555691d 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
@@ -11,7 +11,7 @@
        <div id="article_toolbar">
            <ul class="links">
                <li class="topPosF"><a href="#top" title="{{ 'entry.view.left_menu.back_to_top'|trans }}" class="tool top icon icon-arrow-up-thick"><span>{{ 'entry.view.left_menu.set_as_read'|trans }}</span></a></li>
-                <li><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool link icon icon-link"><span>{{ entry.domainName|removeWww }}</span></a></li>
+                <li><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool link icon icon-link original"><span>{{ entry.domainName|removeWww }}</span></a></li>
                <li><a title="{{ 'entry.view.left_menu.re_fetch_content'|trans }}" class="tool icon icon-reload" href="{{ path('reload_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.re_fetch_content'|trans }}</span></a></li>
                {% set markAsReadLabel = 'entry.view.left_menu.set_as_unread' %}
@@ -19,8 +19,8 @@
                    {% set markAsReadLabel = 'entry.view.left_menu.set_as_read' %}
                {% endif %}
-                <li><a title="{{ markAsReadLabel|trans }}" class="tool icon icon-check {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{{ markAsReadLabel|trans }}</span></a></li>
+                <li><a title="{{ markAsReadLabel|trans }}" class="tool icon icon-check {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %} markasread" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{{ markAsReadLabel|trans }}</span></a></li>
-                <li><a title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" class="tool icon icon-star {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.set_as_starred'|trans }}</span></a></li>
+                <li><a title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" class="tool icon icon-star {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %} favorite" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.set_as_starred'|trans }}</span></a></li>
                <li><a id="nav-btn-add-tag" class="tool icon icon-price-tags" title="{{ 'entry.view.left_menu.add_a_tag'|trans }}"><span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span></a></li>
                <li><a title="{{ 'entry.view.left_menu.delete'|trans }}" class="tool delete icon icon-trash" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.delete'|trans }}</span></a></li>
                {% if craue_setting('share_public') %}
@@ -29,8 +29,9 @@
                {% endif %}
                {% if craue_setting('share_twitter') %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="Tweet"><span>Tweet</span></a></li>{% endif %}
                {% if craue_setting('share_mail') %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="Email"><span>Email</span></a></li>{% endif %}
-                {% if craue_setting('share_shaarli') %}<li><a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool icon-image icon-image--shaarli" title="shaarli"><span>shaarli</span></a></li>{% endif %}
+                {% if craue_setting('share_shaarli') %}<li><a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}&amp;tags={{ entry.tags|join(',')|url_encode }}" target="_blank" class="tool icon-image icon-image--shaarli" title="shaarli"><span>shaarli</span></a></li>{% endif %}
                {% if craue_setting('share_diaspora') %}<li><a href="{{ craue_setting('diaspora_url') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}&notes=&v=1&noui=1&jump=doclose" target="_blank" class="tool diaspora icon-image icon-image--diaspora" title="diaspora"><span>diaspora</span></a></li>{% endif %}
+                {% if craue_setting('share_unmark') %}<li><a href="{{ craue_setting('unmark_url') }}/mark/add?url={{ entry.url|url_encode }}&amp;title={{entry.title|url_encode}}&amp;v=6" target="_blank" class="tool unmark icon-image icon-image--unmark" title="unmark"><span>unmark.it</span></a></li>{% endif %}
                {% if craue_setting('carrot') %}<li><a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" class="tool carrot icon-image icon-image--carrot" target="_blank" title="carrot"><span>Carrot</span></a></li>{% endif %}
                {% if craue_setting('show_printlink') %}<li><a title="{{ 'entry.view.left_menu.print'|trans }}" class="tool icon icon-print" href="javascript: window.print();"><span>{{ 'entry.view.left_menu.print'|trans }}</span></a></li>{% endif %}
                {% if craue_setting('export_epub') %}<li><a href="?epub&amp;method=id&amp;value={{ entry.id }}" title="Generate ePub file">EPUB</a></li>{% endif %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/search_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/search_form.html.twig
new file mode 100644
index 00000000..20821b6d
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/search_form.html.twig
@@ -0,0 +1,17 @@
+<form name="search" method="GET" action="{{ path('search')}}">
+    <h2>{{ 'menu.left.search'|trans }}</h2>
+    <a href="javascript: void(null);" id="search-form-close" class="close-button--popup close-button">&times;</a>
+    {% if form_errors(form) %}
+        <span class="black-text">{{ form_errors(form) }}</span>
+    {% endif %}
+    {% if form_errors(form.term) %}
+        <span class="black-text">{{ form_errors(form.term) }}</span>
+    {% endif %}
+    <input type="hidden" name="currentRoute" value="{{ currentRoute }}" />
+    {{ form_widget(form.term, { 'attr': {'autocomplete': 'off', 'placeholder': 'entry.search.placeholder'} }) }}
+    {{ form_rest(form) }}
+</form>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
index cd4ed3fa..07ff8e14 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
@@ -31,17 +31,11 @@
        <li class="menu all"><a href="{{ path('all') }}">{{ 'menu.left.all_articles'|trans }}</a></li>
        <li class="menu tag"><a href="{{ path('tag') }}">{{ 'menu.left.tags'|trans }}</a></li>
        <li class="menu new"><a href="{{ path('new') }}">{{ 'menu.left.save_link'|trans }}</a></li>
-        <!--<li style="position: relative;"><a href="javascript: void(null);" id="search">{{ 'menu.left.search'|trans }}</a>
+        <li style="position: relative;"><a href="javascript: void(null);" id="search">{{ 'menu.left.search'|trans }}</a>
            <div id="search-form" class="messages info popup-form">
-                <form method="get" action="index.php">
+                {{ render(controller("WallabagCoreBundle:Entry:searchForm", {'currentRoute': app.request.attributes.get('_route')})) }}
-                    <h2>{{ 'menu.left.search'|trans }}</h2>
-                    <a href="javascript: void(null);" id="search-form-close" class="close-button--popup close-button">&times;</a>
-                    <input type="hidden" name="view" value="search">
-                    <input required placeholder="{{ 'menu.search_form.input_label'|trans }}" type="text" name="search" id="searchfield"><br>
-                    <input id="submit-search" type="submit" value="{{ 'menu.left.search'|trans }}">
-                </form>
            </div>
-        </li>-->
+        </li>
        <li class="menu config"><a href="{{ path('config') }}">{{ 'menu.left.config'|trans }}</a></li>
        {% if is_granted('ROLE_SUPER_ADMIN') %}
            <li class="menu users"><a href="{{ path('user_index') }}">{{ 'menu.left.users_management'|trans }}</a></li>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig
index 92cabdd9..654c1d2d 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig
@@ -6,8 +6,10 @@
    {{ 'entry.page_titles.archived'|trans }}
 {% elseif currentRoute == 'all' %}
    {{ 'entry.page_titles.filtered'|trans }}
+{% elseif currentRoute == 'search' %}
+    {{ 'entry.page_titles.filtered_search'|trans }} {{ filter }}
 {% elseif currentRoute == 'tag_entries' %}
-    {{ 'entry.page_titles.filtered_tags'|trans }} {{ currentTag }}
+    {{ 'entry.page_titles.filtered_tags'|trans }} {{ filter }}
 {% elseif currentRoute == 'untagged' %}
    {{ 'entry.page_titles.untagged'|trans }}
 {% else %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig
index 7103f22b..12e8c79f 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig
@@ -2,7 +2,15 @@
 <rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:media="http://search.yahoo.com/mrss/">
    <channel>
        <title>wallabag — {{type}} feed</title>
-        <link>{{ url('unread') }}</link>
+        <link>{{ url(type) }}</link>
+        <link rel="self" href="{{ app.request.uri }}"/>
+        {% if entries.hasPreviousPage -%}
+            <link rel="previous" href="{{ url }}?page={{ entries.previousPage }}"/>
+        {% endif -%}
+        {% if entries.hasNextPage -%}
+            <link rel="next" href="{{ url }}?page={{ entries.nextPage }}"/>
+        {% endif -%}
+        <link rel="last" href="{{ url }}?page={{ entries.nbPages }}"/>
        <pubDate>{{ "now"|date('D, d M Y H:i:s') }}</pubDate>
        <generator>wallabag</generator>
        <description>wallabag {{type}} elements</description>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/howto.html.twig
index 67a10190..231f9bdf 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/howto.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/howto.html.twig
@@ -7,38 +7,186 @@
    <div class="row">
        <div class="col s12">
            <div class="card-panel settings">
-                <p>{{ 'howto.page_description'|trans }}</p>
                <div class="row">
+                    <div class="div_tabs col s12">
-                    <div class="col s12">
+                        <ul class="tabs">
-                        <a href="{{ path('new') }}">{{ 'howto.form.description'|trans }}</a>
+                            <li class="tab col s12 m6 l3"><a class="active" href="#set1">{{ 'howto.tab_menu.add_link'|trans }}</a></li>
-                    </div>
+                            <li class="tab col s12 m6 l3"><a href="#set2">{{ 'howto.tab_menu.shortcuts'|trans }}</a></li>
-                    <div class="col s12">
-                        <h5>{{ 'howto.top_menu.browser_addons'|trans }}</h5>
-                        <ul>
-                            <li><a href="{{ addonsUrl.firefox }}" target="_blank">{{ 'howto.browser_addons.firefox'|trans }}</a></li>
-                            <li><a href="{{ addonsUrl.chrome }}" target="_blank">{{ 'howto.browser_addons.chrome'|trans }}</a></li>
                        </ul>
                    </div>
-                    <div class="col s12">
+                    <div id="set1" class="col s12">
-                        <h5>{{ 'howto.top_menu.mobile_apps'|trans }}</h5>
+                        <p>{{ 'howto.page_description'|trans }}</p>
-                        <ul>
-                            <li>Android: <a href="{{ addonsUrl.f_droid }}" target="_blank">{{ 'howto.mobile_apps.android.via_f_droid'|trans }}</a> / <a href="{{ addonsUrl.google_play }}" target="_blank">{{ 'howto.mobile_apps.android.via_google_play'|trans }}</a></li>
+                        <div class="row">
-                            <li>iOS: <a href="{{ addonsUrl.ios }}" target="_blank">{{ 'howto.mobile_apps.ios'|trans }}</a></li>
-                            <li>Windows Phone: <a href="{{ addonsUrl.windows }}" target="_blank">{{ 'howto.mobile_apps.windows'|trans }}</a></li>
-                        </ul>
-                    </div>
-                    <div class="col s12">
+                            <div class="col s12">
-                        <h5>{{ 'howto.top_menu.bookmarklet'|trans }}</h5>
+                                <a href="{{ path('new') }}">{{ 'howto.form.description'|trans }}</a>
-                        {{ 'howto.bookmarklet.description'|trans }}
+                            </div>
-                        {% include '@WallabagCore/themes/common/Static/_bookmarklet.html.twig' %}
+                            <div class="col s12">
+                                <h5>{{ 'howto.top_menu.browser_addons'|trans }}</h5>
+                                <ul>
+                                    <li><a href="{{ addonsUrl.firefox }}" target="_blank">{{ 'howto.browser_addons.firefox'|trans }}</a></li>
+                                    <li><a href="{{ addonsUrl.chrome }}" target="_blank">{{ 'howto.browser_addons.chrome'|trans }}</a></li>
+                                    <li><a href="{{ addonsUrl.opera }}" target="_blank">{{ 'howto.browser_addons.opera'|trans }}</a></li>
+                                </ul>
+                            </div>
+                            <div class="col s12">
+                                <h5>{{ 'howto.top_menu.mobile_apps'|trans }}</h5>
+                                <ul>
+                                    <li>Android: <a href="{{ addonsUrl.f_droid }}" target="_blank">{{ 'howto.mobile_apps.android.via_f_droid'|trans }}</a> / <a href="{{ addonsUrl.google_play }}" target="_blank">{{ 'howto.mobile_apps.android.via_google_play'|trans }}</a></li>
+                                    <li>iOS: <a href="{{ addonsUrl.ios }}" target="_blank">{{ 'howto.mobile_apps.ios'|trans }}</a></li>
+                                    <li>Windows Phone: <a href="{{ addonsUrl.windows }}" target="_blank">{{ 'howto.mobile_apps.windows'|trans }}</a></li>
+                                </ul>
+                            </div>
+                            <div class="col s12">
+                                <h5>{{ 'howto.top_menu.bookmarklet'|trans }}</h5>
+                                {{ 'howto.bookmarklet.description'|trans }}
+                                {% include '@WallabagCore/themes/common/Static/_bookmarklet.html.twig' %}
+                            </div>
+                        </div>
                    </div>
-                </div>
+                    <div id="set2" class="col s12">
+                        <p>{{ 'howto.shortcuts.page_description'|trans }}</p>
+                        <h5>{{ 'howto.shortcuts.all_pages_title'|trans }}</h5>
+                        <table class="bordered">
+                            <thead>
+                                <tr>
+                                    <th>{{ 'howto.shortcuts.shortcut'|trans }}</th>
+                                    <th>{{ 'howto.shortcuts.action'|trans }}</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <tr>
+                                    <td><code>g u</code></td>
+                                    <td>{{ 'howto.shortcuts.go_unread'|trans }}</td>
+                                </tr>
+                                <tr>
+                                    <td><code>g s</code></td>
+                                    <td>{{ 'howto.shortcuts.go_starred'|trans }}</td>
+                                </tr>
+                                <tr>
+                                    <td><code>g r</code></td>
+                                    <td>{{ 'howto.shortcuts.go_archive'|trans }}</td>
+                                </tr>
+                                <tr>
+                                    <td><code>g a</code></td>
+                                    <td>{{ 'howto.shortcuts.go_all'|trans }}</td>
+                                </tr>
+                                <tr>
+                                    <td><code>g t</code></td>
+                                    <td>{{ 'howto.shortcuts.go_tags'|trans }}</td>
+                                </tr>
+                                <tr>
+                                    <td><code>g c</code></td>
+                                    <td>{{ 'howto.shortcuts.go_config'|trans }}</td>
+                                </tr>
+                                <tr>
+                                    <td><code>g i</code></td>
+                                    <td>{{ 'howto.shortcuts.go_import'|trans }}</td>
+                                </tr>
+                                <tr>
+                                    <td><code>g d</code></td>
+                                    <td>{{ 'howto.shortcuts.go_developers'|trans }}</td>
+                                </tr>
+                                <tr>
+                                    <td><code>?</code></td>
+                                    <td>{{ 'howto.shortcuts.go_howto'|trans }}</td>
+                                </tr>
+                                <tr>
+                                    <td><code>g l</code></td>
+                                    <td>{{ 'howto.shortcuts.go_logout'|trans }}</td>
+                                </tr>
+                            </tbody>
+                        </table>
+                        <h5>{{ 'howto.shortcuts.list_title'|trans }}</h5>
+                        <table class="bordered">
+                            <thead>
+                            <tr>
+                                <th>{{ 'howto.shortcuts.shortcut'|trans }}</th>
+                                <th>{{ 'howto.shortcuts.action'|trans }}</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            <tr>
+                                <td><code>s</code></td>
+                                <td>{{ 'howto.shortcuts.search'|trans }}</td>
+                            </tr>
+                            </tbody>
+                        </table>
+                        <h5>{{ 'howto.shortcuts.article_title'|trans }}</h5>
+                        <table class="bordered">
+                            <thead>
+                            <tr>
+                                <th>{{ 'howto.shortcuts.shortcut'|trans }}</th>
+                                <th>{{ 'howto.shortcuts.action'|trans }}</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            <tr>
+                                <td><code>o</code></td>
+                                <td>{{ 'howto.shortcuts.open_original'|trans }}</td>
+                            </tr>
+                            <tr>
+                                <td><code>f</code></td>
+                                <td>{{ 'howto.shortcuts.toggle_favorite'|trans }}</td>
+                            </tr>
+                            <tr>
+                                <td><code>a</code></td>
+                                <td>{{ 'howto.shortcuts.toggle_archive'|trans }}</td>
+                            </tr>
+                            <tr>
+                                <td><code>del</code></td>
+                                <td>{{ 'howto.shortcuts.delete'|trans }}</td>
+                            </tr>
+                            </tbody>
+                        </table>
+                        <h5>{{ 'howto.shortcuts.material_title'|trans }}</h5>
+                        <table class="bordered">
+                            <thead>
+                            <tr>
+                                <th>{{ 'howto.shortcuts.shortcut'|trans }}</th>
+                                <th>{{ 'howto.shortcuts.action'|trans }}</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            <tr>
+                                <td><code>g n</code></td>
+                                <td>{{ 'howto.shortcuts.add_link'|trans }}</td>
+                            </tr>
+                            <tr>
+                                <td><code>esc</code></td>
+                                <td>{{ 'howto.shortcuts.hide_form'|trans }}</td>
+                            </tr>
+                            <tr>
+                                <td><code>← →</code></td>
+                                <td>{{ 'howto.shortcuts.arrows_navigation'|trans }}</td>
+                            </tr>
+                            <tr>
+                                <td><code>enter</code></td>
+                                <td>{{ 'howto.shortcuts.open_article'|trans }}</td>
+                            </tr>
+                            </tbody>
+                        </table>
+                    </div>
            </div>
        </div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig
index c8a303a6..b7a48551 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig
@@ -15,7 +15,7 @@
                        <li class="col l4 m6 s12">
                            <div class="card teal darken-1">
                                <div class="card-content white-text">
-                                    <span class="card-title">{{ 'quickstart.configure.title'|trans }}</span>
+                                    <span class="card-title white-text">{{ 'quickstart.configure.title'|trans }}</span>
                                    <p>{{ 'quickstart.configure.description'|trans }}</p>
                                </div>
                                <div class="card-action">
@@ -31,7 +31,7 @@
                        <li class="col l4 m6 s12">
                            <div class="card green darken-1">
                                <div class="card-content white-text">
-                                    <span class="card-title">{{ 'quickstart.first_steps.title'|trans }}</span>
+                                    <span class="card-title white-text">{{ 'quickstart.first_steps.title'|trans }}</span>
                                    <p>{{ 'quickstart.first_steps.description'|trans }}</p>
                                </div>
                                <div class="card-action">
@@ -46,7 +46,7 @@
                        <li class="col l4 m6 s12">
                            <div class="card light-green darken-1">
                                <div class="card-content white-text">
-                                    <span class="card-title">{{ 'quickstart.migrate.title'|trans }}</span>
+                                    <span class="card-title white-text">{{ 'quickstart.migrate.title'|trans }}</span>
                                    <p>{{ 'quickstart.migrate.description'|trans }}</p>
                                </div>
                                <div class="card-action">
@@ -63,7 +63,7 @@
                        <li class="col l4 m6 s12">
                            <div class="card blue darken-1">
                                <div class="card-content white-text">
-                                    <span class="card-title">{{ 'quickstart.developer.title'|trans }}</span>
+                                    <span class="card-title white-text">{{ 'quickstart.developer.title'|trans }}</span>
                                    <p>{{ 'quickstart.developer.description'|trans }}</p>
                                </div>
                                <div class="card-action">
@@ -79,7 +79,7 @@
                        <li class="col l4 m6 s12">
                            <div class="card light-blue darken-1">
                                <div class="card-content white-text">
-                                    <span class="card-title">{{ 'quickstart.docs.title'|trans }}</span>
+                                    <span class="card-title white-text">{{ 'quickstart.docs.title'|trans }}</span>
                                    <p>{{ 'quickstart.docs.description'|trans }}</p>
                                </div>
                                <div class="card-action">
@@ -95,7 +95,7 @@
                        <li class="col l4 m6 s12">
                            <div class="card cyan darken-1">
                                <div class="card-content white-text">
-                                    <span class="card-title">{{ 'quickstart.support.title'|trans }}</span>
+                                    <span class="card-title white-text">{{ 'quickstart.support.title'|trans }}</span>
                                    <p>{{ 'quickstart.support.description'|trans }}</p>
                                </div>
                                <div class="card-action">
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 9f67217b..5d411fdd 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
@@ -66,6 +66,14 @@
                                </div>
                            </div>
+                        <div class="row">
+                            <div class="input-field col s12">
+                                {{ form_label(form.config.action_mark_as_read) }}
+                                {{ form_errors(form.config.action_mark_as_read) }}
+                                {{ form_widget(form.config.action_mark_as_read) }}
+                            </div>
+                        </div>
                            <div class="row">
                                <div class="input-field col s11">
                                    {{ form_label(form.config.language) }}
@@ -96,6 +104,18 @@
                                </div>
                            </div>
+                            <div class="row">
+                                <div class="input-field col s12">
+                                    <h5>{{ 'config.form_settings.android_configuration'|trans }}</h5>
+                                    <a href="wallabag://{{ app.user.username }}@{{ wallabag_url }}" class="waves-effect waves-light btn hide-on-large-only">Touch here to prefill your Android application</a>
+                                    <img id="androidQrcode" class="hide-on-med-and-down" />
+                                </div>
+                                <script>
+                                    const imgBase64 = jrQrcode.getQrBase64('wallabag://{{ app.user.username }}@{{ wallabag_url }}');
+                                    document.getElementById('androidQrcode').src = imgBase64;
+                                </script>
+                            </div>
                            {{ form_widget(form.config.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
                            {{ form_rest(form.config) }}
                        </form>
@@ -197,6 +217,34 @@
                            {{ form_widget(form.user.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
                            {{ form_widget(form.user._token) }}
                        </form>
+                        <br /><hr /><br />
+                        <div class="row">
+                            <h5>{{ 'config.reset.title'|trans }}</h5>
+                            <p>{{ 'config.reset.description'|trans }}</p>
+                            <a href="{{ path('config_reset', { type: 'annotations'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red">
+                                {{ 'config.reset.annotations'|trans }}
+                            </a>
+                            <a href="{{ path('config_reset', { type: 'tags'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red">
+                                {{ 'config.reset.tags'|trans }}
+                            </a>
+                            <a href="{{ path('config_reset', { type: 'entries'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red">
+                                {{ 'config.reset.entries'|trans }}
+                            </a>
+                        </div>
+                        {% if enabled_users > 1 %}
+                            <br /><hr /><br />
+                            <div class="row">
+                                <h5>{{ 'config.form_user.delete.title'|trans }}</h5>
+                                <p>{{ 'config.form_user.delete.description'|trans }}</p>
+                                <a href="{{ path('delete_account') }}" onclick="return confirm('{{ 'config.form_user.delete.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red delete-account">
+                                    {{ 'config.form_user.delete.button'|trans }}
+                                </a>
+                            </div>
+                        {% endif %}
                    </div>
                    <div id="set4" class="col s12">
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_actions.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_actions.html.twig
index 56442116..d278da1b 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_actions.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_actions.html.twig
@@ -1,8 +1,6 @@
 <div class="card-action">
    <span class="reading-time grey-text">
-        <i class="material-icons" title="{{ 'entry.list.reading_time'|trans }}">timer</i>
+        {% include "@WallabagCore/themes/material/Entry/_reading_time.html.twig" with {'entry': entry} only %}
-        {{ entry.readingTime / app.user.config.readingSpeed|round }} min&nbsp;
        <i class="material-icons hide-on-med-and-down" title="{{ 'entry.view.created_at'|trans }}">today</i>
        <span class="hide-on-med-and-down">&nbsp;{{ entry.createdAt|date('Y-m-d') }}</span>
    </span>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig
new file mode 100644
index 00000000..bb9b64ce
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig
@@ -0,0 +1,18 @@
+<div class="card">
+    <div class="card-stacked">
+        <div class="card-content">
+            <span class="card-title dot-ellipsis dot-resize-update">
+                <a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title | raw | striptags }}">
+                    {{ entry.title| striptags | truncate(120, true, '…') | raw }}
+                </a>
+            </span>
+            <ul class="tools-list right">
+                <li>
+                    <a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool grey-text" href="{{ path('archive_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isArchived == 0 %}done{% else %}redo{% endif %}</i></a>
+                    <a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool grey-text" href="{{ path('star_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isStarred == 0 %}star_border{% else %}star{% endif %}</i></a>
+                    <a title="{{ 'entry.list.delete'|trans }}" class="tool grey-text delete" href="{{ path('delete_entry', { 'id': entry.id }) }}"><i class="material-icons">delete</i></a>
+                </li>
+            </ul>
+        </div>
+    </div>
+</div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_reading_time.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_reading_time.html.twig
new file mode 100644
index 00000000..1a932a9f
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_reading_time.html.twig
@@ -0,0 +1,7 @@
+{% set readingTime = entry.readingTime / app.user.config.readingSpeed %}
+<i class="material-icons">timer</i>
+{% if readingTime > 0 %}
+    {{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }}
+{% else %}
+    {{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }}
+{% endif %}
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 c610c8d2..5fca53ae 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
@@ -1,17 +1,22 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
 {% block title %}
-    {% set currentTag = '' %}
+    {% set filter = '' %}
    {% if tag is defined %}
-        {% set currentTag = tag %}
+        {% set filter = tag %}
+    {% endif %}
+    {% if searchTerm is defined and searchTerm is not empty %}
+        {% set filter = searchTerm %}
    {% endif %}
-    {% include "@WallabagCore/themes/common/Entry/_title.html.twig" with {'currentTag': currentTag} %}
+    {% include "@WallabagCore/themes/common/Entry/_title.html.twig" with {'filter': filter} %}
 {% endblock %}
 {% block content %}
+    {% set listMode = app.user.config.listMode %}
    <div class="results clearfix">
        <div class="nb-results left">
            {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}
+            <a href="{{ path('switch_view_mode') }}"><i class="material-icons">{% if listMode == 0 %}view_list{% else %}view_module{% endif %}</i></a>
        </div>
        {% if entries.getNbPages > 1 %}
            {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
@@ -21,8 +26,10 @@
    <br />
    <ul class="row data">
        {% for entry in entries %}
-            <li id="entry-{{ entry.id|e }}" class="col l3 m6 s12">
+            <li id="entry-{{ entry.id|e }}" class="col {% if listMode == 0 %}l3 m6{% endif %} s12">
-                {% if entry.previewPicture is null %}
+                {% if listMode == 1 %}
+                    {% include "@WallabagCore/themes/material/Entry/_card_list.html.twig" with {'entry': entry} only %}
+                {% elseif entry.previewPicture is null %}
                    {% include "@WallabagCore/themes/material/Entry/_card_no_preview.html.twig" with {'entry': entry} only %}
                {% elseif not entry.previewPicture is null and entry.mimetype starts with 'image/' %}
                    {% include "@WallabagCore/themes/material/Entry/_card_full_image.html.twig" with {'entry': entry} only %}
@@ -104,6 +111,14 @@
                </div>
                <div class="col s12">
+                    {{ form_label(form.httpStatus) }}
+                </div>
+                <div class="input-field col s12">
+                    {{ form_widget(form.httpStatus) }}
+                </div>
+                <div class="col s12">
                    {{ form_label(form.readingTime) }}
                </div>
                <div class="input-field col s6">
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 b445f7d5..15428b92 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
@@ -46,14 +46,14 @@
        </li>
        <li class="bold border-bottom hide-on-med-and-down">
-            <a class="waves-effect collapsible-header" href="{{ entry.url|e }}">
+            <a class="waves-effect collapsible-header original" href="{{ entry.url|e }}" target="_blank">
                <i class="material-icons small">link</i>
                <span>{{ 'entry.view.left_menu.view_original_article'|trans }}</span>
            </a>
            <div class="collapsible-body"></div>
        </li>
-        <li class="bold hide-on-med-and-down">
+        <li class="bold">
            <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.re_fetch_content'|trans }}" href="{{ path('reload_entry', { 'id': entry.id }) }}" id="reload">
                <i class="material-icons small">autorenew</i>
                <span>{{ 'entry.view.left_menu.re_fetch_content'|trans }}</span>
@@ -67,7 +67,7 @@
        {% endif %}
        <li class="bold hide-on-med-and-down">
-            <a class="waves-effect collapsible-header" title="{{ markAsReadLabel|trans }}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead">
+            <a class="waves-effect collapsible-header markasread" title="{{ markAsReadLabel|trans }}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead">
                <i class="material-icons small">{% if entry.isArchived == 0 %}done{% else %}redo{% endif %}</i>
                <span>{{ markAsReadLabel|trans }}</span>
            </a>
@@ -75,21 +75,21 @@
        </li>
        <li class="bold hide-on-med-and-down">
-            <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav">
+            <a class="waves-effect collapsible-header favorite" title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav">
                <i class="material-icons spall">{% if entry.isStarred == 0 %}star_outline{% else %}star{% endif %}</i>
                <span>{{ 'entry.view.left_menu.set_as_starred'|trans }}</span>
            </a>
            <div class="collapsible-body"></div>
        </li>
-        <li class="bold border-bottom hide-on-med-and-down">
+        <li class="bold border-bottom">
-            <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.delete'|trans }}" href="{{ path('delete_entry', { 'id': entry.id }) }}">
+            <a class="waves-effect collapsible-header delete" title="{{ 'entry.view.left_menu.delete'|trans }}" href="{{ path('delete_entry', { 'id': entry.id }) }}">
                <i class="material-icons small">delete</i>
                <span>{{ 'entry.view.left_menu.delete'|trans }}</span>
            </a>
            <div class="collapsible-body"></div>
        </li>
-        <li class="bold border-bottom hide-on-med-and-down">
+        <li class="bold border-bottom">
            <a class="waves-effect collapsible-header" id="nav-btn-add-tag">
                <i class="material-icons small">label_outline</i>
                <span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span>
@@ -125,7 +125,7 @@
                    {% endif %}
                    {% if craue_setting('share_shaarli') %}
                        <li>
-                            <a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank">
+                        <a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}&amp;tags={{ entry.tags|join(',')|url_encode }}" target="_blank">
                                <i class="tool icon-image icon-image--shaarli" title="shaarli"></i>
                                <span>shaarli</span>
                            </a>
@@ -139,6 +139,14 @@
                            </a>
                        </li>
                    {% endif %}
+                    {% if craue_setting('share_unmark') %}
+                        <li>
+                            <a href="{{ craue_setting('unmark_url') }}/mark/add?url={{ entry.url|url_encode }}&amp;title={{entry.title|url_encode}}&amp;v=6" target="_blank">
+                                <i class="tool icon-image icon-image--unmark" title="unmark"></i>
+                                <span>unmark.it</span>
+                            </a>
+                        </li>
+                    {% endif %}
                    {% if craue_setting('carrot') %}
                        <li>
                            <a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" target="_blank" title="carrot">
@@ -186,14 +194,6 @@
            </div>
        </li>
-        <li class="bold hide-on-large-only">
-            <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.delete'|trans }}" href="{{ path('delete_entry', { 'id': entry.id }) }}">
-                <i class="material-icons small">delete</i>
-                <span>{{ 'entry.view.left_menu.delete'|trans }}</span>
-            </a>
-            <div class="collapsible-body"></div>
-        </li>
        <li class="bold">
            <a class="waves-effect collapsible-header" href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&amp;body={{ entry.url|url_encode }}" title="{{ 'entry.view.left_menu.problem.description'|trans }}">
                <i class="material-icons small">error</i>
@@ -214,13 +214,7 @@
        <aside>
            <ul class="tools">
                <li>
-                    {% set readingTime = entry.readingTime / app.user.config.readingSpeed %}
+                    {% include "@WallabagCore/themes/material/Entry/_reading_time.html.twig" with {'entry': entry} only %}
-                    <i class="material-icons">timer</i>
-                    {% if readingTime > 0 %}
-                        {{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }}
-                    {% else %}
-                        {{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }}
-                    {% endif %}
                </li>
                <li>
                    <i class="material-icons" title="{{ 'entry.view.created_at'|trans }}">today</i>
@@ -257,6 +251,17 @@
        <article>
            {{ entry.content | raw }}
        </article>
+        <div class="fixed-action-btn horizontal click-to-toggle hide-on-large-only">
+            <a class="btn-floating btn-large">
+              <i class="material-icons">menu</i>
+            </a>
+            <ul>
+              <li><a class="btn-floating" href="{{ path('archive_entry', { 'id': entry.id }) }}"><i class="material-icons">done</i></a></li>
+              <li><a class="btn-floating" href="{{ path('star_entry', { 'id': entry.id }) }}"><i class="material-icons">star_outline</i></a></li>
+              <li><a class="btn-floating" href="{{ path('delete_entry', { 'id': entry.id }) }}"><i class="material-icons">delete</i></a></li>
+            </ul>
+        </div>
    </div>
 <script id="annotationroutes" type="application/json">
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/search_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/search_form.html.twig
new file mode 100644
index 00000000..f25de94d
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/search_form.html.twig
@@ -0,0 +1,15 @@
+<form name="search" method="GET" action="{{ path('search')}}">
+    {% if form_errors(form) %}
+        <span class="black-text">{{ form_errors(form) }}</span>
+    {% endif %}
+    {% if form_errors(form.term) %}
+        <span class="black-text">{{ form_errors(form.term) }}</span>
+    {% endif %}
+    <input type="hidden" name="currentRoute" value="{{ currentRoute }}" />
+    {{ form_widget(form.term, { 'attr': {'autocomplete': 'off', 'placeholder': 'entry.search.placeholder'} }) }}
+    {{ form_rest(form) }}
+</form>
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 6e552560..b702c4b6 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
@@ -9,5 +9,6 @@
    {{ form_widget(form.label, { 'attr': {'autocomplete': 'off'} }) }}
-    {{ form_rest(form) }}
+    {{ form_widget(form.add, {'attr': {'class': 'btn waves-effect waves-light hide-on-large-only'}}) }}
+    {{ form_widget(form._token) }}
 </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 f1ef01df..d9fb5d73 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -19,8 +19,6 @@
            Materialize.toast('{{ flashMessage|trans }}', 4000);
        </script>
    {% endfor %}
-    {{ render(controller("WallabagImportBundle:Import:checkQueue")) }}
 {% endblock %}
 {% block menu %}
@@ -82,37 +80,33 @@
                {% block title %}
                {% endblock %}
            </div>
-            <div class="input-field nav-panel-buttom">
+            <ul class="input-field nav-panel-buttom">
-                <ul>
+                <li class="bold">
-                    <li class="bold">
+                    <a class="waves-effect tooltipped" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.add_new_entry'|trans }}" href="{{ path('new') }}" id="nav-btn-add">
-                        <a class="waves-effect tooltipped" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.add_new_entry'|trans }}" href="{{ path('new') }}" id="nav-btn-add">
+                        <i class="material-icons">add</i>
-                            <i class="material-icons">add</i>
+                    </a>
-                        </a>
+                </li>
-                    </li>
+                <li>
-                    <!--<li>
+                    <a class="waves-effect tooltipped" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.search'|trans }}" href="javascript: void(null);" id="nav-btn-search">
-                        <a title="{{ 'menu.top.search'|trans }}" class="waves-effect" href="javascript: void(null);" id="nav-btn-search">
+                        <i class="material-icons">search</i>
-                            <i class="material-icons">search</i>
+                    </a>
-                        </a>
+                </li>
-                    </li>-->
+                <li id="button_filters">
-                    <li id="button_filters">
+                    <a class="nav-panel-menu button-collapse-right tooltipped js-filters-action" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters">
-                        <a class="nav-panel-menu button-collapse-right tooltipped" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters">
+                        <i class="material-icons">filter_list</i>
-                            <i class="material-icons">filter_list</i>
+                    </a>
-                        </a>
+                </li>
-                    </li>
+                <li id="button_export">
-                    <li id="button_export">
+                    <a class="nav-panel-menu button-collapse-right tooltipped js-export-action" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.export'|trans }}" href="#" data-activates="export">
-                        <a class="nav-panel-menu button-collapse-right tooltipped" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.export'|trans }}" href="#" data-activates="export">
+                        <i class="material-icons">file_download</i>
-                            <i class="material-icons">file_download</i>
+                    </a>
-                        </a>
+                </li>
-                    </li>
+            </ul>
-                </ul>
+            <div class="input-field nav-panel-search" style="display: none">
+                {{ render(controller("WallabagCoreBundle:Entry:searchForm", {'currentRoute': app.request.attributes.get('_route')})) }}
+                <label for="search" class="active"><i class="material-icons search">search</i></label>
+                <i class="material-icons close">clear</i>
            </div>
-            <form method="get" action="index.php">
-                <div class="input-field nav-panel-search" style="display: none">
-                    <input name="search" id="searchfield" type="search" required placeholder="{{ 'menu.search_form.input_label'|trans }}">
-                    <label for="search"><i class="material-icons search">search</i></label>
-                    <i class="material-icons close">clear</i>
-                </div>
-            </form>
            <div class="input-field nav-panel-add" style="display: none">
                {{ render(controller("WallabagCoreBundle:Entry:addEntryForm")) }}
                <label for="add" class="active"><i class="material-icons add">add</i></label>