diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-01-24 14:37:06 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-01-24 14:37:06 +0100 |
| commit | 9adeaf2bfc1c16ca70e611b5288886b21414217b (patch) | |
| tree | 53372bc9bd6f38d158aad50c768e18773b7d3f3b /config/locales/ko.yml | |
| parent | a8c109baca4d02cc8aed454e231518c1f8ec1844 (diff) | |
| parent | 4bae4e972d43f71bffb888ac82c180b2fa3f1ada (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system
Diffstat (limited to 'config/locales/ko.yml')
| -rw-r--r-- | config/locales/ko.yml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 25bb714ef..21ea5b554 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -341,9 +341,6 @@ ko: create: 차단 규칙 생성 title: 새 이메일 도메인 차단 title: Email 도메인 차단 - followers: - back_to_account: 계정으로 돌아가기 - title: "%{acct}의 팔로워" instances: by_domain: 도메인 delivery_available: 전송 가능 @@ -924,6 +921,7 @@ ko: dormant: 휴면 followers: 팔로워 following: 팔로잉 + invited: 초대됨 last_active: 마지막 활동 most_recent: 가장 최근 moved: 이동함 |