fix(content): #106 s/Timeline/Activity Stream/

content-src/components/Header/Header.js

@@ -16,7 +16,7 @@ const Header = React.createClass({
         </h1>
         <ul className="nav-picker" hidden={!this.state.showDropdown}>
           <li hidden={props.currentRoute.path === "/"}><Link to="/">Home</Link></li>
-          <li hidden={props.currentRoute.path === "/timeline"}><Link to="/timeline">Timeline</Link></li>
+          <li hidden={props.currentRoute.path === "/timeline"}><Link to="/timeline">Activity Stream</Link></li>
         </ul>
       </section>
       <section className="spacer" />

content-src/components/Routes/Routes.js

@@ -9,7 +9,7 @@ const Routes = React.createClass({
     return (<Router history={history}>
       <Route path="/" component={require("components/Base/Base")}>
         <IndexRoute title="Home" component={require("components/NewTabPage/NewTabPage")} />
-        <Route title="Timeline" path="timeline" icon="fa-timeline" component={require("components/TimelinePage/TimelinePage")} />
+        <Route title="Activity Stream" path="timeline" icon="fa-timeline" component={require("components/TimelinePage/TimelinePage")} />
       </Route>
     </Router>);
   }

lib/ActivityStreams.js

@@ -192,9 +192,8 @@ ActivityStreams.prototype = {
   _setupButton() {
     this._button = ActionButton({
       id: "activity-streams-link",
-      label: "Timeline",
+      label: "Activity Stream",
       icon: data.url("content/img/list-icon.svg"),
-      // TODO: Fix url below to about:timeline when that gets implemented.
       onClick: () => tabs.open(`${this.options.pageURL}#/timeline`)
     });
   },