49 files changed, 1186 insertions, 282 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml
index 51d6ab47..e09b0f18 100644
--- a/src/Wallabag/CoreBundle/Resources/config/services.yml
+++ b/src/Wallabag/CoreBundle/Resources/config/services.yml
@@ -41,6 +41,7 @@ services:
        arguments:
            -
                error_message: '%wallabag_core.fetching_error_message%'
+                error_message_title: '%wallabag_core.fetching_error_message_title%'
            - "@wallabag_core.guzzle.http_client"
            - "@wallabag_core.graby.config_builder"
        calls:
@@ -62,7 +63,11 @@ services:
        class: Wallabag\CoreBundle\GuzzleSiteAuthenticator\GrabySiteConfigBuilder
        arguments:
            - "@wallabag_core.graby.config_builder"
-            - "%sites_credentials%"
+            - "@security.token_storage"
+            - "@wallabag_core.site_credential_repository"
+            - '@logger'
+        tags:
+            - { name: monolog.logger, channel: graby }
    # service alias override
    bd_guzzle_site_authenticator.site_config_builder:
@@ -71,10 +76,11 @@ services:
    wallabag_core.guzzle.http_client_factory:
        class: Wallabag\CoreBundle\Helper\HttpClientFactory
        arguments:
-            - "@bd_guzzle_site_authenticator.authenticator_subscriber"
            - "@wallabag_core.guzzle.cookie_jar"
            - '@=service(''craue_config'').get(''restricted_access'')'
            - '@logger'
+        calls:
+            - ["addSubscriber", ["@bd_guzzle_site_authenticator.authenticator_subscriber"]]
    wallabag_core.guzzle.cookie_jar:
        class: GuzzleHttp\Cookie\FileCookieJar
@@ -85,16 +91,22 @@ services:
        arguments:
            - "@wallabag_core.graby"
            - "@wallabag_core.rule_based_tagger"
-            - "@wallabag_core.tag_repository"
+            - "@validator"
            - "@logger"
            - '%wallabag_core.fetching_error_message%'
+    wallabag_core.tags_assigner:
+        class: Wallabag\CoreBundle\Helper\TagsAssigner
+        arguments:
+            - "@wallabag_core.tag_repository"
    wallabag_core.rule_based_tagger:
        class: Wallabag\CoreBundle\Helper\RuleBasedTagger
        arguments:
            - "@rulerz"
            - "@wallabag_core.tag_repository"
            - "@wallabag_core.entry_repository"
+            - "@logger"
    # repository as a service
    wallabag_core.entry_repository:
@@ -109,10 +121,18 @@ services:
        arguments:
            - WallabagCoreBundle:Tag
+    wallabag_core.site_credential_repository:
+        class: Wallabag\CoreBundle\Repository\SiteCredentialRepository
+        factory: [ "@doctrine.orm.default_entity_manager", getRepository ]
+        arguments:
+            - WallabagCoreBundle:SiteCredential
+        calls:
+            - [ setCrypto, [ "@wallabag_core.helper.crypto_proxy" ] ]
    wallabag_core.helper.entries_export:
        class: Wallabag\CoreBundle\Helper\EntriesExport
        arguments:
-            - '@=service(''craue_config'').get(''wallabag_url'')'
+            - '%domain_name%'
            - src/Wallabag/CoreBundle/Resources/public/themes/_global/img/appicon/apple-touch-icon-152.png
    wallabag.operator.array.matches:
@@ -125,6 +145,16 @@ services:
        tags:
            - { name: rulerz.operator, target: doctrine, operator: matches, inline: true }
+    wallabag.operator.array.notmatches:
+        class: Wallabag\CoreBundle\Operator\PHP\NotMatches
+        tags:
+            - { name: rulerz.operator, target: native, operator: notmatches }
+    wallabag.operator.doctrine.notmatches:
+        class: Wallabag\CoreBundle\Operator\Doctrine\NotMatches
+        tags:
+            - { name: rulerz.operator, target: doctrine, operator: notmatches, inline: true }
    wallabag_core.helper.redirect:
        class: Wallabag\CoreBundle\Helper\Redirect
        arguments:
@@ -175,8 +205,14 @@ services:
        arguments:
            - "@wallabag_core.entry.download_images.client"
            - "%kernel.root_dir%/../web/assets/images"
-            - '@=service(''craue_config'').get(''wallabag_url'')'
+            - '%domain_name%'
            - "@logger"
    wallabag_core.entry.download_images.client:
        class: GuzzleHttp\Client
+    wallabag_core.helper.crypto_proxy:
+        class: Wallabag\CoreBundle\Helper\CryptoProxy
+        arguments:
+            - "%wallabag_core.site_credentials.encryption_key_path%"
+            - "@logger"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index a52b579a..5229ac73 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -32,6 +32,7 @@ menu:
        # save_link: 'Save a link'
        back_to_unread: 'Tilbage til de ulæste artikler'
        # users_management: 'Users management'
+        # site_credentials: 'Site credentials'
    top:
        add_new_entry: 'Tilføj ny artikel'
        search: 'Søg'
@@ -76,6 +77,7 @@ config:
            # 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
+        # android_instruction: "Touch here to prefill 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."
@@ -89,9 +91,10 @@ config:
        token_reset: 'Nulstil token'
        rss_links: 'RSS-Links'
        rss_link:
-            unread: 'ulæst'
+            unread: 'Ulæst'
-            starred: 'favoritter'
+            starred: 'Favoritter'
-            archive: 'arkiv'
+            archive: 'Arkiv'
+            # all: 'All'
        # rss_limit: 'Number of items in the feed'
    form_user:
        # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code on every new untrusted connexion"
@@ -110,6 +113,7 @@ config:
        # annotations: Remove ALL annotations
        # tags: Remove ALL tags
        # entries: Remove ALL entries
+        # archived: Remove ALL archived 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."
@@ -154,6 +158,7 @@ config:
        #         or: 'One rule OR another'
        #         and: 'One rule AND another'
        #         matches: 'Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>'
+        #         notmatches: 'Tests that a <i>subject</i> is not matches a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>'
 entry:
    page_titles:
@@ -185,6 +190,8 @@ entry:
        unread_label: 'Ulæst'
        preview_picture_label: 'Har et vist billede'
        preview_picture_help: 'Forhåndsvis billede'
+        # is_public_label: 'Has a public link'
+        # is_public_help: 'Public link'
        language_label: 'Sprog'
        # http_status_label: 'HTTP status'
        reading_time:
@@ -223,6 +230,8 @@ entry:
        original_article: 'original'
        # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations'
        created_at: 'Oprettelsesdato'
+        # published_at: 'Publication date'
+        # published_by: 'Published by'
    new:
        page_title: 'Gem ny artikel'
        placeholder: 'http://website.com'
@@ -234,10 +243,12 @@ entry:
        # page_title: 'Edit an entry'
        # title_label: 'Title'
        url_label: 'Url'
-        # is_public_label: 'Public'
        save_label: 'Gem'
    public:
-        # shared_by_wallabag: "This article has been shared by <a href=%wallabag_instance%'>wallabag</a>"
+        # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>"
+    confirm:
+        # delete: "Are you sure you want to remove that article?"
+        # delete_tag: "Are you sure you want to remove that tag from that article?"
 about:
    page_title: 'Om'
@@ -510,6 +521,28 @@ user:
        # delete: Delete
        # delete_confirm: Are you sure?
        # back_to_list: Back to list
+    search:
+        # placeholder: Filter by username or email
+site_credential:
+    # page_title: Site credentials management
+    # new_site_credential: Create a credential
+    # edit_site_credential: Edit an existing credential
+    # description: "Here you can manage all credentials for sites which required them (create, edit and delete), like a paywall, an authentication, etc."
+    # list:
+    #     actions: Actions
+    #     edit_action: Edit
+    #     yes: Yes
+    #     no: No
+    #     create_new_one: Create a new credential
+    # form:
+    #     username_label: 'Username'
+    #     host_label: 'Host'
+    #     password_label: 'Password'
+    #     save: Save
+    #     delete: Delete
+    #     delete_confirm: Are you sure?
+    #     back_to_list: Back to list
 error:
    # page_title: An error occurred
@@ -528,6 +561,7 @@ flashes:
            # annotations_reset: Annotations reset
            # tags_reset: Tags reset
            # entries_reset: Entries reset
+            # archived_reset: Archived entries deleted
    entry:
        notice:
            # entry_already_saved: 'Entry already saved on %date%'
@@ -562,3 +596,8 @@ flashes:
            # added: 'User "%username%" added'
            # updated: 'User "%username%" updated'
            # deleted: 'User "%username%" deleted'
+    site_credential:
+        notice:
+            # added: 'Site credential for "%host%" added'
+            # updated: 'Site credential for "%host%" updated'
+            # deleted: 'Site credential for "%host%" deleted'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index 35cb4b5b..996f173a 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -32,6 +32,7 @@ menu:
        save_link: 'Link speichern'
        back_to_unread: 'Zurück zu ungelesenen Artikeln'
        users_management: 'Benutzerverwaltung'
+        # site_credentials: 'Site credentials'
    top:
        add_new_entry: 'Neuen Artikel hinzufügen'
        search: 'Suche'
@@ -76,6 +77,7 @@ config:
            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
+        # android_instruction: "Touch here to prefill your Android application"
        help_theme: "wallabag ist anpassbar. Du kannst dein bevorzugtes Theme hier auswählen."
        help_items_per_page: "Du kannst die Nummer von Artikeln pro Seite anpassen."
        help_reading_speed: "wallabag berechnet eine Lesezeit pro Artikel. Hier kannst du definieren, ob du ein schneller oder langsamer Leser bist. wallabag wird die Lesezeiten danach neu berechnen."
@@ -92,6 +94,7 @@ config:
            unread: 'Ungelesene'
            starred: 'Favoriten'
            archive: 'Archivierte'
+            # all: 'All'
        rss_limit: 'Anzahl der Einträge pro Feed'
    form_user:
        two_factor_description: "Wenn du die Zwei-Faktor-Authentifizierung aktivierst, erhältst du eine E-Mail mit einem Code bei jeder nicht vertrauenswürdigen Verbindung"
@@ -110,6 +113,7 @@ config:
        annotations: Entferne ALLE Annotationen
        tags: Entferne ALLE Tags
        entries: Entferne ALLE Einträge
+        archived: Entferne ALLE archivierten Einträge
        confirm: Bist du wirklich sicher? (DIES KANN NICHT RÜCKGÄNGIG GEMACHT WERDEN)
    form_password:
        description: "Hier kannst du dein Kennwort ändern. Dieses sollte mindestens acht Zeichen enthalten."
@@ -154,6 +158,7 @@ config:
                or: 'Eine Regel ODER die andere'
                and: 'Eine Regel UND eine andere'
                matches: 'Testet, ob eine <i>Variable</i> auf eine <i>Suche</i> zutrifft (Groß- und Kleinschreibung wird nicht berücksichtigt).<br />Beispiel: <code>title matches "Fußball"</code>'
+                notmatches: 'Testet, ob ein <i>Titel</i> nicht auf eine <i>Suche</i> zutrifft (Groß- und Kleinschreibung wird nicht berücksichtigt).<br />Beispiel: <code>title notmatches "Fußball"</code>'
 entry:
    page_titles:
@@ -185,6 +190,8 @@ entry:
        unread_label: 'Ungelesene'
        preview_picture_label: 'Vorschaubild vorhanden'
        preview_picture_help: 'Vorschaubild'
+        # is_public_label: 'Has a public link'
+        # is_public_help: 'Public link'
        language_label: 'Sprache'
        http_status_label: 'HTTP-Status'
        reading_time:
@@ -223,6 +230,8 @@ entry:
        original_article: 'original'
        annotations_on_the_entry: '{0} Keine Anmerkungen|{1} Eine Anmerkung|]1,Inf[ %count% Anmerkungen'
        created_at: 'Erstellungsdatum'
+        published_at: 'Erscheinungsdatum'
+        published_by: 'Veröffentlicht von'
    new:
        page_title: 'Neuen Artikel speichern'
        placeholder: 'https://website.de'
@@ -234,10 +243,12 @@ entry:
        page_title: 'Eintrag bearbeiten'
        title_label: 'Titel'
        url_label: 'URL'
-        is_public_label: 'Öffentlich'
        save_label: 'Speichern'
    public:
-        shared_by_wallabag: "Dieser Artikel wurde mittels <a href='%wallabag_instance%'>wallabag</a> geteilt"
+        shared_by_wallabag: "Dieser Artikel wurde von %username% mittels <a href='%wallabag_instance%'>wallabag</a> geteilt"
+    confirm:
+        delete: "Bist du sicher, dass du diesen Artikel löschen möchtest?"
+        delete_tag: "Bist du sicher, dass du diesen Tag vom Artikel entfernen möchtest?"
 about:
    page_title: 'Über'
@@ -510,6 +521,28 @@ user:
        delete: Löschen
        delete_confirm: Bist du sicher?
        back_to_list: Zurück zur Liste
+    search:
+        placeholder: Filtere nach Benutzer oder E-Mail-Adresse
+site_credential:
+    # page_title: Site credentials management
+    # new_site_credential: Create a credential
+    # edit_site_credential: Edit an existing credential
+    # description: "Here you can manage all credentials for sites which required them (create, edit and delete), like a paywall, an authentication, etc."
+    list:
+        actions: Aktionen
+        edit_action: Bearbeiten
+        yes: Ja
+        no: Nein
+        # create_new_one: Create a new credential
+    form:
+        # username_label: 'Username'
+        # host_label: 'Host'
+        # password_label: 'Password'
+        save: Speichern
+        delete: Löschen
+        delete_confirm: Bist du sicher?
+        back_to_list: Zurück zur Liste
 error:
    page_title: Ein Fehler ist aufgetreten
@@ -528,6 +561,7 @@ flashes:
            annotations_reset: Anmerkungen zurücksetzen
            tags_reset: Tags zurücksetzen
            entries_reset: Einträge zurücksetzen
+            archived_reset: Archiverte Einträge zurücksetzen
    entry:
        notice:
            entry_already_saved: 'Eintrag bereits am %date% gespeichert'
@@ -562,3 +596,8 @@ flashes:
            added: 'Benutzer "%username%" hinzugefügt'
            updated: 'Benutzer "%username%" aktualisiert'
            deleted: 'Benutzer "%username%" gelöscht'
+    site_credential:
+        notice:
+            # added: 'Site credential for "%host%" added'
+            # updated: 'Site credential for "%host%" updated'
+            # deleted: 'Site credential for "%host%" deleted'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index c72e5958..aa1cd1a9 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -32,6 +32,7 @@ menu:
        save_link: 'Save a link'
        back_to_unread: 'Back to unread articles'
        users_management: 'Users management'
+        site_credentials: 'Site credentials'
    top:
        add_new_entry: 'Add a new entry'
        search: 'Search'
@@ -76,6 +77,7 @@ config:
            redirect_current_page: 'To the current page'
        pocket_consumer_key_label: Consumer key for Pocket to import contents
        android_configuration: Configure your Android application
+        android_instruction: "Touch here to prefill 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."
@@ -89,9 +91,10 @@ config:
        token_reset: 'Regenerate your token'
        rss_links: 'RSS links'
        rss_link:
-            unread: 'unread'
+            unread: 'Unread'
-            starred: 'starred'
+            starred: 'Starred'
-            archive: 'archived'
+            archive: 'Archived'
+            all: 'All'
        rss_limit: 'Number of items in the feed'
    form_user:
        two_factor_description: "Enabling two factor authentication means you'll receive an email with a code on every new untrusted connection."
@@ -110,6 +113,7 @@ config:
        annotations: Remove ALL annotations
        tags: Remove ALL tags
        entries: Remove ALL entries
+        archived: Remove ALL archived 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."
@@ -154,6 +158,7 @@ config:
                or: 'One rule OR another'
                and: 'One rule AND another'
                matches: 'Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>'
+                notmatches: 'Tests that a <i>subject</i> is not matches a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>'
 entry:
    page_titles:
@@ -185,6 +190,8 @@ entry:
        unread_label: 'Unread'
        preview_picture_label: 'Has a preview picture'
        preview_picture_help: 'Preview picture'
+        is_public_label: 'Has a public link'
+        is_public_help: 'Public link'
        language_label: 'Language'
        http_status_label: 'HTTP status'
        reading_time:
@@ -223,6 +230,8 @@ entry:
        original_article: 'original'
        annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations'
        created_at: 'Creation date'
+        published_at: 'Publication date'
+        published_by: 'Published by'
    new:
        page_title: 'Save new entry'
        placeholder: 'http://website.com'
@@ -234,10 +243,12 @@ entry:
        page_title: 'Edit an entry'
        title_label: 'Title'
        url_label: 'Url'
-        is_public_label: 'Public'
        save_label: 'Save'
    public:
-        shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
+        shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>"
+    confirm:
+        delete: "Are you sure you want to remove that article?"
+        delete_tag: "Are you sure you want to remove that tag from that article?"
 about:
    page_title: 'About'
@@ -510,6 +521,28 @@ user:
        delete: Delete
        delete_confirm: Are you sure?
        back_to_list: Back to list
+    search:
+        placeholder: Filter by username or email
+site_credential:
+    page_title: Site credentials management
+    new_site_credential: Create a credential
+    edit_site_credential: Edit an existing credential
+    description: "Here you can manage all credentials for sites which required them (create, edit and delete), like a paywall, an authentication, etc."
+    list:
+        actions: Actions
+        edit_action: Edit
+        yes: Yes
+        no: No
+        create_new_one: Create a new credential
+    form:
+        username_label: 'Username'
+        host_label: 'Host'
+        password_label: 'Password'
+        save: Save
+        delete: Delete
+        delete_confirm: Are you sure?
+        back_to_list: Back to list
 error:
    page_title: An error occurred
@@ -528,6 +561,7 @@ flashes:
            annotations_reset: Annotations reset
            tags_reset: Tags reset
            entries_reset: Entries reset
+            archived_reset: Archived entries deleted
    entry:
        notice:
            entry_already_saved: 'Entry already saved on %date%'
@@ -562,3 +596,8 @@ flashes:
            added: 'User "%username%" added'
            updated: 'User "%username%" updated'
            deleted: 'User "%username%" deleted'
+    site_credential:
+        notice:
+            added: 'Site credential for "%host%" added'
+            updated: 'Site credential for "%host%" updated'
+            deleted: 'Site credential for "%host%" deleted'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index 2f769b7e..96998f53 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -32,6 +32,7 @@ menu:
        save_link: 'Guardar un enlace'
        back_to_unread: 'Volver a los artículos sin leer'
        users_management: 'Configuración de usuarios'
+        # site_credentials: 'Site credentials'
    top:
        add_new_entry: 'Añadir un nuevo artículo'
        search: 'Buscar'
@@ -76,6 +77,7 @@ config:
            redirect_current_page: 'A la página actual'
        pocket_consumer_key_label: Clave de consumidor para importar contenidos de Pocket
        android_configuration: Configura tu aplicación Android
+        # android_instruction: "Touch here to prefill your Android application"
        help_theme: "wallabag es personalizable. Puedes elegir tu tema preferido aquí."
        help_items_per_page: "Puedes cambiar el número de artículos mostrados en cada página."
        help_reading_speed: "wallabag calcula un tiempo de lectura para cada artículo. Puedes definir aquí, gracias a esta lista, si eres un lector rápido o lento. wallabag recalculará el tiempo de lectura para cada artículo."
@@ -92,6 +94,7 @@ config:
            unread: 'sin leer'
            starred: 'favoritos'
            archive: 'archivados'
+            # all: 'All'
        rss_limit: 'Límite de artículos en feed RSS'
    form_user:
        two_factor_description: "Con la autenticación en dos pasos recibirá código por e-mail en cada nueva conexión que no sea de confianza."
@@ -110,6 +113,7 @@ config:
        annotations: Eliminar TODAS las anotaciones
        tags: Eliminar TODAS las etiquetas
        entries: Eliminar TODOS los artículos
+        # archived: Remove ALL archived entries
        confirm: ¿Estás completamente seguro? (NO SE PUEDE DESHACER)
    form_password:
        description: "Puedes cambiar la contraseña aquí. Tu nueva contraseña debe tener al menos 8 caracteres."
@@ -154,6 +158,7 @@ config:
                or: 'Una regla U otra'
                and: 'Una regla Y la otra'
                matches: 'Prueba si un <i>sujeto</i> corresponde a una <i>búsqueda</i> (insensible a mayusculas).<br />Ejemplo : <code>title matches "fútbol"</code>'
+                # notmatches: 'Tests that a <i>subject</i> is not matches a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>'
 entry:
    page_titles:
@@ -185,6 +190,8 @@ entry:
        unread_label: 'Sin leer'
        preview_picture_label: 'Tiene imagen de previsualización'
        preview_picture_help: 'Imagen de previsualización'
+        # is_public_label: 'Has a public link'
+        # is_public_help: 'Public link'
        language_label: 'Idioma'
        http_status_label: 'Código de estado HTTP'
        reading_time:
@@ -223,6 +230,8 @@ entry:
        original_article: 'original'
        annotations_on_the_entry: '{0} Sin anotaciones|{1} Una anotación|]1,Inf[ %count% anotaciones'
        created_at: 'Fecha de creación'
+        # published_at: 'Publication date'
+        # published_by: 'Published by'
    new:
        page_title: 'Guardar un nuevo artículo'
        placeholder: 'http://sitioweb.com'
@@ -234,10 +243,12 @@ entry:
        page_title: 'Editar un artículo'
        title_label: 'Título'
        url_label: 'URL'
-        is_public_label: 'Es público'
        save_label: 'Guardar'
    public:
        shared_by_wallabag: "Este artículo se ha compartido con <a href='%wallabag_instance%'>wallabag</a>"
+    confirm:
+        # delete: "Are you sure you want to remove that article?"
+        # delete_tag: "Are you sure you want to remove that tag from that article?"
 about:
    page_title: 'Acerca de'
@@ -510,6 +521,28 @@ user:
        delete: Eliminar
        delete_confirm: ¿Estás seguro?
        back_to_list: Volver a la lista
+    search:
+        # placeholder: Filter by username or email
+site_credential:
+    # page_title: Site credentials management
+    # new_site_credential: Create a credential
+    # edit_site_credential: Edit an existing credential
+    # description: "Here you can manage all credentials for sites which required them (create, edit and delete), like a paywall, an authentication, etc."
+    # list:
+    #     actions: Actions
+    #     edit_action: Edit
+    #     yes: Yes
+    #     no: No
+    #     create_new_one: Create a new credential
+    # form:
+    #     username_label: 'Username'
+    #     host_label: 'Host'
+    #     password_label: 'Password'
+    #     save: Save
+    #     delete: Delete
+    #     delete_confirm: Are you sure?
+    #     back_to_list: Back to list
 error:
    page_title: Ha ocurrido un error
@@ -528,6 +561,7 @@ flashes:
            annotations_reset: Anotaciones reiniciadas
            tags_reset: Etiquetas reiniciadas
            entries_reset: Artículos reiniciados
+            # archived_reset: Archived entries deleted
    entry:
        notice:
            entry_already_saved: 'Artículo ya guardado el %fecha%'
@@ -562,3 +596,8 @@ flashes:
            added: 'Añadido el usuario "%username%"'
            updated: 'Actualizado el usuario "%username%"'
            deleted: 'Eliminado el usuario "%username%"'
+    site_credential:
+        notice:
+            # added: 'Site credential for "%host%" added'
+            # updated: 'Site credential for "%host%" updated'
+            # deleted: 'Site credential for "%host%" deleted'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index 647f12ad..57e6c029 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -32,6 +32,7 @@ menu:
        save_link: 'ذخیرهٔ یک پیوند'
        back_to_unread: 'بازگشت به خوانده‌نشده‌ها'
        # users_management: 'Users management'
+        # site_credentials: 'Site credentials'
    top:
        add_new_entry: 'افزودن مقالهٔ تازه'
        search: 'جستجو'
@@ -77,6 +78,7 @@ config:
        pocket_consumer_key_label: کلید کاربری Pocket برای درون‌ریزی مطالب
        # android_configuration: Configure your Android application
        # help_theme: "wallabag is customizable. You can choose your prefered theme here."
+        # android_instruction: "Touch here to prefill your Android application"
        # 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."
        # help_language: "You can change the language of wallabag interface."
@@ -92,6 +94,7 @@ config:
            unread: 'خوانده‌نشده'
            starred: 'برگزیده'
            archive: 'بایگانی'
+            # all: 'All'
        rss_limit: 'محدودیت آر-اس-اس'
    form_user:
        two_factor_description: "با فعال‌کردن تأیید ۲مرحله‌ای هر بار که اتصال تأییدنشده‌ای برقرار شد، به شما یک کد از راه ایمیل فرستاده می‌شود"
@@ -110,6 +113,7 @@ config:
        # annotations: Remove ALL annotations
        # tags: Remove ALL tags
        # entries: Remove ALL entries
+        # archived: Remove ALL archived 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."
@@ -154,6 +158,7 @@ config:
        #         or: 'One rule OR another'
        #         and: 'One rule AND another'
        #         matches: 'Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>'
+        #         notmatches: 'Tests that a <i>subject</i> is not matches a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>'
 entry:
    page_titles:
@@ -185,6 +190,8 @@ entry:
        unread_label: 'خوانده‌نشده'
        preview_picture_label: 'دارای عکس پیش‌نمایش'
        preview_picture_help: 'پیش‌نمایش عکس'
+        # is_public_label: 'Has a public link'
+        # is_public_help: 'Public link'
        language_label: 'زبان'
        # http_status_label: 'HTTP status'
        reading_time:
@@ -223,6 +230,8 @@ entry:
        original_article: 'اصلی'
        annotations_on_the_entry: '{0} بدون حاشیه|{1} یک حاشیه|]1,Inf[ %nbحاشیه% annotations'
        created_at: 'زمان ساخت'
+        # published_at: 'Publication date'
+        # published_by: 'Published by'
    new:
        page_title: 'ذخیرهٔ مقالهٔ تازه'
        placeholder: 'http://website.com'
@@ -234,10 +243,12 @@ entry:
        page_title: 'ویرایش مقاله'
        title_label: 'عنوان'
        url_label: 'نشانی'
-        is_public_label: 'عمومی'
        save_label: 'ذخیره'
    public:
-        # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
+        # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>"
+    confirm:
+        # delete: "Are you sure you want to remove that article?"
+        # delete_tag: "Are you sure you want to remove that tag from that article?"
 about:
    page_title: 'درباره'
@@ -510,6 +521,28 @@ user:
        # delete: Delete
        # delete_confirm: Are you sure?
        # back_to_list: Back to list
+    search:
+        # placeholder: Filter by username or email
+site_credential:
+    # page_title: Site credentials management
+    # new_site_credential: Create a credential
+    # edit_site_credential: Edit an existing credential
+    # description: "Here you can manage all credentials for sites which required them (create, edit and delete), like a paywall, an authentication, etc."
+    # list:
+    #     actions: Actions
+    #     edit_action: Edit
+    #     yes: Yes
+    #     no: No
+    #     create_new_one: Create a new credential
+    # form:
+    #     username_label: 'Username'
+    #     host_label: 'Host'
+    #     password_label: 'Password'
+    #     save: Save
+    #     delete: Delete
+    #     delete_confirm: Are you sure?
+    #     back_to_list: Back to list
 error:
    # page_title: An error occurred
@@ -528,6 +561,7 @@ flashes:
            # annotations_reset: Annotations reset
            # tags_reset: Tags reset
            # entries_reset: Entries reset
+            # archived_reset: Archived entries deleted
    entry:
        notice:
            entry_already_saved: 'این مقاله در تاریخ %date% ذخیره شده بود'
@@ -562,3 +596,8 @@ flashes:
            # added: 'User "%username%" added'
            # updated: 'User "%username%" updated'
            # deleted: 'User "%username%" deleted'
+    site_credential:
+        notice:
+            # added: 'Site credential for "%host%" added'
+            # updated: 'Site credential for "%host%" updated'
+            # deleted: 'Site credential for "%host%" deleted'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index efddc46a..6eac4c36 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -32,6 +32,7 @@ menu:
        save_link: "Sauvegarder un nouvel article"
        back_to_unread: "Retour aux articles non lus"
        users_management: "Gestion des utilisateurs"
+        site_credentials: 'Accès aux sites'
    top:
        add_new_entry: "Sauvegarder un nouvel article"
        search: "Rechercher"
@@ -46,7 +47,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"
@@ -71,27 +72,29 @@ config:
            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 ?'
+            label: "Où souhaitez-vous être redirigé après avoir marqué un article comme lu ?"
-            redirect_homepage: "À la page d'accueil"
+            redirect_homepage: "À la page d’accueil"
-            redirect_current_page: 'À la page courante'
+            redirect_current_page: "À la page courante"
-        pocket_consumer_key_label: Clé d’authentification Pocket pour importer les données
+        pocket_consumer_key_label: "Clé d’authentification Pocket pour importer les données"
-        android_configuration: Configurez votre application Android
+        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."
+        android_instruction: "Appuyez ici pour préremplir votre application Android"
-        help_items_per_page: "Vous pouvez définir le nombre d'articles affichés sur chaque page."
+        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."
-        help_language: "Vous pouvez définir la langue de l'interface de wallabag."
+        help_language: "Vous pouvez définir la langue de l’interface de wallabag."
-        help_pocket_consumer_key: "Nécessaire pour l'import depuis Pocket. Vous pouvez le créer depuis votre compte Pocket."
+        help_pocket_consumer_key: "Nécessaire pour l’import depuis Pocket. Vous pouvez le créer depuis votre compte Pocket."
    form_rss:
        description: "Les flux RSS fournis par wallabag vous permettent de lire vos articles sauvegardés dans votre lecteur de flux préféré. Pour pouvoir les utiliser, vous devez d’abord créer un jeton."
        token_label: "Jeton RSS"
        no_token: "Aucun jeton généré"
        token_create: "Créez votre jeton"
        token_reset: "Réinitialisez votre jeton"
-        rss_links: "Adresse de vos flux RSS"
+        rss_links: "Adresses de vos flux RSS"
        rss_link:
-            unread: "non lus"
+            unread: "Non lus"
-            starred: "favoris"
+            starred: "Favoris"
-            archive: "lus"
+            archive: "Lus"
+            all: "Tous"
        rss_limit: "Nombre d’articles dans le flux"
    form_user:
        two_factor_description: "Activer l’authentification double-facteur veut dire que vous allez recevoir un code par courriel à chaque nouvelle connexion non approuvée."
@@ -100,17 +103,18 @@ config:
        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 !)
+            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é.
+            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)
+            confirm: "Vous êtes vraiment sûr ? (C’EST IRRÉVERSIBLE)"
-            button: 'Supprimer mon compte'
+            button: "Supprimer mon compte"
    reset:
-        title: Réinitialisation (attention danger !)
+        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 !
+        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
+        annotations: "Supprimer TOUTES les annotations"
-        tags: Supprimer TOUS les tags
+        tags: "Supprimer TOUS les tags"
-        entries: Supprimer TOUS les articles
+        entries: "Supprimer TOUS les articles"
-        confirm: Êtes-vous vraiment vraiment sûr ? (C'EST IRRÉVERSIBLE)
+        archived: "Supprimer TOUS les articles archivés"
+        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"
@@ -154,6 +158,7 @@ config:
                or: "Une règle OU l’autre"
                and: "Une règle ET l’autre"
                matches: "Teste si un <i>sujet</i> correspond à une <i>recherche</i> (non sensible à la casse).<br />Exemple : <code>title matches \"football\"</code>"
+                notmatches: "Teste si un <i>sujet</i> ne correspond pas à une <i>recherche</i> (non sensible à la casse).<br />Exemple : <code>title notmatches \"football\"</code>"
 entry:
    page_titles:
@@ -162,7 +167,7 @@ entry:
        archived: "Articles lus"
        filtered: "Articles filtrés"
        filtered_tags: "Articles filtrés par tags :"
-        filtered_search: 'Articles filtrés par recherche :'
+        filtered_search: "Articles filtrés par recherche :"
        untagged: "Article sans tag"
    list:
        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."
@@ -185,8 +190,10 @@ entry:
        unread_label: "Non lus"
        preview_picture_label: "A une photo"
        preview_picture_help: "Photo"
+        is_public_label: 'A un lien public'
+        is_public_help: 'Lien public'
        language_label: "Langue"
-        http_status_label: 'Statut HTTP'
+        http_status_label: "Statut HTTP"
        reading_time:
            label: "Durée de lecture en minutes"
            from: "de"
@@ -223,6 +230,8 @@ entry:
        original_article: "original"
        annotations_on_the_entry: "{0} Aucune annotation|{1} Une annotation|]1,Inf[ %count% annotations"
        created_at: "Date de création"
+        published_at: "Date de publication"
+        published_by: "Publié par"
    new:
        page_title: "Sauvegarder un nouvel article"
        placeholder: "http://website.com"
@@ -234,10 +243,12 @@ entry:
        page_title: "Éditer un article"
        title_label: "Titre"
        url_label: "Adresse"
-        is_public_label: "Public"
        save_label: "Enregistrer"
    public:
-        shared_by_wallabag: "Cet article a été partagé par <a href=\"%wallabag_instance%\">wallabag</a>"
+        shared_by_wallabag: "Cet article a été partagé par %username% avec <a href=\"%wallabag_instance%\">wallabag</a>"
+    confirm:
+        delete: "Voulez-vous vraiment supprimer cet article ?"
+        delete_tag: "Voulez-vous vraiment supprimer ce tag de cet article ?"
 about:
    page_title: "À propos"
@@ -295,32 +306,32 @@ howto:
    bookmarklet:
        description: "Glissez et déposez ce lien dans votre barre de favoris :"
    shortcuts:
-        page_description: Voici les raccourcis disponibles dans wallabag.
+        page_description: "Voici les raccourcis disponibles dans wallabag."
-        shortcut: Raccourci
+        shortcut: "Raccourci"
-        action: Action
+        action: "Action"
-        all_pages_title: Raccourcis disponibles dans toutes les pages
+        all_pages_title: "Raccourcis disponibles dans toutes les pages"
-        go_unread: Afficher les articles non lus
+        go_unread: "Afficher les articles non lus"
-        go_starred: Afficher les articles favoris
+        go_starred: "Afficher les articles favoris"
-        go_archive:  Afficher les articles lus
+        go_archive:  "Afficher les articles lus"
-        go_all: Afficher tous les articles
+        go_all: "Afficher tous les articles"
-        go_tags: Afficher les tags
+        go_tags: "Afficher les tags"
-        go_config: Aller à la configuration
+        go_config: "Aller à la configuration"
-        go_import: Aller aux imports
+        go_import: "Aller aux imports"
-        go_developers: Aller à la section Développeurs
+        go_developers: "Aller à la section Développeurs"
-        go_howto: Afficher l'aide (cette page !)
+        go_howto: "Afficher l’aide (cette page !)"
-        go_logout: Se déconnecter
+        go_logout: "Se déconnecter"
-        list_title: Raccourcis disponibles dans les pages de liste
+        list_title: "Raccourcis disponibles dans les pages de liste"
-        search: Afficher le formulaire de recherche
+        search: "Afficher le formulaire de recherche"
-        article_title: Raccourcis disponibles quand on affiche un article
+        article_title: "Raccourcis disponibles quand on affiche un article"
-        open_original: Ouvrir l'URL originale de l'article
+        open_original: "Ouvrir l’URL originale de l’article"
-        toggle_favorite: Changer le statut Favori de l'article
+        toggle_favorite: "Changer le statut Favori de l’article"
-        toggle_archive: Changer le status Lu de l'article
+        toggle_archive: "Changer le status Lu de l’article"
-        delete: Supprimer l'article
+        delete: "Supprimer l’article"
-        material_title: Raccourcis disponibles avec le thème Material uniquement
+        material_title: "Raccourcis disponibles avec le thème Material uniquement"
-        add_link: Ajouter un nouvel article
+        add_link: "Ajouter un nouvel article"
-        hide_form: Masquer le formulaire courant (recherche ou nouvel article)
+        hide_form: "Masquer le formulaire courant (recherche ou nouvel article)"
-        arrows_navigation: Naviguer à travers les articles
+        arrows_navigation: "Naviguer à travers les articles"
-        open_article: Afficher l'article sélectionné
+        open_article: "Afficher l’article sélectionné"
 quickstart:
    page_title: "Pour bien débuter"
@@ -382,8 +393,8 @@ tag:
        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'
+        add: "Ajouter"
-        placeholder: 'Vous pouvez ajouter plusieurs tags, séparés par une virgule.'
+        placeholder: "Vous pouvez ajouter plusieurs tags, séparés par une virgule."
 import:
    page_title: "Importer"
@@ -417,7 +428,7 @@ 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."
+        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>"
@@ -486,16 +497,16 @@ developer:
        back: "Retour"
 user:
-    page_title: Gestion des utilisateurs
+    page_title: "Gestion des utilisateurs"
-    new_user: Créer un nouvel utilisateur
+    new_user: "Créer un nouvel utilisateur"
-    edit_user: Éditer un utilisateur existant
+    edit_user: "Éditer un utilisateur existant"
-    description: Ici vous pouvez gérer vos utilisateurs (création, mise à jour et suppression)
+    description: "Ici vous pouvez gérer vos utilisateurs (création, mise à jour et suppression)"
    list:
-        actions: Actions
+        actions: "Actions"
-        edit_action: Éditer
+        edit_action: "Éditer"
-        yes: Oui
+        yes: "Oui"
-        no: Non
+        no: "Non"
-        create_new_one: Créer un nouvel utilisateur
+        create_new_one: "Créer un nouvel utilisateur"
    form:
        username_label: "Nom d’utilisateur"
        name_label: "Nom"
@@ -508,11 +519,33 @@ user:
        twofactor_label: "Double authentification"
        save: "Sauvegarder"
        delete: "Supprimer"
-        delete_confirm: "Voulez-vous vraiment ?"
+        delete_confirm: "Êtes-vous sûr ?"
+        back_to_list: "Revenir à la liste"
+    search:
+        placeholder: "Filtrer par nom d’utilisateur ou email"
+site_credential:
+    page_title: Gestion des accès aux sites
+    new_site_credential: Créer un accès à un site
+    edit_site_credential: Éditer l'accès d'un site
+    description: "Ici vous pouvez gérer les accès aux différents sites. Ces accès permettent de récupérer des contenus sur des sites qui requièrent une authentification ou un paywall"
+    list:
+        actions: Actions
+        edit_action: Éditer
+        yes: Oui
+        no: Non
+        create_new_one: Créer un nouvel accès à un site
+    form:
+        username_label: 'Identifiant'
+        host_label: 'Domaine'
+        password_label: 'Mot de passe'
+        save: "Sauvegarder"
+        delete: "Supprimer"
+        delete_confirm: "Êtes-vous sûr ?"
        back_to_list: "Revenir à la liste"
 error:
-    page_title: Une erreur est survenue
+    page_title: "Une erreur est survenue"
 flashes:
    config:
@@ -525,9 +558,10 @@ flashes:
            tagging_rules_updated: "Règles mises à jour"
            tagging_rules_deleted: "Règle supprimée"
            rss_token_updated: "Jeton RSS mis à jour"
-            annotations_reset: Annotations supprimées
+            annotations_reset: "Annotations supprimées"
-            tags_reset: Tags supprimés
+            tags_reset: "Tags supprimés"
-            entries_reset: Articles supprimés
+            entries_reset: "Articles supprimés"
+            archived_reset: "Articles archivés supprimés"
    entry:
        notice:
            entry_already_saved: "Article déjà sauvegardé le %date%"
@@ -562,3 +596,8 @@ flashes:
            added: 'Utilisateur "%username%" ajouté'
            updated: 'Utilisateur "%username%" mis à jour'
            deleted: 'Utilisateur "%username%" supprimé'
+    site_credential:
+        notice:
+            added: 'Accès au site "%host%" ajouté'
+            updated: 'Accès au site "%host%" mis à jour'
+            deleted: 'Accès au site "%host%" supprimé'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index 3cd3fd17..fa7ae0b2 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -91,9 +91,10 @@ config:
        token_reset: 'Rigenera il tuo token'
        rss_links: 'Collegamenti RSS'
        rss_link:
-            unread: 'non letti'
+            unread: 'Non letti'
-            starred: 'preferiti'
+            starred: 'Preferiti'
-            archive: 'archiviati'
+            archive: 'Archiviati'
+            # all: 'All'
        rss_limit: 'Numero di elementi nel feed'
    form_user:
        two_factor_description: "Abilitando l'autenticazione a due fattori riceverai una e-mail con un codice per ogni nuova connesione non verificata"
@@ -112,6 +113,7 @@ config:
        annotations: Rimuovi TUTTE le annotazioni
        tags: Rimuovi TUTTE le etichette
        entries: Rimuovi TUTTI gli articoli
+        # archived: Remove ALL archived entries
        confirm: Sei veramente sicuro? (NON PUOI TORNARE INDIETRO)
    form_password:
        description: "Qui puoi cambiare la tua password. La tua nuova password dovrebbe essere composta da almeno 8 caratteri."
@@ -156,6 +158,7 @@ config:
                or: "Una regola O un'altra"
                and: "Una regola E un'altra"
                matches: 'Verifica che un <i>oggetto</i> risulti in una <i>ricerca</i> (case-insensitive).<br />Esempio: <code>titolo contiene "football"</code>'
+                # notmatches: 'Tests that a <i>subject</i> is not matches a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>'
 entry:
    page_titles:
@@ -187,6 +190,8 @@ entry:
        unread_label: 'Non letti'
        preview_picture_label: "Ha un'immagine di anteprima"
        preview_picture_help: 'Immagine di anteprima'
+        # is_public_label: 'Has a public link'
+        # is_public_help: 'Public link'
        language_label: 'Lingua'
        http_status_label: 'Stato HTTP'
        reading_time:
@@ -211,7 +216,7 @@ entry:
            view_original_article: 'Contenuto originale'
            re_fetch_content: 'Ri-ottieni pagina'
            delete: 'Elimina'
-            add_a_tag: 'Aggiungi un tag'
+            add_a_tag: 'Aggiungi un''etichetta'
            share_content: 'Condividi'
            share_email_label: 'E-mail'
            public_link: 'Link pubblico'
@@ -222,7 +227,7 @@ entry:
                label: 'Problemi?'
                description: 'Questo contenuto viene visualizzato male?'
        edit_title: 'Modifica titolo'
-        original_article: 'originale'
+        original_article: 'Originale'
        annotations_on_the_entry: '{0} Nessuna annotazione|{1} Una annotazione|]1,Inf[ %count% annotazioni'
        created_at: 'Data di creazione'
        published_at: 'Data di pubblicazione'
@@ -238,13 +243,15 @@ entry:
        page_title: 'Modifica voce'
        title_label: 'Titolo'
        url_label: 'Url'
-        is_public_label: 'Pubblico'
        save_label: 'Salva'
    public:
        shared_by_wallabag: "Questo articolo è stato condiviso da %username% con <a href='%wallabag_instance%'>wallabag</a>"
+    confirm:
+        delete: "Vuoi veramente rimuovere quell'articolo?"
+        delete_tag: "Vuoi veramente rimuovere quell'etichetta da quell'articolo?"
 about:
-    page_title: 'About'
+    page_title: 'A proposito'
    top_menu:
        who_behind_wallabag: "Chi c'è dietro a wallabag"
        getting_help: 'Ottieni aiuto'
@@ -263,7 +270,7 @@ about:
        bug_reports: 'Bug reports'
        support: '<a href="https://github.com/wallabag/wallabag/issues">su GitHub</a>'
    helping:
-        description: 'wallabag è gratuito opensource. Puoi aiutarci:'
+        description: 'wallabag è gratuito ed OpenSource. Puoi aiutarci:'
        by_contributing: 'per contribuire al progetto:'
        by_contributing_2: 'un elenco delle attività richieste'
        by_paypal: 'via Paypal'
@@ -331,7 +338,7 @@ quickstart:
    more: 'Più…'
    intro:
        title: 'Benvenuto su wallabag!'
-        paragraph_1: "Un tour in cui ti guideremo per scoprire e che ti mostrerà delle funzionalità che potrebbero interessarti."
+        paragraph_1: "Ti accompagneremo alla scoperta di wallabag e ti mostreremo delle funzionalità che potrebbero interessarti."
        paragraph_2: 'Seguici!'
    configure:
        title: "Configura l'applicazione"
@@ -401,20 +408,20 @@ import:
        save_label: 'Carica file'
    pocket:
        page_title: 'Importa da > Pocket'
-        description: "Questo importatore copierà tutti i tuoi dati da Pocket. Pocket non ci consente di ottenere contenuti dal loro servzio, così il contenuto leggibile di ogni articolo verrà ri-ottenuto da wallabag."
+        description: "Questo importatore copierà tutti i tuoi dati da Pocket. Pocket non ci consente di ottenere contenuti dal loro servizio, così il contenuto leggibile di ogni articolo verrà ri-ottenuto da wallabag."
        config_missing:
            description: "Importazione da Pocket non configurata."
            admin_message: 'Devi definire %keyurls% una pocket_consumer_key %keyurle%.'
-            user_message: 'Il tuo amministratore di server deve define una API Key per Pocket.'
+            user_message: 'Il tuo amministratore del server deve definire una API Key per Pocket.'
        authorize_message: 'Puoi importare dati dal tuo account Pocket. Devi solo cliccare sul pulsante sottostante e autorizzare la connessione a getpocket.com.'
        connect_to_pocket: 'Connetti a Pocket and importa i dati'
    wallabag_v1:
        page_title: 'Importa da > Wallabag v1'
-        description: 'Questo importatore copierà tutti i tuoi dati da un wallabag v1. Nella tua pagina di configurazione, clicca su "JSON export" nella sezione "Esport i tuoi dati di wallabag". Otterrai un file "wallabag-export-1-xxxx-xx-xx.json".'
+        description: 'Questo importatore copierà tutti i tuoi dati da un wallabag v1. Nella tua pagina di configurazione, clicca su "JSON export" nella sezione "Esporta i tuoi dati di wallabag". Otterrai un file "wallabag-export-1-xxxx-xx-xx.json".'
        how_to: 'Seleziona la tua esportazione di wallabag e clicca sul pulsante sottostante caricare il file e importare i dati.'
    wallabag_v2:
        page_title: 'Importa da > Wallabag v2'
-        description: 'Questo importatore copierà tutti i tuoi dati da un wallabag v2. Vai in "Tutti i contenuti", e, nella sidebar di esportazione, clicca su "JSON". Otterrai un file "Tutti i contenuti.json".'
+        description: 'Questo importatore copierà tutti i tuoi dati da un wallabag v2. Vai in "Tutti i contenuti", e, nella barra laterale di esportazione, clicca su "JSON". Otterrai un file "Tutti i contenuti.json'
    readability:
        page_title: 'Importa da > Readability'
        description: 'Questo importatore copierà tutti i tuoi articoli da Readability. Nella pagina strumenti (https://www.readability.com/tools/), clicca su "Export your data" nella sezione "Data Export". Riceverai una E-mail per scaricare un file json (che tuttavia non termina con .json).'
@@ -514,6 +521,28 @@ user:
        delete: Cancella
        delete_confirm: Sei sicuro?
        back_to_list: Torna alla lista
+    search:
+        # placeholder: Filter by username or email
+site_credential:
+    # page_title: Site credentials management
+    # new_site_credential: Create a credential
+    # edit_site_credential: Edit an existing credential
+    # description: "Here you can manage all credentials for sites which required them (create, edit and delete), like a paywall, an authentication, etc."
+    # list:
+    #     actions: Actions
+    #     edit_action: Edit
+    #     yes: Yes
+    #     no: No
+    #     create_new_one: Create a new credential
+    # form:
+    #     username_label: 'Username'
+    #     host_label: 'Host'
+    #     password_label: 'Password'
+    #     save: Save
+    #     delete: Delete
+    #     delete_confirm: Are you sure?
+    #     back_to_list: Back to list
 error:
    page_title: Si è verificato un errore
@@ -532,6 +561,7 @@ flashes:
            annotations_reset: Reset annotazioni
            tags_reset: Reset etichette
            entries_reset: Reset articoli
+            # archived_reset: Archived entries deleted
    entry:
        notice:
            entry_already_saved: 'Contenuto già salvato in data %date%'
@@ -566,3 +596,8 @@ flashes:
            added: 'Utente "%username%" aggiunto'
            updated: 'Utente "%username%" aggiornato'
            deleted: 'Utente "%username%" eliminato'
+    site_credential:
+        notice:
+            # added: 'Site credential for "%host%" added'
+            # updated: 'Site credential for "%host%" updated'
+            # deleted: 'Site credential for "%host%" deleted'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index 913e3bcb..be57e903 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -32,6 +32,7 @@ menu:
        save_link: 'Enregistrar un novèl article'
        back_to_unread: 'Tornar als articles pas legits'
        users_management: 'Gestion dels utilizaires'
+        # site_credentials: 'Site credentials'
    top:
        add_new_entry: 'Enregistrar un novèl article'
        search: 'Cercar'
@@ -76,6 +77,7 @@ config:
            redirect_current_page: 'A la pagina actuala'
        pocket_consumer_key_label: Clau d'autentificacion Pocket per importar las donadas
        android_configuration: Configuratz vòstra aplicacion Android
+        # android_instruction: "Touch here to prefill your Android application"
        help_theme: "wallabag es personalizable. Podètz causir vòstre tèma preferit aquí."
        help_items_per_page: "Podètz cambiar lo nombre d'articles afichats per pagina."
        help_reading_speed: "wallabag calcula lo temps de lectura per cada article. Podètz lo definir aquí, gràcias a aquesta lista, se sètz un legeire rapid o lent. wallabag tornarà calcular lo temps de lectura per cada article."
@@ -87,11 +89,12 @@ config:
        no_token: 'Pas cap de geton generat'
        token_create: 'Creatz vòstre geton'
        token_reset: 'Reïnicializatz vòstre geton'
-        rss_links: 'URL de vòstres fluxes RSS'
+        rss_links: 'URLs de vòstres fluxes RSS'
        rss_link:
-            unread: 'pas legits'
+            unread: 'Pas legits'
-            starred: 'favorits'
+            starred: 'Favorits'
-            archive: 'legits'
+            archive: 'Legits'
+            # all: 'All'
        rss_limit: "Nombre d'articles dins un flux RSS"
    form_user:
        two_factor_description: "Activar l'autentificacion doble-factor vòl dire que recebretz un còdi per corrièl per cada novèla connexion pas aprovada."
@@ -110,6 +113,7 @@ config:
        annotations: Levar TOTAS las anotacions
        tags: Levar TOTAS las etiquetas
        entries: Levar TOTES los articles
+        archived: Levar TOTES los articles archivats
        confirm: Sètz vertadièrament segur ? (ES IRREVERSIBLE)
    form_password:
        description: "Podètz cambiar vòstre senhal aquí. Vòstre senhal deu èsser long d'almens 8 caractèrs."
@@ -153,7 +157,8 @@ config:
                not_equal_to: 'Diferent de…'
                or: "Una règla O l'autra"
                and: "Una règla E l'autra"
-                matches: 'Teste se un <i>subjècte</i> correspond a una <i>recerca</i> (non sensibla a la cassa).<br />Exemple : <code>title matches \"football\"</code>'
+                matches: 'Teste se un <i>subjècte</i> correspond a una <i>recèrca</i> (non sensibla a la cassa).<br />Exemple : <code>title matches \"football\"</code>'
+                notmatches: 'Teste se <i>subjècte</i> correspond pas a una <i>recèrca</i> (sensibla a la cassa).<br />Example : <code>title notmatches "football"</code>'
 entry:
    page_titles:
@@ -183,8 +188,10 @@ entry:
        archived_label: 'Legits'
        starred_label: 'Favorits'
        unread_label: 'Pas legits'
-        preview_picture_label: 'A una fotò'
+        preview_picture_label: 'A un imatge'
-        preview_picture_help: 'Fotò'
+        preview_picture_help: 'Imatge'
+        # is_public_label: 'Has a public link'
+        # is_public_help: 'Public link'
        language_label: 'Lenga'
        http_status_label: 'Estatut HTTP'
        reading_time:
@@ -223,6 +230,8 @@ entry:
        original_article: 'original'
        annotations_on_the_entry: "{0} Pas cap d'anotacion|{1} Una anotacion|]1,Inf[ %count% anotacions"
        created_at: 'Data de creacion'
+        published_at: 'Data de publicacion'
+        published_by: 'Publicat per'
    new:
        page_title: 'Enregistrar un novèl article'
        placeholder: 'http://website.com'
@@ -234,10 +243,12 @@ entry:
        page_title: 'Modificar un article'
        title_label: 'Títol'
        url_label: 'Url'
-        is_public_label: 'Public'
        save_label: 'Enregistrar'
    public:
        shared_by_wallabag: "Aqueste article es estat partejat per <a href='%wallabag_instance%'>wallabag</a>"
+    confirm:
+        # delete: "Are you sure you want to remove that article?"
+        # delete_tag: "Are you sure you want to remove that tag from that article?"
 about:
    page_title: 'A prepaus'
@@ -341,8 +352,8 @@ quickstart:
        new_user: 'Crear un novèl utilizaire'
        analytics: 'Configurar las estadisticas'
        sharing: 'Activar de paramètres de partatge'
-        export: 'Configurar los expòrt'
+        export: 'Configurar los expòrts'
-        import: 'Configurar los impòrt'
+        import: 'Configurar los impòrts'
    first_steps:
        title: 'Primièrs passes'
        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."
@@ -458,7 +469,7 @@ developer:
        action: 'Suprimir aqueste client'
    client:
        page_title: 'Gestion dels clients API > Novèl client'
-        page_description: "Anatz crear un novèl client. Mercés de cumplir l'url de redireccion cap a vòstra aplicacion."
+        page_description: "Anatz crear un novèl client. Mercés de garnir l'url de redireccion cap a vòstra aplicacion."
        form:
            name_label: "Nom del client"
            redirect_uris_label: 'URLs de redireccion'
@@ -469,7 +480,7 @@ developer:
        page_description: 'Vaquí los paramètres de vòstre client.'
        field_name: 'Nom del client'
        field_id: 'ID Client'
-        field_secret: 'Clau secreta'
+        field_secret: 'Clau secrèta'
        back: 'Retour'
        read_howto: 'Legir "cossí crear ma primièra aplicacion"'
    howto:
@@ -510,6 +521,28 @@ user:
        delete: 'Suprimir'
        delete_confirm: 'Sètz segur ?'
        back_to_list: 'Tornar a la lista'
+    search:
+        placeholder: "Filtrar per nom d'utilizaire o corrièl"
+site_credential:
+    # page_title: Site credentials management
+    # new_site_credential: Create a credential
+    # edit_site_credential: Edit an existing credential
+    # description: "Here you can manage all credentials for sites which required them (create, edit and delete), like a paywall, an authentication, etc."
+    list:
+         actions: 'Accions'
+         edit_action: 'Modificar'
+         yes: 'Òc'
+         no: 'Non'
+        # create_new_one: Create a new credential
+    form:
+        # username_label: 'Username'
+        # host_label: 'Host'
+        # password_label: 'Password'
+        save: 'Enregistrar'
+        delete: 'Suprimir'
+        delete_confirm: 'Sètz segur ?'
+        back_to_list: 'Tornar a la lista'
 error:
    page_title: Una error s'es produsida
@@ -528,6 +561,7 @@ flashes:
            annotations_reset: Anotacions levadas
            tags_reset: Etiquetas levadas
            entries_reset: Articles levats
+            archived_reset: Articles archivat suprimits
    entry:
        notice:
            entry_already_saved: 'Article ja salvargardat lo %date%'
@@ -562,3 +596,8 @@ flashes:
            added: 'Utilizaire "%username%" ajustat'
            updated: 'Utilizaire "%username%" mes a jorn'
            deleted: 'Utilizaire "%username%" suprimit'
+    site_credential:
+        notice:
+            # added: 'Site credential for "%host%" added'
+            # updated: 'Site credential for "%host%" updated'
+            # deleted: 'Site credential for "%host%" deleted'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index b990a6b9..00c559ed 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -32,6 +32,7 @@ menu:
        save_link: 'Zapisz link'
        back_to_unread: 'Powrót do nieprzeczytanych artykułów'
        users_management: 'Zarządzanie użytkownikami'
+        # site_credentials: 'Site credentials'
    top:
        add_new_entry: 'Dodaj nowy wpis'
        search: 'Szukaj'
@@ -76,6 +77,7 @@ config:
            redirect_current_page: 'do bieżącej strony'
        pocket_consumer_key_label: 'Klucz klienta Pocket do importu zawartości'
        android_configuration: Skonfiguruj swoją androidową aplikację
+        android_instruction: "Dotknij tutaj, aby wstępnie uzupełnij androidową aplikację"
        help_theme: "Dopasuj wallabag do swoich potrzeb. Tutaj możesz wybrać preferowany przez ciebie motyw."
        help_items_per_page: "Możesz zmienić ilość artykułów wyświetlanych na każdej stronie."
        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."
@@ -89,9 +91,10 @@ config:
        token_reset: 'Zresetuj swojego tokena'
        rss_links: 'RSS links'
        rss_link:
-            unread: 'nieprzeczytane'
+            unread: 'Nieprzeczytane'
-            starred: 'oznaczone gwiazdką'
+            starred: 'Oznaczone gwiazdką'
-            archive: 'archiwum'
+            archive: 'Archiwum'
+            # all: 'All'
        rss_limit: 'Link do RSS'
    form_user:
        two_factor_description: "Włączenie autoryzacji dwuetapowej oznacza, że będziesz otrzymywał maile z kodem przy każdym nowym, niezaufanym połączeniu"
@@ -110,6 +113,7 @@ config:
        annotations: Usuń WSZYSTKIE adnotacje
        tags: Usuń WSZYSTKIE tagi
        entries: usuń WSZYTSTKIE wpisy
+        archived: usuń WSZYSTKIE zarchiwizowane wpisy
        confirm: Jesteś pewien? (tej operacji NIE MOŻNA cofnąć)
    form_password:
        description: "Tutaj możesz zmienić swoje hasło. Twoje nowe hasło powinno mieć conajmniej 8 znaków."
@@ -154,6 +158,7 @@ config:
                or: 'Jedna reguła LUB inna'
                and: 'Jedna reguła I inna'
                matches: 'Sprawdź czy <i>temat</i> pasuje <i>szukaj</i> (duże lub małe litery).<br />Przykład: <code>tytuł zawiera "piłka nożna"</code>'
+                notmatches: 'Sprawdź czy <i>temat</i> nie zawiera <i>szukaj</i> (duże lub małe litery).<br />Przykład: <code>tytuł nie zawiera "piłka nożna"</code>'
 entry:
    page_titles:
@@ -185,6 +190,8 @@ entry:
        unread_label: 'Nieprzeczytane'
        preview_picture_label: 'Posiada podgląd obrazu'
        preview_picture_help: 'Podgląd obrazu'
+        is_public_label: 'Posiada publiczny link'
+        is_public_help: 'Publiczny link'
        language_label: 'Język'
        http_status_label: 'Status HTTP'
        reading_time:
@@ -223,6 +230,8 @@ entry:
        original_article: 'oryginalny'
        annotations_on_the_entry: '{0} Nie ma adnotacji |{1} Jedna adnotacja |]1,Inf[ %count% adnotacji'
        created_at: 'Czas stworzenia'
+        published_at: 'Data publikacji'
+        published_by: 'Opublikowane przez'
    new:
        page_title: 'Zapisz nowy wpis'
        placeholder: 'http://website.com'
@@ -234,10 +243,12 @@ entry:
        page_title: 'Edytuj wpis'
        title_label: 'Tytuł'
        url_label: 'Adres URL'
-        is_public_label: 'Publiczny'
        save_label: 'Zapisz'
    public:
        shared_by_wallabag: "Ten artykuł został udostępniony przez <a href='%wallabag_instance%'>wallabag</a>"
+    confirm:
+        delete: "Czy jesteś pewien, że chcesz usunąć ten artykuł?"
+        delete_tag: "Czy jesteś pewien, że chcesz usunąć ten tag, z tego artykułu?"
 about:
    page_title: 'O nas'
@@ -510,6 +521,28 @@ user:
        delete: Usuń
        delete_confirm: Jesteś pewien?
        back_to_list: Powrót do listy
+    search:
+        placeholder: Filtruj po nazwie użytkownika lub adresie e-mail
+site_credential:
+    # page_title: Site credentials management
+    # new_site_credential: Create a credential
+    # edit_site_credential: Edit an existing credential
+    # description: "Here you can manage all credentials for sites which required them (create, edit and delete), like a paywall, an authentication, etc."
+    list:
+        actions: Akcje
+        edit_action: Edytuj
+        yes: Tak
+        no: Nie
+        # create_new_one: Create a new credential
+    form:
+        # username_label: 'Username'
+        # host_label: 'Host'
+        # password_label: 'Password'
+        save: Zapisz
+        delete: Usuń
+        delete_confirm: Jesteś pewien?
+        back_to_list: Powrót do listy
 error:
    page_title: Wystąpił błąd
@@ -528,6 +561,7 @@ flashes:
            annotations_reset: Zresetuj adnotacje
            tags_reset: Zresetuj tagi
            entries_reset: Zresetuj wpisy
+            archived_reset: Zarchiwizowane wpisy usunięte
    entry:
        notice:
            entry_already_saved: 'Wpis już został dodany %date%'
@@ -562,3 +596,8 @@ flashes:
            added: 'Użytkownik "%username%" dodany'
            updated: 'Użytkownik "%username%" zaktualizowany'
            deleted: 'Użytkownik "%username%" usunięty'
+    site_credential:
+        notice:
+            # added: 'Site credential for "%host%" added'
+            # updated: 'Site credential for "%host%" updated'
+            # deleted: 'Site credential for "%host%" deleted'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
index 3b1f9cb6..4ab5f144 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
@@ -32,6 +32,7 @@ menu:
        save_link: 'Salvar um link'
        back_to_unread: 'Voltar para os artigos não lidos'
        users_management: 'Gestão de Usuários'
+        # site_credentials: 'Site credentials'
    top:
        add_new_entry: 'Adicionar uma nova entrada'
        search: 'Pesquisa'
@@ -76,6 +77,7 @@ config:
            # 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
+        # android_instruction: "Touch here to prefill 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."
@@ -89,9 +91,10 @@ config:
        token_reset: 'Gerar novamente seu token'
        rss_links: 'Links RSS'
        rss_link:
-            unread: 'não lido'
+            unread: 'Não lido'
-            starred: 'destacado'
+            starred: 'Destacado'
-            archive: 'arquivado'
+            archive: 'Arquivado'
+            # all: 'All'
        rss_limit: 'Número de itens no feed'
    form_user:
        two_factor_description: 'Habilitar autenticação de dois passos significa que você receberá um e-mail com um código a cada nova conexão desconhecida.'
@@ -110,6 +113,7 @@ config:
        # annotations: Remove ALL annotations
        # tags: Remove ALL tags
        # entries: Remove ALL entries
+        # archived: Remove ALL archived 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."
@@ -154,6 +158,7 @@ config:
                or: 'Uma regra OU outra'
                and: 'Uma regra E outra'
                matches: 'Testa que um <i>assunto</i> corresponde a uma <i>pesquisa</i> (maiúscula ou minúscula).<br />Exemplo: <code>título corresponde a "futebol"</code>'
+                # notmatches: 'Tests that a <i>subject</i> is not matches a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>'
 entry:
    page_titles:
@@ -185,6 +190,8 @@ entry:
        unread_label: 'Não Lido'
        preview_picture_label: 'Possui uma imagem de preview'
        preview_picture_help: 'Imagem de preview'
+        # is_public_label: 'Has a public link'
+        # is_public_help: 'Public link'
        language_label: 'Idioma'
        # http_status_label: 'HTTP status'
        reading_time:
@@ -223,6 +230,8 @@ entry:
        original_article: 'original'
        annotations_on_the_entry: '{0} Sem anotações|{1} Uma anotação|]1,Inf[ %nbAnnotations% anotações'
        created_at: 'Data de criação'
+        # published_at: 'Publication date'
+        # published_by: 'Published by'
    new:
        page_title: 'Salvar nova entrada'
        placeholder: 'http://website.com'
@@ -234,10 +243,12 @@ entry:
        page_title: 'Editar uma entrada'
        title_label: 'Título'
        url_label: 'Url'
-        is_public_label: 'Público'
        save_label: 'Salvar'
    public:
        shared_by_wallabag: "Este artigo foi compartilhado pelo <a href='%wallabag_instance%'>wallabag</a>"
+    confirm:
+        # delete: "Are you sure you want to remove that article?"
+        # delete_tag: "Are you sure you want to remove that tag from that article?"
 about:
    page_title: 'Sobre'
@@ -510,6 +521,28 @@ user:
        delete: 'Apagar'
        delete_confirm: 'Tem certeza?'
        back_to_list: 'Voltar para a lista'
+    search:
+        # placeholder: Filter by username or email
+site_credential:
+    # page_title: Site credentials management
+    # new_site_credential: Create a credential
+    # edit_site_credential: Edit an existing credential
+    # description: "Here you can manage all credentials for sites which required them (create, edit and delete), like a paywall, an authentication, etc."
+    list:
+        actions: 'Ações'
+        edit_action: 'Editar'
+        yes: 'Sim'
+        no: 'Não'
+        # create_new_one: Create a new credential
+    form:
+        # username_label: 'Username'
+        # host_label: 'Host'
+        # password_label: 'Password'
+        save: 'Salvar'
+        delete: 'Apagar'
+        delete_confirm: 'Tem certeza?'
+        back_to_list: 'Voltar para a lista'
 error:
    # page_title: An error occurred
@@ -528,6 +561,7 @@ flashes:
            # annotations_reset: Annotations reset
            # tags_reset: Tags reset
            # entries_reset: Entries reset
+            # archived_reset: Archived entries deleted
    entry:
        notice:
            entry_already_saved: 'Entrada já foi salva em %date%'
@@ -562,3 +596,8 @@ flashes:
            added: 'Usuário "%username%" adicionado'
            updated: 'Usuário "%username%" atualizado'
            deleted: 'Usuário "%username%" removido'
+    site_credential:
+        notice:
+            # added: 'Site credential for "%host%" added'
+            # updated: 'Site credential for "%host%" updated'
+            # deleted: 'Site credential for "%host%" deleted'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index 728eed58..f16504ed 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -32,6 +32,7 @@ menu:
        # save_link: 'Save a link'
        back_to_unread: 'Înapoi la articolele necitite'
        # users_management: 'Users management'
+        # site_credentials: 'Site credentials'
    top:
        add_new_entry: 'Introdu un nou articol'
        search: 'Căutare'
@@ -76,6 +77,7 @@ config:
            # redirect_current_page: 'To the current page'
        pocket_consumer_key_label: Cheie consumator pentru importarea contentului din Pocket
        # android_configuration: Configure your Android application
+        # android_instruction: "Touch here to prefill 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."
@@ -89,9 +91,10 @@ config:
        token_reset: 'Resetează-ți token-ul'
        rss_links: 'Link-uri RSS'
        rss_link:
-            unread: 'unread'
+            unread: 'Unread'
-            starred: 'starred'
+            starred: 'Starred'
-            archive: 'archived'
+            archive: 'Archived'
+            # all: 'All'
        rss_limit: 'Limită RSS'
    form_user:
        # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code on every new untrusted connexion"
@@ -110,6 +113,7 @@ config:
        # annotations: Remove ALL annotations
        # tags: Remove ALL tags
        # entries: Remove ALL entries
+        # archived: Remove ALL archived 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."
@@ -154,6 +158,7 @@ config:
        #         or: 'One rule OR another'
        #         and: 'One rule AND another'
        #         matches: 'Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>'
+        #         notmatches: 'Tests that a <i>subject</i> is not matches a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>'
 entry:
    page_titles:
@@ -185,6 +190,8 @@ entry:
        unread_label: 'Necitite'
        preview_picture_label: 'Are o imagine de previzualizare'
        preview_picture_help: 'Previzualizare imagine'
+        # is_public_label: 'Has a public link'
+        # is_public_help: 'Public link'
        language_label: 'Limbă'
        # http_status_label: 'HTTP status'
        reading_time:
@@ -223,6 +230,8 @@ entry:
        original_article: 'original'
        # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations'
        created_at: 'Data creării'
+        # published_at: 'Publication date'
+        # published_by: 'Published by'
    new:
        page_title: 'Salvează un nou articol'
        placeholder: 'http://website.com'
@@ -234,10 +243,12 @@ entry:
        # page_title: 'Edit an entry'
        # title_label: 'Title'
        url_label: 'Url'
-        # is_public_label: 'Public'
        save_label: 'Salvează'
    public:
-        # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
+        # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>"
+    confirm:
+        # delete: "Are you sure you want to remove that article?"
+        # delete_tag: "Are you sure you want to remove that tag from that article?"
 about:
    page_title: 'Despre'
@@ -510,6 +521,28 @@ user:
        # delete: Delete
        # delete_confirm: Are you sure?
        # back_to_list: Back to list
+    search:
+        # placeholder: Filter by username or email
+site_credential:
+    # page_title: Site credentials management
+    # new_site_credential: Create a credential
+    # edit_site_credential: Edit an existing credential
+    # description: "Here you can manage all credentials for sites which required them (create, edit and delete), like a paywall, an authentication, etc."
+    # list:
+    #     actions: Actions
+    #     edit_action: Edit
+    #     yes: Yes
+    #     no: No
+    #     create_new_one: Create a new credential
+    # form:
+    #     username_label: 'Username'
+    #     host_label: 'Host'
+    #     password_label: 'Password'
+    #     save: Save
+    #     delete: Delete
+    #     delete_confirm: Are you sure?
+    #     back_to_list: Back to list
 error:
    # page_title: An error occurred
@@ -528,6 +561,7 @@ flashes:
            # annotations_reset: Annotations reset
            # tags_reset: Tags reset
            # entries_reset: Entries reset
+            # archived_reset: Archived entries deleted
    entry:
        notice:
            # entry_already_saved: 'Entry already saved on %date%'
@@ -562,3 +596,8 @@ flashes:
            # added: 'User "%username%" added'
            # updated: 'User "%username%" updated'
            # deleted: 'User "%username%" deleted'
+    site_credential:
+        notice:
+            # added: 'Site credential for "%host%" added'
+            # updated: 'Site credential for "%host%" updated'
+            # deleted: 'Site credential for "%host%" deleted'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index d3180f42..90a140cd 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -32,6 +32,7 @@ menu:
        # save_link: 'Save a link'
        back_to_unread: 'Okunmayan makalelere geri dön'
        # users_management: 'Users management'
+        # site_credentials: 'Site credentials'
    top:
        add_new_entry: 'Yeni bir makale ekle'
        search: 'Ara'
@@ -76,6 +77,7 @@ config:
            # redirect_current_page: 'To the current page'
        # pocket_consumer_key_label: Consumer key for Pocket to import contents
        # android_configuration: Configure your Android application
+        # android_instruction: "Touch here to prefill 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."
@@ -89,9 +91,10 @@ config:
        token_reset: 'Belirteci (token) sıfırla'
        rss_links: 'RSS akış bağlantıları'
        rss_link:
-            unread: 'okunmayan'
+            unread: 'Okunmayan'
-            starred: 'favoriler'
+            starred: 'Favoriler'
-            archive: 'arşiv'
+            archive: 'Arşiv'
+            # all: 'All'
        rss_limit: 'RSS içeriğinden talep edilecek makale limiti'
    form_user:
        two_factor_description: "İki adımlı doğrulamayı aktifleştirdiğinizde, her yeni güvenilmeyen bağlantılarda size e-posta ile bir kod alacaksınız."
@@ -110,6 +113,7 @@ config:
        # annotations: Remove ALL annotations
        # tags: Remove ALL tags
        # entries: Remove ALL entries
+        # archived: Remove ALL archived 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."
@@ -154,6 +158,7 @@ config:
                or: 'Bir kural veya birbaşkası'
                and: 'Bir kural ve diğeri'
                # matches: 'Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>'
+                # notmatches: 'Tests that a <i>subject</i> is not matches a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>'
 entry:
    page_titles:
@@ -223,6 +228,8 @@ entry:
        original_article: 'orijinal'
        # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations'
        created_at: 'Oluşturulma tarihi'
+        # published_at: 'Publication date'
+        # published_by: 'Published by'
    new:
        page_title: 'Yeni makaleyi kaydet'
        placeholder: 'http://website.com'
@@ -234,10 +241,12 @@ entry:
        page_title: 'Makaleyi düzenle'
        title_label: 'Başlık'
        url_label: 'Url'
-        is_public_label: 'Herkes tarafından erişime açık olsun mu?'
        save_label: 'Kaydet'
    public:
-        # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
+        # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>"
+    confirm:
+        # delete: "Are you sure you want to remove that article?"
+        # delete_tag: "Are you sure you want to remove that tag from that article?"
 about:
    page_title: 'Hakkımızda'
@@ -510,6 +519,8 @@ user:
        # delete: Delete
        # delete_confirm: Are you sure?
        # back_to_list: Back to list
+    search:
+        # placeholder: Filter by username or email
 error:
    # page_title: An error occurred
@@ -528,6 +539,7 @@ flashes:
            # annotations_reset: Annotations reset
            # tags_reset: Tags reset
            # entries_reset: Entries reset
+            # archived_reset: Archived entries deleted
    entry:
        notice:
            entry_already_saved: 'Entry already saved on %date%'
@@ -562,3 +574,8 @@ flashes:
            # added: 'User "%username%" added'
            # updated: 'User "%username%" updated'
            # deleted: 'User "%username%" deleted'
+    site_credential:
+        notice:
+            # added: 'Site credential for "%host%" added'
+            # updated: 'Site credential for "%host%" updated'
+            # deleted: 'Site credential for "%host%" deleted'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.da.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.da.yml
index 32a8b4a8..c6a84209 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/validators.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.da.yml
@@ -4,3 +4,4 @@ validator:
    # password_wrong_value: 'Wrong value for your current password'
    # item_per_page_too_high: 'This will certainly kill the app'
    # rss_limit_too_high: 'This will certainly kill the app'
+    # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.de.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.de.yml
index 37b9888f..c74c00ca 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/validators.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.de.yml
@@ -4,3 +4,4 @@ validator:
    password_wrong_value: 'Falscher Wert für dein aktuelles Kennwort'
    item_per_page_too_high: 'Dies wird die Anwendung möglicherweise beenden'
    rss_limit_too_high: 'Dies wird die Anwendung möglicherweise beenden'
+    # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.en.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.en.yml
index 29217497..8cc117fe 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/validators.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.en.yml
@@ -4,3 +4,4 @@ validator:
    password_wrong_value: 'Wrong value for your current password'
    item_per_page_too_high: 'This will certainly kill the app'
    rss_limit_too_high: 'This will certainly kill the app'
+    quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.es.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.es.yml
index 57ddaa5a..97a8edfa 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/validators.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.es.yml
@@ -4,3 +4,4 @@ validator:
    password_wrong_value: 'Entrada equivocada para su contraseña actual'
    item_per_page_too_high: 'Esto matará la aplicación'
    rss_limit_too_high: 'Esto matará la aplicación'
+    # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.fa.yml
index e0536d18..ef677525 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/validators.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.fa.yml
@@ -4,3 +4,4 @@ validator:
    password_wrong_value: 'رمز فعلی را اشتباه وارد کرده‌اید'
    item_per_page_too_high: 'با این تعداد برنامه به فنا می‌رود'
    rss_limit_too_high: 'با این تعداد برنامه به فنا می‌رود'
+    # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml
index 64574709..f31b4ed2 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml
@@ -4,3 +4,4 @@ validator:
    password_wrong_value: "Votre mot de passe actuel est faux"
    item_per_page_too_high: "Ça ne va pas plaire à l’application"
    rss_limit_too_high: "Ça ne va pas plaire à l’application"
+    quote_length_too_high: "La citation est trop longue. Elle doit avoir au maximum {{ limit }} caractères."
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.it.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.it.yml
index d9beb54f..d949cc3b 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/validators.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.it.yml
@@ -4,3 +4,4 @@ validator:
    password_wrong_value: 'Valore inserito per la password corrente errato'
    item_per_page_too_high: 'Questo valore è troppo alto'
    rss_limit_too_high: 'Questo valore è troppo alto'
+    # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.oc.yml
index f92c2708..fb4aa592 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/validators.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.oc.yml
@@ -4,3 +4,4 @@ validator:
    password_wrong_value: 'Vòstre senhal actual es pas bon'
    item_per_page_too_high: "Aquò li agradarà pas a l'aplicacion"
    rss_limit_too_high: "Aquò li agradarà pas a l'aplicacion"
+    # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml
index ffcd5e7f..e4165c14 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml
@@ -4,3 +4,4 @@ validator:
    password_wrong_value: 'Twoje obecne hasło jest błędne'
    item_per_page_too_high: 'To może spowodować problemy z aplikacją'
    rss_limit_too_high: 'To może spowodować problemy z aplikacją'
+    quote_length_too_high: 'Cytat jest zbyt długi. powinien mieć {{ limit }} znaków lub mniej.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.pt.yml
index 4eddff10..a8c1f9de 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/validators.pt.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.pt.yml
@@ -4,3 +4,4 @@ validator:
    password_wrong_value: 'A senha atual informada está errada'
    item_per_page_too_high: 'Certamente isso pode matar a aplicação'
    rss_limit_too_high: 'Certamente isso pode matar a aplicação'
+    # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.ro.yml
index 59a8cdd8..6840cf11 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/validators.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.ro.yml
@@ -4,3 +4,4 @@ validator:
    # password_wrong_value: 'Wrong value for your current password'
    # item_per_page_too_high: 'This will certainly kill the app'
    # rss_limit_too_high: 'This will certainly kill the app'
+    # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.tr.yml
index 01388771..e1e7317f 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/validators.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.tr.yml
@@ -4,3 +4,4 @@ validator:
    # password_wrong_value: 'Wrong value for your current password'
    # item_per_page_too_high: 'This will certainly kill the app'
    # rss_limit_too_high: 'This will certainly kill the app'
+    # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.'
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
index 3548f590..bcc57dac 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
@@ -82,7 +82,7 @@
        <fieldset class="w500p inline">
            <div class="row">
                <h3>{{ 'config.form_settings.android_configuration'|trans }}</h3>
-                <a href="wallabag://{{ app.user.username }}@{{ wallabag_url }}" >Touch here to prefill your Android application</a>
+                <a href="wallabag://{{ app.user.username }}@{{ wallabag_url }}">{{ 'config.form_settings.android_instruction' | trans }}</a>
                <br/>
                <img id="androidQrcode" />
                <script>
@@ -106,7 +106,7 @@
        <fieldset class="w500p inline">
            <div class="row">
-                <label>Rss token</label>
+                <label>{{ 'config.form_rss.token_label'|trans }}</label>
                {% if rss.token %}
                    {{ rss.token }}
                {% else %}
@@ -128,9 +128,10 @@
            <div class="row">
                <label>{{ 'config.form_rss.rss_links'|trans }}</label>
                <ul>
-                    <li><a href="{{ path('unread_rss', {'username': rss.username, 'token': rss.token}) }}">unread</a></li>
+                    <li><a href="{{ path('unread_rss', {'username': rss.username, 'token': rss.token}) }}">{{ 'config.form_rss.rss_link.unread'|trans }}</a></li>
-                    <li><a href="{{ path('starred_rss', {'username': rss.username, 'token': rss.token}) }}">fav</a></li>
+                    <li><a href="{{ path('starred_rss', {'username': rss.username, 'token': rss.token}) }}">{{ 'config.form_rss.rss_link.starred'|trans }}</a></li>
-                    <li><a href="{{ path('archive_rss', {'username': rss.username, 'token': rss.token}) }}">archives</a></li>
+                    <li><a href="{{ path('archive_rss', {'username': rss.username, 'token': rss.token}) }}">{{ 'config.form_rss.rss_link.archive'|trans }}</a></li>
+                    <li><a href="{{ path('all_rss', {'username': rss.username, 'token': rss.token}) }}">{{ 'config.form_rss.rss_link.all'|trans }}</a></li>
                </ul>
            </div>
        </fieldset>
@@ -200,6 +201,11 @@
                    </a>
                </li>
                <li>
+                    <a href="{{ path('config_reset', { type: 'archived'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red">
+                        {{ 'config.reset.archived'|trans }}
+                    </a>
+                </li>
+                <li>
                    <a href="{{ path('config_reset', { type: 'entries'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red">
                        {{ 'config.reset.entries'|trans }}
                    </a>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
index 859b166b..6424df8d 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
@@ -1,5 +1,12 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
+{% block head %}
+    {{ parent() }}
+    {% if tag is defined and app.user.config.rssToken %}
+        <link rel="alternate" type="application/rss+xml" href="{{ path('tag_rss', {'username': app.user.username, 'token': app.user.config.rssToken, 'slug': tag.slug}) }}" />
+    {% endif %}
+{% endblock %}
 {% block title %}
    {% set filter = '' %}
    {% if tag is defined %}
@@ -12,14 +19,17 @@
 {% endblock %}
 {% block content %}
+    {% set currentRoute = app.request.attributes.get('_route') %}
    {% set listMode = app.user.config.listMode %}
    <div class="results">
        <div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div>
        <div class="pagination">
-            <a href="{{ path('switch_view_mode') }}"><i class="listMode-btn material-icons md-36">{% if listMode == 0 %}list{% else %}view_module{% endif %}</i></a>
+            <a href="{{ path('switch_view_mode') }}"><i class="listMode-btn material-icons md-24">{% if listMode == 0 %}list{% else %}view_module{% endif %}</i></a>
-            <i class="btn-clickable download-btn material-icons md-36 js-export-action">file_download</i>
+            {% if app.user.config.rssToken %}
-            <i class="btn-clickable filter-btn material-icons md-36 js-filters-action">filter_list</i>
+                {% include "@WallabagCore/themes/common/Entry/_rss_link.html.twig" %}
+            {% endif %}
+            <i class="btn-clickable download-btn material-icons md-24 js-export-action">file_download</i>
+            <i class="btn-clickable filter-btn material-icons md-24 js-filters-action">filter_list</i>
            {% if entries.getNbPages > 1 %}
                {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
            {% endif %}
@@ -47,10 +57,10 @@
            </div>
            <ul class="tools links">
-                <li><a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool icon-check icon {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{{ 'entry.list.toogle_as_read'|trans }}</span></a></li>
+                <li><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.list.original_article'|trans }} : {{ entry.title|e }}"><span>{{ entry.domainName|removeWww }}</span></a></li>
-                <li><a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool icon-star icon {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{{ 'entry.list.toogle_as_star'|trans }}</span></a></li>
+                <li><a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool icon {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><i class="material-icons md-24 vertical-align-middle">check</i><span>{{ 'entry.list.toogle_as_read'|trans }}</span></a></li>
-                <li><a title="{{ 'entry.list.delete'|trans }}" class="tool delete icon-trash icon" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{{ 'entry.list.delete'|trans }}</span></a></li>
+                <li><a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool icon {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"><i class="material-icons md-24 vertical-align-middle">star_rate</i><span>{{ 'entry.list.toogle_as_star'|trans }}</span></a></li>
-                <li><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.list.original_article'|trans }} : {{ entry.title|e }}" class="tool link icon-link icon"><span>{{ entry.domainName|removeWww }}</span></a></li>
+                <li><a title="{{ 'entry.list.delete'|trans }}" class="tool icon" onclick="return confirm('{{ 'entry.confirm.delete'|trans|escape('js') }}')" href="{{ path('delete_entry', { 'id': entry.id }) }}"><i class="material-icons md-24 vertical-align-middle">delete</i><span>{{ 'entry.list.delete'|trans }}</span></a></li>
            </ul>
            {% if (entry.previewPicture is null or listMode == 1) %}
                <ul class="card-entry-tags">
@@ -76,7 +86,6 @@
    <!-- Export -->
    <aside id="download-form">
-    {% set currentRoute = app.request.attributes.get('_route') %}
    {% set currentTag = '' %}
    {% if tag is defined %}
        {% set currentTag = tag %}
@@ -127,6 +136,11 @@
                    {{ form_widget(form.previewPicture) }}
                    {{ form_label(form.previewPicture) }}
                </div>
+                <div class="input-field">
+                    {{ form_widget(form.isPublic) }}
+                    {{ form_label(form.isPublic) }}
+                </div>
            </div>
            <div id="filter-language" class="filter-group">
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
index a555691d..3d20a6bc 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
@@ -22,7 +22,7 @@
                <li><a title="{{ markAsReadLabel|trans }}" class="tool icon icon-check {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %} markasread" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{{ markAsReadLabel|trans }}</span></a></li>
                <li><a title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" class="tool icon icon-star {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %} favorite" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.set_as_starred'|trans }}</span></a></li>
                <li><a id="nav-btn-add-tag" class="tool icon icon-price-tags" title="{{ 'entry.view.left_menu.add_a_tag'|trans }}"><span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span></a></li>
-                <li><a title="{{ 'entry.view.left_menu.delete'|trans }}" class="tool delete icon icon-trash" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.delete'|trans }}</span></a></li>
+                <li><a title="{{ 'entry.view.left_menu.delete'|trans }}" onclick="return confirm('{{ 'entry.confirm.delete'|trans|escape('js') }}')" class="tool delete icon icon-trash" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.delete'|trans }}</span></a></li>
                {% if craue_setting('share_public') %}
                    <li><a href="{{ path('share', {'id': entry.id }) }}" target="_blank" class="tool icon icon-eye" title="{{ 'entry.view.left_menu.public_link'|trans }}"><span>{{ 'entry.view.left_menu.public_link'|trans }}</span></a></li>
                    <li><a href="{{ path('delete_share', {'id': entry.id }) }}" class="tool icon icon-no-eye" title="{{ 'entry.view.left_menu.delete_public_link'|trans }}"><span>{{ 'entry.view.left_menu.delete_public_link'|trans }}</span></a></li>
@@ -30,6 +30,7 @@
                {% if craue_setting('share_twitter') %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="Tweet"><span>Tweet</span></a></li>{% endif %}
                {% if craue_setting('share_mail') %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="Email"><span>Email</span></a></li>{% endif %}
                {% if craue_setting('share_shaarli') %}<li><a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}&amp;tags={{ entry.tags|join(',')|url_encode }}" target="_blank" class="tool icon-image icon-image--shaarli" title="shaarli"><span>shaarli</span></a></li>{% endif %}
+                {% if craue_setting('share_scuttle') %}<li><a href="{{ craue_setting('scuttle_url') }}/bookmarks.php?action=add&amp;address={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}&amp;tags={{ entry.tags|join(',')|url_encode }}" target="_blank" class="tool icon-image icon-image--scuttle" title="scuttle"><span>scuttle</span></a></li>{% endif %}
                {% if craue_setting('share_diaspora') %}<li><a href="{{ craue_setting('diaspora_url') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}&notes=&v=1&noui=1&jump=doclose" target="_blank" class="tool diaspora icon-image icon-image--diaspora" title="diaspora"><span>diaspora</span></a></li>{% endif %}
                {% if craue_setting('share_unmark') %}<li><a href="{{ craue_setting('unmark_url') }}/mark/add?url={{ entry.url|url_encode }}&amp;title={{entry.title|url_encode}}&amp;v=6" target="_blank" class="tool unmark icon-image icon-image--unmark" title="unmark"><span>unmark.it</span></a></li>{% endif %}
                {% if craue_setting('carrot') %}<li><a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" class="tool carrot icon-image icon-image--carrot" target="_blank" title="carrot"><span>Carrot</span></a></li>{% endif %}
@@ -43,9 +44,23 @@
        <div id="article-informations">
            <i class="tool icon icon-calendar" title="{{ 'entry.view.created_at'|trans }}">
-                {{ entry.createdAt|date('Y-m-d') }}
+                {{ entry.createdAt|date('Y-m-d H:i') }}
            </i>
+            {% if entry.publishedAt is not null %}
+                <i class="tool icon icon-pencil2" title="{{ 'entry.view.published_at'|trans }}">
+                    {{ entry.publishedAt|date('Y-m-d H:i') }}
+                </i>
+            {% endif %}
+            {% if entry.publishedBy is not empty %}
+                <i class="tool icon icon-users" title="{{ 'entry.view.published_by'|trans }}">
+                    {% for author in entry.publishedBy %}
+                        {{ author }}{% if not loop.last %}, {% endif %}
+                    {% endfor %}
+                </i>
+            {% endif %}
            <i class="tool icon icon-time">
                {% set readingTime = entry.readingTime / app.user.config.readingSpeed %}
                {% if readingTime > 0 %}
@@ -59,10 +74,16 @@
            <aside class="tags">
                <div class="card-entry-tags">
                {% for tag in entry.tags %}
-                    <span class="label-outline"><i class="material-icons">label_outline</i> <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a> <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}" class="nostyle"><i>✘</i></a></span>
+                    <span class="label-outline">
+                        <i class="material-icons">label_outline</i>
+                        <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a>
+                        <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}" onclick="return confirm('{{ 'entry.confirm.delete_tag'|trans|escape('js') }}')" class="nostyle">
+                            <i>✘</i>
+                        </a>
+                    </span>
                {% endfor %}
                </div>
-                <div class="input-field nav-panel-add-tag" style="display: none">
+                <div class="input-field baggy-add-tag" style="display: none">
                    {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }}
                </div>
            </aside>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/edit.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/edit.html.twig
new file mode 100644
index 00000000..882be430
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/edit.html.twig
@@ -0,0 +1,60 @@
+{% extends "WallabagCoreBundle::layout.html.twig" %}
+{% block title %}{{ 'site_credential.page_title'|trans }}{% endblock %}
+{% block content %}
+    <div class="row">
+        <div class="col s12">
+            <div class="card-panel">
+                <div class="row">
+                    <div class="input-field col s12">
+                        <h4>{{ 'site_credential.edit_site_credential'|trans }}</h4>
+                        <div id="set6" class="col s12">
+                            {{ form_start(edit_form) }}
+                                {{ form_errors(edit_form) }}
+                                <div class="row">
+                                    <div class="input-field col s12">
+                                        {{ form_label(edit_form.host) }}
+                                        {{ form_errors(edit_form.host) }}
+                                        {{ form_widget(edit_form.host) }}
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="input-field col s12">
+                                        {{ form_label(edit_form.username) }}
+                                        {{ form_errors(edit_form.username) }}
+                                        {{ form_widget(edit_form.username) }}
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="input-field col s12">
+                                        {{ form_label(edit_form.password) }}
+                                        {{ form_errors(edit_form.password) }}
+                                        {{ form_widget(edit_form.password) }}
+                                    </div>
+                                </div>
+                                <br/>
+                                {{ form_widget(edit_form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
+                                {{ form_widget(edit_form._token) }}
+                            </form>
+                            <p>
+                                {{ form_start(delete_form) }}
+                                    <button onclick="return confirm('{{ 'site_credential.form.delete_confirm'|trans|escape('js') }}')" type="submit" class="btn waves-effect waves-light red">{{ 'site_credential.form.delete'|trans }}</button>
+                                {{ form_end(delete_form) }}
+                            </p>
+                            <p><a class="waves-effect waves-light btn blue-grey" href="{{ path('site_credentials_index') }}">{{ 'site_credential.form.back_to_list'|trans }}</a></p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/index.html.twig
new file mode 100644
index 00000000..324854ad
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/index.html.twig
@@ -0,0 +1,42 @@
+{% extends "WallabagCoreBundle::layout.html.twig" %}
+{% block title %}{{ 'site_credential.page_title'|trans }}{% endblock %}
+{% block content %}
+    <div class="row">
+        <div class="col s12">
+            <div class="card-panel">
+                <div class="row">
+                    <div class="input-field col s12">
+                        <p class="help">{{ 'site_credential.description'|trans|raw }}</p>
+                        <table class="bordered">
+                            <thead>
+                                <tr>
+                                    <th>{{ 'site_credential.form.host_label'|trans }}</th>
+                                    <th>{{ 'site_credential.list.actions'|trans }}</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                            {% for credential in credentials %}
+                                <tr>
+                                    <td>{{ credential.host }}</td>
+                                    <td>
+                                        <a href="{{ path('site_credentials_edit', { 'id': credential.id }) }}">{{ 'site_credential.list.edit_action'|trans }}</a>
+                                    </td>
+                                </tr>
+                            {% endfor %}
+                            </tbody>
+                        </table>
+                        <br />
+                        <p>
+                            <a href="{{ path('site_credentials_new') }}" class="waves-effect waves-light btn">{{ 'site_credential.list.create_new_one'|trans }}</a>
+                        </p>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/new.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/new.html.twig
new file mode 100644
index 00000000..3c008cde
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/new.html.twig
@@ -0,0 +1,53 @@
+{% extends "WallabagCoreBundle::layout.html.twig" %}
+{% block title %}{{ 'site_credential.page_title'|trans }}{% endblock %}
+{% block content %}
+    <div class="row">
+        <div class="col s12">
+            <div class="card-panel">
+                <div class="row">
+                    <div class="input-field col s12">
+                        <h4>{{ 'site_credential.new_site_credential'|trans }}</h4>
+                        <div id="set6" class="col s12">
+                            {{ form_start(form) }}
+                                {{ form_errors(form) }}
+                                <div class="row">
+                                    <div class="input-field col s12">
+                                        {{ form_label(form.host) }}
+                                        {{ form_errors(form.host) }}
+                                        {{ form_widget(form.host) }}
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="input-field col s12">
+                                        {{ form_label(form.username) }}
+                                        {{ form_errors(form.username) }}
+                                        {{ form_widget(form.username) }}
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="input-field col s12">
+                                        {{ form_label(form.password) }}
+                                        {{ form_errors(form.password) }}
+                                        {{ form_widget(form.password) }}
+                                    </div>
+                                </div>
+                                {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
+                                {{ form_rest(form) }}
+                            </form>
+                            <p><a class="waves-effect waves-light btn blue-grey" href="{{ path('site_credentials_index') }}">{{ 'site_credential.form.back_to_list'|trans }}</a></p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig
index 1e2c6b42..070d5629 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig
@@ -9,7 +9,12 @@
    <ul>
    {% for tag in tags %}
-        <li id="tag-{{ tag.id|e }}"><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{tag.label}} ({{ tag.nbEntries | length }})</a></li>
+        <li id="tag-{{ tag.id|e }}">
+            <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{tag.label}} ({{ tag.nbEntries }})</a>
+            <a rel="alternate" type="application/rss+xml" href="{{ path('tag_rss', {'username': app.user.username, 'token': app.user.config.rssToken, 'slug': tag.slug}) }}" class="right">
+                <i class="material-icons md-24">rss_feed</i>
+            </a>
+        </li>
    {% endfor %}
    </ul>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
index 07ff8e14..17fa13bb 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
@@ -2,12 +2,14 @@
 {% block css %}
    {{ parent() }}
-    <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/baggy/css/style.min.css') }}"  media="screen,projection,print"/>
+    {% if not app.debug %}
+        <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/baggy.css') }}">
+    {% endif %}
 {% endblock %}
 {% block scripts %}
    {{ parent() }}
-    <script src="{{ asset('bundles/wallabagcore/themes/baggy/js/baggy.min.js') }}"></script>
+    <script src="{{ asset('bundles/wallabagcore/baggy' ~ (app.debug ? '.dev' : '') ~ '.js') }}"></script>
 {% endblock %}
 {% block header %}
@@ -36,6 +38,9 @@
                {{ render(controller("WallabagCoreBundle:Entry:searchForm", {'currentRoute': app.request.attributes.get('_route')})) }}
            </div>
        </li>
+        {% if craue_setting('restricted_access') %}
+        <li class="menu site_credentials"><a href="{{ path('site_credentials_index') }}">{{ 'menu.left.site_credentials'|trans }}</a></li>
+        {% endif %}
        <li class="menu config"><a href="{{ path('config') }}">{{ 'menu.left.config'|trans }}</a></li>
        {% if is_granted('ROLE_SUPER_ADMIN') %}
            <li class="menu users"><a href="{{ path('user_index') }}">{{ 'menu.left.users_management'|trans }}</a></li>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig
index b3f0affb..528b055c 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig
@@ -33,7 +33,7 @@
                                    <table class="striped">
                                        <tr>
                                            <td>{{ 'developer.existing_clients.field_id'|trans }}</td>
-                                            <td><strong><code>{{ client.id }}_{{ client.randomId }}</code></strong></td>
+                                            <td><strong><code>{{ client.clientId }}</code></strong></td>
                                        </tr>
                                        <tr>
                                            <td>{{ 'developer.existing_clients.field_secret'|trans }}</td>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_rss_link.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_rss_link.html.twig
new file mode 100644
index 00000000..2bf9b2bd
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_rss_link.html.twig
@@ -0,0 +1,6 @@
+{% if tag is defined %}
+    <a rel="alternate" type="application/rss+xml" href="{{ path('tag_rss', {'username': app.user.username, 'token': app.user.config.rssToken, 'slug': tag.slug}) }}" class="right"><i class="material-icons md-24">rss_feed</i></a>
+{% elseif currentRoute in ['unread', 'starred', 'archive', 'all'] %}
+    <a rel="alternate" type="application/rss+xml" href="{{ path(currentRoute ~ '_rss', {'username': app.user.username, 'token': app.user.config.rssToken}) }}" class="right"><i class="material-icons">rss_feed</i></a>
+{% endif %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig
index 12e8c79f..d70aa5dc 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:media="http://search.yahoo.com/mrss/">
    <channel>
-        <title>wallabag — {{type}} feed</title>
+        <title>wallabag - {{ type }} feed</title>
-        <link>{{ url(type) }}</link>
+        <link>{{ url_html }}</link>
        <link rel="self" href="{{ app.request.uri }}"/>
        {% if entries.hasPreviousPage -%}
            <link rel="previous" href="{{ url }}?page={{ entries.previousPage }}"/>
@@ -13,7 +13,7 @@
        <link rel="last" href="{{ url }}?page={{ entries.nbPages }}"/>
        <pubDate>{{ "now"|date('D, d M Y H:i:s') }}</pubDate>
        <generator>wallabag</generator>
-        <description>wallabag {{type}} elements</description>
+        <description>wallabag {{ type }} elements</description>
        {% for entry in entries %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig
index 623cf1c4..a67807f9 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig
@@ -1,32 +1,6 @@
 <html>
    <head>
        <title>{{ entry.title|e|raw }}</title>
-        <style>
-            body {
-                margin: 10px;
-                font-family: 'Roboto',Verdana,Geneva,sans-serif;
-                font-size: 16px;
-                color: #000;
-            }
-            header {
-                text-align: center;
-            }
-            header h1 {
-                font-size: 1.3em;
-            }
-            a,
-            a:hover,
-            a:visited {
-                color: #000;
-            }
-            article {
-                margin: 0 auto;
-                width: 600px;
-            }
-        </style>
        <meta property="og:title" content="{{ entry.title|e|raw }}" />
        <meta property="og:type" content="article" />
        <meta property="og:url" content="{{ app.request.uri }}" />
@@ -40,12 +14,22 @@
        <meta name="twitter:site" content="@wallabagapp" />
        <meta name="twitter:title" content="{{ entry.title|e|raw }}" />
        <meta name="twitter:description" content="{{ entry.content|striptags|slice(0, 300)|raw }}&hellip;" />
+        {% if app.debug %}
+            <script src="{{ asset('bundles/wallabagcore/public.dev.js') }}"></script>
+        {% else %}
+            <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/public.css') }}">
+        {% endif %}
    </head>
    <body>
        <header>
            <h1>{{ entry.title|e|raw }}</h1>
            <div><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e|raw }}" class="tool">{{ entry.domainName|removeWww }}</a></div>
-            <div>{{ "entry.public.shared_by_wallabag"|trans({'%wallabag_instance%': url('homepage')})|raw }}</div>
+            <div>{{ "entry.public.shared_by_wallabag"|trans({'%wallabag_instance%': url('homepage'), '%username%': entry.user.username})|raw }}.</div>
+            {% if entry.previewPicture is not null %}
+                <div><img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|striptags|e('html_attr') }}" /></div>
+            {% endif %}
        </header>
        <article>
            {{ entry.content | raw }}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
index 5d411fdd..a8143315 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
@@ -25,9 +25,9 @@
                            <div class="row">
                                <div class="input-field col s11">
-                                    {{ form_label(form.config.theme) }}
                                    {{ form_errors(form.config.theme) }}
                                    {{ form_widget(form.config.theme) }}
+                                    {{ form_label(form.config.theme) }}
                                </div>
                                <div class="input-field col s1">
                                    <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_theme'|trans }}">
@@ -38,9 +38,9 @@
                            <div class="row">
                                <div class="input-field col s11">
-                                    {{ form_label(form.config.items_per_page) }}
                                    {{ form_errors(form.config.items_per_page) }}
                                    {{ form_widget(form.config.items_per_page) }}
+                                    {{ form_label(form.config.items_per_page) }}
                                </div>
                                <div class="input-field col s1">
                                    <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_items_per_page'|trans }}">
@@ -51,9 +51,9 @@
                            <div class="row">
                                <div class="input-field col s11">
-                                    {{ form_label(form.config.reading_speed) }}
                                    {{ form_errors(form.config.reading_speed) }}
                                    {{ form_widget(form.config.reading_speed) }}
+                                    {{ form_label(form.config.reading_speed) }}
                                    <p>
                                        {{ 'config.form_settings.reading_speed.help_message'|trans }}
                                        <a href="http://www.myreadspeed.com/calculate/">myreadspeed</a>
@@ -66,19 +66,19 @@
                                </div>
                            </div>
-                        <div class="row">
+                            <div class="row">
-                            <div class="input-field col s12">
+                                <div class="input-field col s12">
-                                {{ form_label(form.config.action_mark_as_read) }}
+                                    {{ form_label(form.config.action_mark_as_read) }}
-                                {{ form_errors(form.config.action_mark_as_read) }}
+                                    {{ form_errors(form.config.action_mark_as_read) }}
-                                {{ form_widget(form.config.action_mark_as_read) }}
+                                    {{ form_widget(form.config.action_mark_as_read) }}
+                                </div>
                            </div>
-                        </div>
                            <div class="row">
                                <div class="input-field col s11">
-                                    {{ form_label(form.config.language) }}
                                    {{ form_errors(form.config.language) }}
                                    {{ form_widget(form.config.language) }}
+                                    {{ form_label(form.config.language) }}
                                </div>
                                <div class="input-field col s1">
                                    <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_language'|trans }}">
@@ -89,9 +89,9 @@
                            <div class="row">
                                <div class="input-field col s11">
-                                    {{ form_label(form.config.pocket_consumer_key) }}
                                    {{ form_errors(form.config.pocket_consumer_key) }}
                                    {{ form_widget(form.config.pocket_consumer_key) }}
+                                    {{ form_label(form.config.pocket_consumer_key) }}
                                    <p>
                                        &raquo;
                                        <a href="https://getpocket.com/developer/docs/authentication">https://getpocket.com/developer/docs/authentication</a>
@@ -107,7 +107,7 @@
                            <div class="row">
                                <div class="input-field col s12">
                                    <h5>{{ 'config.form_settings.android_configuration'|trans }}</h5>
-                                    <a href="wallabag://{{ app.user.username }}@{{ wallabag_url }}" class="waves-effect waves-light btn hide-on-large-only">Touch here to prefill your Android application</a>
+                                    <a href="wallabag://{{ app.user.username }}@{{ wallabag_url }}" class="waves-effect waves-light btn hide-on-large-only">{{ 'config.form_settings.android_instruction' | trans }}</a>
                                    <img id="androidQrcode" class="hide-on-med-and-down" />
                                </div>
                                <script>
@@ -132,8 +132,8 @@
                            </div>
                            <div class="row">
-                                <div class="input-field col s12">
+                                <div class="col s12">
-                                    <label>{{ 'config.form_rss.token_label'|trans }}</label>
+                                    <h6 class="grey-text">{{ 'config.form_rss.token_label'|trans }}</h6>
                                    <div>
                                        {% if rss.token %}
                                            {{ rss.token }}
@@ -151,12 +151,13 @@
                            </div>
                            {% if rss.token %}
                            <div class="row">
-                                <div class="input-field col s12">
+                                <div class="col s12">
-                                    <label>{{ 'config.form_rss.rss_links'|trans }}</label>
+                                    <h6 class="grey-text">{{ 'config.form_rss.rss_links'|trans }}</h6>
                                    <ul>
                                        <li><a href="{{ path('unread_rss', {'username': rss.username, 'token': rss.token}) }}">{{ 'config.form_rss.rss_link.unread'|trans }}</a></li>
                                        <li><a href="{{ path('starred_rss', {'username': rss.username, 'token': rss.token}) }}">{{ 'config.form_rss.rss_link.starred'|trans }}</a></li>
                                        <li><a href="{{ path('archive_rss', {'username': rss.username, 'token': rss.token}) }}">{{ 'config.form_rss.rss_link.archive'|trans }}</a></li>
+                                        <li><a href="{{ path('all_rss', {'username': rss.username, 'token': rss.token}) }}">{{ 'config.form_rss.rss_link.all'|trans }}</a></li>
                                    </ul>
                                </div>
                            </div>
@@ -229,6 +230,9 @@
                            <a href="{{ path('config_reset', { type: 'tags'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red">
                                {{ 'config.reset.tags'|trans }}
                            </a>
+                            <a href="{{ path('config_reset', { type: 'archived'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red">
+                                {{ 'config.reset.archived'|trans }}
+                            </a>
                            <a href="{{ path('config_reset', { type: 'entries'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red">
                                {{ 'config.reset.entries'|trans }}
                            </a>
@@ -251,11 +255,11 @@
                        {{ form_start(form.pwd) }}
                            {{ form_errors(form.pwd) }}
-                        <div class="row">
+                            <div class="row">
-                            <div class="input-field col s12">
+                                <div class="input-field col s12">
-                                {{ 'config.form_password.description'|trans }}
+                                    {{ 'config.form_password.description'|trans }}
+                                </div>
                            </div>
-                        </div>
                            <div class="row">
                                <div class="input-field col s12">
@@ -410,8 +414,8 @@
                                        <tr>
                                            <td>domainName</td>
                                            <td>{{ 'config.form_rules.faq.variable_description.domainName'|trans }}</td>
-                                            <td>matches</td>
+                                            <td>matches<br />notmaches</td>
-                                            <td>{{ 'config.form_rules.faq.operator_description.matches'|trans|raw }}</td>
+                                            <td>{{ 'config.form_rules.faq.operator_description.matches'|trans|raw }}<br />{{ 'config.form_rules.faq.operator_description.notmatches'|trans|raw }}</td>
                                        </tr>
                                    </tbody>
                                </table>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_actions.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_actions.html.twig
index d278da1b..468338ac 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_actions.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_actions.html.twig
@@ -9,7 +9,7 @@
        <li>
            <a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool grey-text" href="{{ path('archive_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isArchived == 0 %}done{% else %}redo{% endif %}</i></a>
            <a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool grey-text" href="{{ path('star_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isStarred == 0 %}star_border{% else %}star{% endif %}</i></a>
-            <a title="{{ 'entry.list.delete'|trans }}" class="tool grey-text delete" href="{{ path('delete_entry', { 'id': entry.id }) }}"><i class="material-icons">delete</i></a>
+            <a title="{{ 'entry.list.delete'|trans }}" onclick="return confirm('{{ 'entry.confirm.delete'|trans|escape('js') }}')" class="tool grey-text delete" href="{{ path('delete_entry', { 'id': entry.id }) }}"><i class="material-icons">delete</i></a>
        </li>
    </ul>
 </div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig
index 3ba6253a..b64e1436 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig
@@ -1,18 +1,28 @@
-<div class="card">
+<div class="card-stacked">
-    <div class="card-stacked">
+    <div class="preview">{% if entry.previewPicture is not null %}<img src="{{ entry.previewPicture }}" />{% endif %}</div>
-        <div class="card-content">
+    <div class="card-content">
-            <span class="card-title dot-ellipsis dot-resize-update">
+        <span class="card-title dot-ellipsis dot-resize-update">
-                <a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title | striptags | e('html_attr') }}">
+            <a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title | striptags | e('html_attr') }}">
-                    {{ entry.title| striptags | truncate(120, true, '…') | raw }}
+                {{ entry.title| striptags | truncate(120, true, '…') | raw }}
-                </a>
+            </a>
-            </span>
+        </span>
-            <ul class="tools-list right">
-                <li>
+        <div class="metadata">
-                    <a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool grey-text" href="{{ path('archive_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isArchived == 0 %}done{% else %}redo{% endif %}</i></a>
+            <a href="{{ entry.url|e }}" class="grey-text domain" target="_blank" title="{{ entry.domainName|removeWww }}">
-                    <a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool grey-text" href="{{ path('star_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isStarred == 0 %}star_border{% else %}star{% endif %}</i></a>
+                <span>{{ entry.domainName|removeWww }}</span>
-                    <a title="{{ 'entry.list.delete'|trans }}" class="tool grey-text delete" href="{{ path('delete_entry', { 'id': entry.id }) }}"><i class="material-icons">delete</i></a>
+            </a>
-                </li>
+            {% for tag in entry.tags | slice(0, 3) %}
-            </ul>
+                <span class="chip hide-on-med-and-down">
+                    <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a>
+                </span>
+            {% endfor %}
        </div>
    </div>
+    <ul class="tools-list hide-on-small-only">
+        <li>
+            <a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool grey-text" href="{{ path('archive_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isArchived == 0 %}done{% else %}redo{% endif %}</i></a>
+            <a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool grey-text" href="{{ path('star_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isStarred == 0 %}star_border{% else %}star{% endif %}</i></a>
+            <a title="{{ 'entry.list.delete'|trans }}" onclick="return confirm('{{ 'entry.confirm.delete'|trans|escape('js') }}')" class="tool grey-text delete" href="{{ path('delete_entry', { 'id': entry.id }) }}"><i class="material-icons">delete</i></a>
+        </li>
+    </ul>
 </div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_reading_time.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_reading_time.html.twig
index 1a932a9f..6ba18768 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_reading_time.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_reading_time.html.twig
@@ -1,7 +1,7 @@
 {% set readingTime = entry.readingTime / app.user.config.readingSpeed %}
 <i class="material-icons">timer</i>
 {% if readingTime > 0 %}
-    {{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }}
+    <span>{{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }}</span>
 {% else %}
-    {{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }}
+    <span>{{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }}</span>
 {% endif %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig
index 1c5e2aab..b9537975 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig
@@ -27,11 +27,6 @@
                            {{ form_label(form.url) }}
                            {{ form_widget(form.url) }}
                        </div>
-                        <div class="input-field s12">
-                            {{ form_widget(form.is_public) }}
-                            {{ form_label(form.is_public) }}
-                        </div>
                        <br>
                        {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
index 5fca53ae..0c4dc80b 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
@@ -1,9 +1,16 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
+{% block head %}
+    {{ parent() }}
+    {% if tag is defined and app.user.config.rssToken %}
+        <link rel="alternate" type="application/rss+xml" href="{{ path('tag_rss', {'username': app.user.username, 'token': app.user.config.rssToken, 'slug': tag.slug}) }}" />
+    {% endif %}
+{% endblock %}
 {% block title %}
    {% set filter = '' %}
    {% if tag is defined %}
-        {% set filter = tag %}
+        {% set filter = tag.slug %}
    {% endif %}
    {% if searchTerm is defined and searchTerm is not empty %}
        {% set filter = searchTerm %}
@@ -13,10 +20,14 @@
 {% block content %}
    {% set listMode = app.user.config.listMode %}
+    {% set currentRoute = app.request.attributes.get('_route') %}
    <div class="results clearfix">
        <div class="nb-results left">
            {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}
            <a href="{{ path('switch_view_mode') }}"><i class="material-icons">{% if listMode == 0 %}view_list{% else %}view_module{% endif %}</i></a>
+            {% if app.user.config.rssToken %}
+                {% include "@WallabagCore/themes/common/Entry/_rss_link.html.twig" %}
+            {% endif %}
        </div>
        {% if entries.getNbPages > 1 %}
            {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
@@ -24,9 +35,9 @@
    </div>
    <br />
-    <ul class="row data">
+    <ul class="{% if listMode == 1 %}collection{% else %}row data{% endif %}">
        {% for entry in entries %}
-            <li id="entry-{{ entry.id|e }}" class="col {% if listMode == 0 %}l3 m6{% endif %} s12">
+            <li id="entry-{{ entry.id|e }}" class="col {% if listMode == 0 %}l3 m6{% else %}collection-item{% endif %} s12">
                {% if listMode == 1 %}
                    {% include "@WallabagCore/themes/material/Entry/_card_list.html.twig" with {'entry': entry} only %}
                {% elseif entry.previewPicture is null %}
@@ -45,11 +56,10 @@
    {% endif %}
    <!-- Export -->
-    <div id="export" class="side-nav fixed right-aligned">
+    <div id="export" class="side-nav right-aligned">
-    {% set currentRoute = app.request.attributes.get('_route') %}
    {% set currentTag = '' %}
    {% if tag is defined %}
-        {% set currentTag = tag %}
+        {% set currentTag = tag.slug %}
    {% endif %}
    {% if currentRoute == 'homepage' %}
        {% set currentRoute = 'unread' %}
@@ -68,7 +78,7 @@
    <!-- Filters -->
    {% if form is not null %}
-    <div id="filters" class="side-nav fixed right-aligned">
+    <div id="filters" class="side-nav right-aligned">
        <form action="{{ path('all') }}">
            <h4 class="center">{{ 'entry.filters.title'|trans }}</h4>
@@ -103,6 +113,15 @@
                </div>
                <div class="col s12">
+                    <label>{{ 'entry.filters.is_public_help'|trans }}</label>
+                </div>
+                <div class="input-field col s12 with-checkbox">
+                    {{ form_widget(form.isPublic) }}
+                    {{ form_label(form.isPublic) }}
+                </div>
+                <div class="col s12">
                    {{ form_label(form.language) }}
                </div>
@@ -121,10 +140,12 @@
                <div class="col s12">
                    {{ form_label(form.readingTime) }}
                </div>
                <div class="input-field col s6">
                    {{ form_widget(form.readingTime.left_number, {'type': 'number'}) }}
                    <label for="entry_filter_readingTime_left_number">{{ 'entry.filters.reading_time.from'|trans }}</label>
                </div>
                <div class="input-field col s6">
                    {{ form_widget(form.readingTime.right_number, {'type': 'number'}) }}
                    <label for="entry_filter_readingTime_right_number">{{ 'entry.filters.reading_time.to'|trans }}</label>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
index af53084f..4cff7bf2 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
@@ -12,6 +12,11 @@
        <div class="nav-wrapper cyan darken-1">
            <ul>
                <li>
+                    <a href="#" data-activates="slide-out" class="button-collapse">
+                        <i class="material-icons">menu</i>
+                    </a>
+                </li>
+                <li>
                    <a class="waves-effect" href="{{ path('homepage') }}">
                        <i class="material-icons">exit_to_app</i>
                    </a>
@@ -28,11 +33,6 @@
                        <i class="material-icons small">{% if entry.isStarred == 0 %}star_outline{% else %}star{% endif %}</i>
                    </a>
                </li>
-                <li>
-                    <a href="#" data-activates="slide-out" class="button-collapse right">
-                        <i class="material-icons">menu</i>
-                    </a>
-                </li>
            </ul>
        </div>
    </nav>
@@ -82,7 +82,7 @@
            <div class="collapsible-body"></div>
        </li>
        <li class="bold border-bottom">
-            <a class="waves-effect collapsible-header delete" title="{{ 'entry.view.left_menu.delete'|trans }}" href="{{ path('delete_entry', { 'id': entry.id }) }}">
+            <a class="waves-effect collapsible-header delete" onclick="return confirm('{{ 'entry.confirm.delete'|trans|escape('js') }}')" title="{{ 'entry.view.left_menu.delete'|trans }}" href="{{ path('delete_entry', { 'id': entry.id }) }}">
                <i class="material-icons small">delete</i>
                <span>{{ 'entry.view.left_menu.delete'|trans }}</span>
            </a>
@@ -125,39 +125,43 @@
                    {% endif %}
                    {% if craue_setting('share_shaarli') %}
                        <li>
-                        <a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|striptags|url_encode }}&amp;tags={{ entry.tags|join(',')|striptags|url_encode }}" target="_blank">
+                        <a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|striptags|url_encode }}&amp;tags={{ entry.tags|join(',')|striptags|url_encode }}" target="_blank" title="shaarli" class="tool icon-image shaarli">
-                                <i class="tool icon-image icon-image--shaarli" title="shaarli"></i>
                                <span>shaarli</span>
                            </a>
                        </li>
                    {% endif %}
+                    {% if craue_setting('share_scuttle') %}
+                        <li>
+                        <a href="{{ craue_setting('scuttle_url') }}/bookmarks.php?action=add&amp;address={{ entry.url|url_encode }}&amp;title={{ entry.title|striptags|url_encode }}&amp;tags={{ entry.tags|join(',')|striptags|url_encode }}" target="_blank" title="scuttle" class="tool icon-image scuttle">
+                                <span>scuttle</span>
+                            </a>
+                        </li>
+                    {% endif %}
                    {% if craue_setting('share_diaspora') %}
                        <li>
-                            <a href="{{ craue_setting('diaspora_url') }}/bookmarklet?url={{ entry.url|url_encode }}&amp;title={{ entry.title|striptags|url_encode }}&amp;notes=&amp;v=1&amp;noui=1&amp;jump=doclose" target="_blank">
+                            <a href="{{ craue_setting('diaspora_url') }}/bookmarklet?url={{ entry.url|url_encode }}&amp;title={{ entry.title|striptags|url_encode }}&amp;notes=&amp;v=1&amp;noui=1&amp;jump=doclose" target="_blank" class="tool icon-image diaspora" title="diaspora">
-                                <i class="tool icon-image icon-image--diaspora" title="diaspora"></i>
                                <span>diaspora*</span>
                            </a>
                        </li>
                    {% endif %}
                    {% if craue_setting('share_unmark') %}
                        <li>
-                            <a href="{{ craue_setting('unmark_url') }}/mark/add?url={{ entry.url|url_encode }}&amp;title={{entry.title|striptags|url_encode}}&amp;v=6" target="_blank">
+                            <a href="{{ craue_setting('unmark_url') }}/mark/add?url={{ entry.url|url_encode }}&amp;title={{entry.title|striptags|url_encode}}&amp;v=6" target="_blank" class="tool icon-image unmark" title="unmark">
-                                <i class="tool icon-image icon-image--unmark" title="unmark"></i>
                                <span>unmark.it</span>
                            </a>
                        </li>
                    {% endif %}
                    {% if craue_setting('carrot') %}
                        <li>
-                            <a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&amp;title={{ entry.title|striptags|url_encode }}" target="_blank" title="carrot">
+                            <a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&amp;title={{ entry.title|striptags|url_encode }}" target="_blank" title="carrot" class="tool icon-image carrot">
-                                <i class="tool icon-image icon-image--carrot"></i>
                                <span>Carrot</span>
                            </a>
                        </li>
                    {% endif %}
                    {% if craue_setting('share_mail') %}
                        <li>
-                            <a href="mailto:?subject={{ entry.title|striptags|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" title="{{ 'entry.view.left_menu.share_email_label'|trans }}" class="tool email icon icon-mail">
+                            <a href="mailto:?subject={{ entry.title|striptags|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" title="{{ 'entry.view.left_menu.share_email_label'|trans }}" class="tool icon">
+                                <i class="material-icons vertical-align-middle">mail</i>
                                <span>{{ 'entry.view.left_menu.share_email_label'|trans }}</span>
                            </a>
                        </li>
@@ -212,32 +216,51 @@
            <h1>{{ entry.title|striptags|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1>
        </header>
        <aside>
-            <ul class="tools">
+            <div class="tools">
-                <li>
+                <ul class="stats">
-                    {% include "@WallabagCore/themes/material/Entry/_reading_time.html.twig" with {'entry': entry} only %}
+                    <li>
-                </li>
+                        {% include "@WallabagCore/themes/material/Entry/_reading_time.html.twig" with {'entry': entry} only %}
-                <li>
+                    </li>
-                    <i class="material-icons" title="{{ 'entry.view.created_at'|trans }}">today</i>
+                    <li>
-                    {{ entry.createdAt|date('Y-m-d') }}
+                        <i class="material-icons" title="{{ 'entry.view.created_at'|trans }}">today</i>
-                </li>
+                        {{ entry.createdAt|date('Y-m-d H:i') }}
-                <li>
+                    </li>
-                    <i class="material-icons link">link</i>
+                    {% if entry.publishedAt is not null %}
-                    <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|striptags }}" class="tool">
+                    <li>
-                        {{ entry.domainName|removeWww }}
+                        <i class="material-icons" title="{{ 'entry.view.published_at'|trans }}">create</i>
-                    </a>
+                        {{ entry.publishedAt|date('Y-m-d H:i') }}
-                </li>
+                    </li>
-                <li>
+                    {% endif %}
-                    <i class="material-icons link">comment</i>
+                    {% if entry.publishedBy is not empty %}
-                    {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}
+                        <li>
-                </li>
+                            <i class="material-icons" title="{{ 'entry.view.published_by'|trans }}">person</i>
-                <li id="list">
+                            {% for author in entry.publishedBy %}
+                                {{ author }}{% if not loop.last %}, {% endif %}
+                            {% endfor %}
+                        </li>
+                    {% endif %}
+                    <li>
+                        <i class="material-icons link">link</i>
+                        <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|striptags }}" class="tool">
+                            {{ entry.domainName|removeWww }}
+                        </a>
+                    </li>
+                    <li>
+                        <i class="material-icons link">comment</i>
+                        {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}
+                    </li>
+                </ul>
+                <ul class="tags">
                    {% for tag in entry.tags %}
-                        <div class="chip">
+                        <li class="chip">
-                        <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a> <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"><i class="material-icons">delete</i></a>
+                            <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a>
-                        </div>
+                            <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}" onclick="return confirm('{{ 'entry.confirm.delete_tag'|trans|escape('js') }}')">
+                                <i class="material-icons vertical-align-middle">delete</i>
+                            </a>
+                        </li>
                    {% endfor %}
-                </li>
+                </ul>
-            </ul>
+            </div>
            <div class="input-field nav-panel-add-tag" style="display: none">
                {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }}
@@ -259,7 +282,7 @@
            <ul>
              <li><a class="btn-floating" href="{{ path('archive_entry', { 'id': entry.id }) }}"><i class="material-icons">done</i></a></li>
              <li><a class="btn-floating" href="{{ path('star_entry', { 'id': entry.id }) }}"><i class="material-icons">star_outline</i></a></li>
-              <li><a class="btn-floating" href="{{ path('delete_entry', { 'id': entry.id }) }}"><i class="material-icons">delete</i></a></li>
+              <li><a class="btn-floating" href="{{ path('delete_entry', { 'id': entry.id }) }}" onclick="return confirm('{{ 'entry.confirm.delete'|trans|escape('js') }}')"><i class="material-icons">delete</i></a></li>
            </ul>
        </div>
    </div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/edit.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/edit.html.twig
new file mode 100644
index 00000000..882be430
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/edit.html.twig
@@ -0,0 +1,60 @@
+{% extends "WallabagCoreBundle::layout.html.twig" %}
+{% block title %}{{ 'site_credential.page_title'|trans }}{% endblock %}
+{% block content %}
+    <div class="row">
+        <div class="col s12">
+            <div class="card-panel">
+                <div class="row">
+                    <div class="input-field col s12">
+                        <h4>{{ 'site_credential.edit_site_credential'|trans }}</h4>
+                        <div id="set6" class="col s12">
+                            {{ form_start(edit_form) }}
+                                {{ form_errors(edit_form) }}
+                                <div class="row">
+                                    <div class="input-field col s12">
+                                        {{ form_label(edit_form.host) }}
+                                        {{ form_errors(edit_form.host) }}
+                                        {{ form_widget(edit_form.host) }}
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="input-field col s12">
+                                        {{ form_label(edit_form.username) }}
+                                        {{ form_errors(edit_form.username) }}
+                                        {{ form_widget(edit_form.username) }}
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="input-field col s12">
+                                        {{ form_label(edit_form.password) }}
+                                        {{ form_errors(edit_form.password) }}
+                                        {{ form_widget(edit_form.password) }}
+                                    </div>
+                                </div>
+                                <br/>
+                                {{ form_widget(edit_form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
+                                {{ form_widget(edit_form._token) }}
+                            </form>
+                            <p>
+                                {{ form_start(delete_form) }}
+                                    <button onclick="return confirm('{{ 'site_credential.form.delete_confirm'|trans|escape('js') }}')" type="submit" class="btn waves-effect waves-light red">{{ 'site_credential.form.delete'|trans }}</button>
+                                {{ form_end(delete_form) }}
+                            </p>
+                            <p><a class="waves-effect waves-light btn blue-grey" href="{{ path('site_credentials_index') }}">{{ 'site_credential.form.back_to_list'|trans }}</a></p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/index.html.twig
new file mode 100644
index 00000000..324854ad
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/index.html.twig
@@ -0,0 +1,42 @@
+{% extends "WallabagCoreBundle::layout.html.twig" %}
+{% block title %}{{ 'site_credential.page_title'|trans }}{% endblock %}
+{% block content %}
+    <div class="row">
+        <div class="col s12">
+            <div class="card-panel">
+                <div class="row">
+                    <div class="input-field col s12">
+                        <p class="help">{{ 'site_credential.description'|trans|raw }}</p>
+                        <table class="bordered">
+                            <thead>
+                                <tr>
+                                    <th>{{ 'site_credential.form.host_label'|trans }}</th>
+                                    <th>{{ 'site_credential.list.actions'|trans }}</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                            {% for credential in credentials %}
+                                <tr>
+                                    <td>{{ credential.host }}</td>
+                                    <td>
+                                        <a href="{{ path('site_credentials_edit', { 'id': credential.id }) }}">{{ 'site_credential.list.edit_action'|trans }}</a>
+                                    </td>
+                                </tr>
+                            {% endfor %}
+                            </tbody>
+                        </table>
+                        <br />
+                        <p>
+                            <a href="{{ path('site_credentials_new') }}" class="waves-effect waves-light btn">{{ 'site_credential.list.create_new_one'|trans }}</a>
+                        </p>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/new.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/new.html.twig
new file mode 100644
index 00000000..3c008cde
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/new.html.twig
@@ -0,0 +1,53 @@
+{% extends "WallabagCoreBundle::layout.html.twig" %}
+{% block title %}{{ 'site_credential.page_title'|trans }}{% endblock %}
+{% block content %}
+    <div class="row">
+        <div class="col s12">
+            <div class="card-panel">
+                <div class="row">
+                    <div class="input-field col s12">
+                        <h4>{{ 'site_credential.new_site_credential'|trans }}</h4>
+                        <div id="set6" class="col s12">
+                            {{ form_start(form) }}
+                                {{ form_errors(form) }}
+                                <div class="row">
+                                    <div class="input-field col s12">
+                                        {{ form_label(form.host) }}
+                                        {{ form_errors(form.host) }}
+                                        {{ form_widget(form.host) }}
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="input-field col s12">
+                                        {{ form_label(form.username) }}
+                                        {{ form_errors(form.username) }}
+                                        {{ form_widget(form.username) }}
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="input-field col s12">
+                                        {{ form_label(form.password) }}
+                                        {{ form_errors(form.password) }}
+                                        {{ form_widget(form.password) }}
+                                    </div>
+                                </div>
+                                {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
+                                {{ form_rest(form) }}
+                            </form>
+                            <p><a class="waves-effect waves-light btn blue-grey" href="{{ path('site_credentials_index') }}">{{ 'site_credential.form.back_to_list'|trans }}</a></p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig
index c83543ac..97ddedc9 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig
@@ -14,6 +14,9 @@
            {% for tag in tags %}
                <li title="{{tag.label}} ({{ tag.nbEntries }})" id="tag-{{ tag.id }}" class="col l2 m2 s5">
                    <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{tag.label}} ({{ tag.nbEntries }})</a>
+                    {% if app.user.config.rssToken %}
+                        <a rel="alternate" type="application/rss+xml" href="{{ path('tag_rss', {'username': app.user.username, 'token': app.user.config.rssToken, 'slug': tag.slug}) }}" class="right"><i class="material-icons">rss_feed</i></a>
+                    {% endif %}
                </li>
            {% endfor %}
        </ul>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
index 3c169c04..60907e11 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -2,12 +2,14 @@
 {% block css %}
    {{ parent() }}
-    <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/material/css/style.min.css') }}"  media="screen,projection,print"/>
+    {% if not app.debug %}
+        <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/material.css') }}">
+    {% endif %}
 {% endblock %}
 {% block scripts %}
    {{ parent() }}
-    <script src="{{ asset('bundles/wallabagcore/themes/material/js/material.min.js') }}"></script>
+    <script src="{{ asset('bundles/wallabagcore/material' ~ (app.debug ? '.dev' : '') ~ '.js') }}"></script>
 {% endblock %}
 {% block header %}
@@ -64,6 +66,11 @@
            <li class="bold {% if currentRoute == 'config' %}active{% endif %}">
                <a class="waves-effect" href="{{ path('config') }}">{{ 'menu.left.config'|trans }}</a>
            </li>
+            {% if craue_setting('restricted_access') %}
+            <li class="bold {% if currentRoute starts with 'site_credentials_' %}active{% endif %}">
+                <a class="waves-effect" href="{{ path('site_credentials_index') }}">{{ 'menu.left.site_credentials'|trans }}</a>
+            </li>
+            {% endif %}
            {% if is_granted('ROLE_SUPER_ADMIN') %}
                <li class="bold {% if currentRoute starts with 'user_' %}active{% endif %}">
                    <a class="waves-effect" href="{{ path('user_index') }}">{{ 'menu.left.users_management'|trans }}</a>
@@ -116,12 +123,12 @@
            </ul>
            <div class="input-field nav-panel-search" style="display: none">
                {{ render(controller("WallabagCoreBundle:Entry:searchForm", {'currentRoute': app.request.attributes.get('_route')})) }}
-                <label for="search" class="active"><i class="material-icons search">search</i></label>
+                <label for="search"><i class="material-icons search">search</i></label>
                <i class="material-icons close">clear</i>
            </div>
            <div class="input-field nav-panel-add" style="display: none">
                {{ render(controller("WallabagCoreBundle:Entry:addEntryForm")) }}
-                <label for="add" class="active"><i class="material-icons add">add</i></label>
+                <label for="add"><i class="material-icons add">add</i></label>
                <i class="material-icons close">clear</i>
            </div>
        </div>