12 files changed, 890 insertions, 101 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index a1bee173..34d4021c 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -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,6 +430,10 @@ 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'
@@ -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..eb3644f6 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -70,7 +70,12 @@ 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
+        android_configuration: Konfiguriere deine 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-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."
+        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."
        old_password_label: 'Altes Kennwort'
@@ -145,15 +162,16 @@ entry:
        archived: 'Archivierte Einträge'
        filtered: 'Gefilterte Einträge'
        filtered_tags: 'Gefiltert nach Tags:'
+        # filtered_search: 'Filtered by search:'
        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: 'What are you looking for?'
    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: "Add a link"
+        # shortcuts: "Use shortcuts"
    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: 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: '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: 'Add'
+        # placeholder: 'You can add several tags, separated by a comma.'
 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,6 +430,10 @@ 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'
@@ -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..2626523a 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -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,6 +430,10 @@ 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'
@@ -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..d45f8bf5 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -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,6 +430,10 @@ 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'
@@ -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..36a7cd80 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -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,6 +430,10 @@ 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'
@@ -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..6dd449ba 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -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"
@@ -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,6 +430,10 @@ 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"
@@ -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..4298d1f7 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -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,6 +430,10 @@ 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'
@@ -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..85310cd7 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: 'Desvolopaire'
        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,7 +70,12 @@ 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: '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: Clau d'autentificacion Pocket per importar las donadas
+        android_configuration: Configuratz vòstra aplicacion Android
        # 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: '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."
+        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."
        old_password_label: 'Senhal actual'
@@ -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:
@@ -145,15 +162,16 @@ entry:
        archived: 'Articles legits'
        filtered: 'Articles filtrats'
        filtered_tags: 'Filtats per etiquetas:'
+        # filtered_search: 'Filtered by search:'
        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: 'HTTP status'
        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: 'What are you looking for?'
    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: "Add a link"
+        # shortcuts: "Use shortcuts"
    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: 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: '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 '
    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: 'Add'
+        # placeholder: 'You can add several tags, separated by a comma.'
 import:
    page_title: 'Importar'
@@ -362,6 +417,7 @@ import:
        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 : "
+        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."
@@ -374,6 +430,10 @@ import:
        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"
+    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: 'Desvolopaire'
@@ -397,7 +457,7 @@ developer:
        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: 'Desvolopaire > 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,7 +465,7 @@ 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: 'Desvolopaire > 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'
@@ -413,7 +473,7 @@ developer:
        back: 'Retour'
        read_howto: 'Legir "cossí crear ma primièra aplicacion"'
    howto:
-        page_title: 'Desvolopador > Cossí crear ma primièra aplicacion'
+        page_title: 'Desvolopaire > 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,12 +538,12 @@ 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"
@@ -496,3 +557,8 @@ flashes:
        notice:
            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..35120edc 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -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,6 +430,10 @@ 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'
@@ -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..c4ace37c 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
@@ -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,6 +430,10 @@ 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'
@@ -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..928e5c27 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -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,6 +430,10 @@ 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'
@@ -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..d6cea974 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -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,6 +430,10 @@ 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'
@@ -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'