diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-01-02 13:45:18 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-01-02 15:36:53 +0100 |
| commit | 571d219bb917cefcca7419a0ad4e3889689d5f6a (patch) | |
| tree | 6ab91adcb2c164fd027708e58f5fb96c52474007 /config/locales/ko.yml | |
| parent | b300948526d967aaf5608c93546ee0d54940c0ef (diff) | |
| parent | 66436d08959998be20c6c6bf631177d8c1f3e0d1 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock
Diffstat (limited to 'config/locales/ko.yml')
| -rw-r--r-- | config/locales/ko.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 7ba1df97b..9ac1cd6b9 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -104,6 +104,7 @@ ko: followers: 팔로워 수 followers_url: 팔로워 URL follows: 팔로잉 수 + header: 헤더 inbox_url: 수신함 URL ip: IP location: @@ -134,6 +135,7 @@ ko: push_subscription_expires: PuSH 구독 기간 만료 redownload: 아바타 업데이트 remove_avatar: 아바타 지우기 + remove_header: 헤더 삭제 resend_confirmation: already_confirmed: 이 사용자는 이미 확인되었습니다 send: 다시 확인 이메일 @@ -152,7 +154,6 @@ ko: shared_inbox_url: 공유된 inbox URL show: created_reports: 이 계정에서 제출된 신고 - report: 신고 targeted_reports: 이 계정에 대한 신고 silence: 침묵 silenced: 침묵 됨 |