diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-05-13 22:11:49 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-05-13 22:11:49 +0200 |
| commit | 3baacf6993581ba91e3e3ae0071b25a645d71115 (patch) | |
| tree | ec1dbae77aef8bd43e6f5cfef41dfbc72f133ca3 /config | |
| parent | 559214c33fc0c5b5ee621eb2719fa1a15ac9da95 (diff) | |
| parent | 92f85bea528c5eca97a2f075c53f7dcafdf5cb41 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 4 | ||||
| -rw-r--r-- | config/locales/en.yml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config/application.rb b/config/application.rb index d1980cd68..8348649df 100644 --- a/config/application.rb +++ b/config/application.rb @@ -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, diff --git a/config/locales/en.yml b/config/locales/en.yml index 5b61c9106..9d0e2e092 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -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 |