diff options
author | Ondřej Hruška <ondra@ondrovo.com> | 2017-07-25 21:36:22 +0200 |
---|---|---|
committer | Ondřej Hruška <ondra@ondrovo.com> | 2017-07-25 21:36:22 +0200 |
commit | 7e5691804d4f0019a89b8b8a3dad532bc9d940ea (patch) | |
tree | 84c2f4e4ac07bea3915639a50df84eb62b6c5768 /config/locales/en.yml | |
parent | 852acbd7385a640d9e00e462d58a847851744034 (diff) | |
parent | 7232cdf7e8249f79078005931b1165e54e413fa9 (diff) |
Merge git://github.com/tootsuite/mastodon into tootsuite-master
Diffstat (limited to 'config/locales/en.yml')
-rw-r--r-- | config/locales/en.yml | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 47f276ca1..8fa1ac0e3 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -3,12 +3,16 @@ en: about: about_mastodon_html: Mastodon is a social network based on open web protocols and free, open-source software. It is decentralized like e-mail. about_this: About - business_email: 'Business e-mail:' closed_registrations: Registrations are currently closed on this instance. However! You can find a different instance to make an account on and get access to the very same network from there. contact: Contact + contact_missing: Not set + contact_unavailable: N/A description_headline: What is %{domain}? domain_count_after: other instances domain_count_before: Connected to + extended_description_html: | + <h3>A good place for rules</h3> + <p>The extended description has not been set up yet.</p> features: humane_approach_body: Learning from failures of other networks, Mastodon aims to make ethical design choices to combat the misuse of social media. humane_approach_title: A more humane approach @@ -20,18 +24,14 @@ en: within_reach_title: Always within reach find_another_instance: Find another instance generic_description: "%{domain} is one server in the network" - get_started: Get started hosted_on: Mastodon hosted on %{domain} learn_more: Learn more - links: Links other_instances: Instance list source_code: Source code status_count_after: statuses status_count_before: Who authored - terms: Terms user_count_after: users user_count_before: Home to - version: Version what_is_mastodon: What is Mastodon? accounts: follow: Follow @@ -108,13 +108,15 @@ en: create: Create block hint: The domain block will not prevent creation of account entries in the database, but will retroactively and automatically apply specific moderation methods on those accounts. severity: - desc_html: "<strong>Silence</strong> will make the account's posts invisible to anyone who isn't following them. <strong>Suspend</strong> will remove all of the account's content, media, and profile data." + desc_html: "<strong>Silence</strong> will make the account's posts invisible to anyone who isn't following them. <strong>Suspend</strong> will remove all of the account's content, media, and profile data. Use <strong>None</strong> if you just want to reject media files." + noop: None silence: Silence suspend: Suspend title: New domain block reject_media: Reject media files reject_media_hint: Removes locally stored media files and refuses to download any in the future. Irrelevant for suspensions severities: + noop: None silence: Silence suspend: Suspend severity: Severity @@ -198,8 +200,8 @@ en: show: Show media title: Media no_media: No media - with_media: With media title: Account statuses + with_media: With media subscriptions: callback_url: Callback URL confirmed: Confirmed @@ -272,7 +274,7 @@ en: content: Security verification failed. Are you blocking cookies? title: Security verification failed '429': Throttled - noscript: To use Mastodon, please enable JavaScript. + noscript: To use the Mastodon web application, please enable JavaScript. Alternatively, find a native app for Mastodon for your platform. exports: blocks: You block csv: CSV @@ -347,15 +349,15 @@ en: follow: title: "%{name} is now following you" mention: - action_boost: 'Boost' - action_expand: 'Show more' - action_favourite: 'Favourite' + action_boost: Boost + action_expand: Show more + action_favourite: Favourite title: "%{name} mentioned you" reblog: title: "%{name} boosted your status" subscribed: - body: "You can now receive push notifications." - title: "Subscription registered!" + body: You can now receive push notifications. + title: Subscription registered! remote_follow: acct: Enter your username@domain you want to follow from missing_resource: Could not find the required redirect URL for your account |