Merge remote-tracking branch 'origin/master' into gs-master

Conflicts:
 	app/javascript/mastodon/locales/en.json
 	app/javascript/mastodon/locales/ja.json
 	app/javascript/mastodon/locales/pl.json

The above conflicts appear to be a text conflict introduced by
glitch-soc's additional level of columns (i.e. moving a bunch of columns
under the Misc option).  They were resolved via accept-ours.

app/javascript/mastodon/locales/defaultMessages.json

@@ -118,6 +118,15 @@
     ],
     "path": "app/javascript/mastodon/components/domain.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "{count} {rawCount, plural, one {person} other {people}} talking",
+        "id": "trends.count_by_accounts"
+      }
+    ],
+    "path": "app/javascript/mastodon/components/hashtag.json"
+  },
   {
     "descriptors": [
       {
@@ -500,6 +509,38 @@
         "defaultMessage": "Show boosts from @{name}",
         "id": "account.show_reblogs"
       },
+      {
+        "defaultMessage": "Pinned toots",
+        "id": "navigation_bar.pins"
+      },
+      {
+        "defaultMessage": "Preferences",
+        "id": "navigation_bar.preferences"
+      },
+      {
+        "defaultMessage": "Follow requests",
+        "id": "navigation_bar.follow_requests"
+      },
+      {
+        "defaultMessage": "Favourites",
+        "id": "navigation_bar.favourites"
+      },
+      {
+        "defaultMessage": "Lists",
+        "id": "navigation_bar.lists"
+      },
+      {
+        "defaultMessage": "Blocked users",
+        "id": "navigation_bar.blocks"
+      },
+      {
+        "defaultMessage": "Hidden domains",
+        "id": "navigation_bar.domain_blocks"
+      },
+      {
+        "defaultMessage": "Muted users",
+        "id": "navigation_bar.mutes"
+      },
       {
         "defaultMessage": "Information below may reflect the user's profile incompletely.",
         "id": "account.disclaimer_full"
@@ -541,6 +582,10 @@
         "defaultMessage": "Unblock @{name}",
         "id": "account.unblock"
       },
+      {
+        "defaultMessage": "Edit profile",
+        "id": "account.edit_profile"
+      },
       {
         "defaultMessage": "Follows you",
         "id": "account.follows_you"
@@ -759,6 +804,10 @@
   },
   {
     "descriptors": [
+      {
+        "defaultMessage": "Trending now",
+        "id": "trends.header"
+      },
       {
         "defaultMessage": "People",
         "id": "search_results.accounts"
@@ -990,9 +1039,22 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "Getting started",
-        "id": "getting_started.heading"
+        "defaultMessage": "Refresh",
+        "id": "trends.refresh"
       },
+      {
+        "defaultMessage": "Trending now",
+        "id": "trends.header"
+      },
+      {
+        "defaultMessage": "Load more",
+        "id": "status.load_more"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/getting_started/components/trends.json"
+  },
+  {
+    "descriptors": [
       {
         "defaultMessage": "Home",
         "id": "tabs_bar.home"
@@ -1005,10 +1067,6 @@
         "defaultMessage": "Federated timeline",
         "id": "navigation_bar.public_timeline"
       },
-      {
-        "defaultMessage": "Navigation",
-        "id": "column_subheading.navigation"
-      },
       {
         "defaultMessage": "Settings",
         "id": "column_subheading.settings"
@@ -1029,10 +1087,6 @@
         "defaultMessage": "Follow requests",
         "id": "navigation_bar.follow_requests"
       },
-      {
-        "defaultMessage": "Logout",
-        "id": "navigation_bar.logout"
-      },
       {
         "defaultMessage": "Favourites",
         "id": "navigation_bar.favourites"
@@ -1049,10 +1103,6 @@
         "defaultMessage": "Muted users",
         "id": "navigation_bar.mutes"
       },
-      {
-        "defaultMessage": "Extended information",
-        "id": "navigation_bar.info"
-      },
       {
         "defaultMessage": "Pinned toots",
         "id": "navigation_bar.pins"
@@ -1062,20 +1112,40 @@
         "id": "navigation_bar.lists"
       },
       {
-        "defaultMessage": "Keyboard shortcuts",
+        "defaultMessage": "Discover",
+        "id": "navigation_bar.discover"
+      },
+      {
+        "defaultMessage": "Personal",
+        "id": "navigation_bar.personal"
+      },
+      {
+        "defaultMessage": "Security",
+        "id": "navigation_bar.security"
+      },
+      {
+        "defaultMessage": "Getting started",
+        "id": "getting_started.heading"
+      },
+      {
+        "defaultMessage": "Hotkeys",
         "id": "navigation_bar.keyboard_shortcuts"
       },
       {
-        "defaultMessage": "FAQ",
-        "id": "getting_started.faq"
+        "defaultMessage": "About this instance",
+        "id": "navigation_bar.info"
       },
       {
-        "defaultMessage": "User Guide",
-        "id": "getting_started.userguide"
+        "defaultMessage": "Terms of service",
+        "id": "getting_started.terms"
       },
       {
-        "defaultMessage": "Apps",
-        "id": "getting_started.appsshort"
+        "defaultMessage": "Documentation",
+        "id": "getting_started.documentation"
+      },
+      {
+        "defaultMessage": "Logout",
+        "id": "navigation_bar.logout"
       },
       {
         "defaultMessage": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
@@ -1537,6 +1607,19 @@
     ],
     "path": "app/javascript/mastodon/features/status/index.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Trending now",
+        "id": "trends.header"
+      },
+      {
+        "defaultMessage": "Refresh trends",
+        "id": "trends.refresh"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/trends/index.json"
+  },
   {
     "descriptors": [
       {