diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js index 9a2e0fa9c..3c6dc7194 100644 --- a/app/javascript/mastodon/features/getting_started/index.js +++ b/app/javascript/mastodon/features/getting_started/index.js @@ -18,6 +18,7 @@ import TrendsContainer from './containers/trends_container'; const messages = defineMessages({ home_timeline: { id: 'tabs_bar.home', defaultMessage: 'Home' }, notifications: { id: 'tabs_bar.notifications', defaultMessage: 'Notifications' }, + admin_notifications: { id: 'tabs_bar.admin_notifications', defaultMessage: 'Admin Notifications' }, public_timeline: { id: 'navigation_bar.public_timeline', defaultMessage: 'Federated timeline' }, settings_subheading: { id: 'column_subheading.settings', defaultMessage: 'Settings' }, community_timeline: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' }, @@ -100,7 +101,7 @@ class GettingStarted extends ImmutablePureComponent { if (multiColumn) { navItems.push( , - , + , , ); @@ -108,23 +109,25 @@ class GettingStarted extends ImmutablePureComponent { if (profile_directory) { navItems.push( - - ); + , + , + ); - height += 48; + height += 48*2; } navItems.push( - + , ); height += 34; } else if (profile_directory) { navItems.push( - + , + , ); - height += 48; + height += 48*2; } navItems.push( diff --git a/app/javascript/mastodon/features/ui/components/navigation_panel.js b/app/javascript/mastodon/features/ui/components/navigation_panel.js index 907dbc665..05e823c92 100644 --- a/app/javascript/mastodon/features/ui/components/navigation_panel.js +++ b/app/javascript/mastodon/features/ui/components/navigation_panel.js @@ -16,6 +16,7 @@ const NavigationPanel = () => ( + diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json index 95bd39465..c8f88c39d 100644 --- a/app/javascript/mastodon/locales/ja.json +++ b/app/javascript/mastodon/locales/ja.json @@ -367,6 +367,7 @@ "status.unpin": "プロフィールへの固定を解除", "suggestions.dismiss": "隠す", "suggestions.header": "興味あるかもしれません…", + "tabs_bar.admin_notifications": "Adminからのお知らせ", "tabs_bar.federated_timeline": "連合", "tabs_bar.home": "ホーム", "tabs_bar.local_timeline": "ローカル",