Merge tag 'v1.0.5+3.2.0' into hometown-v1.0.5+3.3.0

app/javascript/mastodon/features/ui/components/columns_area.js

@@ -50,7 +50,7 @@ const componentMap = {
 };
 
 const messages = defineMessages({
-  publish: { id: 'compose_form.publish', defaultMessage: 'Toot' },
+  publish: { id: 'compose_form.publish', defaultMessage: 'Post' },
 });
 
 const shouldHideFAB = path => path.match(/^\/statuses\/|^\/search|^\/getting-started/);

app/javascript/mastodon/features/ui/components/link_footer.js

@@ -64,6 +64,11 @@ class LinkFooter extends React.PureComponent {
             defaultMessage='Mastodon is open source software. You can contribute or report issues on GitHub at {github}.'
             values={{ github: <span><a href={source_url} rel='noopener noreferrer' target='_blank'>{repository}</a> (v{version})</span> }}
           />
+          <FormattedMessage
+            id='getting_started.hometown_open_source_notice'
+            defaultMessage='Hometown is also open source, at {hometown} (v1.0.5).'
+            values={{ hometown: <span><a href='https://github.com/hometown-fork/hometown' rel='noopener' target='_blank'>hometown-fork/hometown</a></span> }}
+          />
         </p>
       </div>
     );

app/javascript/mastodon/features/ui/index.js

@@ -61,7 +61,7 @@ import { previewState as previewVideoState } from './components/video_modal';
 import '../../components/status';
 
 const messages = defineMessages({
-  beforeUnload: { id: 'ui.beforeunload', defaultMessage: 'Your draft will be lost if you leave Mastodon.' },
+  beforeUnload: { id: 'ui.beforeunload', defaultMessage: 'Your draft will be lost if you leave.' },
 });
 
 const mapStateToProps = state => ({