diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-16 08:30:00 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-11-16 08:30:00 +0100 |
| commit | 1901829f9ab20cecd0e011d73c1af1e9a9eb6c40 (patch) | |
| tree | 541e664f02e70cf3e062477a86f412e6ea3d73d8 /config/locales/doorkeeper.ko.yml | |
| parent | eb675af0fb0d73b697e066100c4faf066c0baff7 (diff) | |
| parent | 4d85c27d1adc83aadd219767dbdc7e17b05230b0 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `config/initializers/content_security_policy.rb`: Our config file is pretty different from upstream. Upstream changed CSP directive `script-src` to include `wasm-unsafe-eval` instead of `unsafe-eval`, which we did not include. Added `wasm-unsafe-eval` to `script-src` to fix execution of the OCR web worker. - `package.json`: Upstream updated a dependency (`array-includes`) textually adjacent to a glitch-soc-only dependency (`atrament`). Updated `array-includes` as upstream did.
Diffstat (limited to 'config/locales/doorkeeper.ko.yml')
| -rw-r--r-- | config/locales/doorkeeper.ko.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/locales/doorkeeper.ko.yml b/config/locales/doorkeeper.ko.yml index 3526bab0e..deeb17f0a 100644 --- a/config/locales/doorkeeper.ko.yml +++ b/config/locales/doorkeeper.ko.yml @@ -124,7 +124,7 @@ ko: admin/reports: 신고 관리 all: 전체 blocks: 차단 - bookmarks: 북마크 + bookmarks: 책갈피 conversations: 대화 crypto: 종단간 암호화 favourites: 좋아요 @@ -159,7 +159,7 @@ ko: read: 계정의 모든 데이터를 읽기 read:accounts: 계정의 정보를 보기 read:blocks: 차단을 보기 - read:bookmarks: 내 보관함 보기 + read:bookmarks: 내 책갈피 보기 read:favourites: 관심글을 보기 read:filters: 필터를 보기 read:follows: 팔로우를 보기 @@ -172,7 +172,7 @@ ko: write: 계정 정보 수정 write:accounts: 프로필 수정 write:blocks: 계정이나 도메인 차단 - write:bookmarks: 게시글을 보관함에 넣기 + write:bookmarks: 글을 책갈피에 넣기 write:conversations: 뮤트와 대화 삭제 write:favourites: 관심글 지정 write:filters: 필터 만들기 |