diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-10-25 20:28:51 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-10-25 20:28:51 +0200 |
| commit | e855df149bd2f19729af48cd5f452fa3972273f8 (patch) | |
| tree | 4d9dab4fd4568f67b07642db61a2f382e8b1dcc0 /config/locales/activerecord.sr.yml | |
| parent | c647fa99cab9b9db81d36223cf2c2c27e065b648 (diff) | |
| parent | 5ba46952af87e42a64962a34f7ec43bc710bdcaf (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.env.production.sample`: Upstream added new configuration options, uncommented by default. Commented them. - `Gemfile.lock`: Upstream updated dependencies textually close to glitch-soc-specific dependencies. Updated those upstream dependencies.
Diffstat (limited to 'config/locales/activerecord.sr.yml')
| -rw-r--r-- | config/locales/activerecord.sr.yml | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/config/locales/activerecord.sr.yml b/config/locales/activerecord.sr.yml index d974d0e7b..feebfb6dc 100644 --- a/config/locales/activerecord.sr.yml +++ b/config/locales/activerecord.sr.yml @@ -5,13 +5,28 @@ sr: poll: expires_at: Крајњи рок options: Избори + user: + agreement: Уговор о услузи + email: Имејл адреса + locale: Регионална подешавања + password: Лозинка + user/account: + username: Корисничко име + user/invite_request: + text: Разлог errors: models: account: attributes: username: - invalid: само слова, бројеви и доње црте + invalid: мора да садржи само слова, бројеве и доње црте + reserved: је резервисано status: attributes: reblog: - taken: статуса већ постоји + taken: објава већ постоји + user: + attributes: + email: + blocked: користи недозвољени имејл сервис + unreachable: изгледа да не постоји |