split added glitch locales from vanilla (#82)

* Locale script now accepts overrides and new keys from glitch/locales

* Revert glitchsoc changes to mastodon/locales to prevent future merge conflicts

app/javascript/mastodon/locales/defaultMessages.json

@@ -188,14 +188,6 @@
   },
   {
     "descriptors": [
-      {
-        "defaultMessage": "Collapse",
-        "id": "status.collapse"
-      },
-      {
-        "defaultMessage": "Uncollapse",
-        "id": "status.uncollapse"
-      },
       {
         "defaultMessage": "{name} boosted",
         "id": "status.reblogged_by"
@@ -660,28 +652,12 @@
         "id": "navigation_bar.community_timeline"
       },
       {
-        "defaultMessage": "App settings",
-        "id": "navigation_bar.app_settings"
+        "defaultMessage": "Preferences",
+        "id": "navigation_bar.preferences"
       },
       {
         "defaultMessage": "Logout",
         "id": "navigation_bar.logout"
-      },
-      {
-        "defaultMessage": "Your current layout is:",
-        "id": "layout.current_is"
-      },
-      {
-        "defaultMessage": "Mobile",
-        "id": "layout.mobile"
-      },
-      {
-        "defaultMessage": "Auto",
-        "id": "layout.auto"
-      },
-      {
-        "defaultMessage": "Desktop",
-        "id": "layout.desktop"
       }
     ],
     "path": "app/javascript/mastodon/features/compose/index.json"
@@ -751,10 +727,6 @@
         "defaultMessage": "Preferences",
         "id": "navigation_bar.preferences"
       },
-      {
-        "defaultMessage": "App settings",
-        "id": "navigation_bar.app_settings"
-      },
       {
         "defaultMessage": "Follow requests",
         "id": "navigation_bar.follow_requests"
@@ -792,7 +764,7 @@
         "id": "getting_started.appsshort"
       },
       {
-        "defaultMessage": "Glitchsoc is open source software, a friendly fork of {Mastodon}. You can contribute or report issues on GitHub at {github}.",
+        "defaultMessage": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
         "id": "getting_started.open_source_notice"
       }
     ],
@@ -1111,11 +1083,11 @@
         "id": "column.public"
       },
       {
-        "defaultMessage": "Welcome to {domain}!",
+        "defaultMessage": "Welcome to Mastodon!",
         "id": "onboarding.page_one.welcome"
       },
       {
-        "defaultMessage": "{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.",
+        "defaultMessage": "Mastodon is a network of independent servers joining up to make one larger social network. We call these servers instances.",
         "id": "onboarding.page_one.federation"
       },
       {
@@ -1163,7 +1135,7 @@
         "id": "onboarding.page_six.almost_done"
       },
       {
-        "defaultMessage": "{domain} runs on Glitchsoc. Glitchsoc is a friendly {fork} of {Mastodon}. Glitchsoc is fully compatible with all Mastodon apps and instances. Glitchsoc is free open-source software. You can report bugs, request features, or contribute to the code on {github}.",
+        "defaultMessage": "Mastodon is free open-source software. You can report bugs, request features, or contribute to the code on {github}.",
         "id": "onboarding.page_six.github"
       },
       {
@@ -1210,79 +1182,6 @@
     ],
     "path": "app/javascript/mastodon/features/ui/components/report_modal.json"
   },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "General",
-        "id": "settings.general"
-      },
-      {
-        "defaultMessage": "Wide view (Desktop mode only)",
-        "id": "settings.wide_view"
-      },
-      {
-        "defaultMessage": "Collapsed toots",
-        "id": "settings.collapsed_statuses"
-      },
-      {
-        "defaultMessage": "Enable collapsed toots",
-        "id": "settings.enable_collapsed"
-      },
-      {
-        "defaultMessage": "Automatic collapsing",
-        "id": "settings.auto_collapse"
-      },
-      {
-        "defaultMessage": "Everything",
-        "id": "settings.auto_collapse_all"
-      },
-      {
-        "defaultMessage": "Notifications",
-        "id": "settings.auto_collapse_notifications"
-      },
-      {
-        "defaultMessage": "Lengthy toots",
-        "id": "settings.auto_collapse_lengthy"
-      },
-      {
-        "defaultMessage": "Replies",
-        "id": "settings.auto_collapse_replies"
-      },
-      {
-        "defaultMessage": "Toots with media",
-        "id": "settings.auto_collapse_media"
-      },
-      {
-        "defaultMessage": "Image backgrounds",
-        "id": "settings.image_backgrounds"
-      },
-      {
-        "defaultMessage": "Give collapsed toots an image background",
-        "id": "settings.image_backgrounds_users"
-      },
-      {
-        "defaultMessage": "Preview collapsed toot media",
-        "id": "settings.image_backgrounds_media"
-      },
-      {
-        "defaultMessage": "Media",
-        "id": "settings.media"
-      },
-      {
-        "defaultMessage": "Letterbox media",
-        "id": "settings.media_letterbox"
-      },
-      {
-        "defaultMessage": "User preferences",
-        "id": "settings.preferences"
-      },
-      {
-        "defaultMessage": "Close",
-        "id": "settings.close"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/ui/components/settings_modal.json"
-  },
   {
     "descriptors": [
       {
@@ -1326,4 +1225,4 @@
     ],
     "path": "app/javascript/mastodon/features/ui/components/video_modal.json"
   }
-]
+]