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

2020-05-13 22:11:49 +02:00
parent 559214c33f 92f85bea52
commit 3baacf6993
28 changed files with 695 additions and 813 deletions
@@ -55,8 +55,8 @@ module Mastodon
      :el,
      :en,
      :eo,
-      :'es-AR',
      :es,
+      :'es-AR',
      :et,
      :eu,
      :fa,
@@ -97,8 +97,8 @@ module Mastodon
      :sk,
      :sl,
      :sq,
-      :'sr-Latn',
      :sr,
+      :'sr-Latn',
      :sv,
      :ta,
      :te,
@@ -920,7 +920,7 @@ en:
    cancelled_msg: Successfully cancelled the redirect.
    errors:
      already_moved: is the same account you have already moved to
-      missing_also_known_as: is not back-referencing this account
+      missing_also_known_as: is not an alias of this account
      move_to_self: cannot be current account
      not_found: could not be found
      on_cooldown: You are on cooldown