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.th.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml
@ -569,7 +569,7 @@ site_credential:
        create_new_one: สร้างข้อมูลส่วนตัวใหม่
    form:
        username_label: 'ชื่อผู้ใช้'
-        host_label: 'โฮส'
+        host_label: 'โฮส (subdomain.example.org, .example.org, etc.)'
        password_label: 'รหัสผ่าน'
        save: บันทึก
        delete: ลบ