Add new Ignore Origin rules tab, update ConfigController

[github/wallabag/wallabag.git] / src / Wallabag / CoreBundle / Resources / translations / messages.en.yml

diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index 6874e924bfdbe2941e1d2b8d255c62dead4b8d97..b16662c31bec93033fd1c6bb8601e622b5de82f5 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -59,6 +59,7 @@ config:
         user_info: 'User information'
         password: 'Password'
         rules: 'Tagging rules'
+        ignore_origin: 'Ignore origin rules'
         new_user: 'Add a user'
         reset: 'Reset area'
     form:
@@ -264,7 +265,7 @@ entry:
         provided_by: 'Provided by'
     new:
         page_title: 'Save new entry'
-        placeholder: 'http://website.com'
+        placeholder: 'https://website.com'
         form_new:
             url_label: Url
     search:
@@ -285,6 +286,7 @@ entry:
         reading_time_minutes_short: "%readingTime% min"
         address: "Address"
         added_on: "Added on"
+        published_on: "Published on"
 
 about:
     page_title: 'About'
@@ -429,6 +431,7 @@ tag:
         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'
         no_untagged_entries: 'There are no untagged entries.'
+        untagged: 'Untagged entries'
     new:
         add: 'Add'
         placeholder: 'You can add several tags, separated by a comma.'
@@ -465,6 +468,9 @@ 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.'
+    elcurator:
+        page_title: 'Import > elCurator'
+        description: 'This importer will import all your elCurator articles. Go to your preferences in your elCurator account and then, export your content. You will have a 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).'
@@ -518,7 +524,7 @@ developer:
             redirect_uris_label: 'Redirect URIs (optional)'
             save_label: 'Create a new client'
         action_back: 'Back'
-        copy_to_clipboard: Copy to clipboard
+        copy_to_clipboard: Copy
     client_parameter:
         page_title: 'API clients management > Client parameters'
         page_description: 'Here are your client parameters.'
@@ -609,8 +615,11 @@ flashes:
             entries_reset: Entries reset
             archived_reset: Archived entries deleted
             otp_enabled: Two-factor authentication enabled
+            otp_disabled: Two-factor authentication disabled
             tagging_rules_imported: Tagging rules imported
             tagging_rules_not_imported: Error while importing tagging rules
+            ignore_origin_rules_deleted: 'Ignore origin rule deleted'
+            ignore_origin_rules_updated: 'Ignore origin rule updated'
     entry:
         notice:
             entry_already_saved: 'Entry already saved on %date%'