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

[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 c6633f5ba115e04204bb0c3f64df00cfe6349f91..ea860564b9eabf177b824bd59d6dfc241d15104e 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -144,6 +144,7 @@ entry:
         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'
@@ -354,19 +355,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'
@@ -419,5 +422,5 @@ flashes:
             summary: 'Import summary: %imported% imported, %skipped% already saved.'
     developer:
         notice:
-            client_created: 'New client created.'
-            client_deleted: 'Client deleted'
+            client_created: 'New client %name% created.'
+            client_deleted: 'Client %name% deleted'