github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 15:05:24 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

minor copyedits

Browse Source
This commit is contained in:
Jeff Atwood 2019-03-16 02:03:50 -07:00
parent 8ab6503604
commit 20a99ceb8f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/locales/client.en.yml
View File

@ -726,7 +726,7 @@ en:
muted_users: "Muted"
muted_users_instructions: "Suppress all notifications from these users."
ignored_users: "Ignored"
ignored_users_instructions: "Lists all your ignored users."
ignored_users_instructions: "Suppress all posts and notifications from these users."
muted_topics_link: "Show muted topics"
watched_topics_link: "Show watched topics"
tracked_topics_link: "Show tracked topics"

4
config/locales/server.en.yml
View File

@ -1561,8 +1561,8 @@ en:
enable_s3_uploads: "Place uploads on Amazon S3 storage. IMPORTANT: requires valid S3 credentials (both access key id & secret access key)."
s3_use_iam_profile: 'Use an <a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2_instance-profiles.html">AWS EC2 instance profile</a> to grant access to the S3 bucket. NOTE: enabling this requires Discourse to be running in an appropriately-configured EC2 instance, and overrides the "s3 access key id" and "s3 secret access key" settings.'
s3_upload_bucket: "The Amazon S3 bucket name that files will be uploaded into. WARNING: must be lowercase, no periods, no underscores."
s3_access_key_id: "The Amazon S3 access key id that will be used to upload images."
s3_secret_access_key: "The Amazon S3 secret access key that will be used to upload images."
s3_access_key_id: "The Amazon S3 access key id that will be used to upload images, attachments, and backups."
s3_secret_access_key: "The Amazon S3 secret access key that will be used to upload images, attachments, and backups."
s3_region: "The Amazon S3 region name that will be used to upload images and backups."
s3_cdn_url: "The CDN URL to use for all s3 assets (for example: https://cdn.somewhere.com). WARNING: after changing this setting you must rebake all old posts."