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

2019-05-15 14:38:07 +02:00
parent 9e2194e9cb 227a1a27f1
commit 9f0957b831
26 changed files with 253 additions and 64 deletions
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@ -572,7 +572,7 @@ site_credential:
    #     create_new_one: Create a new credential
    # form:
    #     username_label: 'Username'
-    #     host_label: 'Host'
+    #     host_label: 'Host (subdomain.example.org, .example.org, etc.)'
    #     password_label: 'Password'
    #     save: Save
    #     delete: Delete