diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-07-15 15:32:40 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-07-15 15:32:40 +0200 |
| commit | 3f60b096b51b000905290d69ea05b874b60fa9e0 (patch) | |
| tree | 0b8c7011810b4a97523c2c63816735e519f0682c /config/locales/activerecord.ml.yml | |
| parent | 7a23347db5be3f262dbcafbecf768588dc648bda (diff) | |
| parent | d9cad44ca54374cafa0c97775083bb1bc0a5a3ce (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `config/routes.rb`: Upstream disabled E2EE routes, which we did earlier, but slightly differently. Took upstream's version.
Diffstat (limited to 'config/locales/activerecord.ml.yml')
| -rw-r--r-- | config/locales/activerecord.ml.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config/locales/activerecord.ml.yml b/config/locales/activerecord.ml.yml index baecb9e82..fc30a81fc 100644 --- a/config/locales/activerecord.ml.yml +++ b/config/locales/activerecord.ml.yml @@ -4,9 +4,14 @@ ml: attributes: poll: expires_at: സമയപരിധി + options: ചോയ്സുകൾ errors: models: account: attributes: username: invalid: അക്ഷരങ്ങളും, അക്കങ്ങളും, പിന്നെ അടിവരയും മാത്രം + status: + attributes: + reblog: + taken: സ്റ്റാറ്റസ് ഇതിനകം നിലവിലുണ്ട് |