Revert to upstream translations (keep on local branch instead)

app/javascript/flavours/glitch/features/community_timeline/index.js

@@ -11,7 +11,7 @@ import ColumnSettingsContainer from './containers/column_settings_container';
 import { connectCommunityStream } from 'flavours/glitch/actions/streaming';
 
 const messages = defineMessages({
-  title: { id: 'column.community', defaultMessage: 'The Tavern' },
+  title: { id: 'column.community', defaultMessage: 'Local timeline' },
 });
 
 const mapStateToProps = (state, { columnId }) => {

app/javascript/flavours/glitch/features/compose/components/header.js

@@ -16,7 +16,7 @@ import { signOutLink } from 'flavours/glitch/util/backend_links';
 //  Messages.
 const messages = defineMessages({
   community: {
-    defaultMessage: 'The Tavern',
+    defaultMessage: 'Local timeline',
     id: 'navigation_bar.community_timeline',
   },
   home_timeline: {

app/javascript/flavours/glitch/features/getting_started/index.js

@@ -25,7 +25,7 @@ const messages = defineMessages({
   public_timeline: { id: 'navigation_bar.public_timeline', defaultMessage: 'Federated timeline' },
   navigation_subheading: { id: 'column_subheading.navigation', defaultMessage: 'Navigation' },
   settings_subheading: { id: 'column_subheading.settings', defaultMessage: 'Settings' },
-  community_timeline: { id: 'navigation_bar.community_timeline', defaultMessage: 'The Tavern' },
+  community_timeline: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' },
   direct: { id: 'navigation_bar.direct', defaultMessage: 'Direct messages' },
   bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
   preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },

app/javascript/flavours/glitch/features/ui/components/onboarding_modal.js

@@ -17,7 +17,7 @@ const noop = () => { };
 const messages = defineMessages({
   home_title: { id: 'column.home', defaultMessage: 'Home' },
   notifications_title: { id: 'column.notifications', defaultMessage: 'Notifications' },
-  local_title: { id: 'column.community', defaultMessage: 'The Tavern' },
+  local_title: { id: 'column.community', defaultMessage: 'Local timeline' },
   federated_title: { id: 'column.public', defaultMessage: 'Federated timeline' },
 });
 
@@ -114,7 +114,7 @@ const PageFour = ({ domain, intl }) => (
         </div>
       </div>
 
-      <p><FormattedMessage id='onboarding.page_five.public_timelines' defaultMessage='The Tavern shows public posts from everyone on {domain}. The federated timeline shows public posts from everyone who people on {domain} follow. These are the Public Timelines, a great way to discover new people.' values={{ domain }} /></p>
+      <p><FormattedMessage id='onboarding.page_five.public_timelines' defaultMessage='The local timeline shows public posts from everyone on {domain}. The federated timeline shows public posts from everyone who people on {domain} follow. These are the Public Timelines, a great way to discover new people.' values={{ domain }} /></p>
     </div>
   </div>
 );

app/javascript/mastodon/locales/defaultMessages.json

@@ -1096,11 +1096,11 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "The Tavern",
+        "defaultMessage": "Local timeline",
         "id": "column.community"
       },
       {
-        "defaultMessage": "The Tavern is empty. Write something publicly to get the ball rolling!",
+        "defaultMessage": "The local timeline is empty. Write something publicly to get the ball rolling!",
         "id": "empty_column.community"
       }
     ],
@@ -1542,7 +1542,7 @@
         "id": "navigation_bar.public_timeline"
       },
       {
-        "defaultMessage": "The Tavern",
+        "defaultMessage": "Local timeline",
         "id": "navigation_bar.community_timeline"
       },
       {
@@ -1895,7 +1895,7 @@
         "id": "column_subheading.settings"
       },
       {
-        "defaultMessage": "The Tavern",
+        "defaultMessage": "Local timeline",
         "id": "navigation_bar.community_timeline"
       },
       {
@@ -1988,7 +1988,7 @@
         "id": "hashtag.column_settings.tag_toggle"
       },
       {
-        "defaultMessage": "Tavern only",
+        "defaultMessage": "Local only",
         "id": "community.column_settings.local_only"
       }
     ],
@@ -2152,7 +2152,7 @@
         "id": "keyboard_shortcuts.notifications"
       },
       {
-        "defaultMessage": "to open the Tavern",
+        "defaultMessage": "to open local timeline",
         "id": "keyboard_shortcuts.local"
       },
       {
@@ -3255,7 +3255,7 @@
         "id": "tabs_bar.notifications"
       },
       {
-        "defaultMessage": "The Tavern",
+        "defaultMessage": "Local",
         "id": "tabs_bar.local_timeline"
       },
       {
@@ -3337,7 +3337,7 @@
         "id": "tabs_bar.notifications"
       },
       {
-        "defaultMessage": "The Tavern",
+        "defaultMessage": "Local",
         "id": "tabs_bar.local_timeline"
       },
       {
@@ -3431,4 +3431,4 @@
     ],
     "path": "app/javascript/mastodon/features/video/index.json"
   }
-]
+]