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

[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 2626523a6d02dab40f966bd358b8db2dfca24c0d..3a006a0ec28c4484447e0ed1c046d89739c905d7 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -25,7 +25,7 @@ menu:
         internal_settings: 'Internal Settings'
         import: 'Import'
         howto: 'How to'
-        developer: 'Developer'
+        developer: 'API clients management'
         logout: 'Logout'
         about: 'About'
         search: 'Search'
@@ -110,6 +110,7 @@ config:
         annotations: Remove ALL annotations
         tags: Remove ALL tags
         entries: Remove ALL entries
+        archived: Remove ALL archived entries
         confirm: Are you really sure? (THIS CAN'T BE UNDONE)
     form_password:
         description: "You can change your password here. Your new password should by at least 8 characters long."
@@ -154,6 +155,7 @@ config:
                 or: 'One rule OR another'
                 and: 'One rule AND another'
                 matches: 'Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>'
+                notmatches: 'Tests that a <i>subject</i> is not matches a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>'
 
 entry:
     page_titles:
@@ -214,7 +216,7 @@ entry:
             share_email_label: 'Email'
             public_link: 'public link'
             delete_public_link: 'delete public link'
-            download: 'Download'
+            export: 'Export'
             print: 'Print'
             problem:
                 label: 'Problems?'
@@ -223,6 +225,8 @@ entry:
         original_article: 'original'
         annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations'
         created_at: 'Creation date'
+        published_at: 'Publication date'
+        published_by: 'Published by'
     new:
         page_title: 'Save new entry'
         placeholder: 'http://website.com'
@@ -234,7 +238,6 @@ entry:
         page_title: 'Edit an entry'
         title_label: 'Title'
         url_label: 'Url'
-        is_public_label: 'Public'
         save_label: 'Save'
     public:
         shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
@@ -359,7 +362,7 @@ quickstart:
     developer:
         title: 'Developers'
         description: 'We also thought to the developers: Docker, API, translations, etc.'
-        create_application: 'Create your third application'
+        create_application: 'Create your third-party application'
         use_docker: 'Use Docker to install wallabag'
     docs:
         title: 'Full documentation'
@@ -436,7 +439,7 @@ import:
         how_to: 'Please select your Pinboard export and click on the below button to upload and import it.'
 
 developer:
-    page_title: 'Developer'
+    page_title: 'API clients management'
     welcome_message: 'Welcome to the wallabag API'
     documentation: 'Documentation'
     how_to_first_app: 'How to create my first application'
@@ -457,7 +460,7 @@ developer:
         warn_message_2: "If you remove it, every app configured with that client won't be able to auth on your wallabag."
         action: 'Remove the client %name%'
     client:
-        page_title: 'Developer > New client'
+        page_title: 'API clients management > 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'
@@ -465,7 +468,7 @@ developer:
             save_label: 'Create a new client'
         action_back: 'Back'
     client_parameter:
-        page_title: 'Developer > Client parameters'
+        page_title: 'API clients management > Client parameters'
         page_description: 'Here are your client parameters.'
         field_name: 'Client name'
         field_id: 'Client ID'
@@ -473,7 +476,7 @@ developer:
         back: 'Back'
         read_howto: 'Read the howto "Create my first application"'
     howto:
-        page_title: 'Developer > How to create my first application'
+        page_title: 'API clients management > How to create my first application'
         description:
             paragraph_1: 'The following commands make use of the <a href="https://github.com/jkbrzt/httpie">HTTPie library</a>. Make sure it is installed on your system before using it.'
             paragraph_2: 'You need a token to communicate between your 3rd application and wallabag API.'
@@ -510,6 +513,8 @@ user:
         delete: Delete
         delete_confirm: Are you sure?
         back_to_list: Back to list
+    search:
+        placeholder: Filter by username or email
 
 error:
     page_title: An error occurred
@@ -528,6 +533,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%'