merge develop and fix conflicts.

sharkey-locales/en-US.yml

@@ -371,6 +371,8 @@ _mfm:
   smallDescription: "Displays content small and thin."
   center: "Center"
   centerDescription: "Displays content centered."
+  unixtime: "Unix Time"
+  unixtimeDescription: "Displays a timestamp in the viewer's current timezone."
   inlineCode: "Code (Inline)"
   inlineCodeDescription: "Displays inline syntax highlighting for (program) code."
   blockCode: "Code (Block)"
@@ -572,6 +574,12 @@ bubbleTimelineMustBeEnabled: "Note: the bubble timeline is hidden by default, an
 popularUsersGlobal: "Users popular on the global network"
 popularUsersLocal: "Users popular on {name}"
 
+pollsOnLocal: "Polls trending on {name}"
+pollsOnRemote: "Polls trending on the global network"
+pollsExpired: "Polls that have ended recently"
+trendingPollsDisabled: "Trending polls are disabled on this instance."
+trendingPollsDisabledLogIn: "Please log in to view trending polls."
+
 silenced: "Silenced"
 totalFollowers: "Total followers"
 totalFollowing: "Total following"
@@ -593,3 +601,16 @@ translationTimeoutCaption: "Timeout in milliseconds for translation API requests
 attributionDomains: "Attribution Domains"
 attributionDomainsDescription: "A list of domains whose content can be attributed to you on link previews, separated by new-line. Any subdomain will also be valid. The following needs to be on the webpage:"
 writtenBy: "Written by {user}"
+
+followingPub: "Following (Pub)"
+followersSub: "Followers (Sub)"
+wellKnownResources: "Well-known resources"
+lastPosted: "Last posted: {at}"
+nsfw: "NSFW"
+raw: "Raw"
+cw: "CW"
+mediaSilenced: "Media Silenced"
+bubble: "Bubble"
+verified: "Verified"
+notVerified: "Not Verified"
+hibernated: "Hibernated"