diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-07-15 15:32:40 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-07-15 15:32:40 +0200 |
commit | 3f60b096b51b000905290d69ea05b874b60fa9e0 (patch) | |
tree | 0b8c7011810b4a97523c2c63816735e519f0682c /config/locales/ko.yml | |
parent | 7a23347db5be3f262dbcafbecf768588dc648bda (diff) | |
parent | d9cad44ca54374cafa0c97775083bb1bc0a5a3ce (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `config/routes.rb`: Upstream disabled E2EE routes, which we did earlier, but slightly differently. Took upstream's version.
Diffstat (limited to 'config/locales/ko.yml')
-rw-r--r-- | config/locales/ko.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/locales/ko.yml b/config/locales/ko.yml index bf2aaa5bd..1742e5d08 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -933,6 +933,8 @@ ko: moderation: title: 중재 move_handler: + carry_blocks_over_text: 이 사용자는 당신이 차단한 %{acct}로부터 이주 했습니다. + carry_mutes_over_text: 이 사용자는 당신이 뮤트한 %{acct}로부터 이주 했습니다. copy_account_note_text: '이 사용자는 %{acct}로부터 이동하였습니다. 당신의 이전 노트는 이렇습니다:' notification_mailer: digest: |