From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Sat, 10 Jun 2017 12:41:30 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into 2.3
X-Git-Tag: 2.3.0~31^2~58
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=873f6b8e03079d11fab541aa5b0bc6f8fe2d645e;hp=-c;p=github%2Fwallabag%2Fwallabag.git

Merge remote-tracking branch 'origin/master' into 2.3
---

873f6b8e03079d11fab541aa5b0bc6f8fe2d645e
diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index 3e64af8f,a52b579a..5e7afe27
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@@ -71,7 -71,7 +71,7 @@@ config
              # 300_word: 'I read ~300 words per minute'
              # 400_word: 'I read ~400 words per minute'
          action_mark_as_read:
-             # label: 'Where do you to be redirected after mark an article as read?'
+             # label: 'Where do you want to be redirected to after marking an article as read?'
              # redirect_homepage: 'To the homepage'
              # redirect_current_page: 'To the current page'
          pocket_consumer_key_label: Brugers nøgle til Pocket for at importere materialer
@@@ -110,7 -110,6 +110,7 @@@
          # annotations: Remove ALL annotations
          # tags: Remove ALL tags
          # entries: Remove ALL entries
 +        # archived: Remove ALL archived entries
          # confirm: Are you really really sure? (THIS CAN'T BE UNDONE)
      form_password:
          # description: "You can change your password here. Your new password should by at least 8 characters long."
@@@ -155,7 -154,7 +155,7 @@@
          #         or: 'One rule OR another'
          #         and: 'One rule AND another'
          #         matches: 'Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>'
 -
 +        #         notmatches: 'Tests that a <i>subject</i> is not matches a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>'
  entry:
      page_titles:
          # unread: 'Unread entries'
@@@ -224,8 -223,6 +224,8 @@@
          original_article: 'original'
          # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations'
          created_at: 'Oprettelsesdato'
 +        # published_at: 'Publication date'
 +        # published_by: 'Published by'
      new:
          page_title: 'Gem ny artikel'
          placeholder: 'http://website.com'
@@@ -237,12 -234,10 +237,12 @@@
          # page_title: 'Edit an entry'
          # title_label: 'Title'
          url_label: 'Url'
 -        # is_public_label: 'Public'
          save_label: 'Gem'
      public:
          # shared_by_wallabag: "This article has been shared by <a href=%wallabag_instance%'>wallabag</a>"
 +    confirm:
 +        # delete: "Are you sure you want to remove that article?"
 +        # delete_tag: "Are you sure you want to remove that tag from that article?"
  
  about:
      page_title: 'Om'
@@@ -515,8 -510,6 +515,8 @@@ user
          # delete: Delete
          # delete_confirm: Are you sure?
          # back_to_list: Back to list
 +    search:
 +        # placeholder: Filter by username or email
  
  error:
      # page_title: An error occurred
@@@ -535,7 -528,6 +535,7 @@@ flashes
              # annotations_reset: Annotations reset
              # tags_reset: Tags reset
              # entries_reset: Entries reset
 +            # archived_reset: Archived entries deleted
      entry:
          notice:
              # entry_already_saved: 'Entry already saved on %date%'
diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index 8703a0e5,c72e5958..572084c1
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@@ -71,7 -71,7 +71,7 @@@ config
              300_word: 'I read ~300 words per minute'
              400_word: 'I read ~400 words per minute'
          action_mark_as_read:
-             label: 'Where do you want to be redirected after mark an article as read?'
+             label: 'Where do you want to be redirected to after marking an article as read?'
              redirect_homepage: 'To the homepage'
              redirect_current_page: 'To the current page'
          pocket_consumer_key_label: Consumer key for Pocket to import contents
@@@ -110,7 -110,6 +110,7 @@@
          annotations: Remove ALL annotations
          tags: Remove ALL tags
          entries: Remove ALL entries
 +        archived: Remove ALL archived entries
          confirm: Are you really sure? (THIS CAN'T BE UNDONE)
      form_password:
          description: "You can change your password here. Your new password should by at least 8 characters long."
@@@ -155,7 -154,6 +155,7 @@@
                  or: 'One rule OR another'
                  and: 'One rule AND another'
                  matches: 'Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>'
 +                notmatches: 'Tests that a <i>subject</i> is not matches a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>'
  
  entry:
      page_titles:
@@@ -225,8 -223,6 +225,8 @@@
          original_article: 'original'
          annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations'
          created_at: 'Creation date'
 +        published_at: 'Publication date'
 +        published_by: 'Published by'
      new:
          page_title: 'Save new entry'
          placeholder: 'http://website.com'
@@@ -238,12 -234,10 +238,12 @@@
          page_title: 'Edit an entry'
          title_label: 'Title'
          url_label: 'Url'
 -        is_public_label: 'Public'
          save_label: 'Save'
      public:
          shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
 +    confirm:
 +        delete: "Are you sure you want to remove that article?"
 +        delete_tag: "Are you sure you want to remove that tag from that article?"
  
  about:
      page_title: 'About'
@@@ -516,8 -510,6 +516,8 @@@ user
          delete: Delete
          delete_confirm: Are you sure?
          back_to_list: Back to list
 +    search:
 +        placeholder: Filter by username or email
  
  error:
      page_title: An error occurred
@@@ -536,7 -528,6 +536,7 @@@ flashes
              annotations_reset: Annotations reset
              tags_reset: Tags reset
              entries_reset: Entries reset
 +            archived_reset: Archived entries deleted
      entry:
          notice:
              entry_already_saved: 'Entry already saved on %date%'
diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index ec7a4362,647f12ad..a8900489
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@@ -71,7 -71,7 +71,7 @@@ config
              300_word: 'من تقریباً ۳۰۰ واژه را در دقیقه می‌خوانم'
              400_word: 'من تقریباً ۴۰۰ واژه را در دقیقه می‌خوانم'
          action_mark_as_read:
-             # label: 'Where do you to be redirected after mark an article as read?'
+             # label: 'Where do you want to be redirected to after marking an article as read?'
              # redirect_homepage: 'To the homepage'
              # redirect_current_page: 'To the current page'
          pocket_consumer_key_label: کلید کاربری Pocket برای درون‌ریزی مطالب
@@@ -110,7 -110,6 +110,7 @@@
          # annotations: Remove ALL annotations
          # tags: Remove ALL tags
          # entries: Remove ALL entries
 +        # archived: Remove ALL archived entries
          # confirm: Are you really really sure? (THIS CAN'T BE UNDONE)
      form_password:
          # description: "You can change your password here. Your new password should by at least 8 characters long."
@@@ -155,7 -154,6 +155,7 @@@
          #         or: 'One rule OR another'
          #         and: 'One rule AND another'
          #         matches: 'Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>'
 +        #         notmatches: 'Tests that a <i>subject</i> is not matches a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>'
  
  entry:
      page_titles:
@@@ -225,8 -223,6 +225,8 @@@
          original_article: 'اصلی'
          annotations_on_the_entry: '{0} بدون حاشیه|{1} یک حاشیه|]1,Inf[ %nbحاشیه% annotations'
          created_at: 'زمان ساخت'
 +        # published_at: 'Publication date'
 +        # published_by: 'Published by'
      new:
          page_title: 'ذخیرهٔ مقالهٔ تازه'
          placeholder: 'http://website.com'
@@@ -238,12 -234,10 +238,12 @@@
          page_title: 'ویرایش مقاله'
          title_label: 'عنوان'
          url_label: 'نشانی'
 -        is_public_label: 'عمومی'
          save_label: 'ذخیره'
      public:
          # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
 +    confirm:
 +        # delete: "Are you sure you want to remove that article?"
 +        # delete_tag: "Are you sure you want to remove that tag from that article?"
  
  about:
      page_title: 'درباره'
@@@ -516,8 -510,6 +516,8 @@@ user
          # delete: Delete
          # delete_confirm: Are you sure?
          # back_to_list: Back to list
 +    search:
 +        # placeholder: Filter by username or email
  
  error:
      # page_title: An error occurred
@@@ -536,7 -528,6 +536,7 @@@ flashes
              # annotations_reset: Annotations reset
              # tags_reset: Tags reset
              # entries_reset: Entries reset
 +            # archived_reset: Archived entries deleted
      entry:
          notice:
              entry_already_saved: 'این مقاله در تاریخ %date% ذخیره شده بود'
diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index 16e8072b,e736d9b2..c2007057
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@@ -24,7 -24,7 +24,7 @@@ menu
          tags: 'Tags'
          internal_settings: 'Strumenti'
          import: 'Importa'
 -        howto: 'How to'
 +        howto: 'Come fare'
          # developer: 'API clients management'
          logout: 'Logout'
          about: 'About'
@@@ -44,8 -44,8 +44,8 @@@ footer
      wallabag:
          elsewhere: 'Porta wallabag con te'
          social: 'Social'
 -        powered_by: 'powered by'
 -        about: 'About'
 +        powered_by: 'Offerto da'
 +        about: 'A proposito'
      # stats: Since %user_creation% you read %nb_archives% articles. That is about %per_day% a day!
  
  config:
@@@ -55,7 -55,7 +55,7 @@@
          rss: 'RSS'
          user_info: 'Informazioni utente'
          password: 'Password'
 -        rules: 'Regole di tagging'
 +        rules: 'Regole di etichettatura'
          new_user: 'Aggiungi utente'
      form:
          save: 'Salva'
@@@ -71,7 -71,7 +71,7 @@@
              300_word: 'Leggo ~300 parole al minuto'
              400_word: 'Leggo ~400 parole al minuto'
          action_mark_as_read:
-             # label: 'Where do you to be redirected after mark an article as read?'
+             # label: 'Where do you want to be redirected to after marking an article as read?'
              # redirect_homepage: 'To the homepage'
              # redirect_current_page: 'To the current page'
          pocket_consumer_key_label: Consumer key per Pocket per importare i contenuti
@@@ -83,7 -83,7 +83,7 @@@
          # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account."
      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'
 +        token_label: 'Token RSS'
          no_token: 'Nessun token'
          token_create: 'Crea il tuo token'
          token_reset: 'Rigenera il tuo token'
@@@ -94,10 -94,10 +94,10 @@@
              archive: 'archiviati'
          rss_limit: 'Numero di elementi nel feed'
      form_user:
 -        two_factor_description: "Abilitando la two factor authentication riceverai una e-mail con un codice per ogni nuova connesione non verificata"
 +        two_factor_description: "Abilitando l'\autenticazione a due fattori riceverai una e-mail con un codice per ogni nuova connesione non verificata"
          name_label: 'Nome'
          email_label: 'E-mail'
 -        twoFactorAuthentication_label: 'Two factor authentication'
 +        twoFactorAuthentication_label: 'Autenticazione a due fattori'
          # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
          delete:
              # title: Delete my account (a.k.a danger zone)
@@@ -110,7 -110,6 +110,7 @@@
          # annotations: Remove ALL annotations
          # tags: Remove ALL tags
          # entries: Remove ALL entries
 +        # archived: Remove ALL archived entries
          # confirm: Are you really really sure? (THIS CAN'T BE UNDONE)
      form_password:
          # description: "You can change your password here. Your new password should by at least 8 characters long."
@@@ -119,19 -118,19 +119,19 @@@
          repeat_new_password_label: 'Ripeti la nuova password'
      form_rules:
          if_label: 'se'
 -        then_tag_as_label: 'allora tagga come'
 +        then_tag_as_label: 'allora etichetta come'
          delete_rule_label: 'elimina'
          # edit_rule_label: 'edit'
          rule_label: 'Regola'
 -        tags_label: 'Tag'
 +        tags_label: 'Etichetta'
          faq:
              title: 'FAQ'
 -            tagging_rules_definition_title: 'Cosa significa « regole di tagging » ?'
 -            tagging_rules_definition_description: 'Sono regole utilizzate da wallabag per taggare automaticamente i contenuti.<br />Ogni volta che viene aggiunto un contenuto, tutte le regole di tagging rules vengono utilizzate per aggiungere i tag configurati, risparmiandoti il lavoro di classificare i contenuti manualmente.'
 +            tagging_rules_definition_title: 'Cosa significa « regole di etichettatura» ?'
 +            tagging_rules_definition_description: 'Sono regole utilizzate da wallabag per etichettare automaticamente i contenuti.<br />Ogni volta che viene aggiunto un contenuto, tutte le regole di etichettatura vengono utilizzate per aggiungere le etichette configurate, risparmiandoti il lavoro di classificare i contenuti manualmente.'
              how_to_use_them_title: 'Come si usano?'
 -            how_to_use_them_description: 'Diciamo che vuoi taggare un contenuto come « <i>lettura veloce</i> » quando il tempo di lettura è inferiore ai 3 minuti.<br />In questo case, devi mettere « readingTime &lt;= 3 » nel campo <i>Regola</i> e « <i>lettura veloce</i> » nel campo <i>Tag</i>.<br />Molti tag si possono aggiungere contemporanemente separandoli con una virgola: « <i>lettura veloce, da leggere</i> »<br />Regole complesse possono essere scritte utilizzando gli operatori predefiniti: se « <i>readingTime &gt;= 5 AND domainName = "github.com"</i> » allora tagga « <i>lettura lunga, github </i> »'
 +            how_to_use_them_description: 'Diciamo che vuoi etichettare un contenuto come « <i>lettura veloce</i> » quando il tempo di lettura è inferiore ai 3 minuti.<br />In questo case, devi mettere « readingTime &lt;= 3 » nel campo <i>Regola</i> e « <i>lettura veloce</i> » nel campo <i>Etichette</i>.<br />Molte etichette si possono aggiungere contemporanemente separandole con una virgola: « <i>lettura veloce, da leggere</i> »<br />Regole complesse possono essere scritte utilizzando gli operatori predefiniti: se « <i>readingTime &gt;= 5 AND domainName = "github.com"</i> » allora etichetta « <i>lettura lunga, github </i> »'
              variables_available_title: 'Quali operatori e variabili posso utilizzare per scrivere delle regole?'
 -            variables_available_description: 'I seguenti operatori e variabili posso essere utilizzati per scrivere regole di tagging:'
 +            variables_available_description: 'I seguenti operatori e variabili posso essere utilizzati per scrivere regole di etichettatura:'
              meaning: 'Significato'
              variable_description:
                  label: 'Variabile'
@@@ -155,7 -154,6 +155,7 @@@
                  or: "Una regola O un'altra"
                  and: "Una regola E un'altra"
                  matches: 'Verifica che un <i>oggetto</i> risulti in una <i>ricerca</i> (case-insensitive).<br />Esempio: <code>titolo contiene "football"</code>'
 +                # notmatches: 'Tests that a <i>subject</i> is not matches a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>'
  
  entry:
      page_titles:
@@@ -211,7 -209,7 +211,7 @@@
              view_original_article: 'Contenuto originale'
              re_fetch_content: 'Ri-ottieni pagina'
              delete: 'Elimina'
 -            add_a_tag: 'Aggiungi un tag'
 +            add_a_tag: 'Aggiungi un''etichetta'
              share_content: 'Condividi'
              share_email_label: 'E-mail'
              # public_link: 'public link'
@@@ -222,11 -220,9 +222,11 @@@
                  label: 'Problemi?'
                  description: 'Questo contenuto viene visualizzato male?'
          edit_title: 'Modifica titolo'
 -        original_article: 'originale'
 +        original_article: 'Originale'
          annotations_on_the_entry: '{0} Nessuna annotazione|{1} Una annotazione|]1,Inf[ %count% annotazioni'
          created_at: 'Data di creazione'
 +        # published_at: 'Publication date'
 +        # published_by: 'Published by'
      new:
          page_title: 'Salva un nuovo contenuto'
          placeholder: 'http://website.com'
@@@ -238,15 -234,13 +238,15 @@@
          page_title: 'Modifica voce'
          title_label: 'Titolo'
          url_label: 'Url'
 -        is_public_label: 'Pubblico'
          save_label: 'Salva'
      public:
          # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
 +    confirm:
 +        delete: "Vuoi veramente rimuovere quell'articolo?"
 +        delete_tag: "Vuoi veramente rimuovere quell'etichetta da quell'articolo?"
  
  about:
 -    page_title: 'About'
 +    page_title: 'A proposito'
      top_menu:
          who_behind_wallabag: "Chi c'è dietro a wallabag"
          getting_help: 'Ottieni aiuto'
@@@ -265,7 -259,7 +265,7 @@@
          bug_reports: 'Bug reports'
          support: '<a href="https://github.com/wallabag/wallabag/issues">su GitHub</a>'
      helping:
 -        description: 'wallabag è gratuito opensource. Puoi aiutarci:'
 +        description: 'wallabag è gratuito ed OpenSource. Puoi aiutarci:'
          by_contributing: 'per contribuire al progetto:'
          by_contributing_2: 'un elenco delle attività richieste'
          by_paypal: 'via Paypal'
@@@ -273,7 -267,7 +273,7 @@@
          description: 'Un grazie ai collaboratori di wallabag web application'
      third_party:
          description: 'Ecco un elenco delle librerie di terze parti utilizzate in wallabag (con le rispettive licenze):'
 -        package: 'Package'
 +        package: 'Pacchetto'
          license: 'Licenza'
  
  howto:
@@@ -299,7 -293,7 +299,7 @@@
          ios: 'sullo store di iTunes'
          windows: 'sullo store di Microsoft'
      bookmarklet:
 -        description: 'Trascinando e rilasciando questo link sulla barra dei bookmark del tuo browser:'
 +        description: 'Trascinando e rilasciando questo link sulla barra dei preferiti del tuo browser:'
      shortcuts:
          # page_description: Here are the shortcuts available in wallabag.
          # shortcut: Shortcut
@@@ -333,7 -327,7 +333,7 @@@ quickstart
      # 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_1: "Ti accompagneremo alla scoperta di wallabag e ti mostreremo delle funzionalità che potrebbero interessarti."
          paragraph_2: 'Seguici!'
      configure:
          title: "Configura l'applicazione"
@@@ -383,9 -377,9 +383,9 @@@
          gitter: 'Su Gitter'
  
  tag:
 -    page_title: 'Tags'
 +    page_title: 'Etichette'
      list:
 -        number_on_the_page: "{0} Non ci sono tag.|{1} C'è un tag.|]1,Inf[ ci sono %count% tag."
 +        number_on_the_page: "{0} Non ci sono etichette.|{1} C'è un'etichetta.|]1,Inf[ ci sono %count% etichette."
          # see_untagged_entries: 'See untagged entries'
      new:
          # add: 'Add'
@@@ -403,20 -397,20 +403,20 @@@ import
          save_label: 'Carica file'
      pocket:
          page_title: 'Importa da > Pocket'
 -        description: "Questo importatore copierà tutti i tuoi dati da Pocket. Pocket non ci consente di ottenere contenuti dal loro servzio, così il contenuto leggibile di ogni articolo verrà ri-ottenuto da wallabag."
 +        description: "Questo importatore copierà tutti i tuoi dati da Pocket. Pocket non ci consente di ottenere contenuti dal loro servizio, così il contenuto leggibile di ogni articolo verrà ri-ottenuto da wallabag."
          config_missing:
              description: "Importazione da Pocket non configurata."
              admin_message: 'Devi definire %keyurls% una pocket_consumer_key %keyurle%.'
 -            user_message: 'Il tuo amministratore di server deve define una API Key per Pocket.'
 +            user_message: 'Il tuo amministratore del server deve definire una API Key per Pocket.'
          authorize_message: 'Puoi importare dati dal tuo account Pocket. Devi solo cliccare sul pulsante sottostante e autorizzare la connessione a getpocket.com.'
          connect_to_pocket: 'Connetti a Pocket and importa i dati'
      wallabag_v1:
          page_title: 'Importa da > Wallabag v1'
 -        description: 'Questo importatore copierà tutti i tuoi dati da un wallabag v1. Nella tua pagina di configurazione, clicca su "JSON export" nella sezione "Esport i tuoi dati di wallabag". Otterrai un file "wallabag-export-1-xxxx-xx-xx.json".'
 +        description: 'Questo importatore copierà tutti i tuoi dati da un wallabag v1. Nella tua pagina di configurazione, clicca su "JSON export" nella sezione "Esporta i tuoi dati di wallabag". Otterrai un file "wallabag-export-1-xxxx-xx-xx.json".'
          how_to: 'Seleziona la tua esportazione di wallabag e clicca sul pulsante sottostante caricare il file e importare i dati.'
      wallabag_v2:
          page_title: 'Importa da > Wallabag v2'
 -        description: 'Questo importatore copierà tutti i tuoi dati da un wallabag v2. Vai in "Tutti i contenuti", e, nella sidebar di esportazione, clicca su "JSON". Otterrai un file "Tutti i contenuti.json".'
 +        description: 'Questo importatore copierà tutti i tuoi dati da un wallabag v2. Vai in "Tutti i contenuti", e, nella barra laterale di esportazione, clicca su "JSON". Otterrai un file "Tutti i contenuti.json'
      readability:
          page_title: 'Importa da > Readability'
          # description: '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).'
@@@ -455,19 -449,19 +455,19 @@@ developer
          title: 'Client esistenti'
          field_id: 'Client ID'
          field_secret: 'Client secret'
 -        field_uris: 'Redirect URI'
 -        field_grant_types: 'Tipi di grant permessi'
 +        field_uris: 'URI di reindirizzamento'
 +        field_grant_types: 'Tipi di permessi concessi'
          no_client: 'Ancora nessun client.'
      remove:
 -        warn_message_1: "Hai la possibilitò di rimuovere questo client.L'operazione è IRREVERSIBILE!"
 +        warn_message_1: "Hai la possibilità di rimuovere questo client. L'operazione è IRREVERSIBILE!"
          warn_message_2: "Se lo rimuovi, ogni app configurata con questo client non sarà più in grado di autenticarsi."
          action: 'Rimuovi questo client'
      client:
          # page_title: 'API clients management > Nuovo client'
 -        page_description: 'Stai per creare un nuovo client. Compila i campi sottostanti per il redirect URI della tua applicazione.'
 +        page_description: 'Stai per creare un nuovo client. Compila i campi sottostanti per lo URI di reindirizzamento della tua applicazione.'
          form:
              # name_label: 'Name of the client'
 -            redirect_uris_label: 'Redirect URI'
 +            redirect_uris_label: 'URI di reindirizzamento'
              save_label: 'Crea un nuovo client'
          action_back: 'Indietro'
      client_parameter:
@@@ -477,7 -471,7 +477,7 @@@
          field_id: 'Client ID'
          field_secret: 'Client secret'
          back: 'Indietro'
 -        read_howto: 'Leggi howto "Come creare la mia prima applicazione"'
 +        read_howto: 'Leggi "Come creare la mia prima applicazione"'
      howto:
          # page_title: 'API clients management > Come creare la mia prima applicazione'
          description:
@@@ -516,8 -510,6 +516,8 @@@ user
          # delete: Delete
          # delete_confirm: Are you sure?
          # back_to_list: Back to list
 +    search:
 +        # placeholder: Filter by username or email
  
  error:
      # page_title: An error occurred
@@@ -530,13 -522,12 +530,13 @@@ flashes
              password_not_updated_demo: "In modalità demo, non puoi cambiare la password dell'utente."
              user_updated: 'Informazioni aggiornate'
              rss_updated: 'Informazioni RSS aggiornate'
 -            tagging_rules_updated: 'Regole di tagging aggiornate'
 -            tagging_rules_deleted: 'Regola di tagging aggiornate'
 -            rss_token_updated: 'RSS token aggiornato'
 +            tagging_rules_updated: 'Regole di etichettatura aggiornate'
 +            tagging_rules_deleted: 'Regole di etichettatura eliminate'
 +            rss_token_updated: 'Token RSS aggiornato'
              # annotations_reset: Annotations reset
              # tags_reset: Tags reset
              # entries_reset: Entries reset
 +            # archived_reset: Archived entries deleted
      entry:
          notice:
              entry_already_saved: 'Contenuto già salvato in data %date%'
@@@ -552,7 -543,7 +552,7 @@@
              entry_deleted: 'Contenuto eliminato'
      tag:
          notice:
 -            tag_added: 'Tag aggiunto'
 +            tag_added: 'Etichetta aggiunta'
      import:
          notice:
              failed: 'Importazione fallita, riprova.'
diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
index bf038ee8,3b1f9cb6..896ccb04
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
@@@ -71,7 -71,7 +71,7 @@@ config
              300_word: 'Posso ler ~300 palavras por minuto'
              400_word: 'Posso ler ~400 palavras por minuto'
          action_mark_as_read:
-             # label: 'Where do you to be redirected after mark an article as read?'
+             # label: 'Where do you want to be redirected to after marking an article as read?'
              # redirect_homepage: 'To the homepage'
              # redirect_current_page: 'To the current page'
          pocket_consumer_key_label: 'Chave do consumidor do Pocket para importar conteúdo'
@@@ -110,7 -110,6 +110,7 @@@
          # annotations: Remove ALL annotations
          # tags: Remove ALL tags
          # entries: Remove ALL entries
 +        # archived: Remove ALL archived entries
          # confirm: Are you really really sure? (THIS CAN'T BE UNDONE)
      form_password:
          # description: "You can change your password here. Your new password should by at least 8 characters long."
@@@ -155,7 -154,6 +155,7 @@@
                  or: 'Uma regra OU outra'
                  and: 'Uma regra E outra'
                  matches: 'Testa que um <i>assunto</i> corresponde a uma <i>pesquisa</i> (maiúscula ou minúscula).<br />Exemplo: <code>título corresponde a "futebol"</code>'
 +                # notmatches: 'Tests that a <i>subject</i> is not matches a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>'
  
  entry:
      page_titles:
@@@ -225,8 -223,6 +225,8 @@@
          original_article: 'original'
          annotations_on_the_entry: '{0} Sem anotações|{1} Uma anotação|]1,Inf[ %nbAnnotations% anotações'
          created_at: 'Data de criação'
 +        # published_at: 'Publication date'
 +        # published_by: 'Published by'
      new:
          page_title: 'Salvar nova entrada'
          placeholder: 'http://website.com'
@@@ -238,12 -234,10 +238,12 @@@
          page_title: 'Editar uma entrada'
          title_label: 'Título'
          url_label: 'Url'
 -        is_public_label: 'Público'
          save_label: 'Salvar'
      public:
          shared_by_wallabag: "Este artigo foi compartilhado pelo <a href='%wallabag_instance%'>wallabag</a>"
 +    confirm:
 +        # delete: "Are you sure you want to remove that article?"
 +        # delete_tag: "Are you sure you want to remove that tag from that article?"
  
  about:
      page_title: 'Sobre'
@@@ -516,8 -510,6 +516,8 @@@ user
          delete: 'Apagar'
          delete_confirm: 'Tem certeza?'
          back_to_list: 'Voltar para a lista'
 +    search:
 +        # placeholder: Filter by username or email
  
  error:
      # page_title: An error occurred
@@@ -536,7 -528,6 +536,7 @@@ flashes
              # annotations_reset: Annotations reset
              # tags_reset: Tags reset
              # entries_reset: Entries reset
 +            # archived_reset: Archived entries deleted
      entry:
          notice:
              entry_already_saved: 'Entrada já foi salva em %date%'
diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index bd66d83a,728eed58..c447dc9b
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@@ -71,7 -71,7 +71,7 @@@ config
              # 300_word: 'I read ~300 words per minute'
              # 400_word: 'I read ~400 words per minute'
          action_mark_as_read:
-             # label: 'Where do you to be redirected after mark an article as read?'
+             # label: 'Where do you want to be redirected to after marking an article as read?'
              # redirect_homepage: 'To the homepage'
              # redirect_current_page: 'To the current page'
          pocket_consumer_key_label: Cheie consumator pentru importarea contentului din Pocket
@@@ -110,7 -110,6 +110,7 @@@
          # annotations: Remove ALL annotations
          # tags: Remove ALL tags
          # entries: Remove ALL entries
 +        # archived: Remove ALL archived entries
          # confirm: Are you really really sure? (THIS CAN'T BE UNDONE)
      form_password:
          # description: "You can change your password here. Your new password should by at least 8 characters long."
@@@ -155,7 -154,6 +155,7 @@@
          #         or: 'One rule OR another'
          #         and: 'One rule AND another'
          #         matches: 'Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>'
 +        #         notmatches: 'Tests that a <i>subject</i> is not matches a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>'
  
  entry:
      page_titles:
@@@ -225,8 -223,6 +225,8 @@@
          original_article: 'original'
          # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations'
          created_at: 'Data creării'
 +        # published_at: 'Publication date'
 +        # published_by: 'Published by'
      new:
          page_title: 'Salvează un nou articol'
          placeholder: 'http://website.com'
@@@ -238,12 -234,10 +238,12 @@@
          # page_title: 'Edit an entry'
          # title_label: 'Title'
          url_label: 'Url'
 -        # is_public_label: 'Public'
          save_label: 'Salvează'
      public:
          # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
 +    confirm:
 +        # delete: "Are you sure you want to remove that article?"
 +        # delete_tag: "Are you sure you want to remove that tag from that article?"
  
  about:
      page_title: 'Despre'
@@@ -516,8 -510,6 +516,8 @@@ user
          # delete: Delete
          # delete_confirm: Are you sure?
          # back_to_list: Back to list
 +    search:
 +        # placeholder: Filter by username or email
  
  error:
      # page_title: An error occurred
@@@ -536,7 -528,6 +536,7 @@@ flashes
              # annotations_reset: Annotations reset
              # tags_reset: Tags reset
              # entries_reset: Entries reset
 +            # archived_reset: Archived entries deleted
      entry:
          notice:
              # entry_already_saved: 'Entry already saved on %date%'
diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index b86c4003,d3180f42..61e1a1ea
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@@ -71,7 -71,7 +71,7 @@@ config
              # 300_word: 'I read ~300 words per minute'
              # 400_word: 'I read ~400 words per minute'
          action_mark_as_read:
-             # label: 'Where do you to be redirected after mark an article as read?'
+             # label: 'Where do you want to be redirected to after marking an article as read?'
              # redirect_homepage: 'To the homepage'
              # redirect_current_page: 'To the current page'
          # pocket_consumer_key_label: Consumer key for Pocket to import contents
@@@ -110,7 -110,6 +110,7 @@@
          # annotations: Remove ALL annotations
          # tags: Remove ALL tags
          # entries: Remove ALL entries
 +        # archived: Remove ALL archived entries
          # confirm: Are you really really sure? (THIS CAN'T BE UNDONE)
      form_password:
          # description: "You can change your password here. Your new password should by at least 8 characters long."
@@@ -155,7 -154,6 +155,7 @@@
                  or: 'Bir kural veya birbaşkası'
                  and: 'Bir kural ve diğeri'
                  # matches: 'Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>'
 +                # notmatches: 'Tests that a <i>subject</i> is not matches a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>'
  
  entry:
      page_titles:
@@@ -225,8 -223,6 +225,8 @@@
          original_article: 'orijinal'
          # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations'
          created_at: 'Oluşturulma tarihi'
 +        # published_at: 'Publication date'
 +        # published_by: 'Published by'
      new:
          page_title: 'Yeni makaleyi kaydet'
          placeholder: 'http://website.com'
@@@ -238,12 -234,10 +238,12 @@@
          page_title: 'Makaleyi düzenle'
          title_label: 'Başlık'
          url_label: 'Url'
 -        is_public_label: 'Herkes tarafından erişime açık olsun mu?'
          save_label: 'Kaydet'
      public:
          # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
 +    confirm:
 +        # delete: "Are you sure you want to remove that article?"
 +        # delete_tag: "Are you sure you want to remove that tag from that article?"
  
  about:
      page_title: 'Hakkımızda'
@@@ -516,8 -510,6 +516,8 @@@ user
          # delete: Delete
          # delete_confirm: Are you sure?
          # back_to_list: Back to list
 +    search:
 +        # placeholder: Filter by username or email
  
  error:
      # page_title: An error occurred
@@@ -536,7 -528,6 +536,7 @@@ flashes
              # annotations_reset: Annotations reset
              # tags_reset: Tags reset
              # entries_reset: Entries reset
 +            # archived_reset: Archived entries deleted
      entry:
          notice:
              entry_already_saved: 'Entry already saved on %date%'