diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-05-07 19:51:00 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-07 19:51:00 +0200 |
commit | 50f8ee2e07e0a8a0ab8971543cb6544c8d6c5f5d (patch) | |
tree | 2d0f4954a3077e3e0bb2d02f671af41b69672e2a /config/locales/activerecord.ko.yml | |
parent | a346912030012dc1451249373ff7ef1a61016517 (diff) | |
parent | e08b31a70624fe069d2f26bf2078a69e2d48f6aa (diff) |
Merge pull request #1526 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/activerecord.ko.yml')
-rw-r--r-- | config/locales/activerecord.ko.yml | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/config/locales/activerecord.ko.yml b/config/locales/activerecord.ko.yml index 3c081269a..07f8a39f7 100644 --- a/config/locales/activerecord.ko.yml +++ b/config/locales/activerecord.ko.yml @@ -5,13 +5,28 @@ ko: poll: expires_at: 마감 기한 options: 선택 + user: + agreement: 이용약관 + email: 이메일 주소 + locale: 언어 + password: 암호 + user/account: + username: 사용자명 + user/invite_request: + text: 이유 errors: models: account: attributes: username: invalid: 영문자, 숫자, _만 사용 가능 + reserved: 이미 예약되어 있습니다 status: attributes: reblog: taken: 이미 게시물이 존재합니다 + user: + attributes: + email: + blocked: 허용되지 않은 이메일 제공자입니다 + unreachable: 존재하지 않는 것 같습니다 |