13 files changed, 861 insertions, 165 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index c066aaf7..40644ff5 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -31,6 +31,7 @@ menu:
        search: 'Søg'
        # save_link: 'Save a link'
        back_to_unread: 'Tilbage til de ulæste artikler'
+        # users_management: 'Users management'
    top:
        add_new_entry: 'Tilføj ny artikel'
        search: 'Søg'
@@ -45,6 +46,7 @@ footer:
        # social: 'Social'
        # powered_by: 'powered by'
        about: 'Om'
+    # stats: Since %user_creation% you read %nb_archives% articles. That is about %per_day% a day!
 config:
    page_title: 'Opsætning'
@@ -68,6 +70,7 @@ config:
            # 200_word: 'I read ~200 words per minute'
            # 300_word: 'I read ~300 words per minute'
            # 400_word: 'I read ~400 words per minute'
+        pocket_consumer_key_label: Brugers nøgle til Pocket for at importere materialer
    form_rss:
        description: 'RSS-feeds fra wallabag gør det muligt at læse de artikler, der gemmes i wallabag, med din RSS-læser. Det kræver, at du genererer et token først.'
        token_label: 'RSS-Token'
@@ -93,6 +96,7 @@ config:
        # if_label: 'if'
        # then_tag_as_label: 'then tag as'
        # delete_rule_label: 'delete'
+        # edit_rule_label: 'edit'
        # rule_label: 'Rule'
        # tags_label: 'Tags'
        # faq:
@@ -126,12 +130,6 @@ 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>'
-    form_new_user:
-        username_label: 'Brugernavn'
-        password_label: 'Adgangskode'
-        repeat_new_password_label: 'Gentag adgangskode'
-        plain_password_label: '????'
-        email_label: 'Emailadresse'
 entry:
    page_titles:
@@ -139,11 +137,14 @@ entry:
        # starred: 'Starred entries'
        # archived: 'Archived entries'
        # filtered: 'Filtered entries'
+        # filtered_tags: 'Filtered by tags'
+        # untagged: 'Untagged entries'
    list:
        # number_on_the_page: '{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.'
        reading_time: 'estimeret læsetid'
        reading_time_minutes: 'estimeret læsetid: %readingTime% min'
        reading_time_less_one_minute: 'estimeret læsetid: <small class="inferieur">&lt;</small> 1 min'
+        # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags'
        reading_time_minutes_short: '%readingTime% min'
        reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
        original_article: 'original'
@@ -185,6 +186,8 @@ entry:
            add_a_tag: 'Tliføj et tag'
            share_content: 'Deling'
            # share_email_label: 'Email'
+            # public_link: 'public link'
+            # delete_public_link: 'delete public link'
            download: 'Download'
            # print: 'Print'
            problem:
@@ -260,12 +263,14 @@ howto:
 quickstart:
    # page_title: 'Quickstart'
+    # more: 'More…'
    # intro:
    #     title: 'Welcome to wallabag!'
    #     paragraph_1: "We'll accompany you to visit wallabag and show you some features which can interest you."
    #     paragraph_2: 'Follow us!'
    # configure:
    #     title: 'Configure the application'
+    #     description: 'In order to have an application which suits you, have a look into the configuration of wallabag.'
    #     language: 'Change language and design'
    #     rss: 'Enable RSS feeds'
    #     tagging_rules: 'Write rules to automatically tag your articles'
@@ -279,6 +284,7 @@ quickstart:
    #     import: 'Configure import'
    # first_steps:
    #     title: 'First steps'
+    #     description: "Now wallabag is well configured, it's time to archive the web. You can click on the top right sign + to add a link."
    #     new_article: 'Save your first article'
    #     unread_articles: 'And classify it!'
    # migrate:
@@ -287,11 +293,16 @@ quickstart:
    #     pocket: 'Migrate from Pocket'
    #     wallabag_v1: 'Migrate from wallabag v1'
    #     wallabag_v2: 'Migrate from wallabag v2'
+    #     readability: 'Migrate from Readability'
+    #     instapaper: 'Migrate from Instapaper'
    # developer:
    #     title: 'Developers'
+    #     description: 'We also thought to the developers: Docker, API, translations, etc.'
    #     create_application: 'Create your third application'
+    #     use_docker: 'Use Docker to install wallabag'
    # docs:
    #     title: 'Full documentation'
+    #     description: "There are so much features in wallabag. Don't hesitate to read the manual to know them and to learn how to use them."
    #     annotate: 'Annotate your article'
    #     export: 'Convert your articles into ePUB or PDF'
    #     search_filters: 'See how you can look for an article by using search engine and filters'
@@ -308,6 +319,7 @@ tag:
    page_title: 'Tags'
    list:
        # number_on_the_page: '{0} There is no tag.|{1} There is one tag.|]1,Inf[ There are %count% tags.'
+        # see_untagged_entries: 'See untagged entries'
 import:
    # page_title: 'Import'
@@ -335,6 +347,24 @@ import:
    # wallabag_v2:
    #     page_title: 'Import > Wallabag v2'
    #     description: 'This importer will import all your wallabag v2 articles. Go to All articles, then, on the export sidebar, click on "JSON". You will have a "All articles.json" file.'
+    # readability:
+    #     page_title: 'Import > Readability'
+    #     description: 'This importer will import all your Readability articles. On the tools (https://www.readability.com/tools/) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact).'
+    #     how_to: 'Please select your Readability export and click on the below button to upload and import it.'
+    worker:
+        # enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:"
+    # firefox:
+    #    page_title: 'Import > Firefox'
+    #    description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file."
+    #    how_to: "Please choose the bookmark backup file and click on the button below to import it. Note that the process may take a long time since all articles have to be fetched."
+    #chrome:
+    #    page_title: 'Import > Chrome'
+    #    description: "This importer will import all your Chrome bookmarks. The location of the file depends on your operating system : <ul><li>On Linux, go into the <code>~/.config/chromium/Default/</code> directory</li><li>On Windows, it should be at <code>%LOCALAPPDATA%\\Google\\Chrome\\User Data\\Default</code></li><li>On OS X, it should be at <code>~/Library/Application Support/Google/Chrome/Default/Bookmarks</code></li></ul>Once you got there, copy the Bookmarks file someplace you'll find.<em><br>Note that if you have Chromium instead of Chrome, you'll have to correct paths accordingly.</em></p>"
+    #    how_to: "Please choose the bookmark backup file and click on the button below to import it. Note that the process may take a long time since all articles have to be fetched."
+    # instapaper:
+    #     page_title: 'Import > Instapaper'
+    #     description: 'This importer will import all your Instapaper articles. On the settings (https://www.instapaper.com/user) page, click on "Download .CSV file" in the "Export" section. A CSV file will be downloaded (like "instapaper-export.csv").'
+    #     how_to: 'Please select your Instapaper export and click on the below button to upload and import it.'
 developer:
    # page_title: 'Developer'
@@ -361,12 +391,14 @@ developer:
    #     page_title: 'Developer > New client'
    #     page_description: 'You are about to create a new client. Please fill the field below for the redirect URI of your application.'
    #     form:
+    #         name_label: 'Name of the client'
    #         redirect_uris_label: 'Redirect URIs'
    #         save_label: 'Create a new client'
    #     action_back: 'Back'
    # client_parameter:
    #     page_title: 'Developer > Client parameters'
    #     page_description: 'Here are your client parameters.'
+    #     field_name: 'Client name'
    #     field_id: 'Client ID'
    #     field_secret: 'Client secret'
    #     back: 'Back'
@@ -384,6 +416,33 @@ developer:
    #         paragraph_8: 'If you want to see all the API endpoints, you can have a look <a href="%link%">to our API documentation</a>.'
    #     back: 'Back'
+user:
+    # page_title: Users management
+    # new_user: Create a new user
+    # edit_user: Edit an existing user
+    # description: "Here you can manage all users (create, edit and delete)"
+    # list:
+    #     actions: Actions
+    #     edit_action: Edit
+    #     yes: Yes
+    #     no: No
+    #     create_new_one: Create a new user
+    form:
+        username_label: 'Brugernavn'
+        # name_label: 'Name'
+        password_label: 'Adgangskode'
+        repeat_new_password_label: 'Gentag adgangskode'
+        plain_password_label: '????'
+        email_label: 'Emailadresse'
+        # enabled_label: 'Enabled'
+        # locked_label: 'Locked'
+        # last_login_label: 'Last login'
+        # twofactor_label: Two factor authentication
+        # save: Save
+        # delete: Delete
+        # delete_confirm: Are you sure?
+        # back_to_list: Back to list
 flashes:
    config:
        notice:
@@ -400,10 +459,10 @@ flashes:
        notice:
            # entry_already_saved: 'Entry already saved on %date%'
            # entry_saved: 'Entry saved'
-            # entry_saved_failed: 'Failed to save entry'
+            # entry_saved_failed: 'Entry saved but fetching content failed'
            # entry_updated: 'Entry updated'
            # entry_reloaded: 'Entry reloaded'
-            # entry_reload_failed: 'Failed to reload entry'
+            # entry_reload_failed: 'Entry reloaded but fetching content failed'
            entry_archived: 'Artikel arkiveret'
            entry_unarchived: 'Artikel ikke længere arkiveret'
            entry_starred: 'Artikel markeret som favorit'
@@ -417,6 +476,10 @@ flashes:
            # failed: 'Import failed, please try again.'
            # failed_on_file: 'Error while processing import. Please verify your import file.'
            # summary: 'Import summary: %imported% imported, %skipped% already saved.'
+            # summary_with_queue: 'Import summary: %queued% queued.'
+        error:
+            # redis_enabled_not_installed: Redis is enabled for handle asynchronous import but it looks like <u>we can't connect to it</u>. Please check Redis configuration.
+            # rabbit_enabled_not_installed: RabbitMQ is enabled for handle asynchronous import but it looks like <u>we can't connect to it</u>. Please check RabbitMQ configuration.
    developer:
        notice:
            # client_created: 'New client created.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index 28d826b6..6f790744 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -31,6 +31,7 @@ menu:
        search: 'Suche'
        save_link: 'Link speichern'
        back_to_unread: 'Zurück zu ungelesenen Artikeln'
+        # users_management: 'Users management'
    top:
        add_new_entry: 'Neuen Artikel hinzufügen'
        search: 'Suche'
@@ -45,6 +46,7 @@ footer:
        social: 'Soziales'
        powered_by: 'angetrieben von'
        about: 'Über'
+    # stats: Since %user_creation% you read %nb_archives% articles. That is about %per_day% a day!
 config:
    page_title: 'Einstellungen'
@@ -68,6 +70,7 @@ config:
            200_word: 'Ich lese ~200 Wörter pro Minute'
            300_word: 'Ich lese ~300 Wörter pro Minute'
            400_word: 'Ich lese ~400 Wörter pro Minute'
+        pocket_consumer_key_label: Consumer-Key für Pocket, um Inhalte zu importieren
    form_rss:
        description: 'Die RSS-Feeds von wallabag erlauben es dir, deine gespeicherten Artikel mit deinem bevorzugten RSS-Reader zu lesen. Vorher musst du jedoch einen Token erstellen.'
        token_label: 'RSS-token'
@@ -93,6 +96,7 @@ config:
        if_label: 'Wenn'
        then_tag_as_label: 'dann tagge als'
        delete_rule_label: 'löschen'
+        # edit_rule_label: 'edit'
        rule_label: 'Regel'
        tags_label: 'Tags'
        faq:
@@ -126,12 +130,6 @@ config:
                or: 'Eine Regel ODER die andere'
                and: 'Eine Regel UND eine andere'
                matches: 'Tests, 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>'
-    form_new_user:
-        username_label: 'Benutzername'
-        password_label: 'Kennwort'
-        repeat_new_password_label: 'Neues Kennwort wiederholen'
-        plain_password_label: '????'
-        email_label: 'E-Mail-Adresse'
 entry:
    page_titles:
@@ -139,11 +137,14 @@ entry:
        starred: 'Favorisierte Einträge'
        archived: 'Archivierte Einträge'
        filtered: 'Gefilterte Einträge'
+        # filtered_tags: 'Filtered by tags'
+        # untagged: 'Untagged entries'
    list:
        number_on_the_page: '{0} Es gibt keine Einträge.|{1} Es gibt einen Eintrag.|]1,Inf[ Es gibt %count% Einträge.'
        reading_time: 'geschätzte Lesezeit'
        reading_time_minutes: 'geschätzte Lesezeit: %readingTime% min'
        reading_time_less_one_minute: 'geschätzte Lesezeit: <small class="inferieur">&lt;</small> 1 min'
+        # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags'
        reading_time_minutes_short: '%readingTime% min'
        reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
        original_article: 'original'
@@ -185,6 +186,8 @@ entry:
            add_a_tag: 'Tag hinzufügen'
            share_content: 'Teilen'
            share_email_label: 'E-Mail'
+            # public_link: 'public link'
+            # delete_public_link: 'delete public link'
            download: 'Herunterladen'
            print: 'Drucken'
            problem:
@@ -260,12 +263,14 @@ howto:
 quickstart:
    page_title: 'Schnelleinstieg'
+    # more: 'More…'
    intro:
        title: 'Willkommen zu wallabag!'
        paragraph_1: "Wir werden dich bei der Benutzung von wallabag begleiten und dir einige Funktionen zeigen, die dich interessieren könnten."
        paragraph_2: 'Folge uns!'
    configure:
        title: 'Anwendung konfigurieren'
+        # description: 'In order to have an application which suits you, have a look into the configuration of wallabag.'
        language: 'Sprache und Design ändern'
        rss: 'RSS-Feeds aktivieren'
        tagging_rules: 'Schreibe Regeln, um deine Beiträge automatisch zu taggen (verschlagworten)'
@@ -279,6 +284,7 @@ quickstart:
        import: 'Import-Einstellungen ändern'
    first_steps:
        title: 'Erste Schritte'
+        # description: "Now wallabag is well configured, it's time to archive the web. You can click on the top right sign + to add a link"
        new_article: 'Speichere deinen ersten Artikel'
        unread_articles: 'Und klassifiziere ihn!'
    migrate:
@@ -287,11 +293,16 @@ quickstart:
        pocket: 'von Pocket migrieren'
        wallabag_v1: 'von wallabag v1 migrieren'
        wallabag_v2: 'von wallabag v2 migrieren'
+        readability: 'von Readability migrieren'
+        instapaper: 'von Instapaper migrieren'
    developer:
        title: 'Entwickler'
+        # description: 'We also thought to the developers: Docker, API, translations, etc.'
        create_application: 'Erstelle eine Anwendung und nutze die wallabag API'
+        # use_docker: 'Use Docker to install wallabag'
    docs:
        title: 'Komplette Dokumentation'
+        # description: "There are so much features in wallabag. Don't hesitate to read the manual to know them and to learn how to use them."
        annotate: 'Anmerkungen zu Artikeln hinzufügen'
        export: 'Artikel nach ePUB oder PDF konvertieren'
        search_filters: 'Schau nach, wie du nach einem Artikel über die Such- und Filterfunktion suchen kannst'
@@ -308,6 +319,7 @@ tag:
    page_title: 'Tags'
    list:
        number_on_the_page: '{0} Es gibt keine Tags.|{1} Es gibt einen Tag.|]1,Inf[ Es gibt %count% Tags.'
+        # see_untagged_entries: 'See untagged entries'
 import:
    page_title: 'Importieren'
@@ -335,6 +347,24 @@ import:
    wallabag_v2:
        page_title: 'Aus wallabag v2 importieren'
        description: 'Dieser Import wird all deine Artikel aus wallabag v2 importieren. Gehe auf "Alle Artikel" und dann, in der Exportieren-Seitenleiste auf "JSON". Dabei erhältst du eine "All articles.json"-Datei.'
+    readability:
+        page_title: 'Aus Readability importieren'
+        # description: 'This importer will import all your Readability articles. On the tools (https://www.readability.com/tools/) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact).'
+        # how_to: 'Please select your Readability export and click on the below button to upload and import it.'
+    worker:
+        # enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:"
+    firefox:
+        page_title: 'Aus Firefox importieren'
+        # description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file."
+        # how_to: "Please choose the bookmark backup file and click on the button below to import it. Note that the process may take a long time since all articles have to be fetched."
+    chrome:
+        page_title: 'Aus Chrome importieren'
+        # description: "This importer will import all your Chrome bookmarks. The location of the file depends on your operating system : <ul><li>On Linux, go into the <code>~/.config/chromium/Default/</code> directory</li><li>On Windows, it should be at <code>%LOCALAPPDATA%\\Google\\Chrome\\User Data\\Default</code></li><li>On OS X, it should be at <code>~/Library/Application Support/Google/Chrome/Default/Bookmarks</code></li></ul>Once you got there, copy the Bookmarks file someplace you'll find.<em><br>Note that if you have Chromium instead of Chrome, you'll have to correct paths accordingly.</em></p>"
+        # how_to: "Please choose the bookmark backup file and click on the button below to import it. Note that the process may take a long time since all articles have to be fetched."
+    instapaper:
+        page_title: 'Aus Instapaper importieren'
+        # description: 'This importer will import all your Instapaper articles. On the settings (https://www.instapaper.com/user) page, click on "Download .CSV file" in the "Export" section. A CSV file will be downloaded (like "instapaper-export.csv").'
+        # how_to: 'Please select your Instapaper export and click on the below button to upload and import it.'
 developer:
    page_title: 'Entwickler'
@@ -361,12 +391,14 @@ developer:
        page_title: 'Entwickler > Neuer Client'
        page_description: 'Du bist dabei, einen neuen Client zu erstellen. Fülle das nachfolgende Feld für die Weiterleitungs-URIs deiner Anwendung aus.'
        form:
+            # name_label: 'Name of the client'
            redirect_uris_label: 'Weiterleitungs-URIs'
            save_label: 'Neuen Client erstellen'
        action_back: 'Zurück'
    client_parameter:
        page_title: 'Entwickler > Client-Parameter'
        page_description: 'Dies sind deine Client-Parameter.'
+        # field_name: 'Client name'
        field_id: 'Client-ID'
        field_secret: 'Client-Secret'
        back: 'Zurück'
@@ -384,6 +416,33 @@ developer:
            paragraph_8: 'Wenn du alle API-Endpunkte sehen willst, werfe einen Blick auf die <a href="%link%">API-Dokumentation</a>.'
        back: 'Zurück'
+user:
+    # page_title: Users management
+    # new_user: Create a new user
+    # edit_user: Edit an existing user
+    # description: "Here you can manage all users (create, edit and delete)"
+    # list:
+    #     actions: Actions
+    #     edit_action: Edit
+    #     yes: Yes
+    #     no: No
+    #     create_new_one: Create a new user
+    form:
+        username_label: 'Benutzername'
+        # name_label: 'Name'
+        password_label: 'Kennwort'
+        repeat_new_password_label: 'Neues Kennwort wiederholen'
+        plain_password_label: '????'
+        email_label: 'E-Mail-Adresse'
+        # enabled_label: 'Enabled'
+        # locked_label: 'Locked'
+        # last_login_label: 'Last login'
+        # twofactor_label: Two factor authentication
+        # save: Save
+        # delete: Delete
+        # delete_confirm: Are you sure?
+        # back_to_list: Back to list
 flashes:
    config:
        notice:
@@ -400,10 +459,10 @@ flashes:
        notice:
            entry_already_saved: 'Eintrag bereits am %date% gespeichert'
            entry_saved: 'Eintrag gespeichert'
-            # entry_saved_failed: 'Failed to save entry'
+            # entry_saved_failed: 'Entry saved but fetching content failed'
            entry_updated: 'Eintrag aktualisiert'
            entry_reloaded: 'Eintrag neugeladen'
-            entry_reload_failed: 'Neuladen des Eintrags fehlgeschlagen'
+            # entry_reload_failed: 'Entry reloaded but fetching content failed'
            entry_archived: 'Artikel archiviert'
            entry_unarchived: 'Artikel dearchiviert'
            entry_starred: 'Artikel favorisiert'
@@ -417,6 +476,10 @@ flashes:
            failed: 'Import fehlgeschlagen, bitte erneut probieren.'
            failed_on_file: 'Fehler während des Imports. Bitte überprüfe deine Import-Datei.'
            summary: 'Import-Zusammenfassung: %imported% importiert, %skipped% bereits gespeichert.'
+            # summary_with_queue: 'Import summary: %queued% queued.'
+        error:
+            # redis_enabled_not_installed: Redis is enabled for handle asynchronous import but it looks like <u>we can't connect to it</u>. Please check Redis configuration.
+            # rabbit_enabled_not_installed: RabbitMQ is enabled for handle asynchronous import but it looks like <u>we can't connect to it</u>. Please check RabbitMQ configuration.
    developer:
        notice:
            client_created: 'Neuer Client erstellt.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index c6633f5b..91abe162 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -31,6 +31,7 @@ menu:
        search: 'Search'
        save_link: 'Save a link'
        back_to_unread: 'Back to unread articles'
+        users_management: 'Users management'
    top:
        add_new_entry: 'Add a new entry'
        search: 'Search'
@@ -45,6 +46,7 @@ footer:
        social: 'Social'
        powered_by: 'powered by'
        about: 'About'
+    stats: Since %user_creation% you read %nb_archives% articles. That is about %per_day% a day!
 config:
    page_title: 'Config'
@@ -68,6 +70,7 @@ config:
            200_word: 'I read ~200 words per minute'
            300_word: 'I read ~300 words per minute'
            400_word: 'I read ~400 words per minute'
+        pocket_consumer_key_label: Consumer key for Pocket to import contents
    form_rss:
        description: 'RSS feeds provided by wallabag allow you to read your saved articles with your favourite RSS reader. You need to generate a token first.'
        token_label: 'RSS token'
@@ -93,6 +96,7 @@ config:
        if_label: 'if'
        then_tag_as_label: 'then tag as'
        delete_rule_label: 'delete'
+        edit_rule_label: 'edit'
        rule_label: 'Rule'
        tags_label: 'Tags'
        faq:
@@ -126,12 +130,6 @@ 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>'
-    form_new_user:
-        username_label: 'Username'
-        password_label: 'Password'
-        repeat_new_password_label: 'Repeat new password'
-        plain_password_label: '????'
-        email_label: 'Email'
 entry:
    page_titles:
@@ -139,11 +137,14 @@ entry:
        starred: 'Starred entries'
        archived: 'Archived entries'
        filtered: 'Filtered entries'
+        filtered_tags: 'Filtered by tags'
+        untagged: 'Untagged entries'
    list:
        number_on_the_page: '{0} There are no entries.|{1} There is one entry.|]1,Inf[ There are %count% entries.'
        reading_time: 'estimated reading time'
        reading_time_minutes: 'estimated reading time: %readingTime% min'
        reading_time_less_one_minute: 'estimated reading time: <small class="inferieur">&lt;</small> 1 min'
+        number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags'
        reading_time_minutes_short: '%readingTime% min'
        reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
        original_article: 'original'
@@ -185,6 +186,8 @@ entry:
            add_a_tag: 'Add a tag'
            share_content: 'Share'
            share_email_label: 'Email'
+            public_link: 'public link'
+            delete_public_link: 'delete public link'
            download: 'Download'
            print: 'Print'
            problem:
@@ -260,12 +263,14 @@ howto:
 quickstart:
    page_title: 'Quickstart'
+    more: 'More…'
    intro:
        title: 'Welcome to wallabag!'
        paragraph_1: "We'll accompany you on your visit to wallabag and show you some features that might interest you."
        paragraph_2: 'Follow us!'
    configure:
        title: 'Configure the application'
+        description: 'In order to have an application which suits you, have a look into the configuration of wallabag.'
        language: 'Change language and design'
        rss: 'Enable RSS feeds'
        tagging_rules: 'Write rules to automatically tag your articles'
@@ -279,6 +284,7 @@ quickstart:
        import: 'Configure import'
    first_steps:
        title: 'First steps'
+        description: "Now wallabag is well configured, it's time to archive the web. You can click on the top right sign + to add a link."
        new_article: 'Save your first article'
        unread_articles: 'And classify it!'
    migrate:
@@ -287,11 +293,16 @@ quickstart:
        pocket: 'Migrate from Pocket'
        wallabag_v1: 'Migrate from wallabag v1'
        wallabag_v2: 'Migrate from wallabag v2'
+        readability: 'Migrate from Readability'
+        instapaper: 'Migrate from Instapaper'
    developer:
        title: 'Developers'
+        description: 'We also thought to the developers: Docker, API, translations, etc.'
        create_application: 'Create your third application'
+        use_docker: 'Use Docker to install wallabag'
    docs:
        title: 'Full documentation'
+        description: "There are so much features in wallabag. Don't hesitate to read the manual to know them and to learn how to use them."
        annotate: 'Annotate your article'
        export: 'Convert your articles into ePUB or PDF'
        search_filters: 'See how you can look for an article by using the search engine and filters'
@@ -308,6 +319,7 @@ tag:
    page_title: 'Tags'
    list:
        number_on_the_page: '{0} There are no tags.|{1} There is one tag.|]1,Inf[ There are %count% tags.'
+        see_untagged_entries: 'See untagged entries'
 import:
    page_title: 'Import'
@@ -335,6 +347,24 @@ import:
    wallabag_v2:
        page_title: 'Import > Wallabag v2'
        description: 'This importer will import all your wallabag v2 articles. Go to All articles, then, on the export sidebar, click on "JSON". You will have a "All articles.json" file.'
+    readability:
+        page_title: 'Import > Readability'
+        description: 'This importer will import all your Readability articles. On the tools (https://www.readability.com/tools/) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact).'
+        how_to: 'Please select your Readability export and click on the below button to upload and import it.'
+    worker:
+        enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:"
+    firefox:
+        page_title: 'Import > Firefox'
+        description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file."
+        how_to: "Please choose the bookmark backup file and click on the button below to import it. Note that the process may take a long time since all articles have to be fetched."
+    chrome:
+        page_title: 'Import > Chrome'
+        description: "This importer will import all your Chrome bookmarks. The location of the file depends on your operating system : <ul><li>On Linux, go into the <code>~/.config/chromium/Default/</code> directory</li><li>On Windows, it should be at <code>%LOCALAPPDATA%\\Google\\Chrome\\User Data\\Default</code></li><li>On OS X, it should be at <code>~/Library/Application Support/Google/Chrome/Default/Bookmarks</code></li></ul>Once you got there, copy the Bookmarks file someplace you'll find.<em><br>Note that if you have Chromium instead of Chrome, you'll have to correct paths accordingly.</em></p>"
+        how_to: "Please choose the bookmark backup file and click on the button below to import it. Note that the process may take a long time since all articles have to be fetched."
+    instapaper:
+        page_title: 'Import > Instapaper'
+        description: 'This importer will import all your Instapaper articles. On the settings (https://www.instapaper.com/user) page, click on "Download .CSV file" in the "Export" section. A CSV file will be downloaded (like "instapaper-export.csv").'
+        how_to: 'Please select your Instapaper export and click on the below button to upload and import it.'
 developer:
    page_title: 'Developer'
@@ -354,19 +384,21 @@ developer:
        field_grant_types: 'Grant type allowed'
        no_client: 'No client yet.'
    remove:
-        warn_message_1: 'You have the ability to remove this client. This action is IRREVERSIBLE !'
+        warn_message_1: 'You have the ability to remove the client %name%. This action is IRREVERSIBLE !'
        warn_message_2: "If you remove it, every app configured with that client won't be able to auth on your wallabag."
-        action: 'Remove this client'
+        action: 'Remove the client %name%'
    client:
        page_title: 'Developer > New client'
        page_description: 'You are about to create a new client. Please fill the field below for the redirect URI of your application.'
        form:
-            redirect_uris_label: 'Redirect URIs'
+            name_label: 'Name of the client'
+            redirect_uris_label: 'Redirect URIs (optional)'
            save_label: 'Create a new client'
        action_back: 'Back'
    client_parameter:
        page_title: 'Developer > Client parameters'
        page_description: 'Here are your client parameters.'
+        field_name: 'Client name'
        field_id: 'Client ID'
        field_secret: 'Client secret'
        back: 'Back'
@@ -384,6 +416,33 @@ developer:
            paragraph_8: 'If you want to see all the API endpoints, you can have a look <a href="%link%">to our API documentation</a>.'
        back: 'Back'
+user:
+    page_title: Users management
+    new_user: Create a new user
+    edit_user: Edit an existing user
+    description: "Here you can manage all users (create, edit and delete)"
+    list:
+        actions: Actions
+        edit_action: Edit
+        yes: Yes
+        no: No
+        create_new_one: Create a new user
+    form:
+        username_label: 'Username'
+        name_label: 'Name'
+        password_label: 'Password'
+        repeat_new_password_label: 'Repeat new password'
+        plain_password_label: '????'
+        email_label: 'Email'
+        enabled_label: 'Enabled'
+        locked_label: 'Locked'
+        last_login_label: 'Last login'
+        twofactor_label: Two factor authentication
+        save: Save
+        delete: Delete
+        delete_confirm: Are you sure?
+        back_to_list: Back to list
 flashes:
    config:
        notice:
@@ -394,16 +453,15 @@ flashes:
            rss_updated: 'RSS information updated'
            tagging_rules_updated: 'Tagging rules updated'
            tagging_rules_deleted: 'Tagging rule deleted'
-            user_added: 'User "%username%" added'
            rss_token_updated: 'RSS token updated'
    entry:
        notice:
            entry_already_saved: 'Entry already saved on %date%'
            entry_saved: 'Entry saved'
-            entry_saved_failed: 'Failed to save entry'
+            entry_saved_failed: 'Entry saved but fetching content failed'
            entry_updated: 'Entry updated'
            entry_reloaded: 'Entry reloaded'
-            entry_reload_failed: 'Failed to reload entry'
+            entry_reload_failed: 'Entry reloaded but fetching content failed'
            entry_archived: 'Entry archived'
            entry_unarchived: 'Entry unarchived'
            entry_starred: 'Entry starred'
@@ -417,7 +475,16 @@ flashes:
            failed: 'Import failed, please try again.'
            failed_on_file: 'Error while processing import. Please verify your import file.'
            summary: 'Import summary: %imported% imported, %skipped% already saved.'
+            summary_with_queue: 'Import summary: %queued% queued.'
+        error:
+            redis_enabled_not_installed: Redis is enabled for handle asynchronous import but it looks like <u>we can't connect to it</u>. Please check Redis configuration.
+            rabbit_enabled_not_installed: RabbitMQ is enabled for handle asynchronous import but it looks like <u>we can't connect to it</u>. Please check RabbitMQ configuration.
    developer:
        notice:
-            client_created: 'New client created.'
+            client_created: 'New client %name% created.'
-            client_deleted: 'Client deleted'
+            client_deleted: 'Client %name% deleted'
+    user:
+        notice:
+            added: 'User "%username%" added'
+            updated: 'User "%username%" updated'
+            deleted: 'User "%username%" deleted'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index 266b4af5..25d2f3a2 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -31,6 +31,7 @@ menu:
        search: 'Buscar'
        save_link: 'Archivar un enlace'
        back_to_unread: 'Volver a los artículos sin leer'
+        # users_management: 'Users management'
    top:
        add_new_entry: 'Añadir un nuevo artículo'
        search: 'Buscar'
@@ -45,6 +46,7 @@ footer:
        social: 'Social'
        powered_by: 'funciona por'
        about: 'Acerca de'
+    # stats: Since %user_creation% you read %nb_archives% articles. That is about %per_day% a day!
 config:
    page_title: 'Configuración'
@@ -68,6 +70,7 @@ config:
            200_word: 'Leo ~200 palabras por minuto'
            300_word: 'Leo ~300 palabras por minuto'
            400_word: 'Leo ~400 palabras por minuto'
+        # pocket_consumer_key_label: Consumer key for Pocket to import contents
    form_rss:
        description: 'Los feeds RSS de wallabag permiten leer los artículos guardados con su lector RSS favorito. Necesita generar un token primero'
        token_label: 'RSS token'
@@ -93,6 +96,7 @@ config:
        if_label: 'si'
        then_tag_as_label: 'Etiquete como'
        delete_rule_label: 'Borre'
+        # edit_rule_label: 'edit'
        rule_label: 'Regla'
        tags_label: 'Etiquetas'
        faq:
@@ -126,12 +130,6 @@ config:
                or: 'Una regla U otra'
                and: 'Una regla Y la otra'
                matches: 'Pruebe si un <i>sujeto</i> corresponde a una <i>búsqueda</i> (insensible a mayusculas).<br />Ejemplo : <code>título coincide "football"</code>'
-    form_new_user:
-        username_label: 'Nombre de usuario'
-        password_label: 'Contraseña'
-        repeat_new_password_label: 'Confirmar la nueva contraseña'
-        plain_password_label: '????'
-        email_label: 'Email'
 entry:
    page_titles:
@@ -139,11 +137,14 @@ entry:
        starred: 'Artículos favoritos'
        archived: 'Artículos archivados'
        filtered: 'Artículos filtrados'
+        # filtered_tags: 'Filtered by tags'
+        # untagged: 'Untagged entries'
    list:
        number_on_the_page: '{0} No hay artículos.|{1} Hay un artículo.|]1,Inf[ Hay %count% artículos.'
        reading_time: 'tiempo estimado de lectura'
        reading_time_minutes: 'tiempo estimado de lectura: %readingTime% min'
        reading_time_less_one_minute: 'tiempo estimado de lectura: <small class="inferieur">&lt;</small> 1 min'
+        # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags'
        reading_time_minutes_short: '%readingTime% min'
        reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
        original_article: 'original'
@@ -185,6 +186,8 @@ entry:
            add_a_tag: 'Añadir una etiqueta'
            share_content: 'Compartir'
            share_email_label: 'Dirección e-mail'
+            # public_link: 'public link'
+            # delete_public_link: 'delete public link'
            download: 'Descargar'
            print: 'Imprimir'
            problem:
@@ -260,12 +263,14 @@ howto:
 quickstart:
    page_title: 'Comienzo rápido'
+    # more: 'More…'
    intro:
        title: 'Bienvenido a wallabag !'
        paragraph_1: "Le acompañaremos a su visita de wallabag y le mostraremos algunas características que le pueden interesar."
        paragraph_2: '¡Síganos!'
    configure:
        title: 'Configure la aplicación'
+        # description: 'In order to have an application which suits you, have a look into the configuration of wallabag.'
        language: 'Cambie el idioma y el diseño de la aplicación'
        rss: 'Activar los feeds RSS'
        tagging_rules: 'Escribir reglas para etiquetear automaticamente sus artículos'
@@ -279,6 +284,7 @@ quickstart:
        import: 'Configure importación'
    first_steps:
        title: 'Primeros pasos'
+        # description: "Now wallabag is well configured, it's time to archive the web. You can click on the top right sign + to add a link."
        new_article: 'Guarde su primer artículo'
        unread_articles: '¡Y clasifíquelo!'
    migrate:
@@ -287,11 +293,16 @@ quickstart:
        pocket: 'Migrar desde Pocket'
        wallabag_v1: 'Migrar desde wallabag v1'
        wallabag_v2: 'Migrar desde wallabag v2'
+        readability: 'Migrar desde Readability'
+        instapaper: 'Migrar desde Instapaper'
    developer:
        title: 'Promotores'
+        # description: 'We also thought to the developers: Docker, API, translations, etc.'
        create_application: 'Cree su tercera aplicación'
+        # use_docker: 'Use Docker to install wallabag'
    docs:
        title: 'Documentación completa'
+        # description: "There are so much features in wallabag. Don't hesitate to read the manual to know them and to learn how to use them."
        annotate: 'Anote su artículo'
        export: 'Convierta sus artículos a ePub o a PDF'
        search_filters: 'Aprenda a utilizar el buscador y los filtros para encontrar el artículo que le interese'
@@ -308,6 +319,7 @@ tag:
    page_title: 'Etiquetas'
    list:
        number_on_the_page: '{0} No hay ninguna etiqueta.|{1} Hay una etiqueta.|]1,Inf[ Hay %count% etiquetas.'
+        # see_untagged_entries: 'See untagged entries'
 import:
    page_title: 'Importar'
@@ -335,6 +347,24 @@ import:
    wallabag_v2:
        page_title: 'Importar > Wallabag v2'
        description: 'Va a importar sus artículos de otra instancia de wallabag v2. Vaya a Todos los artículos, entonces, en la barra lateral, oprima en "JSON". Usted tendrá un fichero "All articles.json"'
+    readability:
+        page_title: 'Importar > Readability'
+        # description: 'This importer will import all your Readability articles. On the tools (https://www.readability.com/tools/) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact).'
+        # how_to: 'Please select your Readability export and click on the below button to upload and import it.'
+    worker:
+        # enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:"
+    firefox:
+       page_title: 'Importar > Firefox'
+       # description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file."
+       # how_to: "Please choose the bookmark backup file and click on the button below to import it. Note that the process may take a long time since all articles have to be fetched."
+    chrome:
+       page_title: 'Importar > Chrome'
+       # description: "This importer will import all your Chrome bookmarks. The location of the file depends on your operating system : <ul><li>On Linux, go into the <code>~/.config/chromium/Default/</code> directory</li><li>On Windows, it should be at <code>%LOCALAPPDATA%\\Google\\Chrome\\User Data\\Default</code></li><li>On OS X, it should be at <code>~/Library/Application Support/Google/Chrome/Default/Bookmarks</code></li></ul>Once you got there, copy the Bookmarks file someplace you'll find.<em><br>Note that if you have Chromium instead of Chrome, you'll have to correct paths accordingly.</em></p>"
+       # how_to: "Please choose the bookmark backup file and click on the button below to import it. Note that the process may take a long time since all articles have to be fetched."
+    instapaper:
+        page_title: 'Importar > Instapaper'
+        # description: 'This importer will import all your Instapaper articles. On the settings (https://www.instapaper.com/user) page, click on "Download .CSV file" in the "Export" section. A CSV file will be downloaded (like "instapaper-export.csv").'
+        # how_to: 'Please select your Instapaper export and click on the below button to upload and import it.'
 developer:
    page_title: 'Promotor'
@@ -361,12 +391,14 @@ developer:
        page_title: 'Promotor > Nuevo cliente'
        page_description: 'Va a crear un nuevo cliente. Por favor, llene el campo abajo para URI redirigido de su aplicación.'
        form:
+            # name_label: 'Name of the client'
            redirect_uris_label: 'los URI redirigidos'
            save_label: 'Crear un nuevo cliente'
        action_back: 'Atrás'
    client_parameter:
        page_title: 'Promotor > Parámetros del cliente'
        page_description: 'Aquí hay sus parámetros del cliente.'
+        # field_name: 'Client name'
        field_id: 'Identificación del cliente'
        field_secret: 'Cliente secreto'
        back: 'Atrás'
@@ -384,6 +416,33 @@ developer:
            paragraph_8: 'Si quiere ver todos los fines de API, se puede ver <a href="%link%">a nuestra documentación API</a>.'
        back: 'Atrás'
+user:
+    # page_title: Users management
+    # new_user: Create a new user
+    # edit_user: Edit an existing user
+    # description: "Here you can manage all users (create, edit and delete)"
+    # list:
+    #     actions: Actions
+    #     edit_action: Edit
+    #     yes: Yes
+    #     no: No
+    #     create_new_one: Create a new user
+    form:
+        username_label: 'Nombre de usuario'
+        # name_label: 'Name'
+        password_label: 'Contraseña'
+        repeat_new_password_label: 'Confirmar la nueva contraseña'
+        plain_password_label: '????'
+        email_label: 'Email'
+        # enabled_label: 'Enabled'
+        # locked_label: 'Locked'
+        # last_login_label: 'Last login'
+        # twofactor_label: Two factor authentication
+        # save: Save
+        # delete: Delete
+        # delete_confirm: Are you sure?
+        # back_to_list: Back to list
 flashes:
    config:
        notice:
@@ -400,10 +459,10 @@ flashes:
        notice:
            entry_already_saved: 'Entrada ya guardada por %fecha%'
            entry_saved: 'Entrada guardada'
-            # entry_saved_failed: 'Failed to save entry'
+            # entry_saved_failed: 'Entry saved but fetching content failed'
            entry_updated: 'Entrada actualizada'
            entry_reloaded: 'Entrada recargada'
-            entry_reload_failed: 'Entrada recargada reprobada'
+            # entry_reload_failed: 'Entry reloaded but fetching content failed'
            entry_archived: 'Artículo archivado'
            entry_unarchived: 'Artículo desarchivado'
            entry_starred: 'Artículo guardado en los favoritos'
@@ -414,9 +473,13 @@ flashes:
            tag_added: 'Etiqueta añadida'
    import:
        notice:
-             failed: 'Importación reprobada, por favor inténtelo de nuevo.'
+            failed: 'Importación reprobada, por favor inténtelo de nuevo.'
-             failed_on_file: 'Se ocurre un error por procesar importación. Por favor verifique su archivo importado.'
+            failed_on_file: 'Se ocurre un error por procesar importación. Por favor verifique su archivo importado.'
-             summary: 'Resúmen importado: %importado% importado, %saltados% ya guardado.'
+            summary: 'Resúmen importado: %importado% importado, %saltados% ya guardado.'
+            # summary_with_queue: 'Import summary: %queued% queued.'
+        error:
+            # redis_enabled_not_installed: Redis is enabled for handle asynchronous import but it looks like <u>we can't connect to it</u>. Please check Redis configuration.
+            # rabbit_enabled_not_installed: RabbitMQ is enabled for handle asynchronous import but it looks like <u>we can't connect to it</u>. Please check RabbitMQ configuration.
    developer:
        notice:
            client_created: 'Nuevo cliente creado.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index c2350019..b02ffea0 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -31,6 +31,7 @@ menu:
        search: 'جستجو'
        save_link: 'ذخیرهٔ یک پیوند'
        back_to_unread: 'بازگشت به خوانده‌نشده‌ها'
+        # users_management: 'Users management'
    top:
        add_new_entry: 'افزودن مقالهٔ تازه'
        search: 'جستجو'
@@ -45,6 +46,7 @@ footer:
        social: 'شبکه‌های اجتماعی'
        powered_by: 'توانمند با'
        about: 'درباره'
+    # stats: Since %user_creation% you read %nb_archives% articles. That is about %per_day% a day!
 config:
    page_title: 'پیکربندی'
@@ -68,6 +70,7 @@ config:
            200_word: 'من تقریباً ۲۰۰ واژه را در دقیقه می‌خوانم'
            300_word: 'من تقریباً ۳۰۰ واژه را در دقیقه می‌خوانم'
            400_word: 'من تقریباً ۴۰۰ واژه را در دقیقه می‌خوانم'
+        pocket_consumer_key_label: کلید کاربری Pocket برای درون‌ریزی مطالب
    form_rss:
        description: 'با خوراک آر-اس-اس که wallabag در اختیارتان می‌گذارد، می‌توانید مقاله‌های ذخیره‌شده را در نرم‌افزار آر-اس-اس دلخواه خود بخوانید. برای این کار نخست باید یک کد بسازید.'
        token_label: 'کد آر-اس-اس'
@@ -93,6 +96,7 @@ config:
        if_label: 'اگر'
        then_tag_as_label: 'این برچسب را بزن'
        delete_rule_label: 'پاک کن'
+        # edit_rule_label: 'edit'
        rule_label: 'قانون'
        tags_label: 'برچسب‌ها'
        faq:
@@ -126,12 +130,6 @@ 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>'
-    form_new_user:
-        username_label: 'نام کاربری'
-        password_label: 'رمز'
-        repeat_new_password_label: 'رمز تازه را دوباره بنویسید'
-        plain_password_label: '????'
-        email_label: 'نشانی ایمیل'
 entry:
    page_titles:
@@ -139,11 +137,14 @@ entry:
        starred: 'مقاله‌های برگزیده'
        archived: 'مقاله‌های بایگانی‌شده'
        filtered: 'مقاله‌های فیلترشده'
+        # filtered_tags: 'Filtered by tags'
+        # untagged: 'Untagged entries'
    list:
        number_on_the_page: '{0} هیج مقاله‌ای نیست.|{1} یک مقاله هست.|]1,Inf[ %count% مقاله هست.'
        reading_time: 'زمان تخمینی برای خواندن'
        reading_time_minutes: 'زمان تخمینی برای خواندن: %readingTime% min'
        reading_time_less_one_minute: 'زمان تخمینی برای خواندن: <small class="inferieur">&lt;</small> 1 min'
+        # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags'
        reading_time_minutes_short: '%readingTime% min'
        reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
        original_article: 'original'
@@ -185,6 +186,8 @@ entry:
            add_a_tag: 'افزودن برچسب'
            share_content: 'هم‌رسانی'
            share_email_label: 'نشانی ایمیل'
+            # public_link: 'public link'
+            # delete_public_link: 'delete public link'
            download: 'بارگیری'
            print: 'چاپ'
            problem:
@@ -260,6 +263,7 @@ howto:
 quickstart:
    page_title: 'Quickstart'
+    # more: 'More…'
    intro:
        title: 'به wallabag خوش آمدید!!'
        paragraph_1: "به شما کمک خواهیم کرد تا wallabag را بشناسید و با برخی از ویژگی‌های جالبش آشنا شوید"
@@ -279,6 +283,7 @@ quickstart:
        import: 'درون‌ریزی را تنظیم کنید'
    first_steps:
        title: 'گام نخست'
+        # description: "Now wallabag is well configured, it's time to archive the web. You can click on the top right sign + to add a link."
        new_article: 'نخستین مقالهٔ خود را ذخیره کنید'
        unread_articles: 'و آن را طبقه‌بندی کنید!'
    migrate:
@@ -287,11 +292,16 @@ quickstart:
        pocket: 'مهاجرت از Pocket'
        wallabag_v1: 'مهاجرت از نسخهٔ یکم wallabag'
        wallabag_v2: 'مهاجرت از نسخهٔ دوم wallabag'
+        readability: 'مهاجرت از نسخهٔ دوم Readability'
+        instapaper: 'مهاجرت از نسخهٔ دوم Instapaper'
    developer:
        title: 'برنامه‌نویسان'
+        # description: 'We also thought to the developers: Docker, API, translations, etc.'
        create_application: 'برنامهٔ wallabag خود را بسازید'
+        # use_docker: 'Use Docker to install wallabag'
    docs:
        title: 'راهنمای کامل'
+        # description: "There are so much features in wallabag. Don't hesitate to read the manual to know them and to learn how to use them."
        annotate: 'روی مقاله‌هایتان یادداشت بگذارید'
        export: 'مقاله‌هایتان را به قالب ePUB یا PDF دربیاورید'
        search_filters: 'به کمک موتور جستجو و فیلترها به دنبال مقاله‌هایتان بگردید'
@@ -308,18 +318,19 @@ tag:
    page_title: 'برچسب‌ها'
    list:
        number_on_the_page: '{0} هیچ برچسبی نیست.|{1} یک برچسب هست.|]1,Inf[ %count% برچسب هست.'
+        # see_untagged_entries: 'See untagged entries'
 import:
-     page_title: 'درون‌ریزی'
+    page_title: 'درون‌ریزی'
-     page_description: 'به درون‌ریز wallabag خوش آمدید. لطفاً سرویس قبلی خود را که می‌خواهید از آن مهاجرت کنید انتخاب کنید.'
+    page_description: 'به درون‌ریز wallabag خوش آمدید. لطفاً سرویس قبلی خود را که می‌خواهید از آن مهاجرت کنید انتخاب کنید.'
-     action:
+    action:
        import_contents: 'درون‌ریزی مقاله‌ها'
-     form:
+    form:
        mark_as_read_title: 'علامت‌زدن همه به عنوان خوانده‌شده؟'
        mark_as_read_label: 'همهٔ مقاله‌های درون‌ریزی شده را به عنوان خوانده‌شده علامت بزن'
        file_label: 'پرونده'
        save_label: 'بارگذاری پرونده'
-     pocket:
+    pocket:
        page_title: 'درون‌ریزی > Pocket'
        description: "این برنامه همهٔ داده‌های Pocket شما را درون‌ریزی می‌کند. سرویس Pocket اجازه نمی‌دهد که متن مقاله‌ها را درون‌ریزی کنیم، بنابراین wallabag متن مقاله‌ها را دوباره از اینترنت دریافت می‌کند."
        config_missing:
@@ -328,13 +339,31 @@ import:
           user_message: 'مدیر سرور شما باید یک API Key برای Pocket تعریف کند.'
        authorize_message: 'شما می‌توانید داده‌هایتان را از حساب Pocket خود درون‌ریزی کنید. روی دکمهٔ زیر کلیک کنید و به برنامه اجازه دهید تا به getpocket.com وصل شود.'
        connect_to_pocket: 'به Pocket وصل شو و داده‌ها را دریافت کن'
-     wallabag_v1:
+    wallabag_v1:
        page_title: 'درون‌ریزی > Wallabag v1'
        description: 'این برنامه همهٔ داده‌های شما را در نسخهٔ ۱ wallabag درون‌ریزی می‌کند. در صفحهٔ تنظیمات، روی "JSON export" در بخش "Export your wallabag data" کلیک کنید. با این کار شما پرونده‌ای به شکل "wallabag-export-1-xxxx-xx-xx.json" دریافت خواهید کرد.'
        how_to: 'لطفاً پرونده را انتخاب کنید و روی دکمهٔ زیر کلیک کنید تا بارگذاری و درون‌ریزی شود.'
-     wallabag_v2:
+    wallabag_v2:
        page_title: 'درون‌ریزی > Wallabag v2'
        description: 'این برنامه همهٔ داده‌های شما را در نسخهٔ ۲ wallabag درون‌ریزی می‌کند. به بخش «همهٔ مقاله‌ها» بروید و در بخش «برون‌ریزی» روی "JSON" کلیک کنید. با این کار شما پرونده‌ای به شکل "All articles.json" دریافت خواهید کرد.'
+    readability:
+        page_title: 'درون‌ریزی > Readability'
+        # description: 'This importer will import all your Readability articles. On the tools (https://www.readability.com/tools/) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact).'
+        # how_to: 'Please select your Readability export and click on the below button to upload and import it.'
+    worker:
+        # enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:"
+    firefox:
+       page_title: 'درون‌ریزی > Firefox'
+       # description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file."
+       # how_to: "Please choose the bookmark backup file and click on the button below to import it. Note that the process may take a long time since all articles have to be fetched."
+    chrome:
+       page_title: 'درون‌ریزی > Chrome'
+       # description: "This importer will import all your Chrome bookmarks. The location of the file depends on your operating system : <ul><li>On Linux, go into the <code>~/.config/chromium/Default/</code> directory</li><li>On Windows, it should be at <code>%LOCALAPPDATA%\\Google\\Chrome\\User Data\\Default</code></li><li>On OS X, it should be at <code>~/Library/Application Support/Google/Chrome/Default/Bookmarks</code></li></ul>Once you got there, copy the Bookmarks file someplace you'll find.<em><br>Note that if you have Chromium instead of Chrome, you'll have to correct paths accordingly.</em></p>"
+       # how_to: "Please choose the bookmark backup file and click on the button below to import it. Note that the process may take a long time since all articles have to be fetched."
+    instapaper:
+        page_title: 'درون‌ریزی > Instapaper'
+        # description: 'This importer will import all your Instapaper articles. On the settings (https://www.instapaper.com/user) page, click on "Download .CSV file" in the "Export" section. A CSV file will be downloaded (like "instapaper-export.csv").'
+        # how_to: 'Please select your Instapaper export and click on the below button to upload and import it.'
 developer:
    # page_title: 'Developer'
@@ -361,12 +390,14 @@ developer:
    #     page_title: 'Developer > New client'
    #     page_description: 'You are about to create a new client. Please fill the field below for the redirect URI of your application.'
    #     form:
+    #         name_label: 'Name of the client'
    #         redirect_uris_label: 'Redirect URIs'
    #         save_label: 'Create a new client'
    #     action_back: 'بازگشت'
    # client_parameter:
    #     page_title: 'Developer > Client parameters'
    #     page_description: 'Here are your client parameters.'
+    #     field_name: 'Client name'
    #     field_id: 'Client ID'
    #     field_secret: 'Client secret'
    #     back: 'بازگشت'
@@ -384,6 +415,33 @@ developer:
    #         paragraph_8: 'If you want to see all the API endpoints, you can have a look <a href="%link%">to our API documentation</a>.'
    #     back: 'بازگشت'
+user:
+    # page_title: Users management
+    # new_user: Create a new user
+    # edit_user: Edit an existing user
+    # description: "Here you can manage all users (create, edit and delete)"
+    # list:
+    #     actions: Actions
+    #     edit_action: Edit
+    #     yes: Yes
+    #     no: No
+    #     create_new_one: Create a new user
+    form:
+        username_label: 'نام کاربری'
+        # name_label: 'Name'
+        password_label: 'رمز'
+        repeat_new_password_label: 'رمز تازه را دوباره بنویسید'
+        plain_password_label: '????'
+        email_label: 'نشانی ایمیل'
+        # enabled_label: 'Enabled'
+        # locked_label: 'Locked'
+        # last_login_label: 'Last login'
+        # twofactor_label: Two factor authentication
+        # save: Save
+        # delete: Delete
+        # delete_confirm: Are you sure?
+        # back_to_list: Back to list
 flashes:
    config:
        notice:
@@ -400,10 +458,10 @@ flashes:
        notice:
            entry_already_saved: 'این مقاله در تاریخ %date% ذخیره شده بود'
            entry_saved: 'مقاله ذخیره شد'
-            # entry_saved_failed: 'Failed to save entry'
+            # entry_saved_failed: 'Entry saved but fetching content failed'
            entry_updated: 'مقاله به‌روز شد'
            entry_reloaded: 'مقاله به‌روز شد'
-            entry_reload_failed: 'به‌روزرسانی مقاله شکست خورد'
+            # entry_reload_failed: 'Entry reloaded but fetching content failed'
            entry_archived: 'مقاله بایگانی شد'
            entry_unarchived: 'مقاله از بایگانی درآمد'
            entry_starred: 'مقاله برگزیده شد'
@@ -417,6 +475,10 @@ flashes:
            failed: 'درون‌ریزی شکست خورد. لطفاً دوباره تلاش کنید.'
            failed_on_file: 'خطا هنگام پردازش پروندهٔ ورودی. آیا پروندهٔ درون‌ریزی شده سالم است؟'
            summary: 'گزارش درون‌ریزی: %imported% وارد شد, %skipped% از قبل ذخیره شده بود.'
+            # summary_with_queue: 'Import summary: %queued% queued.'
+        error:
+            # redis_enabled_not_installed: Redis is enabled for handle asynchronous import but it looks like <u>we can't connect to it</u>. Please check Redis configuration.
+            # rabbit_enabled_not_installed: RabbitMQ is enabled for handle asynchronous import but it looks like <u>we can't connect to it</u>. Please check RabbitMQ configuration.
    developer:
        notice:
            # client_created: 'New client created.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 25d9ec59..598205b0 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -31,6 +31,7 @@ menu:
        search: 'Recherche'
        save_link: 'Sauvegarder un nouvel article'
        back_to_unread: 'Retour aux articles non lus'
+        users_management: 'Gestion des utilisateurs'
    top:
        add_new_entry: 'Sauvegarder un nouvel article'
        search: 'Rechercher'
@@ -45,9 +46,10 @@ footer:
        social: 'Social'
        powered_by: 'propulsé par'
        about: 'À propos'
-    page_title: 'Configuration'
+    stats: Depuis le %user_creation% vous avez lu %nb_archives% articles. Ce qui fait %per_day% par jour !
 config:
+    page_title: 'Configuration'
    tab_menu:
        settings: 'Paramètres'
        rss: 'RSS'
@@ -68,6 +70,7 @@ config:
            200_word: 'Je lis environ 200 mots par minute'
            300_word: 'Je lis environ 300 mots par minute'
            400_word: 'Je lis environ 400 mots par minute'
+        pocket_consumer_key_label: Clé d'authentification Pocket pour importer les données
    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'
@@ -93,6 +96,7 @@ config:
        if_label: 'si'
        then_tag_as_label: 'alors attribuer les tags'
        delete_rule_label: 'supprimer'
+        edit_rule_label: 'éditer'
        rule_label: 'Règle'
        tags_label: 'Tags'
        faq:
@@ -126,12 +130,6 @@ 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>'
-    form_new_user:
-        username_label: "Nom d'utilisateur"
-        password_label: 'Mot de passe'
-        repeat_new_password_label: 'Confirmez votre nouveau mot de passe'
-        plain_password_label: 'Mot de passe en clair'
-        email_label: 'Adresse e-mail'
 entry:
    page_titles:
@@ -139,11 +137,14 @@ entry:
        starred: 'Articles favoris'
        archived: 'Articles lus'
        filtered: 'Articles filtrés'
+        filtered_tags: 'Articles filtrés par tags'
+        untagged: 'Article sans tag'
    list:
        number_on_the_page: "{0} Il n'y a pas d'articles.|{1} Il y a un article.|]1,Inf[ Il y a %count% articles."
        reading_time: 'durée de lecture'
        reading_time_minutes: 'durée de lecture: %readingTime% min'
        reading_time_less_one_minute: 'durée de lecture: <small class="inferieur">&lt;</small> 1 min'
+        number_of_tags: '{1}et un autre tag|]1,Inf[et %count% autres tags'
        reading_time_minutes_short: '%readingTime% min'
        reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
        original_article: 'original'
@@ -185,6 +186,8 @@ entry:
            add_a_tag: 'Ajouter un tag'
            share_content: 'Partager'
            share_email_label: 'Email'
+            public_link: 'Lien public'
+            delete_public_link: 'Supprimer lien public'
            download: 'Télécharger'
            print: 'Imprimer'
            problem:
@@ -260,12 +263,14 @@ howto:
 quickstart:
    page_title: 'Pour bien débuter'
+    more: 'Et plus encore…'
    intro:
        title: 'Bienvenue sur wallabag !'
        paragraph_1: "Nous allons vous accompagner pour vous faire faire le tour de la maison et vous présenter quelques fonctionnalités qui pourraient vous intéresser pour vous approprier cet outil."
        paragraph_2: 'Suivez-nous !'
    configure:
        title: "Configurez l'application"
+        description: 'Pour voir une application qui vous correspond, allez voir du côté de la configuration de wallabag.'
        language: "Changez la langue et le design de l'application"
        rss: 'Activez les flux RSS'
        tagging_rules: 'Écrivez des règles pour classer automatiquement vos articles'
@@ -279,6 +284,7 @@ quickstart:
        import: "Configurer l'import"
    first_steps:
        title: 'Premiers pas'
+        description: "Maintenant que wallabag est bien configuré, il est temps d'archiver le web. Vous pouvez cliquer sur le signe + dans le coin en haut à droite."
        new_article: 'Ajoutez votre premier article'
        unread_articles: 'Et rangez-le !'
    migrate:
@@ -287,11 +293,16 @@ quickstart:
        pocket: 'Migrer depuis Pocket'
        wallabag_v1: 'Migrer depuis wallabag v1'
        wallabag_v2: 'Migrer depuis wallabag v2'
+        readability: 'Migrer depuis Readability'
+        instapaper: 'Migrer depuis Instapaper'
    developer:
        title: 'Pour les développeurs'
+        description: 'Nous avons aussi pensé aux développeurs : Docker, API, traductions, etc.'
        create_application: 'Créer votre application tierce'
+        use_docker: 'Utiliser Docker pour installer wallabag'
    docs:
        title: 'Documentation complète'
+        description: "Il y a tellement de fonctionnalités dans wallabag. N'hésitez pas à lire le manuel pour les connaitre et apprendre comment les utiliser."
        annotate: 'Annoter votre article'
        export: 'Convertissez vos articles en ePub ou en PDF'
        search_filters: "Apprenez à utiliser le moteur de recherche et les filtres pour retrouver l'article qui vous intéresse"
@@ -308,6 +319,7 @@ tag:
    page_title: 'Tags'
    list:
        number_on_the_page: "{0} Il n'y a pas de tag.|{1} Il y a un tag.|]1,Inf[ Il y a %count% tags."
+        see_untagged_entries: 'Voir les articles sans tag'
 import:
    page_title: 'Importer'
@@ -335,6 +347,24 @@ import:
    wallabag_v2:
        page_title: 'Importer > Wallabag v2'
        description: "Cet outil va importer tous vos articles d'une autre instance de wallabag v2. Allez dans tous vos articles, puis, sur la barre latérale, cliquez sur \"JSON\". Vous allez récupérer un fichier \"All articles.json\""
+    readability:
+        page_title: 'Importer > Readability'
+        description: 'Cet outil va importer toutes vos données de Readability. Sur la page des outils (https://www.readability.com/tools/), cliquez sur "Export your data" dans la section "Data Export". Vous allez recevoir un email avec un lien pour télécharger le json.'
+        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 :"
+    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>"
+        how_to: "Choisissez le fichier de sauvegarde de vos marques-page et cliquez sur le bouton pour l'importer. Soyez avertis que le processus peut prendre un temps assez long car tous les articles doivent être récupérés en ligne."
+    chrome:
+        page_title: 'Import > Chrome'
+        description: "Cet outil va vous permettre d'importer tous vos marques-pages de Google Chrome/Chromium. Pour Google Chrome, la situation du fichier dépend de votre système d'exploitation : <ul><li>Sur GNU/Linux, allez dans le répertoire <code>~/.config/google-chrome/Default/</code></li><li>Sous Windows, il devrait se trouver à <code>%LOCALAPPDATA%\\Google\\Chrome\\User Data\\Default</code></li><li>Sur OS X, il devrait se trouver dans le fichier <code>~/Library/Application Support/Google/Chrome/Default/Bookmarks</code></li></ul>Une fois que vous y êtes, copiez le fichier Bookmarks à un endroit où vous le retrouverez.<em><br>Notez que si vous utilisez Chromium à la place de Chrome, vous devez corriger les chemins en conséquence.</em></p>"
+        how_to: "Choisissez le fichier de sauvegarde de vos marques-page et cliquez sur le bouton pour l'importer. Soyez avertis que le processus peut prendre un temps assez long car tous les articles doivent être récupérés en ligne."
+    instapaper:
+        page_title: 'Import > Instapaper'
+        description: 'Sur la page des paramètres (`https://www.instapaper.com/user<https://www.instapaper.com/user>`_), cliquez sur "Download .CSV file" dans la section "Export". Un fichier CSV se téléchargera ("instapaper-export.csv").'
+        how_to: "Choisissez le fichier de votre export Instapaper et cliquez sur le bouton ci-dessous pour l'importer."
 developer:
    page_title: 'Développeur'
@@ -345,7 +375,7 @@ developer:
    list_methods: "Lister toutes les méthodes de l'API"
    clients:
        title: 'Clients'
-        create_new: 'Créer une nouveau client'
+        create_new: 'Créer un nouveau client'
    existing_clients:
        title: 'Les clients existants'
        field_id: 'ID Client'
@@ -354,19 +384,21 @@ developer:
        field_grant_types: 'Type de privilège accordé'
        no_client: 'Aucun client pour le moment'
    remove:
-        warn_message_1: 'Vous avez la possibilité de supprimer un client. Cette action est IRREVERSIBLE !'
+        warn_message_1: 'Vous avez la possibilité de supprimer le client %name%. Cette action est IRREVERSIBLE !'
-        warn_message_2: "Si vous supprimez un client, toutes les applications qui l'utilisaient ne fonctionneront plus avec votre compte wallabag."
+        warn_message_2: "Si vous supprimez le client %name%, toutes les applications qui l'utilisaient ne fonctionneront plus avec votre compte wallabag."
-        action: 'Supprimer ce client'
+        action: 'Supprimer le client %name%'
    client:
        page_title: 'Développeur > Nouveau client'
        page_description: "Vous allez créer un nouveau client. Merci de remplir l'url de redirection vers votre application."
        form:
-            redirect_uris_label: 'URLs de redirection'
+            name_label: "Nom du client"
+            redirect_uris_label: 'URLs de redirection (optionnel)'
            save_label: 'Créer un nouveau client'
        action_back: 'Retour'
    client_parameter:
        page_title: 'Développeur > Les paramètres de votre client'
        page_description: 'Voilà les paramètres de votre client'
+        field_name: 'Nom du client'
        field_id: 'ID Client'
        field_secret: 'Clé secrète'
        back: 'Retour'
@@ -384,6 +416,33 @@ developer:
            paragraph_8: "Si vous voulez toutes les méthodes de l'API, jetez un oeil <a href=\"%link%\">à la documentation de l'API</a>."
        back: 'Retour'
+user:
+    page_title: Gestion des utilisateurs
+    new_user: Créer un nouvel utilisateur
+    edit_user: Éditer un utilisateur existant
+    description: Ici vous pouvez gérer vos utilisateurs (création, mise à jour et suppression)
+    list:
+        actions: Actions
+        edit_action: Éditer
+        yes: Oui
+        no: Non
+        create_new_one: Créer un nouvel utilisateur
+    form:
+        username_label: "Nom d'utilisateur"
+        name_label: 'Nom'
+        password_label: 'Mot de passe'
+        repeat_new_password_label: 'Confirmez votre nouveau mot de passe'
+        plain_password_label: 'Mot de passe en clair'
+        email_label: 'Adresse e-mail'
+        enabled_label: 'Activé'
+        locked_label: 'Bloqué'
+        last_login_label: 'Dernière connexion'
+        twofactor_label: Double authentification
+        save: Sauvegarder
+        delete: Supprimer
+        delete_confirm: Êtes-vous sûr?
+        back_to_list: Revenir à la liste
 flashes:
    config:
        notice:
@@ -400,10 +459,10 @@ flashes:
        notice:
            entry_already_saved: 'Article déjà sauvergardé le %date%'
            entry_saved: 'Article enregistré'
-            entry_saved_failed: "L'enregistrement a échoué"
+            entry_saved_failed: 'Article enregistré mais impossible de récupérer le contenu'
            entry_updated: 'Article mis à jour'
            entry_reloaded: 'Article rechargé'
-            entry_reload_failed: "Le rechargement de l'article a échoué"
+            entry_reload_failed: "Article mis à jour mais impossible de récupérer le contenu"
            entry_archived: 'Article marqué comme lu'
            entry_unarchived: 'Article marqué comme non lu'
            entry_starred: 'Article ajouté dans les favoris'
@@ -416,8 +475,12 @@ flashes:
        notice:
            failed: "L'import a échoué, veuillez ré-essayer"
            failed_on_file: "Erreur lors du traitement de l'import. Vérifier votre fichier."
-            summary: "Rapport d'import: %imported% importés, %skipped% déjà présent."
+            summary: "Rapport d'import: %imported% importés, %skipped% déjà présents."
+            summary_with_queue: "Rapport d'import: %queued% en cours de traitement."
+        error:
+            redis_enabled_not_installed: Redis est activé pour les imports asynchrones mais <u>impossible de s'y connecter</u>. Vérifier la configuration de Redis.
+            rabbit_enabled_not_installed: RabbitMQ est activé pour les imports asynchrones mais <u>impossible de s'y connecter</u>. Vérifier la configuration de RabbitMQ.
    developer:
        notice:
-            client_created: 'Nouveau client créé'
+            client_created: 'Nouveau client %name% créé'
-            client_deleted: 'Client supprimé'
+            client_deleted: 'Client %name% supprimé'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index 231ba759..c58c929f 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -31,6 +31,7 @@ menu:
        search: 'Cerca'
        save_link: 'Salva collegamento'
        back_to_unread: 'Torna ai contenuti non letti'
+        # users_management: 'Users management'
    top:
        add_new_entry: 'Aggiungi un nuovo contenuto'
        search: 'Cerca'
@@ -45,6 +46,7 @@ footer:
        social: 'Social'
        powered_by: 'powered by'
        about: 'About'
+    # stats: Since %user_creation% you read %nb_archives% articles. That is about %per_day% a day!
 config:
    page_title: 'Configurazione'
@@ -68,6 +70,7 @@ config:
            200_word: 'Leggo ~200 parole al minuto'
            300_word: 'Leggo ~300 parole al minuto'
            400_word: 'Leggo ~400 parole al minuto'
+        pocket_consumer_key_label: Consumer key per Pocket per importare i contenuti
    form_rss:
        description: 'I feed RSS generati da wallabag ti permettono di leggere i tuoi contenuti salvati con il tuo lettore di RSS preferito. Prima, devi generare un token.'
        token_label: 'RSS token'
@@ -93,6 +96,7 @@ config:
        if_label: 'se'
        then_tag_as_label: 'allora tagga come'
        delete_rule_label: 'elimina'
+        # edit_rule_label: 'edit'
        rule_label: 'Regola'
        tags_label: 'Tag'
        faq:
@@ -126,12 +130,6 @@ 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>'
-    form_new_user:
-        username_label: 'Username'
-        password_label: 'Password'
-        repeat_new_password_label: 'Ripeti password'
-        plain_password_label: '????'
-        email_label: 'E-mail'
 entry:
    page_titles:
@@ -139,11 +137,14 @@ entry:
        starred: 'Contenuti preferiti'
        archived: 'Contenuti archiviati'
        filtered: 'Contenuti filtrati'
+        # filtered_tags: 'Filtered by tags'
+        # untagged: 'Untagged entries'
    list:
        number_on_the_page: "{0} Non ci sono contenuti.|{1} C'è un contenuto.|]1,Inf[ Ci sono %count% contenuti."
        reading_time: 'tempo di lettura stimato'
        reading_time_minutes: 'tempo di lettura stimato: %readingTime% min'
        reading_time_less_one_minute: 'tempo di lettura stimato: <small class="inferieur">&lt;</small> 1 min'
+        # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags'
        reading_time_minutes_short: '%readingTime% min'
        reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
        original_article: 'originale'
@@ -156,6 +157,7 @@ entry:
        status_label: 'Stato'
        archived_label: 'Archiviati'
        starred_label: 'Preferiti'
+        # unread_label: 'Unread'
        preview_picture_label: "Ha un'immagine di anteprima"
        preview_picture_help: 'Immagine di anteprima'
        language_label: 'Lingua'
@@ -184,6 +186,8 @@ entry:
            add_a_tag: 'Aggiungi un tag'
            share_content: 'Condividi'
            share_email_label: 'E-mail'
+            # public_link: 'public link'
+            # delete_public_link: 'delete public link'
            download: 'Download'
            print: 'Stampa'
            problem:
@@ -259,12 +263,14 @@ howto:
 quickstart:
    page_title: 'Introduzione'
+    # more: 'More…'
    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_2: 'Seguici!'
    configure:
        title: "Configura l'applicazione"
+        # description: 'In order to have an application which suits you, have a look into the configuration of wallabag.'
        language: 'Cambia lingua e design'
        rss: 'Abilita i feed RSS'
        tagging_rules: 'Scrivi delle regole per taggare automaticamente i contenuti'
@@ -278,6 +284,7 @@ quickstart:
        import: "Configura l'importazione"
    first_steps:
        title: 'Pimi passi'
+        # description: "Now wallabag is well configured, it's time to archive the web. You can click on the top right sign + to add a link."
        new_article: 'Salva il tuo primo contenuto'
        unread_articles: 'E classificalo!'
    migrate:
@@ -286,11 +293,16 @@ quickstart:
        pocket: 'Trasferisci da Pocket'
        wallabag_v1: 'Trasferisci da wallabag v1'
        wallabag_v2: 'Trasferisci da wallabag v2'
+        readability: 'Trasferisci da Readability'
+        instapaper: 'Trasferisci da Instapaper'
    developer:
        title: 'Sviluppatori'
+        # description: 'We also thought to the developers: Docker, API, translations, etc.'
        create_application: 'Crea la tua applicazione'
+        # use_docker: 'Use Docker to install wallabag'
    docs:
        title: 'Documentazione completa'
+        # description: "There are so much features in wallabag. Don't hesitate to read the manual to know them and to learn how to use them."
        annotate: 'Annota il tuo contenuto'
        export: 'Converti i tuoi contenuti in EPUB o PDF'
        search_filters: 'Impara come puoi recuperare un contenuto tramite la ricerca e i filtri'
@@ -307,6 +319,7 @@ tag:
    page_title: 'Tags'
    list:
        number_on_the_page: "{0} Non ci sono tag.|{1} C'è un tag.|]1,Inf[ ci sono %count% tag."
+        # see_untagged_entries: 'See untagged entries'
 import:
    page_title: 'Importa'
@@ -334,6 +347,24 @@ import:
    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".'
+    readability:
+        page_title: 'Importa da > Readability'
+        # description: 'This importer will import all your Readability articles. On the tools (https://www.readability.com/tools/) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact).'
+        # how_to: 'Please select your Readability export and click on the below button to upload and import it.'
+    worker:
+        # enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:"
+    firefox:
+       page_title: 'Importa da > Firefox'
+       # description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file."
+       # how_to: "Please choose the bookmark backup file and click on the button below to import it. Note that the process may take a long time since all articles have to be fetched."
+    chrome:
+       page_title: 'Importa da > Chrome'
+       # description: "This importer will import all your Chrome bookmarks. The location of the file depends on your operating system : <ul><li>On Linux, go into the <code>~/.config/chromium/Default/</code> directory</li><li>On Windows, it should be at <code>%LOCALAPPDATA%\\Google\\Chrome\\User Data\\Default</code></li><li>On OS X, it should be at <code>~/Library/Application Support/Google/Chrome/Default/Bookmarks</code></li></ul>Once you got there, copy the Bookmarks file someplace you'll find.<em><br>Note that if you have Chromium instead of Chrome, you'll have to correct paths accordingly.</em></p>"
+       # how_to: "Please choose the bookmark backup file and click on the button below to import it. Note that the process may take a long time since all articles have to be fetched."
+    instapaper:
+        page_title: 'Importa da > Instapaper'
+        # description: 'This importer will import all your Instapaper articles. On the settings (https://www.instapaper.com/user) page, click on "Download .CSV file" in the "Export" section. A CSV file will be downloaded (like "instapaper-export.csv").'
+        # how_to: 'Please select your Instapaper export and click on the below button to upload and import it.'
 developer:
    page_title: 'Sviluppatori'
@@ -360,12 +391,14 @@ developer:
        page_title: 'Sviluppatori > Nuovo client'
        page_description: 'Stai per creare un nuovo client. Compila i campi sottostanti per il redirect URI della tua applicazione.'
        form:
+            # name_label: 'Name of the client'
            redirect_uris_label: 'Redirect URI'
            save_label: 'Crea un nuovo client'
        action_back: 'Indietro'
    client_parameter:
        page_title: 'Sviluppatori > parametri Client'
        page_description: 'Questi sono i tuoi parametri del client.'
+        # field_name: 'Client name'
        field_id: 'Client ID'
        field_secret: 'Client secret'
        back: 'Indietro'
@@ -383,6 +416,33 @@ developer:
            paragraph_8: 'Se vuoi visualizzare tutti gli API endpoints, dai una occhiata alla <a href="%link%">documentazione delle API</a>.'
        back: 'Indietro'
+user:
+    # page_title: Users management
+    # new_user: Create a new user
+    # edit_user: Edit an existing user
+    # description: "Here you can manage all users (create, edit and delete)"
+    # list:
+    #     actions: Actions
+    #     edit_action: Edit
+    #     yes: Yes
+    #     no: No
+    #     create_new_one: Create a new user
+    form:
+        username_label: 'Username'
+        # name_label: 'Name'
+        password_label: 'Password'
+        repeat_new_password_label: 'Ripeti password'
+        plain_password_label: '????'
+        email_label: 'E-mail'
+        # enabled_label: 'Enabled'
+        # locked_label: 'Locked'
+        # last_login_label: 'Last login'
+        # twofactor_label: Two factor authentication
+        # save: Save
+        # delete: Delete
+        # delete_confirm: Are you sure?
+        # back_to_list: Back to list
 flashes:
    config:
        notice:
@@ -399,10 +459,10 @@ flashes:
        notice:
            entry_already_saved: 'Contenuto già salvato in data %date%'
            entry_saved: 'Contenuto salvato'
-            # entry_saved_failed: 'Failed to save entry'
+            # entry_saved_failed: 'Entry saved but fetching content failed'
            entry_updated: 'Contenuto aggiornato'
            entry_reloaded: 'Contenuto ricaricato'
-            entry_reload_failed: 'Errore nel ricaricamento del contenuto'
+            # entry_reload_failed: 'Entry reloaded but fetching content failed'
            entry_archived: 'Contenuto archiviato'
            entry_unarchived: 'Contenuto dis-archiviato'
            entry_starred: 'Contenuto segnato come preferito'
@@ -416,6 +476,10 @@ flashes:
            failed: 'Importazione fallita, riprova.'
            failed_on_file: 'Errore durante la processazione dei dati da importare. Verifica il tuo file di import.'
            summary: 'Sommario di importazione: %imported% importati, %skipped% già salvati.'
+            # summary_with_queue: 'Import summary: %queued% queued.'
+        error:
+            # redis_enabled_not_installed: Redis is enabled for handle asynchronous import but it looks like <u>we can't connect to it</u>. Please check Redis configuration.
+            # rabbit_enabled_not_installed: RabbitMQ is enabled for handle asynchronous import but it looks like <u>we can't connect to it</u>. Please check RabbitMQ configuration.
    developer:
        notice:
            client_created: 'Nuovo client creato.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index 6e71b850..8f06434d 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -19,18 +19,19 @@ menu:
        unread: 'Pas legits'
        starred: 'Favorits'
        archive: 'Legits'
-        all_articles: 'Tots los articles'
+        all_articles: 'Totes los articles'
        config: 'Configuracion'
        tags: 'Etiquetas'
        internal_settings: 'Configuracion interna'
        import: 'Importar'
        howto: 'Ajuda'
        developer: 'Desvolopador'
-        logout: 'Déconnexion'
+        logout: 'Desconnexion'
        about: 'A prepaus'
        search: 'Cercar'
        save_link: 'Enregistrar un novèl article'
        back_to_unread: 'Tornar als articles pas legits'
+        # users_management: 'Users management'
    top:
        add_new_entry: 'Enregistrar un novèl article'
        search: 'Cercar'
@@ -41,13 +42,14 @@ menu:
 footer:
    wallabag:
-        elsewhere: 'Emportatz wallabag amb vosaultres'
+        elsewhere: 'Emportatz wallabag amb vosautres'
        social: 'Social'
        powered_by: 'propulsat per'
        about: 'A prepaus'
-    page_title: 'Configuracion'
+    # stats: Since %user_creation% you read %nb_archives% articles. That is about %per_day% a day!
 config:
+    page_title: 'Configuracion'
    tab_menu:
        settings: 'Paramètres'
        rss: 'RSS'
@@ -68,11 +70,12 @@ config:
            200_word: "Legissi a l'entorn de 200 mots per minuta"
            300_word: "Legissi a l'entorn de 300 mots per minuta"
            400_word: "Legissi a l'entorn de 400 mots per minuta"
+        pocket_consumer_key_label: Clau d'autentificacion Pocket per importar las donadas
    form_rss:
        description: "Los fluxes RSS fornits per wallabag vos permeton de legir vòstres articles salvagardats dins vòstre lector de fluxes preferit. Per los poder emplegar, vos cal, d'en primièr crear un geton."
        token_label: 'Geton RSS'
-        no_token: 'Aucun jeton généré'
+        no_token: 'Pas cap de geton generat'
-        token_create: '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_link:
@@ -93,6 +96,7 @@ config:
        if_label: 'se'
        then_tag_as_label: 'alara atribuir las etiquetas'
        delete_rule_label: 'suprimir'
+        # edit_rule_label: 'edit'
        rule_label: 'Règla'
        tags_label: 'Etiquetas'
        faq:
@@ -126,12 +130,6 @@ config:
                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>'
-    form_new_user:
-        username_label: "Nom d'utilizaire"
-        password_label: 'Senhal'
-        repeat_new_password_label: 'Confirmatz vòstre novèl senhal'
-        plain_password_label: 'Senhal en clar'
-        email_label: 'Adreça de corrièl'
 entry:
    page_titles:
@@ -139,11 +137,14 @@ entry:
        starred: 'Articles favorits'
        archived: 'Articles legits'
        filtered: 'Articles filtrats'
+        filtered_tags: 'Filtats per etiquetas'
+        untagged: 'Articles sens etiqueta'
    list:
        number_on_the_page: "{0} I a pas cap d'article.|{1} I a un article.|]1,Inf[ I a %count% articles."
        reading_time: 'durada de lectura'
        reading_time_minutes: 'durada de lectura : %readingTime% min'
        reading_time_less_one_minute: 'durada de lectura : <small class="inferieur">&lt;</small> 1 min'
+        number_of_tags: '{1}e una autra etiqueta|]1,Inf[e %count% autras etiquetas'
        reading_time_minutes_short: '%readingTime% min'
        reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
        original_article: 'original'
@@ -183,8 +184,10 @@ entry:
            re_fetch_content: 'Tornar cargar lo contengut'
            delete: 'Suprimir'
            add_a_tag: 'Ajustar una etiqueta'
-            share_content: 'Partatjar'
+            share_content: 'Partejar'
            share_email_label: 'Corrièl'
+            public_link: 'ligam public'
+            delete_public_link: 'suprimir lo ligam public'
            download: 'Telecargar'
            print: 'Imprimir'
            problem:
@@ -218,7 +221,7 @@ about:
        developped_by: 'Desvolopat per'
        website: 'Site web'
        many_contributors: 'E un fum de contributors ♥ <a href="https://github.com/wallabag/wallabag/graphs/contributors">sur Github</a>'
-        project_website: 'Site web del projète'
+        project_website: 'Site web del projècte'
        license: 'Licéncia'
        version: 'Version'
    getting_help:
@@ -239,7 +242,7 @@ about:
 howto:
    page_title: 'Ajuda'
-    page_description: "I a mai d'un biai d'enregistrar un article :"
+    page_description: "I a mai d'un biais d'enregistrar un article :"
    top_menu:
        browser_addons: 'Extensions de navigator'
        mobile_apps: 'Aplicacions mobil'
@@ -260,12 +263,14 @@ howto:
 quickstart:
    page_title: 'Per ben començar'
+    # more: 'More…'
    intro:
        title: 'Benvenguda sus wallabag !'
        paragraph_1: "Anem vos guidar per far lo torn de la proprietat e vos presentar unas fonccionalitats que vos poirián interessar per vos apropriar aquesta aisina."
        paragraph_2: 'Seguètz-nos '
    configure:
        title: "Configuratz l'aplicacio"
+        # description: 'In order to have an application which suits you, have a look into the configuration of wallabag.'
        language: "Cambiatz la lenga e l'estil de l'aplicacion"
        rss: 'Activatz los fluxes RSS'
        tagging_rules: 'Escrivètz de règlas per classar automaticament vòstres articles'
@@ -279,6 +284,7 @@ quickstart:
        import: 'Configurar los impòrt'
    first_steps:
        title: 'Primièrs passes'
+        # description: "Now wallabag is well configured, it's time to archive the web. You can click on the top right sign + to add a link."
        new_article: 'Ajustatz vòstre primièr article'
        unread_articles: 'E racaptatz-lo !'
    migrate:
@@ -287,11 +293,16 @@ quickstart:
        pocket: 'Migrar dempuèi Pocket'
        wallabag_v1: 'Migrar dempuèi wallabag v1'
        wallabag_v2: 'Migrar dempuèi wallabag v2'
+        readability: 'Migrar dempuèi Readability'
+        instapaper: 'Migrar dempuèi Instapaper'
    developer:
        title: 'Pels desvolopadors'
+        # description: 'We also thought to the developers: Docker, API, translations, etc.'
        create_application: 'Crear vòstra aplicacion tèrça'
+        # use_docker: 'Use Docker to install wallabag'
    docs:
        title: 'Documentacion complèta'
+        # description: "There are so much features in wallabag. Don't hesitate to read the manual to know them and to learn how to use them."
        annotate: 'Anotatar vòstre article'
        export: 'Convertissètz vòstres articles en ePub o en PDF'
        search_filters: "Aprenètz a utilizar lo motor de recèrca e los filtres per retrobar l'article que vos interèssa"
@@ -308,6 +319,7 @@ tag:
    page_title: 'Etiquetas'
    list:
        number_on_the_page: "{0} I a pas cap d'etiquetas.|{1} I a una etiqueta.|]1,Inf[ I a %count% etiquetas."
+        see_untagged_entries: "Afichar las entradas sens pas cap d'etiquetas"
 import:
    page_title: 'Importar'
@@ -320,7 +332,7 @@ import:
        file_label: 'Fichièr'
        save_label: 'Importar lo fichièr'
    pocket:
-        page_title: 'Importer > Pocket'
+        page_title: 'Importar > Pocket'
        description: "Aquesta aisina importarà totas vòstras donadas de Pocket. Pocket nos permet pas de recuperar lo contengut dempuèi lor servidor, alara wallabag deu tornar fulhetar cada article per recuperar son contengut."
        config_missing:
            description: "L'importacion dempuèi Pocket es pas configurada."
@@ -329,20 +341,38 @@ import:
        authorize_message: "Podètz importar vòstras donadas dempuèi vòstre compte Pocket. Vos cal pas que clicar sul boton çai-jos e autorizar wallabag a se connectar a getpocket.com."
        connect_to_pocket: 'Se connectar a Pocket e importar las donadas'
    wallabag_v1:
-        page_title: 'Importer > Wallabag v1'
+        page_title: 'Importar > Wallabag v1'
        description: 'Aquesta aisina importarà totas vòstras donadas de wallabag v1. Sus vòstre pagina de configuracion de wallabag v1, clicatz sus \"Export JSON\" dins la seccion \"Exportar vòstras donadas de wallabag\". Traparatz un fichièr \"wallabag-export-1-xxxx-xx-xx.json\".'
        how_to: "Causissètz lo fichièr de vòstra exportacion wallabag v1 e clicatz sul boton çai-jos per l'importar."
    wallabag_v2:
-        page_title: 'Importer > Wallabag v2'
+        page_title: 'Importar > Wallabag v2'
        description: "Aquesta aisina importarà totas vòstras donadas d'una instància mai de wallabag v2. Anatz dins totes vòstres articles, puèi, sus la barra laterala, clicatz sus \"JSON\". Traparatz un fichièr \"All articles.json\""
+    readability:
+        page_title: 'Importar > Readability'
+        description: "Aquesta aisina importarà totas vòstres articles de Readability. Sus la pagina de l'aisina (https://www.readability.com/tools/), clicatz sus \"Export your data\" dins la seccion \"Data Export\". Recebretz un corrièl per telecargar un json (qu'acaba pas amb un .json de fach)."
+        how_to: "Mercés de seleccionar vòstre Readability fichièr e de clicar sul boton dejós per lo telecargar e l'importar."
+    worker:
+        enabled: "L'importacion se fa de manièra asincròna. Un còp l'importacion lançada, una aisina externa s'ocuparà dels messatges un per un. Lo servici actual es : "
+    firefox:
+        page_title: 'Importar > Firefox'
+        description: "Aquesta aisina importarà totas vòstres favorits de Firefox. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file."
+        how_to: "Mercés de causir lo fichièr de salvagarda e de clicar sul boton dejós per l'importar. Notatz que lo tractament pòt durar un moment ja que totes los articles an d'èsser recuperats."
+    chrome:
+        page_title: 'Importar > Chrome'
+        description: "Aquesta aisina importarà totas vòstres favorits de Chrome. L'emplaçament del fichièr depend de vòstre sistèma operatiu : <ul><li>Sus Linux, anatz al dorsièr <code>~/.config/chromium/Default/</code></li><li>Sus Windows, deu èsser dins <code>%LOCALAPPDATA%\\Google\\Chrome\\User Data\\Default</code></li><li>sus OS X, deu èsser dins <code>~/Library/Application Support/Google/Chrome/Default/Bookmarks</code></li></ul>Un còp enlà, copiatz lo fichièr de favorits dins un endrech que volètz.<em><br>Notatz que s'avètz Chromium al lòc de Chrome, vos cal cambiar lo camin segon aquesta situacion.</em></p>"
+        how_to: "Mercés de causir lo fichièr de salvagarda e de clicar sul boton dejós per l'importar. Notatz que lo tractament pòt durar un moment ja que totes los articles an d'èsser recuperats."
+    instapaper:
+        page_title: 'Importar > Instapaper'
+        description: "Aquesta aisina importarà totas vòstres articles d'Instapaper. Sus la pagina de paramètres (https://www.instapaper.com/user), clicatz sus \"Download .CSV file\" dins la seccion \"Export\". Un fichièr CSV serà telecargat (aital \"instapaper-export.csv\")."
+        how_to: "Mercés de causir vòstre fichièr Instapaper e de clicar sul boton dejós per lo telecargar e l'importar"
 developer:
-    page_title: 'Desvolopador'
+    page_title: 'Desvolopaire'
    welcome_message: "Benvenguda sus l'API de wallabag"
    documentation: 'Documentacion'
    how_to_first_app: 'Cossí crear vòstra primièra aplicacion'
    full_documentation: "Veire la documentacion completa de l'API"
-    # list_methods: 'List API methods'
+    list_methods: "Lista dels metòdes de l'API"
    clients:
        title: 'Clients'
        create_new: 'Crear un novèl client'
@@ -361,20 +391,22 @@ developer:
        page_title: 'Desvlopador > Novèl client'
        page_description: "Anatz crear un novèl client. Mercés de cumplir l'url de redireccion cap a vòstra aplicacion."
        form:
+            name_label: "Nom del client"
            redirect_uris_label: 'URLs de redireccion'
            save_label: 'Crear un novèl client'
        action_back: 'Retorn'
    client_parameter:
        page_title: 'Desvolopador > Los paramètres de vòstre client'
        page_description: 'Vaquí los paramètres de vòstre client'
+        field_name: 'Nom del client'
        field_id: 'ID Client'
        field_secret: 'Clau secreta'
        back: 'Retour'
-        read_howto: 'Legir \"cossí crear ma primièra aplicacion\"'
+        read_howto: 'Legir "cossí crear ma primièra aplicacion"'
    howto:
        page_title: 'Desvolopador > Cossí crear ma primièra aplicacion'
        description:
-            paragraph_1: "Las comandas seguentas utilizan la <a href=\"https://github.com/jkbrzt/httpie\">libraria HTTPie</a>. Asseguratz-vos que siasqueòu installadas abans de l'utilizar."
+            paragraph_1: "Las comandas seguentas utilizan la <a href=\"https://github.com/jkbrzt/httpie\">bibliotèca HTTPie</a>. Asseguratz-vos que siasqueòu installadas abans de l'utilizar."
            paragraph_2: "Vos cal un geton per escambiar entre vòstra aplicacion e l'API de wallabar."
            paragraph_3: 'Per crear un geton, vos cal crear <a href=\"%link%\">crear un novèl client</a>.'
            paragraph_4: 'Ara creatz un geton (remplaçar client_id, client_secret, username e password amb las bonas valors) :'
@@ -384,6 +416,33 @@ developer:
            paragraph_8: "Se volètz totas las adreças d'accès de l'API, donatz un còp d’uèlh <a href=\"%link%\">a la documentacion de l'API</a>."
        back: 'Retorn'
+user:
+    # page_title: Users management
+    # new_user: Create a new user
+    # edit_user: Edit an existing user
+    # description: "Here you can manage all users (create, edit and delete)"
+    # list:
+    #     actions: Actions
+    #     edit_action: Edit
+    #     yes: Yes
+    #     no: No
+    #     create_new_one: Create a new user
+    form:
+        username_label: "Nom d'utilizaire"
+        # name_label: 'Name'
+        password_label: 'Senhal'
+        repeat_new_password_label: 'Confirmatz vòstre novèl senhal'
+        plain_password_label: 'Senhal en clar'
+        email_label: 'Adreça de corrièl'
+        # enabled_label: 'Enabled'
+        # locked_label: 'Locked'
+        # last_login_label: 'Last login'
+        # twofactor_label: Two factor authentication
+        # save: Save
+        # delete: Delete
+        # delete_confirm: Are you sure?
+        # back_to_list: Back to list
 flashes:
    config:
        notice:
@@ -400,10 +459,10 @@ flashes:
        notice:
            entry_already_saved: 'Article ja salvargardat lo %date%'
            entry_saved: 'Article enregistrat'
-            # entry_saved_failed: 'Failed to save entry'
+            entry_saved_failed: 'Article salvat mai fracàs de la recuperacion del contengut'
            entry_updated: 'Article mes a jorn'
            entry_reloaded: 'Article recargat'
-            entry_reload_failed: "Fracàs de l'actualizacion de l'article"
+            entry_reload_failed: "L'article es estat cargat de nòu mai la recuperacion del contengut a fracassat"
            entry_archived: 'Article marcat coma legit'
            entry_unarchived: 'Article marcat coma pas legit'
            entry_starred: 'Article apondut dins los favorits'
@@ -417,6 +476,10 @@ flashes:
            failed: "L'importacion a fracassat, mercés de tornar ensajar"
            failed_on_file: "Errorr pendent du tractament de l'import. Mercés de verificar vòstre fichièr."
            summary: "Rapòrt d'import: %imported% importats, %skipped% ja presents."
+            summary_with_queue: "Rapòrt d'import : %queued% en espèra de tractament."
+        error:
+            redis_enabled_not_installed: "Redis es capable d'importar de manièra asincròna mai sembla que <u>podèm pas nos conectar amb el</u>. Mercés de verificar la configuracion de Redis."
+            rabbit_enabled_not_installed: "RabbitMQ es capable d'importar de manièra asincròna mai sembla que <u>podèm pas nos conectar amb el</u>. Mercés de verificar la configuracion de RabbitMQ."
    developer:
        notice:
            client_created: 'Novèl client creat'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index 2db26cf1..54e669b3 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -31,6 +31,7 @@ menu:
        search: 'Szukaj'
        save_link: 'Zapisz link'
        back_to_unread: 'Powrót do nieprzeczytanych artykułów'
+        # users_management: 'Users management'
    top:
        add_new_entry: 'Dodaj nowy wpis'
        search: 'Szukaj'
@@ -45,6 +46,7 @@ footer:
        social: 'Społeczność'
        powered_by: 'Kontrolowany przez'
        about: 'O nas'
+    # stats: Since %user_creation% you read %nb_archives% articles. That is about %per_day% a day!
 config:
    page_title: 'Konfiguracja'
@@ -68,6 +70,7 @@ config:
            200_word: 'Czytam ~200 słów na minutę'
            300_word: 'Czytam ~300 słów na minutę'
            400_word: 'Czytam ~400 słów na minutę'
+        pocket_consumer_key_label: 'Klucz klienta Pocket do importu zawartości'
    form_rss:
        description: 'Kanały RSS prowadzone przez wallabag pozwalają Ci na czytanie twoich zapisanych artykułów w twoium ulubionym czytniku RSS. Musisz najpierw wynegenerować tokena.‌'
        token_label: 'Token RSS'
@@ -93,6 +96,7 @@ config:
        if_label: 'jeżeli'
        then_tag_as_label: 'wtedy otaguj jako'
        delete_rule_label: 'usuń'
+        # edit_rule_label: 'edit'
        rule_label: 'Reguła'
        tags_label: 'Tagi'
        faq:
@@ -126,12 +130,6 @@ 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>'
-    form_new_user:
-        username_label: 'Nazwa użytkownika'
-        password_label: 'Hasło'
-        repeat_new_password_label: 'Powtórz nowe hasło'
-        plain_password_label: 'Jawne hasło'
-        email_label: 'Adres email'
 entry:
    page_titles:
@@ -139,11 +137,14 @@ entry:
        starred: 'Wpisy oznaczone gwiazdką'
        archived: 'Zarchiwizowane wpisy'
        filtered: 'Odfiltrowane wpisy'
+        filtered_tags: 'Filtrowane po tagach'
+        untagged: 'Odtaguj wpisy'
    list:
        number_on_the_page: '{0} Nie ma wpisów.|{1} Jest jeden wpis.|]1,Inf[ Są %count% wpisy.'
        reading_time: 'szacunkowy czas czytania'
        reading_time_minutes: 'szacunkowy czas czytania: %readingTime% min'
        reading_time_less_one_minute: 'szacunkowy czas czytania: <small class="inferieur">&lt;</small> 1 min'
+        number_of_tags: '{1} i inny tag|]1,Inf[i %count% innych tagów'
        reading_time_minutes_short: '%readingTime% min'
        reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
        original_article: 'oryginał'
@@ -185,6 +186,8 @@ entry:
            add_a_tag: 'Dodaj tag'
            share_content: 'Udostępnij'
            share_email_label: 'Adres email'
+            public_link: 'Publiczny link'
+            delete_public_link: 'Usuń publiczny link'
            download: 'Pobierz'
            print: 'Drukuj'
            problem:
@@ -260,12 +263,14 @@ howto:
 quickstart:
    page_title: 'Szybki start'
+    # more: 'More…'
    intro:
         title: 'Witaj w wallabag!'
         paragraph_1: "Będziemy ci towarzyszyli w Twojej poznaniu wallabag i pokażemy możliwości, które mogą cię zainteresować."
         paragraph_2: 'Śledź nas!'
    configure:
         title: 'Konfiguruj aplikację'
+         description: 'In order to have an application which suits you, have a look into the configuration of wallabag.'
         language: 'Zmień język i wygląd'
         rss: 'Włącz kanały RSS'
         tagging_rules: 'Napisz reguły pozwalające na automatyczne otagowanie twoich artykułów'
@@ -273,12 +278,13 @@ quickstart:
         title: 'Administracja'
         description: 'Jako administrator wallabag, możesz:'
         new_user: 'Tworzyć nowego użytkownika'
-         analytics: 'Configure analytics'
+         analytics: 'Konfigurować analityki'
         sharing: 'Włączyć pewne parametry dotyczące udostępniania artykułów'
         export: 'Skonfigurować eksport'
         import: 'Skonfigurować import'
    first_steps:
        title: 'Pierwsze kroki'
+        # description: "Now wallabag is well configured, it's time to archive the web. You can click on the top right sign + to add a link"
        new_article: 'Zapisz swój pierwszy artukuł'
        unread_articles: 'I sklasyfikuj go!'
    migrate:
@@ -287,11 +293,16 @@ quickstart:
        pocket: 'Migruj z Pocket'
        wallabag_v1: 'Migruj z wallabag v1'
        wallabag_v2: 'Migruj z wallabag v2'
+        readability: 'Migruj z Readability'
+        instapaper: 'Migruj z Instapaper'
    developer:
        title: 'Deweloperzy'
+        # description: 'We also thought to the developers: Docker, API, translations, etc.'
        create_application: 'Stwórz swoją aplikację'
+        # use_docker: 'Use Docker to install wallabag'
    docs:
        title: 'Pełna Dokumentacja'
+        # description: "There are so much features in wallabag. Don't hesitate to read the manual to know them and to learn how to use them."
        annotate: 'Dadaj adnotację do swojego artykułu'
        export: 'Konwertuj swoje artykuły do ePUB lub PDF'
        search_filters: 'Zabacz jak możesz znaleźć artykuł dzięku użyciu silnika wyszukiwarki i filtrów'
@@ -308,6 +319,7 @@ tag:
    page_title: 'Tagi'
    list:
        number_on_the_page: '{0} Nie ma tagów.|{1} Jest jeden tag.|]1,Inf[ Są %count% tagi.'
+        see_untagged_entries: 'Zobacz nieotagowane wpisy'
 import:
    page_title: 'Import'
@@ -335,6 +347,24 @@ import:
    wallabag_v2:
        page_title: 'Import > Wallabag v2'
        description: 'Ten importer, zaimportuje wszystkie twoje artykułu z wallabag v2. Idź do wszystkich artykułów, a następnie na panelu exportu kliknij na "JSON". Otrzymasz plik "All articles.json".'
+    readability:
+        page_title: 'Import > Readability'
+        description: 'Ten importer, zaimportuje wszystkie twoje artykuły z Readability. Na stronie narzędzi (https://www.readability.com/tools/), kliknij na "Export your data" w sekcji "Data Export". Otrzymach email z plikiem JSON (plik nie będzie zawierał rozszerzenia .json).'
+        how_to: 'Wybierz swój plik eksportu z Readability i kliknij poniższy przycisk, aby go załadować.'
+    worker:
+        enabled: "Import jest wykonywany asynchronicznie. Od momentu rozpoczęcia importu, zewnętrzna usługa może zajmować się na raz tylko jednym zadaniem. Bieżącą usługą jest:"
+    firefox:
+       page_title: 'Import > Firefox'
+       description: "Ten importer zaimportuje wszystkie twoje zakładki z Firefoksa. Idź do twoich zakładek (Ctrl+Shift+O), następnie w \"Import i kopie zapasowe\", wybierz \"Utwórz kopię zapasową...\". Uzyskasz plik .json."
+       how_to: "Wybierz swój plik z zakładkami i naciśnij poniższy przycisk, aby je zaimportować. Może to zająć dłuższą chwilę, zanim wszystkie artykuły zostaną przeniesione."
+    chrome:
+       page_title: 'Import > Chrome'
+       description: "Ten importer zaimportuje wszystkie twoje zakładki z Chrome. Lokalizacja pliku jest zależna od twojego systemy operacyjnego : <ul><li>Pod Linuksem, idź do katalogu <code>~/.config/chromium/Default/</code></li><li>Pod Windowsem, powinien się on znajdować w <code>%LOCALAPPDATA%\\Google\\Chrome\\User Data\\Default</code></li><li>Pod OS X, powinien się on znajdować w <code>~/Library/Application Support/Google/Chrome/Default/Bookmarks</code></li></ul>Po odnalezieniu pliku, skopiuj go w łatwo dostęne miejsce.<em><br>Jeżeli używasz Chromium zamiast Chrome, będziesz musiał odpowiednio poprawić ścieżkę dostępu.</em></p>"
+       how_to: "Wybierz swój plik z zakładkami i naciśnij poniższy przycisk, aby je zaimportować. Może to zająć dłuższą chwilę, zanim wszystkie artykuły zostaną przeniesione."
+    instapaper:
+        page_title: 'Import > Instapaper'
+        description: 'Ten importer, zaimportuje wszystkie twoje artykuły z Instapaper. W ustawieniach (https://www.instapaper.com/user), kliknij na "Download .CSV file"  w sekcji "Export". Otrzymasz plik CSV.'
+        how_to: 'Wybierz swój plik eksportu z Instapaper i kliknij poniższy przycisk, aby go załadować.'
 developer:
    page_title: 'Deweloper'
@@ -342,38 +372,40 @@ developer:
    documentation: 'Dokumentacja'
    how_to_first_app: 'Jak stworzyć moją pierwszą aplikację'
    full_documentation: 'Pokaż pełne API'
-    # list_methods: 'List API methods'
+    list_methods: 'Lista metod API'
    clients:
-         title: 'Klienci'
+        title: 'Klienci'
-         create_new: 'Utwórz nowego klienta'
+        create_new: 'Utwórz nowego klienta'
    existing_clients:
-         title: 'Istniejący klienci'
+        title: 'Istniejący klienci'
-         field_id: 'Client ID'
+        field_id: 'ID klienta'
-         field_secret: 'Client secret'
+        field_secret: 'Client secret'
-         field_uris: 'Przekieruj URIs'
+        field_uris: 'Przekieruj URIs'
-         field_grant_types: 'Przyznaj pozwolenie'
+        field_grant_types: 'Przyznaj pozwolenie'
-         no_client: 'Nie ma jeszcze klienta.'
+        no_client: 'Nie ma jeszcze klienta.'
    remove:
-         warn_message_1: 'Masz możliwość usunięcia tego klienta. Ta akcja jest NIEODWRACALNA !'
+        warn_message_1: 'Masz możliwość usunięcia tego klienta. Ta akcja jest NIEODWRACALNA !'
-         warn_message_2: "Jeżeli go usuniesz, aplikacje skonfigurowane z tym klientem nię będa w stanie autoryzować twojego wallabag."
+        warn_message_2: "Jeżeli go usuniesz, aplikacje skonfigurowane z tym klientem nię będa w stanie autoryzować twojego wallabag."
-         action: 'Usuń tego klienta'
+        action: 'Usuń tego klienta'
    client:
-         page_title: 'Deweloper > Nowy klient'
+        page_title: 'Deweloper > Nowy klient'
-         page_description: 'Tworzysz nowego klienta. Wypełnij poniższe pole w celu przekierowania URI twojej aplikacji.'
+        page_description: 'Tworzysz nowego klienta. Wypełnij poniższe pole w celu przekierowania URI twojej aplikacji.'
-         form:
+        form:
-             redirect_uris_label: 'Przekieruj adresy URI'
+            # name_label: 'Name of the client'
-             save_label: 'Stwórz nowego klienta'
+            redirect_uris_label: 'Przekieruj adresy URI'
-         action_back: 'Cofnij'
+            save_label: 'Stwórz nowego klienta'
+        action_back: 'Cofnij'
    client_parameter:
-         page_title: 'Deweloper > Parametry klienta'
+        page_title: 'Deweloper > Parametry klienta'
-         page_description: 'Tutaj znajdują się parametry klienta.'
+        page_description: 'Tutaj znajdują się parametry klienta.'
-         field_id: 'Client ID'
+        # field_name: 'Client name'
-         field_secret: 'Client secret'
+        field_id: 'Client ID'
-         back: 'Cofnij'
+        field_secret: 'Client secret'
-         read_howto: 'Przeczytaj jak "Stworzyć moją pierwszą aplikację"'
+        back: 'Cofnij'
+        read_howto: 'Przeczytaj jak "Stworzyć moją pierwszą aplikację"'
    howto:
-         page_title: 'Deweloper > Jak stworzyć moją pierwszą aplikację'
+        page_title: 'Deweloper > Jak stworzyć moją pierwszą aplikację'
-         description:
+        description:
            paragraph_1: 'Następujące komendy korzystają <a href="https://github.com/jkbrzt/httpie">Biblioteka HTTPie</a>. Upewnij się, czy zainstalowałeś ją w swoim systemie zanim z niej skorzystasz'
            paragraph_2: 'Potrzebujesz tokena w celu nawiązania komunikacji między swoją aplikacją a API wallabag.'
            paragraph_3: 'W celu stworzenia tokena musisz <a href="%link%">stwórz nowego klienta</a>.'
@@ -382,7 +414,34 @@ developer:
            paragraph_6: 'access_token jest użyteczny do wywołania API endpoint. Na przykład:'
            paragraph_7: 'To wywołanie zwróci wszystkie twoje wpisy.'
            paragraph_8: 'Jeżeli chcesz wyświetlić wszystkie punkty końcowe API, zobacz <a href="%link%">Dokumentacja naszego API</a>.'
-         back: 'Cofnij'
+        back: 'Cofnij'
+user:
+    # page_title: Users management
+    # new_user: Create a new user
+    # edit_user: Edit an existing user
+    # description: "Here you can manage all users (create, edit and delete)"
+    # list:
+    #     actions: Actions
+    #     edit_action: Edit
+    #     yes: Yes
+    #     no: No
+    #     create_new_one: Create a new user
+    form:
+        username_label: 'Nazwa użytkownika'
+        # name_label: 'Name'
+        password_label: 'Hasło'
+        repeat_new_password_label: 'Powtórz nowe hasło'
+        plain_password_label: 'Jawne hasło'
+        email_label: 'Adres email'
+        # enabled_label: 'Enabled'
+        # locked_label: 'Locked'
+        # last_login_label: 'Last login'
+        # twofactor_label: Two factor authentication
+        # save: Save
+        # delete: Delete
+        # delete_confirm: Are you sure?
+        # back_to_list: Back to list
 flashes:
    config:
@@ -400,10 +459,10 @@ flashes:
        notice:
            entry_already_saved: 'Wpis już został dodany %date%'
            entry_saved: 'Wpis zapisany'
-            # entry_saved_failed: 'Failed to save entry'
+            entry_saved_failed: 'Wpis zapisany, ale wystąpił bład pobierania treści'
            entry_updated: 'Wpis zaktualizowany'
            entry_reloaded: 'Wpis ponownie załadowany'
-            entry_reload_failed: 'Błąd ponownego załadowania'
+            entry_reload_failed: 'Wpis ponownie załadowany, ale wystąpił bład pobierania treści'
            entry_archived: 'Wpis dodany do archiwum'
            entry_unarchived: 'Wpis usunięty z archiwum'
            entry_starred: 'Wpis oznaczony gwiazdką'
@@ -417,6 +476,10 @@ flashes:
            failed: 'Nieudany import, prosimy spróbować ponownie.'
            failed_on_file: 'Błąd podczas ptrzetwarzania pliku. Sprawdż swój importowany plik.'
            summary: 'Podsumowanie importu: %imported% zaimportowane, %skipped% już zapisane.'
+            summary_with_queue: 'Podsumowanie importu: %queued% zakolejkowane.'
+        error:
+            redis_enabled_not_installed: 'Redis jest włączony dla obsługi importu asynchronicznego, ale <u>nie możemy się z nim połączyć</u>. Sprawdź konfigurację Redisa.'
+            rabbit_enabled_not_installed: 'RabbitMQ jest włączony dla obsługi importu asynchronicznego, ale <u>nie możemy się z nim połączyć</u>. Sprawdź konfigurację RabbitMQ.'
    developer:
        notice:
            client_created: 'Nowy klient utworzony.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index d8f09bc9..4e0e454c 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -31,6 +31,7 @@ menu:
        search: 'Căutare'
        # save_link: 'Save a link'
        back_to_unread: 'Înapoi la articolele necitite'
+        # users_management: 'Users management'
    top:
        add_new_entry: 'Introdu un nou articol'
        search: 'Căutare'
@@ -45,6 +46,7 @@ footer:
        # social: 'Social'
        # powered_by: 'powered by'
        about: 'Despre'
+    # stats: Since %user_creation% you read %nb_archives% articles. That is about %per_day% a day!
 config:
    page_title: 'Configurație'
@@ -68,6 +70,7 @@ config:
            # 200_word: 'I read ~200 words per minute'
            # 300_word: 'I read ~300 words per minute'
            # 400_word: 'I read ~400 words per minute'
+        pocket_consumer_key_label: Cheie consumator pentru importarea contentului din Pocket
    form_rss:
        description: 'Feed-urile RSS oferite de wallabag îți permit să-ți citești articolele salvate în reader-ul tău preferat RSS.'
        token_label: 'RSS-Token'
@@ -93,6 +96,7 @@ config:
        # if_label: 'if'
        # then_tag_as_label: 'then tag as'
        # delete_rule_label: 'delete'
+        # edit_rule_label: 'edit'
        # rule_label: 'Rule'
        # tags_label: 'Tags'
        # faq:
@@ -126,12 +130,6 @@ 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>'
-    form_new_user:
-        username_label: 'Nume de utilizator'
-        password_label: 'Parolă'
-        repeat_new_password_label: 'Repeat new password'
-        plain_password_label: '????'
-        email_label: 'E-mail'
 entry:
    page_titles:
@@ -139,11 +137,14 @@ entry:
        # starred: 'Starred entries'
        # archived: 'Archived entries'
        # filtered: 'Filtered entries'
+        # filtered_tags: 'Filtered by tags'
+        # untagged: 'Untagged entries'
    list:
        # number_on_the_page: '{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.'
        reading_time: 'timp estimat de citire'
        reading_time_minutes: 'timp estimat de citire: %readingTime% min'
        reading_time_less_one_minute: 'timp estimat de citire: <small class="inferieur">&lt;</small> 1 min'
+        # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags'
        reading_time_minutes_short: '%readingTime% min'
        reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
        original_article: 'original'
@@ -185,6 +186,8 @@ entry:
            add_a_tag: 'Adaugă un tag'
            share_content: 'Dă mai departe'
            share_email_label: 'E-mail'
+            # public_link: 'public link'
+            # delete_public_link: 'delete public link'
            download: 'Descarcă'
            # print: 'Print'
            problem:
@@ -260,12 +263,14 @@ howto:
 quickstart:
    # page_title: 'Quickstart'
+    # more: 'More…'
    # intro:
    #     title: 'Welcome to wallabag!'
    #     paragraph_1: "We'll accompany you to visit wallabag and show you some features which can interest you."
    #     paragraph_2: 'Follow us!'
    # configure:
    #     title: 'Configure the application'
+    #     description: 'In order to have an application which suits you, have a look into the configuration of wallabag.'
    #     language: 'Change language and design'
    #     rss: 'Enable RSS feeds'
    #     tagging_rules: 'Write rules to automatically tag your articles'
@@ -279,6 +284,7 @@ quickstart:
    #     import: 'Configure import'
    # first_steps:
    #     title: 'First steps'
+    #     description: "Now wallabag is well configured, it's time to archive the web. You can click on the top right sign + to add a link."
    #     new_article: 'Save your first article'
    #     unread_articles: 'And classify it!'
    # migrate:
@@ -287,11 +293,16 @@ quickstart:
    #     pocket: 'Migrate from Pocket'
    #     wallabag_v1: 'Migrate from wallabag v1'
    #     wallabag_v2: 'Migrate from wallabag v2'
+    #     readability: 'Migrate from Readability'
+    #     instapaper: 'Migrate from Instapaper'
    # developer:
    #     title: 'Developers'
+    #     description: 'We also thought to the developers: Docker, API, translations, etc.'
    #     create_application: 'Create your third application'
+    #     use_docker: 'Use Docker to install wallabag'
    # docs:
    #     title: 'Full documentation'
+    #     description: "There are so much features in wallabag. Don't hesitate to read the manual to know them and to learn how to use them."
    #     annotate: 'Annotate your article'
    #     export: 'Convert your articles into ePUB or PDF'
    #     search_filters: 'See how you can look for an article by using search engine and filters'
@@ -308,6 +319,7 @@ tag:
    page_title: 'Tag-uri'
    list:
        # number_on_the_page: '{0} There is no tag.|{1} There is one tag.|]1,Inf[ There are %count% tags.'
+        # see_untagged_entries: 'See untagged entries'
 import:
    # page_title: 'Import'
@@ -335,6 +347,24 @@ import:
    # wallabag_v2:
    #     page_title: 'Import > Wallabag v2'
    #     description: 'This importer will import all your wallabag v2 articles. Go to All articles, then, on the export sidebar, click on "JSON". You will have a "All articles.json" file.'
+    # readability:
+    #     page_title: 'Import > Readability'
+    #     description: 'This importer will import all your Readability articles. On the tools (https://www.readability.com/tools/) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact).'
+    #     how_to: 'Please select your Readability export and click on the below button to upload and import it.'
+    worker:
+        # enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:"
+    # firefox:
+    #    page_title: 'Import > Firefox'
+    #    description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file."
+    #    how_to: "Please choose the bookmark backup file and click on the button below to import it. Note that the process may take a long time since all articles have to be fetched."
+    # chrome:
+    #    page_title: 'Import > Chrome'
+    #    description: "This importer will import all your Chrome bookmarks. The location of the file depends on your operating system : <ul><li>On Linux, go into the <code>~/.config/chromium/Default/</code> directory</li><li>On Windows, it should be at <code>%LOCALAPPDATA%\\Google\\Chrome\\User Data\\Default</code></li><li>On OS X, it should be at <code>~/Library/Application Support/Google/Chrome/Default/Bookmarks</code></li></ul>Once you got there, copy the Bookmarks file someplace you'll find.<em><br>Note that if you have Chromium instead of Chrome, you'll have to correct paths accordingly.</em></p>"
+    #    how_to: "Please choose the bookmark backup file and click on the button below to import it. Note that the process may take a long time since all articles have to be fetched."
+    # instapaper:
+    #     page_title: 'Import > Instapaper'
+    #     description: 'This importer will import all your Instapaper articles. On the settings (https://www.instapaper.com/user) page, click on "Download .CSV file" in the "Export" section. A CSV file will be downloaded (like "instapaper-export.csv").'
+    #     how_to: 'Please select your Instapaper export and click on the below button to upload and import it.'
 developer:
    # page_title: 'Developer'
@@ -361,12 +391,14 @@ developer:
    #     page_title: 'Developer > New client'
    #     page_description: 'You are about to create a new client. Please fill the field below for the redirect URI of your application.'
    #     form:
+    #         name_label: 'Name of the client'
    #         redirect_uris_label: 'Redirect URIs'
    #         save_label: 'Create a new client'
    #     action_back: 'Back'
    # client_parameter:
    #     page_title: 'Developer > Client parameters'
    #     page_description: 'Here are your client parameters.'
+    #     field_name: 'Client name'
    #     field_id: 'Client ID'
    #     field_secret: 'Client secret'
    #     back: 'Back'
@@ -384,6 +416,33 @@ developer:
    #         paragraph_8: 'If you want to see all the API endpoints, you can have a look <a href="%link%">to our API documentation</a>.'
    #     back: 'Back'
+user:
+    # page_title: Users management
+    # new_user: Create a new user
+    # edit_user: Edit an existing user
+    # description: "Here you can manage all users (create, edit and delete)"
+    # list:
+    #     actions: Actions
+    #     edit_action: Edit
+    #     yes: Yes
+    #     no: No
+    #     create_new_one: Create a new user
+    form:
+        username_label: 'Nume de utilizator'
+        # name_label: 'Name'
+        password_label: 'Parolă'
+        repeat_new_password_label: 'Repeat new password'
+        plain_password_label: '????'
+        email_label: 'E-mail'
+        # enabled_label: 'Enabled'
+        # locked_label: 'Locked'
+        # last_login_label: 'Last login'
+        # twofactor_label: Two factor authentication
+        # save: Save
+        # delete: Delete
+        # delete_confirm: Are you sure?
+        # back_to_list: Back to list
 flashes:
    config:
        notice:
@@ -400,10 +459,10 @@ flashes:
        notice:
            # entry_already_saved: 'Entry already saved on %date%'
            # entry_saved: 'Entry saved'
-            # entry_saved_failed: 'Failed to save entry'
+            # entry_saved_failed: 'Entry saved but fetching content failed'
            # entry_updated: 'Entry updated'
            # entry_reloaded: 'Entry reloaded'
-            # entry_reload_failed: 'Failed to reload entry'
+            # entry_reload_failed: 'Entry reloaded but fetching content failed'
            entry_archived: 'Articol arhivat'
            entry_unarchived: 'Articol dezarhivat'
            entry_starred: 'Articol adăugat la favorite'
@@ -417,6 +476,10 @@ flashes:
            # failed: 'Import failed, please try again.'
            # failed_on_file: 'Error while processing import. Please verify your import file.'
            # summary: 'Import summary: %imported% imported, %skipped% already saved.'
+            # summary_with_queue: 'Import summary: %queued% queued.'
+        error:
+            # redis_enabled_not_installed: Redis is enabled for handle asynchronous import but it looks like <u>we can't connect to it</u>. Please check Redis configuration.
+            # rabbit_enabled_not_installed: RabbitMQ is enabled for handle asynchronous import but it looks like <u>we can't connect to it</u>. Please check RabbitMQ configuration.
    developer:
        notice:
            # client_created: 'New client created.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index 074d13e2..02b3aae6 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -31,6 +31,7 @@ menu:
        search: 'Ara'
        # save_link: 'Save a link'
        back_to_unread: 'Okunmayan makalelere geri dön'
+        # users_management: 'Users management'
    top:
        add_new_entry: 'Yeni bir makale ekle'
        search: 'Ara'
@@ -45,6 +46,7 @@ footer:
        social: 'Sosyal'
        powered_by: 'powered by'
        about: 'Hakkımızda'
+    # stats: Since %user_creation% you read %nb_archives% articles. That is about %per_day% a day!
 config:
    page_title: 'Yapılandırma'
@@ -68,6 +70,7 @@ config:
            # 200_word: 'I read ~200 words per minute'
            # 300_word: 'I read ~300 words per minute'
            # 400_word: 'I read ~400 words per minute'
+        # pocket_consumer_key_label: Consumer key for Pocket to import contents
    form_rss:
        description: 'wallabag RSS akışı kaydetmiş olduğunuz makalelerini favori RSS okuyucunuzda görüntülemenizi sağlar. Bunu yapabilmek için öncelikle belirteç (token) oluşturmalısınız.'
        token_label: 'RSS belirteci (token)'
@@ -126,12 +129,6 @@ 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>'
-    form_new_user:
-        username_label: 'Kullanıcı adı'
-        password_label: 'Şifre'
-        repeat_new_password_label: 'Yeni şifrenin tekrarı'
-        plain_password_label: '????'
-        email_label: 'E-posta'
 entry:
    page_titles:
@@ -139,11 +136,14 @@ entry:
        # starred: 'Starred entries'
        # archived: 'Archived entries'
        # filtered: 'Filtered entries'
+        # filtered_tags: 'Filtered by tags'
+        # untagged: 'Untagged entries'
    list:
        number_on_the_page: '{0} Herhangi bir makale yok.|{1} Burada bir adet makale var.|]1,Inf[ Burada %count% adet makale var.'
        reading_time: 'tahmini okuma süresi'
        reading_time_minutes: 'tahmini okuma süresi: %readingTime% min'
        reading_time_less_one_minute: 'tahmini okuma süresi: <small class="inferieur">&lt;</small> 1 min'
+        # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags'
        reading_time_minutes_short: '%readingTime% min'
        reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
        original_article: 'orijinal'
@@ -185,6 +185,8 @@ entry:
            add_a_tag: 'Bir etiket ekle'
            share_content: 'Paylaş'
            share_email_label: 'E-posta'
+            # public_link: 'public link'
+            # delete_public_link: 'delete public link'
            download: 'İndir'
            # print: 'Print'
            problem:
@@ -260,12 +262,14 @@ howto:
 quickstart:
    page_title: 'Hızlı başlangıç'
+    # more: 'More…'
    intro:
        title: 'wallabag'
        paragraph_1: "wallabag kurduğunuz için teşekkür ederiz. Bu sayfada biz size eşlik edecek ve ilginizi çekecek birkaç özellik göstereceğim."
        paragraph_2: 'Bizi takip edin!'
    configure:
        title: 'Uygulamayı Yapılandırma'
+        # description: 'In order to have an application which suits you, have a look into the configuration of wallabag.'
        language: 'Dili ve tasarımı değiştirme'
        rss: 'RSS akışını aktifleştirme'
        # tagging_rules: 'Write rules to automatically tag your articles'
@@ -279,6 +283,7 @@ quickstart:
        # import: 'Configure import'
    first_steps:
        title: 'İlk adım'
+        # description: "Now wallabag is well configured, it's time to archive the web. You can click on the top right sign + to add a link."
        new_article: 'İlk makalenizi kaydedin'
        unread_articles: 'Ve bunu sınıflandırın!'
    migrate:
@@ -287,11 +292,16 @@ quickstart:
        pocket: "Pocket üzerindeki verilerinizi wallabag'e aktarın"
        wallabag_v1: "wallabag v1 üzerindeki verilerinizi wallabag'in yeni sürümüne aktarın"
        wallabag_v2: "wallabag v2 üzerindeki verilerinizi wallabag'in yeni sürümüne aktarın"
+        readability: "Readability üzerindeki verilerinizi wallabag'e aktarın'"
+        instapaper: "Instapaper üzerindeki verilerinizi wallabag'e aktarın'"
    developer:
        # title: 'Developers'
+        # description: 'We also thought to the developers: Docker, API, translations, etc.'
        # create_application: 'Create your third application'
+        # use_docker: 'Use Docker to install wallabag'
    docs:
        title: 'Dokümantasyon'
+        # description: "There are so much features in wallabag. Don't hesitate to read the manual to know them and to learn how to use them."
        # annotate: 'Annotate your article'
        export: 'Makalelerinizi ePUB ya da PDF formatına çevirme'
        search_filters: 'Makaleleri görüntülemek için arama motorlarını ve filteri kullanma'
@@ -308,6 +318,7 @@ tag:
    page_title: 'Etiketler'
    list:
        number_on_the_page: '{0} Herhangi bir etiket yok.|{1} Burada bir adet etiket var.|]1,Inf[ Burada %count% adet etiket var.'
+        # see_untagged_entries: 'See untagged entries'
 import:
    page_title: 'İçe Aktar'
@@ -335,6 +346,24 @@ import:
    wallabag_v2:
        page_title: 'İçe Aktar > Wallabag v2'
        # description: 'This importer will import all your wallabag v2 articles. Go to All articles, then, on the export sidebar, click on "JSON". You will have a "All articles.json" file.'
+    readability:
+        page_title: 'İçe Aktar > Readability'
+        # description: 'This importer will import all your Readability articles. On the tools (https://www.readability.com/tools/) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact).'
+        # how_to: 'Please select your Readability export and click on the below button to upload and import it.'
+    worker:
+        # enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:"
+    firefox:
+       page_title: 'İçe Aktar > Firefox'
+       # description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file."
+       # how_to: "Please choose the bookmark backup file and click on the button below to import it. Note that the process may take a long time since all articles have to be fetched."
+    chrome:
+       page_title: 'İçe Aktar > Chrome'
+       # description: "This importer will import all your Chrome bookmarks. The location of the file depends on your operating system : <ul><li>On Linux, go into the <code>~/.config/chromium/Default/</code> directory</li><li>On Windows, it should be at <code>%LOCALAPPDATA%\\Google\\Chrome\\User Data\\Default</code></li><li>On OS X, it should be at <code>~/Library/Application Support/Google/Chrome/Default/Bookmarks</code></li></ul>Once you got there, copy the Bookmarks file someplace you'll find.<em><br>Note that if you have Chromium instead of Chrome, you'll have to correct paths accordingly.</em></p>"
+       # how_to: "Please choose the bookmark backup file and click on the button below to import it. Note that the process may take a long time since all articles have to be fetched."
+    instapaper:
+        page_title: 'İçe Aktar > Instapaper'
+        # description: 'This importer will import all your Instapaper articles. On the settings (https://www.instapaper.com/user) page, click on "Download .CSV file" in the "Export" section. A CSV file will be downloaded (like "instapaper-export.csv").'
+        # how_to: 'Please select your Instapaper export and click on the below button to upload and import it.'
 developer:
    # page_title: 'Developer'
@@ -361,12 +390,14 @@ developer:
    #     page_title: 'Developer > New client'
    #     page_description: 'You are about to create a new client. Please fill the field below for the redirect URI of your application.'
    #     form:
+    #        name_label: 'Name of the client'
    #         redirect_uris_label: 'Redirect URIs'
    #         save_label: 'Create a new client'
    #     action_back: 'Back'
    # client_parameter:
    #     page_title: 'Developer > Client parameters'
    #     page_description: 'Here are your client parameters.'
+    #     field_name: 'Client name'
    #     field_id: 'Client ID'
    #     field_secret: 'Client secret'
    #     back: 'Back'
@@ -384,6 +415,33 @@ developer:
    #         paragraph_8: 'If you want to see all the API endpoints, you can have a look <a href="%link%">to our API documentation</a>.'
    #     back: 'Back'
+user:
+    # page_title: Users management
+    # new_user: Create a new user
+    # edit_user: Edit an existing user
+    # description: "Here you can manage all users (create, edit and delete)"
+    # list:
+    #     actions: Actions
+    #     edit_action: Edit
+    #     yes: Yes
+    #     no: No
+    #     create_new_one: Create a new user
+    form:
+        username_label: 'Kullanıcı adı'
+        # name_label: 'Name'
+        password_label: 'Şifre'
+        repeat_new_password_label: 'Yeni şifrenin tekrarı'
+        plain_password_label: '????'
+        email_label: 'E-posta'
+        # enabled_label: 'Enabled'
+        # locked_label: 'Locked'
+        # last_login_label: 'Last login'
+        # twofactor_label: Two factor authentication
+        # save: Save
+        # delete: Delete
+        # delete_confirm: Are you sure?
+        # back_to_list: Back to list
 flashes:
    config:
        notice:
@@ -400,10 +458,10 @@ flashes:
        notice:
            entry_already_saved: 'Entry already saved on %date%'
            entry_saved: 'Makale kaydedildi'
-            # entry_saved_failed: 'Failed to save entry'
+            # entry_saved_failed: 'Entry saved but fetching content failed'
            # entry_updated: 'Entry updated'
            entry_reloaded: 'Makale içeriği yenilendi'
-            # entry_reload_failed: 'Failed to reload entry'
+            # entry_reload_failed: 'Entry reloaded but fetching content failed'
            entry_archived: 'Makale arşivlendi'
            entry_unarchived: 'Makale arşivden çıkartıldı'
            entry_starred: 'Makale favorilere eklendi'
@@ -417,6 +475,10 @@ flashes:
            # failed: 'Import failed, please try again.'
            # failed_on_file: 'Error while processing import. Please verify your import file.'
            # summary: 'Import summary: %imported% imported, %skipped% already saved.'
+            # summary_with_queue: 'Import summary: %queued% queued.'
+        error:
+            # redis_enabled_not_installed: Redis is enabled for handle asynchronous import but it looks like <u>we can't connect to it</u>. Please check Redis configuration.
+            # rabbit_enabled_not_installed: RabbitMQ is enabled for handle asynchronous import but it looks like <u>we can't connect to it</u>. Please check RabbitMQ configuration.
    developer:
        notice:
            # client_created: 'New client created.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.da.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.da.yml
index dfe2c64d..313339ed 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/validators.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.da.yml
@@ -1,6 +1,6 @@
 validator:
    password_must_match: 'De indtastede adgangskoder skal være ens'
    password_too_short: 'Adgangskoden skal være mindst 8 tegn'
-#     password_wrong_value: 'Wrong value for your current password'
+    # password_wrong_value: 'Wrong value for your current password'
-#     item_per_page_too_high: 'This will certainly kill the app'
+    # item_per_page_too_high: 'This will certainly kill the app'
-#     rss_limit_too_hight: 'This will certainly kill the app'
+    # rss_limit_too_hight: 'This will certainly kill the app'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.tr.yml
index 80ab470a..1b358965 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/validators.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.tr.yml
@@ -1,6 +1,6 @@
 validator:
-#     password_must_match: 'The password fields must match.'
+    # password_must_match: 'The password fields must match.'
-#     password_too_short: 'Password should by at least 8 chars long'
+    # password_too_short: 'Password should by at least 8 chars long'
-#     password_wrong_value: 'Wrong value for your current password'
+    # password_wrong_value: 'Wrong value for your current password'
-#     item_per_page_too_high: 'This will certainly kill the app'
+    # item_per_page_too_high: 'This will certainly kill the app'
-#     rss_limit_too_hight: 'This will certainly kill the app'
+    # rss_limit_too_hight: 'This will certainly kill the app'