From: David Yip <yipdw@member.fsf.org>
Date: Wed, 25 Oct 2017 21:01:20 +0000 (-0500)
Subject: Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct... 
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=42f2045c217df4b482e6ce70615a1d3252e0e972;p=mastodon.git

Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline
---

42f2045c217df4b482e6ce70615a1d3252e0e972
diff --cc app/javascript/mastodon/features/getting_started/index.js
index 68267c54f,94dabd4ad..9b94b9830
--- a/app/javascript/mastodon/features/getting_started/index.js
+++ b/app/javascript/mastodon/features/getting_started/index.js
@@@ -17,8 -16,8 +17,9 @@@ const messages = defineMessages(
    navigation_subheading: { id: 'column_subheading.navigation', defaultMessage: 'Navigation' },
    settings_subheading: { id: 'column_subheading.settings', defaultMessage: 'Settings' },
    community_timeline: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' },
+   direct: { id: 'navigation_bar.direct', defaultMessage: 'Direct messages' },
    preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
 +  settings: { id: 'navigation_bar.app_settings', defaultMessage: 'App settings' },
    follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
    sign_out: { id: 'navigation_bar.logout', defaultMessage: 'Logout' },
    favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favourites' },