pulled master, moved locale entry to new location

diff --cc app/javascript/flavours/glitch/features/ui/components/modal_root.js
Simple merge

diff --cc app/javascript/flavours/glitch/locales/en.js
index 0000000000000000000000000000000000000000,1d2e0ecf41f076de44d714cbc04a277d119c8499..07d77e0e1159b187af706f5926b493c7548956b9
mode 000000,100644..100644
--- /dev/null
--- 2/app/javascript/flavours/glitch/locales/en.js
+++ b/app/javascript/flavours/glitch/locales/en.js
@@@ -1,0 -1,50 +1,52 @@@
+ import inherited from 'mastodon/locales/en.json';
+ 
+ const messages = {
+   'getting_started.open_source_notice': 'Glitchsoc is free open source software forked from {Mastodon}. You can contribute or report issues on GitHub at {github}.',
+   'layout.auto': 'Auto',
+   'layout.current_is': 'Your current layout is:',
+   'layout.desktop': 'Desktop',
+   'layout.mobile': 'Mobile',
+   'navigation_bar.app_settings': 'App settings',
+   'getting_started.onboarding': 'Show me around',
+   'onboarding.page_one.federation': '{domain} is an \'instance\' of Mastodon. Mastodon is a network of independent servers joining up to make one larger social network. We call these servers instances.',
+   'onboarding.page_one.welcome': 'Welcome to {domain}!',
+   'onboarding.page_six.github': '{domain} runs on Glitchsoc. Glitchsoc is a friendly {fork} of {Mastodon}, and is compatible with any Mastodon instance or app. Glitchsoc is entirely free and open-source. You can report bugs, request features, or contribute to the code on {github}.',
+   'settings.auto_collapse': 'Automatic collapsing',
+   'settings.auto_collapse_all': 'Everything',
+   'settings.auto_collapse_lengthy': 'Lengthy toots',
+   'settings.auto_collapse_media': 'Toots with media',
+   'settings.auto_collapse_notifications': 'Notifications',
+   'settings.auto_collapse_reblogs': 'Boosts',
+   'settings.auto_collapse_replies': 'Replies',
+   'settings.close': 'Close',
+   'settings.collapsed_statuses': 'Collapsed toots',
+   'settings.enable_collapsed': 'Enable collapsed toots',
+   'settings.general': 'General',
+   'settings.image_backgrounds': 'Image backgrounds',
+   'settings.image_backgrounds_media': 'Preview collapsed toot media',
+   'settings.image_backgrounds_users': 'Give collapsed toots an image background',
+   'settings.media': 'Media',
+   'settings.media_letterbox': 'Letterbox media',
+   'settings.media_fullwidth': 'Full-width media previews',
+   'settings.preferences': 'User preferences',
+   'settings.wide_view': 'Wide view (Desktop mode only)',
+   'settings.navbar_under': 'Navbar at the bottom (Mobile only)',
+   'status.collapse': 'Collapse',
+   'status.uncollapse': 'Uncollapse',
+ 
++  "favourite_modal.combo": "You can press {combo} to skip this next time",
++
+   'home.column_settings.show_direct': 'Show DMs',
+ 
+   'notification.markForDeletion': 'Mark for deletion',
+   'notifications.clear': 'Clear all my notifications',
+   'notifications.marked_clear_confirmation': 'Are you sure you want to permanently clear all selected notifications?',
+   'notifications.marked_clear': 'Clear selected notifications',
+ 
+   'notification_purge.btn_all': 'Select\nall',
+   'notification_purge.btn_none': 'Select\nnone',
+   'notification_purge.btn_invert': 'Invert\nselection',
+   'notification_purge.btn_apply': 'Clear\nselected',
+ };
+ 
+ export default Object.assign({}, inherited, messages);

diff --cc app/javascript/flavours/glitch/styles/components/index.scss
Simple merge

diff --cc app/views/settings/preferences/show.html.haml
Simple merge