diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-03-27 21:54:44 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-03-27 21:54:44 +0100 |
| commit | 7b435fd9bf81265241fab792d8e8e0c2f4f1b619 (patch) | |
| tree | ef366f436ed5180489cc9377268e10328fe9a932 /config/locales/doorkeeper.ko.yml | |
| parent | 02f1c04fabab221130de8dfb5611be81825b193b (diff) | |
| parent | 6c79b7237e31eb510af7df3f4f2cb133dea39845 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/services/post_status_service.rb`: CW/sensitive logic fixed upstream, but different in glitch-soc. Ported the changes accordingly.
Diffstat (limited to 'config/locales/doorkeeper.ko.yml')
| -rw-r--r-- | config/locales/doorkeeper.ko.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/locales/doorkeeper.ko.yml b/config/locales/doorkeeper.ko.yml index 6f4192ebe..16a2d0490 100644 --- a/config/locales/doorkeeper.ko.yml +++ b/config/locales/doorkeeper.ko.yml @@ -126,7 +126,7 @@ ko: read: 계정의 모든 데이터를 읽기 read:accounts: 계정의 정보를 보기 read:blocks: 차단을 보기 - read:bookmarks: 내 갈무리 보기 + read:bookmarks: 내 보관함 보기 read:favourites: 관심글을 보기 read:filters: 필터를 보기 read:follows: 팔로우를 보기 @@ -139,7 +139,7 @@ ko: write: 계정 정보 수정 write:accounts: 프로필 수정 write:blocks: 계정이나 도메인 차단 - write:bookmarks: 게시글을 갈무리하기 + write:bookmarks: 게시글을 보관함에 넣기 write:favourites: 관심글 지정 write:filters: 필터 만들기 write:follows: 사람을 팔로우 |