Merge branch 'main' into glitch-soc/merge-upstream

2022-03-04 01:07:49 +01:00
parent 3637a0101e 2ea754b861
commit d9c3109bb6
24 changed files with 66 additions and 57 deletions
@@ -16,6 +16,7 @@ en:
    contact: Contact
    contact_missing: Not set
    contact_unavailable: N/A
+    continue_to_web: Continue to web app
    discover_users: Discover users
    documentation: Documentation
    federation_hint_html: With an account on %{instance} you'll be able to follow people on any Mastodon server and beyond.
@@ -25,6 +26,8 @@ en:
      This account is a virtual actor used to represent the server itself and not any individual user.
      It is used for federation purposes and should not be blocked unless you want to block the whole instance, in which case you should use a domain block.
    learn_more: Learn more
+    logged_in_as_html: You are currently logged in as %{username}.
+    logout_before_registering: You are already logged in.
    privacy_policy: Privacy policy
    rules: Server rules
    rules_html: 'Below is a summary of rules you need to follow if you want to have an account on this server of Mastodon:'
@@ -1484,6 +1487,7 @@ en:
      '2629746': 1 month
      '31556952': 1 year
      '5259492': 2 months
+      '604800': 1 week
      '63113904': 2 years
      '7889238': 3 months
    min_age_label: Age threshold