diff options
| author | ThibG <thib@sitedethib.com> | 2019-06-05 13:28:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-05 13:28:05 +0200 |
| commit | ff74aaca7cd532065f24829a3ac16de809bacf3f (patch) | |
| tree | ba851bcad4bf9f657a0c2414ac3befdea9acea15 /app/javascript | |
| parent | 58946fef3c05342289c1c50132996fc4fd01cf68 (diff) | |
| parent | 02b56c7e1a0fa561af9a85f765ec22eee3053561 (diff) | |
Merge pull request #1093 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript')
| -rw-r--r-- | app/javascript/mastodon/features/ui/components/navigation_panel.js | 3 | ||||
| -rw-r--r-- | app/javascript/mastodon/locales/ko.json | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/app/javascript/mastodon/features/ui/components/navigation_panel.js b/app/javascript/mastodon/features/ui/components/navigation_panel.js index 613be7391..1d783ba1b 100644 --- a/app/javascript/mastodon/features/ui/components/navigation_panel.js +++ b/app/javascript/mastodon/features/ui/components/navigation_panel.js @@ -22,7 +22,8 @@ const NavigationPanel = () => ( <hr /> <a className='column-link column-link--transparent' href='/settings/preferences'><Icon className='column-link__icon' id='cog' fixedWidth /><FormattedMessage id='navigation_bar.preferences' defaultMessage='Preferences' /></a> - <a className='column-link column-link--transparent' href='/relationships'><Icon className='column-link__icon' id='address-book-o' fixedWidth /><FormattedMessage id='navigation_bar.follows_and_followers' defaultMessage='Follows and followers' /></a> + <a className='column-link column-link--transparent' href='/relationships'><Icon className='column-link__icon' id='users' fixedWidth /><FormattedMessage id='navigation_bar.follows_and_followers' defaultMessage='Follows and followers' /></a> + <a className='column-link column-link--transparent' href='/explore'><Icon className='column-link__icon' id='address-book-o' fixedWidth /><FormattedMessage id='navigation_bar.profile_directory' defaultMessage='Profile directory' /></a> </div> ); diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json index 9a49ce4aa..bd7b9764d 100644 --- a/app/javascript/mastodon/locales/ko.json +++ b/app/javascript/mastodon/locales/ko.json @@ -204,6 +204,7 @@ "keyboard_shortcuts.search": "검색창에 포커스", "keyboard_shortcuts.start": "\"시작하기\" 컬럼 열기", "keyboard_shortcuts.toggle_hidden": "CW로 가려진 텍스트를 표시/비표시", + "keyboard_shortcuts.toggle_sensitivity": "이미지 보이기/숨기기", "keyboard_shortcuts.toot": "새 툿 작성", "keyboard_shortcuts.unfocus": "작성창에서 포커스 해제", "keyboard_shortcuts.up": "리스트에서 위로 이동", @@ -236,6 +237,7 @@ "navigation_bar.favourites": "즐겨찾기", "navigation_bar.filters": "뮤트", "navigation_bar.follow_requests": "팔로우 요청", + "navigation_bar.follows_and_followers": "팔로우와 팔로워", "navigation_bar.info": "이 서버에 대해서", "navigation_bar.keyboard_shortcuts": "단축키", "navigation_bar.lists": "리스트", @@ -348,7 +350,7 @@ "status.show_less_all": "모두 접기", "status.show_more": "더 보기", "status.show_more_all": "모두 펼치기", - "status.show_thread": "스레드 보기", + "status.show_thread": "글타래 보기", "status.unmute_conversation": "이 대화의 뮤트 해제하기", "status.unpin": "고정 해제", "suggestions.dismiss": "추천 지우기", |