diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-09-03 14:33:06 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-09-03 14:33:06 +0200 |
commit | 6c233a04a04f674b1be75ce7c6c4547c7a006797 (patch) | |
tree | 24b32d52e098fac57e91fd26be1311b7b677c9c9 /config/locales/simple_form.ko.yml | |
parent | e915bc3e9e32e34bf80d1bd66ee3f80d2ca37969 (diff) | |
parent | ccc2f608c5c1caac2ea4796f4490f29d59d67068 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: README.md Discarded upstream changes to the README, kept our version.
Diffstat (limited to 'config/locales/simple_form.ko.yml')
-rw-r--r-- | config/locales/simple_form.ko.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml index 73751fc99..97baf7856 100644 --- a/config/locales/simple_form.ko.yml +++ b/config/locales/simple_form.ko.yml @@ -92,6 +92,7 @@ ko: follow_request: 누군가 나를 팔로우 하길 원할 때 이메일 보내기 mention: 누군가 나에게 답장했을 때 이메일 보내기 reblog: 누군가 내 툿을 부스트 했을 때 이메일 보내기 + report: 새 신고 등록시 이메일로 알리기 'no': 아니오 required: mark: "*" |