diff --git a/src/locales/en.po b/src/locales/en.po
index 34b2b02bc..375874234 100644
--- a/src/locales/en.po
+++ b/src/locales/en.po
@@ -116,7 +116,7 @@ msgstr ""
 #: src/pages/accounts.jsx:109
 #: src/pages/hashtag.jsx:199
 #: src/pages/list.jsx:157
-#: src/pages/public.jsx:114
+#: src/pages/public.jsx:132
 #: src/pages/status.jsx:1212
 #: src/pages/trending.jsx:471
 msgid "More"
@@ -286,14 +286,14 @@ msgid "Unable to copy link"
 msgstr ""
 
 #: src/components/account-info.jsx:1313
-#: src/components/shortcuts-settings.jsx:1059
+#: src/components/shortcuts-settings.jsx:1077
 #: src/components/status.jsx:1186
 #: src/components/status.jsx:3267
 msgid "Copy"
 msgstr ""
 
 #: src/components/account-info.jsx:1328
-#: src/components/shortcuts-settings.jsx:1077
+#: src/components/shortcuts-settings.jsx:1095
 #: src/components/status.jsx:1202
 msgid "Sharing doesn't seem to work."
 msgstr ""
@@ -413,9 +413,9 @@ msgstr ""
 #: src/components/media-modal.jsx:321
 #: src/components/notification-service.jsx:156
 #: src/components/report-modal.jsx:75
-#: src/components/shortcuts-settings.jsx:230
-#: src/components/shortcuts-settings.jsx:583
-#: src/components/shortcuts-settings.jsx:783
+#: src/components/shortcuts-settings.jsx:248
+#: src/components/shortcuts-settings.jsx:601
+#: src/components/shortcuts-settings.jsx:801
 #: src/components/status.jsx:2992
 #: src/components/status.jsx:3231
 #: src/components/status.jsx:3731
@@ -501,7 +501,7 @@ msgstr ""
 
 #: src/components/account-info.jsx:2225
 #: src/components/list-add-edit.jsx:149
-#: src/components/shortcuts-settings.jsx:715
+#: src/components/shortcuts-settings.jsx:733
 #: src/pages/filters.jsx:554
 #: src/pages/notifications.jsx:981
 msgid "Save"
@@ -524,8 +524,8 @@ msgid "Cloak mode enabled"
 msgstr ""
 
 #: src/components/columns.jsx:26
-#: src/components/nav-menu.jsx:175
-#: src/components/shortcuts-settings.jsx:139
+#: src/components/nav-menu.jsx:177
+#: src/components/shortcuts-settings.jsx:140
 #: src/components/timeline.jsx:437
 #: src/pages/catchup.jsx:876
 #: src/pages/filters.jsx:89
@@ -640,8 +640,8 @@ msgid "Public"
 msgstr ""
 
 #: src/components/compose.jsx:1237
-#: src/components/nav-menu.jsx:337
-#: src/components/shortcuts-settings.jsx:165
+#: src/components/nav-menu.jsx:339
+#: src/components/shortcuts-settings.jsx:168
 #: src/components/status.jsx:94
 msgid "Local"
 msgstr ""
@@ -682,7 +682,7 @@ msgstr ""
 
 #: src/components/compose.jsx:1381
 #: src/components/compose.jsx:3078
-#: src/components/shortcuts-settings.jsx:715
+#: src/components/shortcuts-settings.jsx:733
 #: src/pages/list.jsx:359
 msgid "Add"
 msgstr ""
@@ -715,7 +715,7 @@ msgstr ""
 
 #: src/components/compose.jsx:1878
 #: src/components/compose.jsx:1955
-#: src/components/nav-menu.jsx:238
+#: src/components/nav-menu.jsx:240
 msgid "More…"
 msgstr ""
 
@@ -751,7 +751,7 @@ msgstr ""
 
 #: src/components/compose.jsx:2511
 #: src/components/compose.jsx:2761
-#: src/components/shortcuts-settings.jsx:726
+#: src/components/shortcuts-settings.jsx:744
 #: src/pages/catchup.jsx:1074
 #: src/pages/filters.jsx:412
 msgid "Remove"
@@ -986,7 +986,7 @@ msgid "The end."
 msgstr ""
 
 #: src/components/keyboard-shortcuts-help.jsx:43
-#: src/components/nav-menu.jsx:356
+#: src/components/nav-menu.jsx:366
 #: src/pages/catchup.jsx:1619
 msgid "Keyboard shortcuts"
 msgstr ""
@@ -1083,10 +1083,10 @@ msgid "<0>Ctrl</0> + <1>Enter</1> or <2>⌘</2> + <3>Enter</3>"
 msgstr ""
 
 #: src/components/keyboard-shortcuts-help.jsx:147
-#: src/components/nav-menu.jsx:325
+#: src/components/nav-menu.jsx:327
 #: src/components/search-form.jsx:72
 #: src/components/shortcuts-settings.jsx:52
-#: src/components/shortcuts-settings.jsx:179
+#: src/components/shortcuts-settings.jsx:197
 #: src/pages/search.jsx:45
 #: src/pages/search.jsx:299
 msgid "Search"
@@ -1248,34 +1248,34 @@ msgstr ""
 msgid "Post updated. Check it out."
 msgstr ""
 
-#: src/components/nav-menu.jsx:117
+#: src/components/nav-menu.jsx:119
 msgid "Menu"
 msgstr ""
 
-#: src/components/nav-menu.jsx:153
+#: src/components/nav-menu.jsx:155
 msgid "Reload page now to update?"
 msgstr ""
 
-#: src/components/nav-menu.jsx:165
+#: src/components/nav-menu.jsx:167
 msgid "New update available…"
 msgstr ""
 
 #. js-lingui-explicit-id
-#: src/components/nav-menu.jsx:184
-#: src/components/shortcuts-settings.jsx:140
+#: src/components/nav-menu.jsx:186
+#: src/components/shortcuts-settings.jsx:141
 #: src/pages/following.jsx:22
 #: src/pages/following.jsx:141
 msgid "following.title"
 msgstr "Following"
 
-#: src/components/nav-menu.jsx:191
+#: src/components/nav-menu.jsx:193
 #: src/pages/catchup.jsx:871
 msgid "Catch-up"
 msgstr ""
 
-#: src/components/nav-menu.jsx:198
+#: src/components/nav-menu.jsx:200
 #: src/components/shortcuts-settings.jsx:58
-#: src/components/shortcuts-settings.jsx:146
+#: src/components/shortcuts-settings.jsx:147
 #: src/pages/home.jsx:224
 #: src/pages/mentions.jsx:20
 #: src/pages/mentions.jsx:167
@@ -1284,9 +1284,9 @@ msgstr ""
 msgid "Mentions"
 msgstr ""
 
-#: src/components/nav-menu.jsx:205
+#: src/components/nav-menu.jsx:207
 #: src/components/shortcuts-settings.jsx:49
-#: src/components/shortcuts-settings.jsx:152
+#: src/components/shortcuts-settings.jsx:153
 #: src/pages/filters.jsx:24
 #: src/pages/home.jsx:84
 #: src/pages/home.jsx:184
@@ -1295,25 +1295,25 @@ msgstr ""
 msgid "Notifications"
 msgstr ""
 
-#: src/components/nav-menu.jsx:208
+#: src/components/nav-menu.jsx:210
 msgid "New"
 msgstr ""
 
-#: src/components/nav-menu.jsx:219
+#: src/components/nav-menu.jsx:221
 msgid "Profile"
 msgstr ""
 
-#: src/components/nav-menu.jsx:227
+#: src/components/nav-menu.jsx:229
 #: src/components/shortcuts-settings.jsx:54
-#: src/components/shortcuts-settings.jsx:195
+#: src/components/shortcuts-settings.jsx:213
 #: src/pages/bookmarks.jsx:11
 #: src/pages/bookmarks.jsx:23
 msgid "Bookmarks"
 msgstr ""
 
-#: src/components/nav-menu.jsx:247
+#: src/components/nav-menu.jsx:249
 #: src/components/shortcuts-settings.jsx:55
-#: src/components/shortcuts-settings.jsx:201
+#: src/components/shortcuts-settings.jsx:219
 #: src/pages/catchup.jsx:1446
 #: src/pages/catchup.jsx:2062
 #: src/pages/favourites.jsx:11
@@ -1322,13 +1322,13 @@ msgstr ""
 msgid "Likes"
 msgstr ""
 
-#: src/components/nav-menu.jsx:253
+#: src/components/nav-menu.jsx:255
 #: src/pages/followed-hashtags.jsx:14
 #: src/pages/followed-hashtags.jsx:44
 msgid "Followed Hashtags"
 msgstr ""
 
-#: src/components/nav-menu.jsx:261
+#: src/components/nav-menu.jsx:263
 #: src/pages/account-statuses.jsx:331
 #: src/pages/filters.jsx:54
 #: src/pages/filters.jsx:93
@@ -1336,65 +1336,70 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
-#: src/components/nav-menu.jsx:269
+#: src/components/nav-menu.jsx:271
 msgid "Muted users"
 msgstr ""
 
-#: src/components/nav-menu.jsx:277
+#: src/components/nav-menu.jsx:279
 msgid "Muted users…"
 msgstr ""
 
-#: src/components/nav-menu.jsx:284
+#: src/components/nav-menu.jsx:286
 msgid "Blocked users"
 msgstr ""
 
-#: src/components/nav-menu.jsx:292
+#: src/components/nav-menu.jsx:294
 msgid "Blocked users…"
 msgstr ""
 
-#: src/components/nav-menu.jsx:304
+#: src/components/nav-menu.jsx:306
 msgid "Accounts…"
 msgstr ""
 
-#: src/components/nav-menu.jsx:314
+#: src/components/nav-menu.jsx:316
 #: src/pages/login.jsx:189
 #: src/pages/status.jsx:835
 #: src/pages/welcome.jsx:64
 msgid "Log in"
 msgstr ""
 
-#: src/components/nav-menu.jsx:331
+#: src/components/nav-menu.jsx:333
 #: src/components/shortcuts-settings.jsx:57
-#: src/components/shortcuts-settings.jsx:172
+#: src/components/shortcuts-settings.jsx:190
 #: src/pages/trending.jsx:441
 msgid "Trending"
 msgstr ""
 
-#: src/components/nav-menu.jsx:343
-#: src/components/shortcuts-settings.jsx:165
+#: src/components/nav-menu.jsx:346
+#: src/components/shortcuts-settings.jsx:169
+msgid "Bubble"
+msgstr "Bubble"
+
+#: src/components/nav-menu.jsx:353
+#: src/components/shortcuts-settings.jsx:170
 msgid "Federated"
 msgstr ""
 
-#: src/components/nav-menu.jsx:366
+#: src/components/nav-menu.jsx:376
 msgid "Shortcuts / Columns…"
 msgstr ""
 
-#: src/components/nav-menu.jsx:376
-#: src/components/nav-menu.jsx:390
+#: src/components/nav-menu.jsx:386
+#: src/components/nav-menu.jsx:400
 msgid "Settings…"
 msgstr ""
 
-#: src/components/nav-menu.jsx:420
-#: src/components/nav-menu.jsx:447
+#: src/components/nav-menu.jsx:430
+#: src/components/nav-menu.jsx:457
 #: src/components/shortcuts-settings.jsx:50
-#: src/components/shortcuts-settings.jsx:158
+#: src/components/shortcuts-settings.jsx:159
 #: src/pages/list.jsx:126
 #: src/pages/lists.jsx:16
 #: src/pages/lists.jsx:50
 msgid "Lists"
 msgstr ""
 
-#: src/components/nav-menu.jsx:428
+#: src/components/nav-menu.jsx:438
 #: src/components/shortcuts.jsx:215
 #: src/pages/list.jsx:133
 msgid "All Lists"
@@ -1754,8 +1759,8 @@ msgid "Home / Following"
 msgstr ""
 
 #: src/components/shortcuts-settings.jsx:51
-msgid "Public (Local / Federated)"
-msgstr ""
+msgid "Local / Bubble / Federated"
+msgstr "Local / Bubble / Federated"
 
 #: src/components/shortcuts-settings.jsx:53
 msgid "Account"
@@ -1770,272 +1775,276 @@ msgid "List ID"
 msgstr ""
 
 #: src/components/shortcuts-settings.jsx:70
-msgid "Local only"
-msgstr ""
+msgid "Variant"
+msgstr "Variant"
 
-#: src/components/shortcuts-settings.jsx:75
-#: src/components/shortcuts-settings.jsx:84
-#: src/components/shortcuts-settings.jsx:122
+#: src/components/shortcuts-settings.jsx:73
+msgid "'local', 'bubble' or 'federated'"
+msgstr "'local', 'bubble' or 'federated'"
+
+#: src/components/shortcuts-settings.jsx:76
+#: src/components/shortcuts-settings.jsx:85
+#: src/components/shortcuts-settings.jsx:123
 #: src/pages/login.jsx:193
 msgid "Instance"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:78
-#: src/components/shortcuts-settings.jsx:87
-#: src/components/shortcuts-settings.jsx:125
+#: src/components/shortcuts-settings.jsx:79
+#: src/components/shortcuts-settings.jsx:88
+#: src/components/shortcuts-settings.jsx:126
 msgid "Optional, e.g. mastodon.social"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:93
+#: src/components/shortcuts-settings.jsx:94
 msgid "Search term"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:96
+#: src/components/shortcuts-settings.jsx:97
 msgid "Optional, unless for multi-column mode"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:113
+#: src/components/shortcuts-settings.jsx:114
 msgid "e.g. PixelArt (Max 5, space-separated)"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:117
+#: src/components/shortcuts-settings.jsx:118
 #: src/pages/hashtag.jsx:355
 msgid "Media only"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:235
+#: src/components/shortcuts-settings.jsx:253
 #: src/components/shortcuts.jsx:192
 msgid "Shortcuts"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:243
+#: src/components/shortcuts-settings.jsx:261
 msgid "beta"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:249
+#: src/components/shortcuts-settings.jsx:267
 msgid "Specify a list of shortcuts that'll appear as:"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:255
+#: src/components/shortcuts-settings.jsx:273
 msgid "Floating button"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:260
+#: src/components/shortcuts-settings.jsx:278
 msgid "Tab/Menu bar"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:265
+#: src/components/shortcuts-settings.jsx:283
 msgid "Multi-column"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:332
+#: src/components/shortcuts-settings.jsx:350
 msgid "Not available in current view mode"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:351
+#: src/components/shortcuts-settings.jsx:369
 msgid "Move up"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:367
+#: src/components/shortcuts-settings.jsx:385
 msgid "Move down"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:379
+#: src/components/shortcuts-settings.jsx:397
 #: src/components/status.jsx:1314
 #: src/pages/list.jsx:170
 msgid "Edit"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:400
+#: src/components/shortcuts-settings.jsx:418
 msgid "Add more than one shortcut/column to make this work."
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:411
+#: src/components/shortcuts-settings.jsx:429
 msgid "No columns yet. Tap on the Add column button."
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:412
+#: src/components/shortcuts-settings.jsx:430
 msgid "No shortcuts yet. Tap on the Add shortcut button."
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:415
+#: src/components/shortcuts-settings.jsx:433
 msgid "Not sure what to add?<0/>Try adding <1>Home / Following and Notifications</1> first."
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:443
+#: src/components/shortcuts-settings.jsx:461
 msgid "Max {SHORTCUTS_LIMIT} columns"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:444
+#: src/components/shortcuts-settings.jsx:462
 msgid "Max {SHORTCUTS_LIMIT} shortcuts"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:458
+#: src/components/shortcuts-settings.jsx:476
 msgid "Import/export"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:468
+#: src/components/shortcuts-settings.jsx:486
 msgid "Add column…"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:469
+#: src/components/shortcuts-settings.jsx:487
 msgid "Add shortcut…"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:516
+#: src/components/shortcuts-settings.jsx:534
 msgid "Specific list is optional. For multi-column mode, list is required, else the column will not be shown."
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:517
+#: src/components/shortcuts-settings.jsx:535
 msgid "For multi-column mode, search term is required, else the column will not be shown."
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:518
+#: src/components/shortcuts-settings.jsx:536
 msgid "Multiple hashtags are supported. Space-separated."
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:587
+#: src/components/shortcuts-settings.jsx:605
 msgid "Edit shortcut"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:587
+#: src/components/shortcuts-settings.jsx:605
 msgid "Add shortcut"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:623
+#: src/components/shortcuts-settings.jsx:641
 msgid "Timeline"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:649
+#: src/components/shortcuts-settings.jsx:667
 msgid "List"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:788
+#: src/components/shortcuts-settings.jsx:806
 msgid "Import/Export <0>Shortcuts</0>"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:798
+#: src/components/shortcuts-settings.jsx:816
 msgid "Import"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:806
+#: src/components/shortcuts-settings.jsx:824
 msgid "Paste shortcuts here"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:822
+#: src/components/shortcuts-settings.jsx:840
 msgid "Downloading saved shortcuts from instance server…"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:851
+#: src/components/shortcuts-settings.jsx:869
 msgid "Unable to download shortcuts"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:854
+#: src/components/shortcuts-settings.jsx:872
 msgid "Download shortcuts from instance server"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:912
+#: src/components/shortcuts-settings.jsx:930
 msgid "* Exists in current shortcuts"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:917
+#: src/components/shortcuts-settings.jsx:935
 msgid "List may not work if it's from a different account."
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:927
+#: src/components/shortcuts-settings.jsx:945
 msgid "Invalid settings format"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:935
+#: src/components/shortcuts-settings.jsx:953
 msgid "Append to current shortcuts?"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:938
+#: src/components/shortcuts-settings.jsx:956
 msgid "Only shortcuts that don’t exist in current shortcuts will be appended."
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:960
+#: src/components/shortcuts-settings.jsx:978
 msgid "No new shortcuts to import"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:975
+#: src/components/shortcuts-settings.jsx:993
 msgid "Shortcuts imported. Exceeded max {SHORTCUTS_LIMIT}, so the rest are not imported."
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:976
-#: src/components/shortcuts-settings.jsx:1000
+#: src/components/shortcuts-settings.jsx:994
+#: src/components/shortcuts-settings.jsx:1018
 msgid "Shortcuts imported"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:986
+#: src/components/shortcuts-settings.jsx:1004
 msgid "Import & append…"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:994
+#: src/components/shortcuts-settings.jsx:1012
 msgid "Override current shortcuts?"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:995
+#: src/components/shortcuts-settings.jsx:1013
 msgid "Import shortcuts?"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:1009
+#: src/components/shortcuts-settings.jsx:1027
 msgid "or override…"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:1009
+#: src/components/shortcuts-settings.jsx:1027
 msgid "Import…"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:1018
+#: src/components/shortcuts-settings.jsx:1036
 msgid "Export"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:1033
+#: src/components/shortcuts-settings.jsx:1051
 msgid "Shortcuts copied"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:1036
+#: src/components/shortcuts-settings.jsx:1054
 msgid "Unable to copy shortcuts"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:1050
+#: src/components/shortcuts-settings.jsx:1068
 msgid "Shortcut settings copied"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:1053
+#: src/components/shortcuts-settings.jsx:1071
 msgid "Unable to copy shortcut settings"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:1083
+#: src/components/shortcuts-settings.jsx:1101
 msgid "Share"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:1122
+#: src/components/shortcuts-settings.jsx:1140
 msgid "Saving shortcuts to instance server…"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:1129
+#: src/components/shortcuts-settings.jsx:1147
 msgid "Shortcuts saved"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:1134
+#: src/components/shortcuts-settings.jsx:1152
 msgid "Unable to save shortcuts"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:1137
+#: src/components/shortcuts-settings.jsx:1155
 msgid "Sync to instance server"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:1145
+#: src/components/shortcuts-settings.jsx:1163
 msgid "{0, plural, one {# character} other {# characters}}"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:1157
+#: src/components/shortcuts-settings.jsx:1175
 msgid "Raw Shortcuts JSON"
 msgstr ""
 
-#: src/components/shortcuts-settings.jsx:1170
+#: src/components/shortcuts-settings.jsx:1188
 msgid "Import/export settings from/to instance server (Very experimental)"
 msgstr ""
 
@@ -2481,7 +2490,7 @@ msgid "Nothing to see here yet."
 msgstr ""
 
 #: src/pages/account-statuses.jsx:506
-#: src/pages/public.jsx:97
+#: src/pages/public.jsx:115
 #: src/pages/trending.jsx:449
 msgid "Unable to load posts"
 msgstr ""
@@ -3041,25 +3050,25 @@ msgid "Add to Shortcuts"
 msgstr ""
 
 #: src/pages/hashtag.jsx:486
-#: src/pages/public.jsx:139
+#: src/pages/public.jsx:164
 #: src/pages/trending.jsx:478
 msgid "Enter a new instance e.g. \"mastodon.social\""
 msgstr ""
 
 #: src/pages/hashtag.jsx:489
-#: src/pages/public.jsx:142
+#: src/pages/public.jsx:167
 #: src/pages/trending.jsx:481
 msgid "Invalid instance"
 msgstr ""
 
 #: src/pages/hashtag.jsx:503
-#: src/pages/public.jsx:156
+#: src/pages/public.jsx:181
 #: src/pages/trending.jsx:493
 msgid "Go to another instance…"
 msgstr ""
 
 #: src/pages/hashtag.jsx:516
-#: src/pages/public.jsx:169
+#: src/pages/public.jsx:194
 #: src/pages/trending.jsx:504
 msgid "Go to my instance (<0>{currentInstance}</0>)"
 msgstr ""
@@ -3276,32 +3285,44 @@ msgstr ""
 msgid "Dismissed"
 msgstr ""
 
-#: src/pages/public.jsx:27
+#: src/pages/public.jsx:26
 msgid "Local timeline ({instance})"
 msgstr ""
 
+#: src/pages/public.jsx:27
+msgid "Bubble timeline ({instance})"
+msgstr "Bubble timeline ({instance})"
+
 #: src/pages/public.jsx:28
 msgid "Federated timeline ({instance})"
 msgstr ""
 
-#: src/pages/public.jsx:90
+#: src/pages/public.jsx:31
 msgid "Local timeline"
 msgstr ""
 
-#: src/pages/public.jsx:90
+#: src/pages/public.jsx:32
+msgid "Bubble timeline"
+msgstr "Bubble timeline"
+
+#: src/pages/public.jsx:33
 msgid "Federated timeline"
 msgstr ""
 
-#: src/pages/public.jsx:96
+#: src/pages/public.jsx:114
 msgid "No one has posted anything yet."
 msgstr ""
 
-#: src/pages/public.jsx:123
-msgid "Switch to Federated"
+#: src/pages/public.jsx:140
+msgid "Switch to Local"
 msgstr ""
 
-#: src/pages/public.jsx:130
-msgid "Switch to Local"
+#: src/pages/public.jsx:148
+msgid "Switch to Bubble"
+msgstr "Switch to Bubble"
+
+#: src/pages/public.jsx:156
+msgid "Switch to Federated"
 msgstr ""
 
 #: src/pages/search.jsx:49