diff --git a/i18n/english.yml b/i18n/english.yml
index 30f18a5ca..965e77a0d 100644
--- a/i18n/english.yml
+++ b/i18n/english.yml
@@ -1,371 +1,369 @@
-id: en-US
-name: English
-DatatoolsNavbar:
-  manager: Manager
-  editor: Editor
-  alerts: Alerts
-  users: Users
-  signConfig: eTID Config
-  guide: Guide
-  account: My Account
-  resetPassword: Reset Password
-  logout: Log Out
-  login: Log In
-Breadcrumbs:
-  root: Explore
-  projects: Projects
-  deployments: Deployments
-FeedInfoPanel:
-  uploadShapefile:
-    title: Upload route shapefile
-    body: Select a zipped shapefile to display on map. Note: this is only for use as a visual aid.
-    error: Uploaded file must be a valid zip file (.zip).
-RegionSearch:
-  placeholder: Search for regions or agencies
-PublicFeedsTable:
-  search: Search
-  name: Feed Name
-  region: Region
-  stateProvince: State or Province
-  country: Country
-  lastUpdated: Last Updated
-  link: Link to GTFS
-PublicFeedsViewer:
-  title: Catalogue
-ProjectsList:
-  title: Projects
-  noProjects: You currently do not have any projects.
-  createFirst: Create my first project
-  search: Search by project name
-  table:
-    name: Project Name
-  new: New Project
-  help:
-    title: What's a project?
-    content: A project is used to group GTFS feeds. For example, the feeds in a project may be in the same region or they may collectively define a planning scenario.
-DeploymentsPanel:
-  title: Deployments
-  search: Search for deployments by name
-  new: New Deployment
-  delete: Remove deployment
-  table:
-    name: Name
-    creationDate: Creation date
-    feedCount: Number of feeds
-    deployedTo: Deployed to
-ProjectViewer:
-  mergeFeeds: Merge all
-  makePublic: Update public feeds
-  settings: Settings
-  makePublic: Publish public feeds
-  deployments: Deployments
-  feeds:
-    title: Feed Sources
+_id: en-US
+_name: English
+components:
+  Breadcrumbs:
+    deployments: Deployments
+    projects: Projects
+    root: Explore
+  CreateUser:
+    new: Create User
+  DatatoolsNavbar:
+    account: My Account
+    alerts: Alerts
+    editor: Editor
+    guide: Guide
+    login: Log In
+    logout: Log Out
+    manager: Manager
+    resetPassword: Reset Password
+    signConfig: eTID Config
+    users: Users
+  DeploymentViewer:
+    addFeedSource: Add Feed Source
+    allFeedsAdded: All feeds added
+    deploy: Deploy
+    download: Download
+    noServers: No servers defined
     search: Search by name
     table:
+      dateRetrieved: Date Retrieved
+      errorCount: Error Count
+      expires: Expires
+      loadStatus: Loaded Successfully
       name: Name
-      public: Public?
-      deployable: Deployable?
-      retrievalMethod: Retrieval Method
-      lastUpdated: Updated
-      errorCount: Errors
-      validRange: Valid Range
-    new: New Feed Source
-    createFirst: Create first feed source!
-    update: Fetch all
-EditorFeedSourcePanel:
-  title: Snapshots
-  version: Version
-  publish: Publish
-  createFromScratch: Create GTFS from Scratch
-  loadLatest: Load latest for editing
-  help:
-    title: What are snapshots?
-    body:
-      - Snapshots are save points you can always revert back to when editing a GTFS feed.
-      - A snapshot might represent a work-in-progress, future planning scenario or even different service patterns (e.g., summer schedule markup).
-  of: of
-  noVersions: (No Versions)
-  noVersionsExist: No versions exist for this feed source.
-  date: Date
-  name: Name
-  download: Download
-  active: Active
-  restore: Make active
-  load: Load for Editing
-  snapshot: snapshot
-  confirmLoad: This will override all active GTFS Editor data for this Feed Source with the data from this version. If there is unsaved work in the Editor you want to keep, you must snapshot the current Editor data first. Are you sure you want to continue?
-  confirmDelete: This will permanently delete this snapshot. Any data saved here cannot be recovered. Are you sure you want to continue?
-  feed: Feed
-  delete: Delete
-FeedSourceViewer:
-  edit: Edit GTFS
-  deploy: Deploy
-  private: Private view
-  viewPublic: View public page
-  versions: Versions
-  gtfs: GTFS
-  properties:
-    title: Settings
-    property: Property
-    value: Value
-    name: Name
-    noneSelected: (None Selected)
-    retrievalMethod:
-      title: Retrieval Method
-      fetchedAutomatically: Fetched Automatically
-      manuallyUploaded: Manually Uploaded
-      producedInHouse: Produced In-house
-    public: Public?
-    deployable: Deployable?
-    snapshot: Editor Snapshot
-  upload: Upload
-  update: Update
-FeedVersionViewer:
-  status: Status
-  version: version
-  noVersionsExist: No versions exist for this feed source.
-  timestamp: File Timestamp
-  download: Download
-  load: Load
-  confirmLoad: This will override all active GTFS Editor data for this Feed Source with the data from this version. If there is unsaved work in the Editor you want to keep, you must snapshot the current Editor data first. Are you sure you want to continue?
-  feed: Feed
-  delete: Delete
-  confirmDelete: Are you sure you want to delete this version? This cannot be undone.
-FeedVersionTabs:
-  agencyCount: Agency Count
-  routeCount: Route Count
-  tripCount: Trip Count
-  stopTimesCount: Stop time Count
-  validDates: Valid Dates
-GtfsValidationExplorer:
-  title: Validation Explorer
-  validationIssues: Validation Issues
-  accessibilityValidation: Accessibility Explorer
-  timeValidation: Time-based Validation
-  table:
-    file: File
-    issue: Issue
-    priority: Priority
-    count: Count
-GtfsValidationViewer:
-  title: Validation Results
-  issues:
-    routes: Route issues
-    stops: Stop issues
-    trips: Trip issues
-    shapes: Shape issues
-    stop_times: Stop times issues
-    other: Other issues
-  noResults: No validation results to show.
-  explorer: Validation Explorer
-ResultTable:
-  problemType: Problem Type
-  priority: Priority
-  affectedIds: Affected ID(s)
-  line: Line
-  description: Description
-DeploymentViewer:
-  versions: Feed Versions
-  search: Search by name
-  download: Download
-  noServers: No servers defined
-  addFeedSource: Add Feed Source
-  allFeedsAdded: All feeds added
-  deploy: Deploy
-  table:
+      routeCount: Route Count
+      stopTimesCount: Stop time count
+      tripCount: Trip Count
+      validFrom: Valid from
+      version: Version
+    versions: Feed Versions
+  DeploymentsPanel:
+    delete: Remove deployment
+    new: New Deployment
+    search: Search for deployments by name
+    table:
+      creationDate: Creation date
+      deployedTo: Deployed to
+      feedCount: Number of feeds
+      name: Name
+    title: Deployments
+  EditorFeedSourcePanel:
+    active: Active
+    confirmDelete: This will permanently delete this snapshot. Any data saved here cannot be recovered. Are you sure you want to continue?
+    confirmLoad: 'This will override all active GTFS Editor data for this Feed Source with the data from this version. If there is unsaved work in the Editor you want to keep, you must snapshot the current Editor data first. Are you sure you want to continue?'
+    createFromScratch: Create GTFS from Scratch
+    date: Date
+    delete: Delete
+    download: Download
+    feed: Feed
+    help:
+      body:
+        - Snapshots are save points you can always revert back to when editing a GTFS feed.
+        - 'A snapshot might represent a work-in-progress, future planning scenario or even different service patterns (e.g., summer schedule markup).'
+      title: What are snapshots?
+    load: Load for Editing
+    loadLatest: Load latest for editing
     name: Name
+    noVersions: (No Versions)
+    noVersionsExist: No versions exist for this feed source.
+    of: of
+    publish: Publish
+    restore: Make active
+    snapshot: snapshot
+    title: Snapshots
+    version: Version
+  FeedInfoPanel:
+    uploadShapefile:
+      body: 'Select a zipped shapefile to display on map. Note: this is only for use as a visual aid.'
+      error: Uploaded file must be a valid zip file (.zip).
+      title: Upload route shapefile
+  FeedSourcePanel:
+    search: Search feeds
+  FeedSourceViewer:
+    deploy: Deploy
+    edit: Edit GTFS
+    gtfs: GTFS
+    private: Private view
+    properties:
+      deployable: Deployable?
+      name: Name
+      noneSelected: (None Selected)
+      property: Property
+      public: Public?
+      retrievalMethod:
+        fetchedAutomatically: Fetched Automatically
+        manuallyUploaded: Manually Uploaded
+        producedInHouse: Produced In-house
+        title: Retrieval Method
+      snapshot: Editor Snapshot
+      title: Settings
+      value: Value
+    update: Update
+    upload: Upload
+    versions: Versions
+    viewPublic: View public page
+  FeedVersionNavigator:
+    confirmDelete: Are you sure you want to delete this version? This cannot be undone.
+    confirmLoad: 'This will override all active GTFS Editor data for this Feed Source with the data from this version. If there is unsaved work in the Editor you want to keep, you must snapshot the current Editor data first. Are you sure you want to continue?'
+    delete: Delete
+    download: Download
+    feed: Feed
+    load: Load for Editing
+    next: Next
+    of: of
+    previous: Previous
     version: Version
-    dateRetrieved: Date Retrieved
-    loadStatus: Loaded Successfully
-    errorCount: Error Count
+  FeedVersionTabs:
+    agencyCount: Agency Count
     routeCount: Route Count
+    stopTimesCount: Stop time Count
     tripCount: Trip Count
-    stopTimesCount: Stop time count
-    validFrom: Valid from
-    expires: Expires
-FeedVersionNavigator:
-  version: Version
-  of: of
-  previous: Previous
-  next: Next
-  download: Download
-  load: Load for Editing
-  confirmLoad: This will override all active GTFS Editor data for this Feed Source with the data from this version. If there is unsaved work in the Editor you want to keep, you must snapshot the current Editor data first. Are you sure you want to continue?
-  feed: Feed
-  delete: Delete
-  confirmDelete: Are you sure you want to delete this version? This cannot be undone.
-NotesViewer:
-  title: Comments
-  feedSource: Feed Source
-  feedVersion: Version
-  all: All Comments
-  none: No comments.
-  refresh: Refresh
-  postComment: Post a New Comment
-  new: Post
-ProjectSettings:
-  title: Settings
-  save: Save
-  rename: Rename
-  confirmDelete: Are you sure you want to delete this project? This action cannot be undone and all feed sources and their versions will be permanently deleted.
-  deleteProject: Delete Project?
-  general:
-    title: General
-    name: Project name
-    location:
-      title: Location
-      defaultLocation: Default location (lat, lng)
-      defaultTimeZone: Default time zone
-      boundingBox: Bounding box (W,S,E,N)
-      defaultLanguage: Default language
-    updates:
-      title: Updates
-      autoFetchFeeds: Auto fetch feed sources?
-  deployment:
-    title: Deployment
-    buildConfig:
-      title: Build Config
-      fetchElevationUS: Fetch Elevation
-      elevationBucket:
-        bucketName: S3 Bucket Name
-        accessKey: Access Key
-        secretKey: Secret Key
-      stationTransfers: Sta. Transfers
-      subwayAccessTime: Subway Access Time
-      fares: Fares
-    routerConfig:
-      title: Router Config
-      numItineraries: "# of itineraries"
-      walkSpeed: Walk Speed
-      stairsReluctance: Stairs Reluctance
-      carDropoffTime: Car Dropoff Time
-      brandingUrlRoot: Branding URL Root
-      requestLogFile: Request log file
-      updaters:
-        title: Real-time updaters
-        new: Add updater
-        $index:
-          type: Type
-          frequencySec: Frequency (in seconds)
-          sourceType: Source type
-          url: URL
-          defaultAgencyId: Default agency ID
-    otpServers:
-      title: Servers
-      new: Add server
-      serverPlaceholder: Server name
-      name: Name
-      namePlaceholder: Production
-      delete: Remove
-      public: Public URL
-      internal: Internal URLs
-      admin: Admin access only?
-      s3Bucket: S3 bucket name
-    osm:
-      title: OSM Extract
-      gtfs: Use GTFS-Derived Extract Bounds
-      custom: Use Custom Extract Bounds
-      bounds: Custom Extract Bounds
-UserAccount:
-  title: My settings
-  personalSettings: Personal settings
-  profile:
-    title: Profile
-    profileInformation: Profile information
-  account:
-    title: Account
-  organizations:
-    title: Organizations
-  notifications:
-    title: Notifications
-    subscriptions: Your subscriptions
-    methods: Notification methods
-    unsubscribeAll: Unsubscribe from all
-  billing:
-    title: Billing
-  organizationSettings: Organization settings
-
-UserAdmin:
-  title: Administration
-  noAccess: You do not have sufficient user privileges to access this area.
-UserList:
-  filterByOrg: Filter by org.
-  title: User Management
-  showing: Showing Users
-  of: of
-  search: Search by username
-UserRow:
-  appAdmin: App admin
-  orgAdmin: Org admin
-  cancel: Cancel
-  delete: Delete
-  deleteConfirm: Are you sure you want to permanently delete this user?
-  edit: Edit
-  save: Save
-UserHomePage:
-  title: Projects
-  noProjects: You currently do not have any projects.
-  createFirst: Create my first project
-  table:
-    name: Project Name
-  new: New Project
-  help:
-    title: What's a project?
-    content: A project is used to group GTFS feeds. For example, the feeds in a project may be in the same region or they may collectively define a planning scenario.
-FeedSourcePanel:
-  search: Search feeds
-OrganizationList:
-  search: Search orgs
-  new: Create org
-OrganizationSettings:
-  orgDetails: Organization details
-  projects: Projects
-  extensions: Extensions
-  subDetails: Subscription details
-  name:
-    label: Name
-    placeholder: Big City Transit
-  logoUrl:
-    label: Logo URL
-    placeholder: http://example.com/logo_30x30.png
-  subscriptionBeginDate: Subscription begins
-  subscriptionEndDate: Subscription ends
-  usageTier:
-    low: Low
-    medium: Medium
-    high: High
-
-CreateUser:
-  new: Create User
-UserSettings:
-  edit: Edit
-  delete: Delete
-  cancel: Cancel
-  save: Save
-  application: Application Settings
-  org:
-    admin: Organization administrator
-    description: Organization administrators have full access to projects within the organization.
-    billing: Billing admin
-  admin:
-    title: Application Admininistrator
-    description: Application administrators have full access to all projects.
-  project:
-    title: Project Settings for
-    noAccess: No Access
-    admin: Admin
-    custom: Custom
-    feeds: Feed Sources
-    cannotFetchFeeds: Cannot fetch feeds
-    permissions: Permissions
-WatchButton:
-  watch: Watch
-  unwatch: Unwatch
-StarButton:
-  star: Star
-  unstar: Unstar
-TimezoneSelect:
-  placeholder: Select timezone...
-LanguageSelect:
-  placeholder: Select language...
+    validDates: Valid Dates
+  FeedVersionViewer:
+    confirmDelete: Are you sure you want to delete this version? This cannot be undone.
+    confirmLoad: 'This will override all active GTFS Editor data for this Feed Source with the data from this version. If there is unsaved work in the Editor you want to keep, you must snapshot the current Editor data first. Are you sure you want to continue?'
+    delete: Delete
+    download: Download
+    feed: Feed
+    load: Load
+    noVersionsExist: No versions exist for this feed source.
+    status: Status
+    timestamp: File Timestamp
+    version: version
+  GtfsValidationExplorer:
+    accessibilityValidation: Accessibility Explorer
+    table:
+      count: Count
+      file: File
+      issue: Issue
+      priority: Priority
+    timeValidation: Time-based Validation
+    title: Validation Explorer
+    validationIssues: Validation Issues
+  GtfsValidationViewer:
+    explorer: Validation Explorer
+    issues:
+      other: Other issues
+      routes: Route issues
+      shapes: Shape issues
+      stop_times: Stop times issues
+      stops: Stop issues
+      trips: Trip issues
+    noResults: No validation results to show.
+    title: Validation Results
+  LanguageSelect:
+    placeholder: Select language...
+  NotesViewer:
+    all: All Comments
+    feedSource: Feed Source
+    feedVersion: Version
+    new: Post
+    none: No comments.
+    postComment: Post a New Comment
+    refresh: Refresh
+    title: Comments
+  OrganizationList:
+    new: Create org
+    search: Search orgs
+  OrganizationSettings:
+    extensions: Extensions
+    logoUrl:
+      label: Logo URL
+      placeholder: 'http://example.com/logo_30x30.png'
+    name:
+      label: Name
+      placeholder: Big City Transit
+    orgDetails: Organization details
+    projects: Projects
+    subDetails: Subscription details
+    subscriptionBeginDate: Subscription begins
+    subscriptionEndDate: Subscription ends
+    usageTier:
+      high: High
+      low: Low
+      medium: Medium
+  ProjectSettings:
+    confirmDelete: Are you sure you want to delete this project? This action cannot be undone and all feed sources and their versions will be permanently deleted.
+    deleteProject: Delete Project?
+    deployment:
+      buildConfig:
+        elevationBucket:
+          accessKey: Access Key
+          bucketName: S3 Bucket Name
+          secretKey: Secret Key
+        fares: Fares
+        fetchElevationUS: Fetch Elevation
+        stationTransfers: Sta. Transfers
+        subwayAccessTime: Subway Access Time
+        title: Build Config
+      osm:
+        bounds: Custom Extract Bounds
+        custom: Use Custom Extract Bounds
+        gtfs: Use GTFS-Derived Extract Bounds
+        title: OSM Extract
+      otpServers:
+        admin: Admin access only?
+        delete: Remove
+        internal: Internal URLs
+        name: Name
+        namePlaceholder: Production
+        new: Add server
+        public: Public URL
+        s3Bucket: S3 bucket name
+        serverPlaceholder: Server name
+        title: Servers
+      routerConfig:
+        brandingUrlRoot: Branding URL Root
+        carDropoffTime: Car Dropoff Time
+        numItineraries: '# of itineraries'
+        requestLogFile: Request log file
+        stairsReluctance: Stairs Reluctance
+        title: Router Config
+        updaters:
+          $index:
+            defaultAgencyId: Default agency ID
+            frequencySec: Frequency (in seconds)
+            sourceType: Source type
+            type: Type
+            url: URL
+          new: Add updater
+          title: Real-time updaters
+        walkSpeed: Walk Speed
+      title: Deployment
+    general:
+      location:
+        boundingBox: 'Bounding box (W,S,E,N)'
+        defaultLanguage: Default language
+        defaultLocation: 'Default location (lat, lng)'
+        defaultTimeZone: Default time zone
+        title: Location
+      name: Project name
+      title: General
+      updates:
+        autoFetchFeeds: Auto fetch feed sources?
+        title: Updates
+    rename: Rename
+    save: Save
+    title: Settings
+  ProjectViewer:
+    deployments: Deployments
+    feeds:
+      createFirst: Create first feed source!
+      new: New Feed Source
+      search: Search by name
+      table:
+        deployable: Deployable?
+        errorCount: Errors
+        lastUpdated: Updated
+        name: Name
+        public: Public?
+        retrievalMethod: Retrieval Method
+        validRange: Valid Range
+      title: Feed Sources
+      update: Fetch all
+    makePublic: Publish public feeds
+    mergeFeeds: Merge all
+    settings: Settings
+  ProjectsList:
+    createFirst: Create my first project
+    help:
+      content: 'A project is used to group GTFS feeds. For example, the feeds in a project may be in the same region or they may collectively define a planning scenario.'
+      title: What's a project?
+    new: New Project
+    noProjects: You currently do not have any projects.
+    search: Search by project name
+    table:
+      name: Project Name
+    title: Projects
+  PublicFeedsTable:
+    country: Country
+    lastUpdated: Last Updated
+    link: Link to GTFS
+    name: Feed Name
+    region: Region
+    search: Search
+    stateProvince: State or Province
+  PublicFeedsViewer:
+    title: Catalogue
+  RegionSearch:
+    placeholder: Search for regions or agencies
+  ResultTable:
+    affectedIds: Affected ID(s)
+    description: Description
+    line: Line
+    priority: Priority
+    problemType: Problem Type
+  StarButton:
+    star: Star
+    unstar: Unstar
+  TimezoneSelect:
+    placeholder: Select timezone...
+  UserAccount:
+    account:
+      title: Account
+    billing:
+      title: Billing
+    notifications:
+      methods: Notification methods
+      subscriptions: Your subscriptions
+      title: Notifications
+      unsubscribeAll: Unsubscribe from all
+    organizationSettings: Organization settings
+    organizations:
+      title: Organizations
+    personalSettings: Personal settings
+    profile:
+      profileInformation: Profile information
+      title: Profile
+    title: My settings
+  UserAdmin:
+    noAccess: You do not have sufficient user privileges to access this area.
+    title: Administration
+  UserHomePage:
+    createFirst: Create my first project
+    help:
+      content: 'A project is used to group GTFS feeds. For example, the feeds in a project may be in the same region or they may collectively define a planning scenario.'
+      title: What's a project?
+    new: New Project
+    noProjects: You currently do not have any projects.
+    table:
+      name: Project Name
+    title: Projects
+  UserList:
+    filterByOrg: Filter by org.
+    of: of
+    search: Search by username
+    showing: Showing Users
+    title: User Management
+  UserRow:
+    appAdmin: App admin
+    cancel: Cancel
+    delete: Delete
+    deleteConfirm: Are you sure you want to permanently delete this user?
+    edit: Edit
+    orgAdmin: Org admin
+    save: Save
+  UserSettings:
+    admin:
+      description: Application administrators have full access to all projects.
+      title: Application Admininistrator
+    application: Application Settings
+    cancel: Cancel
+    delete: Delete
+    edit: Edit
+    org:
+      admin: Organization administrator
+      billing: Billing admin
+      description: Organization administrators have full access to projects within the organization.
+    project:
+      admin: Admin
+      cannotFetchFeeds: Cannot fetch feeds
+      custom: Custom
+      feeds: Feed Sources
+      noAccess: No Access
+      permissions: Permissions
+      title: Project Settings for
+    save: Save
+  WatchButton:
+    unwatch: Unwatch
+    watch: Watch
diff --git a/i18n/espanol.yml b/i18n/espanol.yml
index 17dd3d2b9..7869ab8e3 100644
--- a/i18n/espanol.yml
+++ b/i18n/espanol.yml
@@ -1,339 +1,338 @@
-id: es
-name: Español
-DatatoolsNavbar:
-  manager: Administrador
-  editor: Editor
-  alerts: Alertas
-  users: Usuarios
-  signConfig: eTID Config
-  guide: Manual del usuario
-  account: My Account
-  resetPassword: Reset Password
-  logout: Cerrar sesión
-  login: Iniciar sesión
-Breadcrumbs:
-  root: Explore
-  projects: Projects
-  deployments: Deployments
-FeedInfoPanel:
-  uploadShapefile:
-    title: Upload route shapefile
-    body: Select a zipped shapefile to display on map. Note: this is only for use as a visual aid.
-    error: Uploaded file must be a valid zip file (.zip).
-RegionSearch:
-  placeholder: Search for regions or agencies
-PublicFeedsTable:
-  search: Search
-  name: Feed Name
-  region: Region
-  stateProvince: State or Province
-  country: Country
-  lastUpdated: Last Updated
-  link: Link to GTFS
-PublicFeedsViewer:
-  title: Catalogue
-ProjectsList:
-  title: Projects
-  noProjects: You currently do not have any projects.
-  createFirst: Create my first project
-  search: Search by project name
-  table:
-    name: Project Name
-  new: New Project
-  help:
-    title: What's a project?
-    content: A project is used to group GTFS feeds. For example, the feeds in a project may be in the same region or they may collectively define a planning scenario.
-DeploymentsPanel:
-  title: Deployments
-  new: New Deployment
-  delete: Remove deployment
-  table:
-    name: Name
-    creationDate: Creation date
-    feedCount: Number of feeds
-ProjectViewer:
-  mergeFeeds: Merge Feeds
-  settings: Settings
-  makePublic: Update public feeds
-  feeds:
-    title: Feed Sources
+_id: es
+_name: Español
+components:
+  Breadcrumbs:
+    deployments: Deployments
+    projects: Projects
+    root: Explore
+  CreateUser:
+    new: Create User
+  DatatoolsNavbar:
+    account: My Account
+    alerts: Alertas
+    editor: Editor
+    guide: Manual del usuario
+    login: Iniciar sesión
+    logout: Cerrar sesión
+    manager: Administrador
+    resetPassword: Reset Password
+    signConfig: eTID Config
+    users: Usuarios
+  DeploymentViewer:
+    addFeedSource: Add Feed Source
+    allFeedsAdded: All feeds added
+    deploy: Deploy
+    download: Download
+    noServers: No servers defined
     search: Search by name
     table:
-      name: Name
-      public: Public?
-      deployable: Deployable?
-      retrievalMethod: Retrieval Method
-      lastUpdated: GTFS Last Updated
+      dateRetrieved: Date Retrieved
       errorCount: Error Count
-      validRange: Valid Range
-    new: New Feed Source
-    update: Update all
-EditorFeedSourcePanel:
-  title: Snapshots
-  version: Version
-  publish: Publish
-  createFromScratch: Create GTFS from Scratch
-  loadLatest: Load latest for editing
-  help:
-    title: What are snapshots?
-    body:
-      - Snapshots are save points you can always revert back to when editing a GTFS feed.
-      - A snapshot might represent a work-in-progress, future planning scenario or even different service patterns (e.g., summer schedule markup).
-  of: of
-  noVersions: (No Versions)
-  noVersionsExist: No versions exist for this feed source.
-  date: Date
-  name: Name
-  download: Download
-  active: Active
-  restore: Make active
-  load: Load for Editing
-  snapshot: snapshot
-  confirmLoad: This will override all active GTFS Editor data for this Feed Source with the data from this version. If there is unsaved work in the Editor you want to keep, you must snapshot the current Editor data first. Are you sure you want to continue?
-  confirmDelete: This will permanently delete this snapshot. Any data saved here cannot be recovered. Are you sure you want to continue?
-  feed: Feed
-  delete: Delete
-FeedSourceViewer:
-  deploy: Deploy
-  private: Private view
-  viewPublic: View public page
-  versions: Feed Versions
-  properties:
-    title: Feed Source Properties
-    property: Property
-    value: Value
-    name: Name
-    noneSelected: (None Selected)
-    retrievalMethod:
-      title: Retrieval Method
-      fetchedAutomatically: Fetched Automatically
-      manuallyUploaded: Manually Uploaded
-      producedInHouse: Produced In-house
-    public: Public?
-    deployable: Deployable?
-    snapshot: Editor Snapshot
-  upload: Upload
-  update: Update
-FeedVersionViewer:
-  status: Status
-  version: Version
-  noVersionsExist: No versions exist for this feed source.
-  timestamp: File Timestamp
-  download: Download
-  load: Load for Editing
-  confirmLoad: This will override all active GTFS Editor data for this Feed Source with the data from this version. If there is unsaved work in the Editor you want to keep, you must snapshot the current Editor data first. Are you sure you want to continue?
-  feed: Feed
-  delete: Delete
-  confirmDelete: Are you sure you want to delete this version? This cannot be undone.
-FeedVersionTabs:
-  agencyCount: Agency Count
-  routeCount: Route Count
-  tripCount: Trip Count
-  stopTimesCount: Stop time Count
-  validDates: Valid Dates
-GtfsValidationExplorer:
-  title: Validation Explorer
-  validationIssues: Validation Issues
-  accessibilityValidation: Accessibility Explorer
-  timeValidation: Time-based Validation
-  table:
-    file: File
-    issue: Issue
-    priority: Priority
-    count: Count
-GtfsValidationViewer:
-  title: Validation Results
-  routeIssues: Route Issues
-  stopIssues: Stop Issues
-  tripIssues: Trip Issues
-  shapeIssues: Shape Issues
-  noResults: No validation results to show.
-  explorer: Validation Explorer
-ResultTable:
-  problemType: Problem Type
-  priority: Priority
-  affectedIds: Affected ID(s)
-  line: Line
-  description: Description
-DeploymentViewer:
-  versions: Feed Versions
-  search: Search by name
-  download: Download
-  noServers: No servers defined
-  addFeedSource: Add Feed Source
-  allFeedsAdded: All feeds added
-  deploy: Deploy
-  table:
+      expires: Expires
+      loadStatus: Loaded Successfully
+      name: Name
+      routeCount: Route Count
+      stopTimesCount: Stop time count
+      tripCount: Trip Count
+      validFrom: Valid from
+      version: Version
+    versions: Feed Versions
+  DeploymentsPanel:
+    delete: Remove deployment
+    new: New Deployment
+    table:
+      creationDate: Creation date
+      feedCount: Number of feeds
+      name: Name
+    title: Deployments
+  EditorFeedSourcePanel:
+    active: Active
+    confirmDelete: This will permanently delete this snapshot. Any data saved here cannot be recovered. Are you sure you want to continue?
+    confirmLoad: 'This will override all active GTFS Editor data for this Feed Source with the data from this version. If there is unsaved work in the Editor you want to keep, you must snapshot the current Editor data first. Are you sure you want to continue?'
+    createFromScratch: Create GTFS from Scratch
+    date: Date
+    delete: Delete
+    download: Download
+    feed: Feed
+    help:
+      body:
+        - Snapshots are save points you can always revert back to when editing a GTFS feed.
+        - 'A snapshot might represent a work-in-progress, future planning scenario or even different service patterns (e.g., summer schedule markup).'
+      title: What are snapshots?
+    load: Load for Editing
+    loadLatest: Load latest for editing
     name: Name
+    noVersions: (No Versions)
+    noVersionsExist: No versions exist for this feed source.
+    of: of
+    publish: Publish
+    restore: Make active
+    snapshot: snapshot
+    title: Snapshots
     version: Version
-    dateRetrieved: Date Retrieved
-    loadStatus: Loaded Successfully
-    errorCount: Error Count
+  FeedInfoPanel:
+    uploadShapefile:
+      body: 'Select a zipped shapefile to display on map. Note: this is only for use as a visual aid.'
+      error: Uploaded file must be a valid zip file (.zip).
+      title: Upload route shapefile
+  FeedSourcePanel:
+    search: Search feeds
+  FeedSourceViewer:
+    deploy: Deploy
+    private: Private view
+    properties:
+      deployable: Deployable?
+      name: Name
+      noneSelected: (None Selected)
+      property: Property
+      public: Public?
+      retrievalMethod:
+        fetchedAutomatically: Fetched Automatically
+        manuallyUploaded: Manually Uploaded
+        producedInHouse: Produced In-house
+        title: Retrieval Method
+      snapshot: Editor Snapshot
+      title: Feed Source Properties
+      value: Value
+    update: Update
+    upload: Upload
+    versions: Feed Versions
+    viewPublic: View public page
+  FeedVersionNavigator:
+    delete: Delete
+    download: Download
+    edit: Edit
+    feed: Feed
+    next: Next
+    noVersions: (No Versions)
+    noVersionsExist: No versions exist for this feed source.
+    of: of
+    previous: Previous
+    version: Version
+  FeedVersionTabs:
+    agencyCount: Agency Count
     routeCount: Route Count
+    stopTimesCount: Stop time Count
     tripCount: Trip Count
-    stopTimesCount: Stop time count
-    validFrom: Valid from
-    expires: Expires
-FeedVersionNavigator:
-  version: Version
-  of: of
-  noVersions: (No Versions)
-  noVersionsExist: No versions exist for this feed source.
-  previous: Previous
-  next: Next
-  download: Download
-  edit: Edit
-  feed: Feed
-  delete: Delete
-NotesViewer:
-  title: Comments for this
-  feedSource: Feed Source
-  feedVersion: Version
-  all: All Comments
-  none: No comments.
-  refresh: Refresh
-  postComment: Post a New Comment
-  new: Post
-ProjectSettings:
-  title: Project Settings
-  save: Save
-  rename: Rename
-  confirmDelete: Are you sure you want to delete this project? This action cannot be undone and all feed sources and their versions will be permanently deleted.
-  deleteProject: Delete Project?
-  general:
-    title: General
-    location:
-      title: Location
-      defaultLocation: Default location (lat, lng)
-      defaultTimeZone: Default time zone
-      boundingBox: Bounding box (W,S,E,N)
-      defaultLanguage: Default language
-    updates:
-      title: Updates
-      autoFetchFeeds: Auto fetch feed sources?
-  deployment:
-    title: Deployment
-    buildConfig:
-      title: Build Config
-      fetchElevationUS: Fetch Elevation
-      elevationBucket:
-        bucketName: S3 Bucket Name
-        accessKey: Access Key
-        secretKey: Secret Key
-      stationTransfers: Sta. Transfers
-      subwayAccessTime: Subway Access Time
-      fares: Fares
-    routerConfig:
-      title: Router Config
-      numItineraries: "# of itineraries"
-      walkSpeed: Walk Speed
-      stairsReluctance: Stairs Reluctance
-      carDropoffTime: Car Dropoff Time
-      brandingUrlRoot: Branding URL Root
-      requestLogFile: Request log file
-      updaters:
-        title: Real-time updaters
-        new: Add updater
-        $index:
-          type: Type
-          frequencySec: Frequency (in seconds)
-          sourceType: Source type
-          url: URL
-          defaultAgencyId: Default agency ID
-    otpServers:
-      title: Servers
-      new: Add server
-      serverPlaceholder: Server name
-      name: Name
-      namePlaceholder: Production
-      delete: Remove
-      public: Public URL
-      internal: Internal URLs
-      admin: Admin access only?
-      s3Bucket: S3 bucket name
-    osm:
-      title: OSM Extract
-      gtfs: Use GTFS-Derived Extract Bounds
-      custom: Use Custom Extract Bounds
-      bounds: Custom Extract Bounds
-
-UserAdmin:
-  title: User Management
-UserList:
-  filterByOrg: Filter by org.
-  title: User Management
-  showing: Showing Users
-  of: of
-  search: Search by username
-UserRow:
-  appAdmin: App admin
-  orgAdmin: Org admin
-  cancel: Cancel
-  delete: Delete
-  deleteConfirm: Are you sure you want to permanently delete this user?
-  edit: Edit
-  save: Save
-UserHomePage:
-  title: Projects
-  noProjects: You currently do not have any projects.
-  createFirst: Create my first project
-  search: Search feeds
-  table:
-    name: Project Name
-  new: New Project
-  help:
-    title: What's a project?
-    content: A project is used to group GTFS feeds. For example, the feeds in a project may be in the same region or they may collectively define a planning scenario.
-FeedSourcePanel:
-  search: Search feeds
-OrganizationList:
-  search: Search orgs
-  new: Create org
-OrganizationSettings:
-  orgDetails: Organization details
-  projects: Projects
-  extensions: Extensions
-  subDetails: Subscription details
-  name:
-    label: Name
-    placeholder: Big City Transit
-  logoUrl:
-    label: Logo URL
-    placeholder: http://example.com/logo_30x30.png
-  subscriptionBeginDate: Subscription begins
-  subscriptionEndDate: Subscription ends
-  usageTier:
-    low: Low
-    medium: Medium
-    high: High
-
-CreateUser:
-  new: Create User
-UserSettings:
-  edit: Edit
-  delete: Delete
-  cancel: Cancel
-  save: Save
-  application: Application Settings
-  org:
-    admin: Organization administrator
-    description: Organization administrators have full access to projects within the organization.
-    billing: Billing admin
-  admin:
-    title: Application Admininistrator
-    description: Application administrators have full access to all projects.
-  project:
-    title: Project Settings for
-    noAccess: No Access
-    admin: Admin
-    custom: Custom
-    feeds: Feed Sources
-    cannotFetchFeeds: Cannot fetch feeds
-    permissions: Permissions
-WatchButton:
-  watch: Watch
-  unwatch: Unwatch
-TimezoneSelect:
-  placeholder: Select timezone...
-LanguageSelect:
-  placeholder: Select language...
+    validDates: Valid Dates
+  FeedVersionViewer:
+    confirmDelete: Are you sure you want to delete this version? This cannot be undone.
+    confirmLoad: 'This will override all active GTFS Editor data for this Feed Source with the data from this version. If there is unsaved work in the Editor you want to keep, you must snapshot the current Editor data first. Are you sure you want to continue?'
+    delete: Delete
+    download: Download
+    feed: Feed
+    load: Load for Editing
+    noVersionsExist: No versions exist for this feed source.
+    status: Status
+    timestamp: File Timestamp
+    version: Version
+  GtfsValidationExplorer:
+    accessibilityValidation: Accessibility Explorer
+    table:
+      count: Count
+      file: File
+      issue: Issue
+      priority: Priority
+    timeValidation: Time-based Validation
+    title: Validation Explorer
+    validationIssues: Validation Issues
+  GtfsValidationViewer:
+    explorer: Validation Explorer
+    noResults: No validation results to show.
+    routeIssues: Route Issues
+    shapeIssues: Shape Issues
+    stopIssues: Stop Issues
+    title: Validation Results
+    tripIssues: Trip Issues
+  LanguageSelect:
+    placeholder: Select language...
+  NotesViewer:
+    all: All Comments
+    feedSource: Feed Source
+    feedVersion: Version
+    new: Post
+    none: No comments.
+    postComment: Post a New Comment
+    refresh: Refresh
+    title: Comments for this
+  OrganizationList:
+    new: Create org
+    search: Search orgs
+  OrganizationSettings:
+    extensions: Extensions
+    logoUrl:
+      label: Logo URL
+      placeholder: 'http://example.com/logo_30x30.png'
+    name:
+      label: Name
+      placeholder: Big City Transit
+    orgDetails: Organization details
+    projects: Projects
+    subDetails: Subscription details
+    subscriptionBeginDate: Subscription begins
+    subscriptionEndDate: Subscription ends
+    usageTier:
+      high: High
+      low: Low
+      medium: Medium
+  ProjectSettings:
+    confirmDelete: Are you sure you want to delete this project? This action cannot be undone and all feed sources and their versions will be permanently deleted.
+    deleteProject: Delete Project?
+    deployment:
+      buildConfig:
+        elevationBucket:
+          accessKey: Access Key
+          bucketName: S3 Bucket Name
+          secretKey: Secret Key
+        fares: Fares
+        fetchElevationUS: Fetch Elevation
+        stationTransfers: Sta. Transfers
+        subwayAccessTime: Subway Access Time
+        title: Build Config
+      osm:
+        bounds: Custom Extract Bounds
+        custom: Use Custom Extract Bounds
+        gtfs: Use GTFS-Derived Extract Bounds
+        title: OSM Extract
+      otpServers:
+        admin: Admin access only?
+        delete: Remove
+        internal: Internal URLs
+        name: Name
+        namePlaceholder: Production
+        new: Add server
+        public: Public URL
+        s3Bucket: S3 bucket name
+        serverPlaceholder: Server name
+        title: Servers
+      routerConfig:
+        brandingUrlRoot: Branding URL Root
+        carDropoffTime: Car Dropoff Time
+        numItineraries: '# of itineraries'
+        requestLogFile: Request log file
+        stairsReluctance: Stairs Reluctance
+        title: Router Config
+        updaters:
+          $index:
+            defaultAgencyId: Default agency ID
+            frequencySec: Frequency (in seconds)
+            sourceType: Source type
+            type: Type
+            url: URL
+          new: Add updater
+          title: Real-time updaters
+        walkSpeed: Walk Speed
+      title: Deployment
+    general:
+      location:
+        boundingBox: 'Bounding box (W,S,E,N)'
+        defaultLanguage: Default language
+        defaultLocation: 'Default location (lat, lng)'
+        defaultTimeZone: Default time zone
+        title: Location
+      title: General
+      updates:
+        autoFetchFeeds: Auto fetch feed sources?
+        title: Updates
+    rename: Rename
+    save: Save
+    title: Project Settings
+  ProjectViewer:
+    feeds:
+      new: New Feed Source
+      search: Search by name
+      table:
+        deployable: Deployable?
+        errorCount: Error Count
+        lastUpdated: GTFS Last Updated
+        name: Name
+        public: Public?
+        retrievalMethod: Retrieval Method
+        validRange: Valid Range
+      title: Feed Sources
+      update: Update all
+    makePublic: Update public feeds
+    mergeFeeds: Merge Feeds
+    settings: Settings
+  ProjectsList:
+    createFirst: Create my first project
+    help:
+      content: 'A project is used to group GTFS feeds. For example, the feeds in a project may be in the same region or they may collectively define a planning scenario.'
+      title: What's a project?
+    new: New Project
+    noProjects: You currently do not have any projects.
+    search: Search by project name
+    table:
+      name: Project Name
+    title: Projects
+  PublicFeedsTable:
+    country: Country
+    lastUpdated: Last Updated
+    link: Link to GTFS
+    name: Feed Name
+    region: Region
+    search: Search
+    stateProvince: State or Province
+  PublicFeedsViewer:
+    title: Catalogue
+  RegionSearch:
+    placeholder: Search for regions or agencies
+  ResultTable:
+    affectedIds: Affected ID(s)
+    description: Description
+    line: Line
+    priority: Priority
+    problemType: Problem Type
+  TimezoneSelect:
+    placeholder: Select timezone...
+  UserAdmin:
+    title: User Management
+  UserHomePage:
+    createFirst: Create my first project
+    help:
+      content: 'A project is used to group GTFS feeds. For example, the feeds in a project may be in the same region or they may collectively define a planning scenario.'
+      title: What's a project?
+    new: New Project
+    noProjects: You currently do not have any projects.
+    search: Search feeds
+    table:
+      name: Project Name
+    title: Projects
+  UserList:
+    filterByOrg: Filter by org.
+    of: of
+    search: Search by username
+    showing: Showing Users
+    title: User Management
+  UserRow:
+    appAdmin: App admin
+    cancel: Cancel
+    delete: Delete
+    deleteConfirm: Are you sure you want to permanently delete this user?
+    edit: Edit
+    orgAdmin: Org admin
+    save: Save
+  UserSettings:
+    admin:
+      description: Application administrators have full access to all projects.
+      title: Application Admininistrator
+    application: Application Settings
+    cancel: Cancel
+    delete: Delete
+    edit: Edit
+    org:
+      admin: Organization administrator
+      billing: Billing admin
+      description: Organization administrators have full access to projects within the organization.
+    project:
+      admin: Admin
+      cannotFetchFeeds: Cannot fetch feeds
+      custom: Custom
+      feeds: Feed Sources
+      noAccess: No Access
+      permissions: Permissions
+      title: Project Settings for
+    save: Save
+  WatchButton:
+    unwatch: Unwatch
+    watch: Watch
diff --git a/i18n/francais.yml b/i18n/francais.yml
index 734e70bef..498aca045 100644
--- a/i18n/francais.yml
+++ b/i18n/francais.yml
@@ -1,339 +1,338 @@
-id: fr
-name: Français
-DatatoolsNavbar:
-  manager: Gestionnaire
-  editor: Editeur
-  alerts: Alertes
-  users: Utilisateurs
-  signConfig: eTID Config
-  guide: Guide de l'utilisateur
-  account: My Account
-  resetPassword: Reset Password
-  logout: Fermer une session
-  login: Se connecter
-Breadcrumbs:
-  root: Explore
-  projects: Projects
-  deployments: Deployments
-FeedInfoPanel:
-  uploadShapefile:
-    title: Upload route shapefile
-    body: Select a zipped shapefile to display on map. Note: this is only for use as a visual aid.
-    error: Uploaded file must be a valid zip file (.zip).
-RegionSearch:
-  placeholder: Search for regions or agencies
-PublicFeedsTable:
-  search: Search
-  name: Feed Name
-  region: Region
-  stateProvince: State or Province
-  country: Country
-  lastUpdated: Last Updated
-  link: Link to GTFS
-PublicFeedsViewer:
-  title: Catalogue
-ProjectsList:
-  title: Projects
-  noProjects: You currently do not have any projects.
-  createFirst: Create my first project
-  search: Search by project name
-  table:
-    name: Project Name
-  new: New Project
-  help:
-    title: What's a project?
-    content: A project is used to group GTFS feeds. For example, the feeds in a project may be in the same region or they may collectively define a planning scenario.
-DeploymentsPanel:
-  title: Deployments
-  new: New Deployment
-  delete: Remove deployment
-  table:
-    name: Name
-    creationDate: Creation date
-    feedCount: Number of feeds
-ProjectViewer:
-  mergeFeeds: Merge Feeds
-  settings: Settings
-  makePublic: Update public feeds
-  feeds:
-    title: Feed Sources
+_id: fr
+_name: Français
+components:
+  Breadcrumbs:
+    deployments: Deployments
+    projects: Projects
+    root: Explore
+  CreateUser:
+    new: Create User
+  DatatoolsNavbar:
+    account: My Account
+    alerts: Alertes
+    editor: Editeur
+    guide: Guide de l'utilisateur
+    login: Se connecter
+    logout: Fermer une session
+    manager: Gestionnaire
+    resetPassword: Reset Password
+    signConfig: eTID Config
+    users: Utilisateurs
+  DeploymentViewer:
+    addFeedSource: Add Feed Source
+    allFeedsAdded: All feeds added
+    deploy: Deploy
+    download: Download
+    noServers: No servers defined
     search: Search by name
     table:
-      name: Name
-      public: Public?
-      deployable: Deployable?
-      retrievalMethod: Retrieval Method
-      lastUpdated: GTFS Last Updated
+      dateRetrieved: Date Retrieved
       errorCount: Error Count
-      validRange: Valid Range
-    new: New Feed Source
-    update: Update all
-EditorFeedSourcePanel:
-  title: Snapshots
-  version: Version
-  publish: Publish
-  createFromScratch: Create GTFS from Scratch
-  loadLatest: Load latest for editing
-  help:
-    title: What are snapshots?
-    body:
-      - Snapshots are save points you can always revert back to when editing a GTFS feed.
-      - A snapshot might represent a work-in-progress, future planning scenario or even different service patterns (e.g., summer schedule markup).
-  of: of
-  noVersions: (No Versions)
-  noVersionsExist: No versions exist for this feed source.
-  date: Date
-  name: Name
-  download: Download
-  active: Active
-  restore: Make active
-  load: Load for Editing
-  snapshot: snapshot
-  confirmLoad: This will override all active GTFS Editor data for this Feed Source with the data from this version. If there is unsaved work in the Editor you want to keep, you must snapshot the current Editor data first. Are you sure you want to continue?
-  confirmDelete: This will permanently delete this snapshot. Any data saved here cannot be recovered. Are you sure you want to continue?
-  feed: Feed
-  delete: Delete
-FeedSourceViewer:
-  deploy: Deploy
-  private: Private view
-  viewPublic: View public page
-  versions: Feed Versions
-  properties:
-    title: Feed Source Properties
-    property: Property
-    value: Value
-    name: Name
-    noneSelected: (None Selected)
-    retrievalMethod:
-      title: Retrieval Method
-      fetchedAutomatically: Fetched Automatically
-      manuallyUploaded: Manually Uploaded
-      producedInHouse: Produced In-house
-    public: Public?
-    deployable: Deployable?
-    snapshot: Editor Snapshot
-  upload: Upload
-  update: Update
-FeedVersionViewer:
-  status: Status
-  version: Version
-  noVersionsExist: No versions exist for this feed source.
-  timestamp: File Timestamp
-  download: Download
-  load: Load for Editing
-  confirmLoad: This will override all active GTFS Editor data for this Feed Source with the data from this version. If there is unsaved work in the Editor you want to keep, you must snapshot the current Editor data first. Are you sure you want to continue?
-  feed: Feed
-  delete: Delete
-  confirmDelete: Are you sure you want to delete this version? This cannot be undone.
-FeedVersionTabs:
-  agencyCount: Agency Count
-  routeCount: Route Count
-  tripCount: Trip Count
-  stopTimesCount: Stop time Count
-  validDates: Valid Dates
-GtfsValidationExplorer:
-  title: Validation Explorer
-  validationIssues: Validation Issues
-  accessibilityValidation: Accessibility Explorer
-  timeValidation: Time-based Validation
-  table:
-    file: File
-    issue: Issue
-    priority: Priority
-    count: Count
-GtfsValidationViewer:
-  title: Validation Results
-  routeIssues: Route Issues
-  stopIssues: Stop Issues
-  tripIssues: Trip Issues
-  shapeIssues: Shape Issues
-  noResults: No validation results to show.
-  explorer: Validation Explorer
-ResultTable:
-  problemType: Problem Type
-  priority: Priority
-  affectedIds: Affected ID(s)
-  line: Line
-  description: Description
-DeploymentViewer:
-  versions: Feed Versions
-  search: Search by name
-  download: Download
-  noServers: No servers defined
-  addFeedSource: Add Feed Source
-  allFeedsAdded: All feeds added
-  deploy: Deploy
-  table:
+      expires: Expires
+      loadStatus: Loaded Successfully
+      name: Name
+      routeCount: Route Count
+      stopTimesCount: Stop time count
+      tripCount: Trip Count
+      validFrom: Valid from
+      version: Version
+    versions: Feed Versions
+  DeploymentsPanel:
+    delete: Remove deployment
+    new: New Deployment
+    table:
+      creationDate: Creation date
+      feedCount: Number of feeds
+      name: Name
+    title: Deployments
+  EditorFeedSourcePanel:
+    active: Active
+    confirmDelete: This will permanently delete this snapshot. Any data saved here cannot be recovered. Are you sure you want to continue?
+    confirmLoad: 'This will override all active GTFS Editor data for this Feed Source with the data from this version. If there is unsaved work in the Editor you want to keep, you must snapshot the current Editor data first. Are you sure you want to continue?'
+    createFromScratch: Create GTFS from Scratch
+    date: Date
+    delete: Delete
+    download: Download
+    feed: Feed
+    help:
+      body:
+        - Snapshots are save points you can always revert back to when editing a GTFS feed.
+        - 'A snapshot might represent a work-in-progress, future planning scenario or even different service patterns (e.g., summer schedule markup).'
+      title: What are snapshots?
+    load: Load for Editing
+    loadLatest: Load latest for editing
     name: Name
+    noVersions: (No Versions)
+    noVersionsExist: No versions exist for this feed source.
+    of: of
+    publish: Publish
+    restore: Make active
+    snapshot: snapshot
+    title: Snapshots
     version: Version
-    dateRetrieved: Date Retrieved
-    loadStatus: Loaded Successfully
-    errorCount: Error Count
+  FeedInfoPanel:
+    uploadShapefile:
+      body: 'Select a zipped shapefile to display on map. Note: this is only for use as a visual aid.'
+      error: Uploaded file must be a valid zip file (.zip).
+      title: Upload route shapefile
+  FeedSourcePanel:
+    search: Search feeds
+  FeedSourceViewer:
+    deploy: Deploy
+    private: Private view
+    properties:
+      deployable: Deployable?
+      name: Name
+      noneSelected: (None Selected)
+      property: Property
+      public: Public?
+      retrievalMethod:
+        fetchedAutomatically: Fetched Automatically
+        manuallyUploaded: Manually Uploaded
+        producedInHouse: Produced In-house
+        title: Retrieval Method
+      snapshot: Editor Snapshot
+      title: Feed Source Properties
+      value: Value
+    update: Update
+    upload: Upload
+    versions: Feed Versions
+    viewPublic: View public page
+  FeedVersionNavigator:
+    delete: Delete
+    download: Download
+    edit: Edit
+    feed: Feed
+    next: Next
+    noVersions: (No Versions)
+    noVersionsExist: No versions exist for this feed source.
+    of: of
+    previous: Previous
+    version: Version
+  FeedVersionTabs:
+    agencyCount: Agency Count
     routeCount: Route Count
+    stopTimesCount: Stop time Count
     tripCount: Trip Count
-    stopTimesCount: Stop time count
-    validFrom: Valid from
-    expires: Expires
-FeedVersionNavigator:
-  version: Version
-  of: of
-  noVersions: (No Versions)
-  noVersionsExist: No versions exist for this feed source.
-  previous: Previous
-  next: Next
-  download: Download
-  edit: Edit
-  feed: Feed
-  delete: Delete
-NotesViewer:
-  title: Comments for this
-  feedSource: Feed Source
-  feedVersion: Version
-  all: All Comments
-  none: No comments.
-  refresh: Refresh
-  postComment: Post a New Comment
-  new: Post
-ProjectSettings:
-  title: Project Settings
-  save: Save
-  rename: Rename
-  confirmDelete: Are you sure you want to delete this project? This action cannot be undone and all feed sources and their versions will be permanently deleted.
-  deleteProject: Delete Project?
-  general:
-    title: General
-    location:
-      title: Location
-      defaultLocation: Default location (lat, lng)
-      defaultTimeZone: Default time zone
-      boundingBox: Bounding box (W,S,E,N)
-      defaultLanguage: Default language
-    updates:
-      title: Updates
-      autoFetchFeeds: Auto fetch feed sources?
-  deployment:
-    title: Deployment
-    buildConfig:
-      title: Build Config
-      fetchElevationUS: Fetch Elevation
-      elevationBucket:
-        bucketName: S3 Bucket Name
-        accessKey: Access Key
-        secretKey: Secret Key
-      stationTransfers: Sta. Transfers
-      subwayAccessTime: Subway Access Time
-      fares: Fares
-    routerConfig:
-      title: Router Config
-      numItineraries: "# of itineraries"
-      walkSpeed: Walk Speed
-      stairsReluctance: Stairs Reluctance
-      carDropoffTime: Car Dropoff Time
-      brandingUrlRoot: Branding URL Root
-      requestLogFile: Request log file
-      updaters:
-        title: Real-time updaters
-        new: Add updater
-        $index:
-          type: Type
-          frequencySec: Frequency (in seconds)
-          sourceType: Source type
-          url: URL
-          defaultAgencyId: Default agency ID
-    otpServers:
-      title: Servers
-      new: Add server
-      serverPlaceholder: Server name
-      name: Name
-      namePlaceholder: Production
-      delete: Remove
-      public: Public URL
-      internal: Internal URLs
-      admin: Admin access only?
-      s3Bucket: S3 bucket name
-    osm:
-      title: OSM Extract
-      gtfs: Use GTFS-Derived Extract Bounds
-      custom: Use Custom Extract Bounds
-      bounds: Custom Extract Bounds
-
-UserAdmin:
-  title: User Management
-UserList:
-  filterByOrg: Filter by org.
-  title: User Management
-  showing: Showing Users
-  of: of
-  search: Search by username
-UserRow:
-  appAdmin: App admin
-  orgAdmin: Org admin
-  cancel: Cancel
-  delete: Delete
-  deleteConfirm: Are you sure you want to permanently delete this user?
-  edit: Edit
-  save: Save
-UserHomePage:
-  title: Projects
-  noProjects: You currently do not have any projects.
-  createFirst: Create my first project
-  search: Search feeds
-  table:
-    name: Project Name
-  new: New Project
-  help:
-    title: What's a project?
-    content: A project is used to group GTFS feeds. For example, the feeds in a project may be in the same region or they may collectively define a planning scenario.
-FeedSourcePanel:
-  search: Search feeds
-OrganizationList:
-  search: Search orgs
-  new: Create org
-OrganizationSettings:
-  orgDetails: Organization details
-  projects: Projects
-  extensions: Extensions
-  subDetails: Subscription details
-  name:
-    label: Name
-    placeholder: Big City Transit
-  logoUrl:
-    label: Logo URL
-    placeholder: http://example.com/logo_30x30.png
-  subscriptionBeginDate: Subscription begins
-  subscriptionEndDate: Subscription ends
-  usageTier:
-    low: Low
-    medium: Medium
-    high: High
-
-CreateUser:
-  new: Create User
-UserSettings:
-  edit: Edit
-  delete: Delete
-  cancel: Cancel
-  save: Save
-  application: Application Settings
-  org:
-    admin: Organization administrator
-    description: Organization administrators have full access to projects within the organization.
-    billing: Billing admin
-  admin:
-    title: Application Admininistrator
-    description: Application administrators have full access to all projects.
-  project:
-    title: Project Settings for
-    noAccess: No Access
-    admin: Admin
-    custom: Custom
-    feeds: Feed Sources
-    cannotFetchFeeds: Cannot fetch feeds
-    permissions: Permissions
-WatchButton:
-  watch: Watch
-  unwatch: Unwatch
-TimezoneSelect:
-  placeholder: Select timezone...
-LanguageSelect:
-  placeholder: Select language...
+    validDates: Valid Dates
+  FeedVersionViewer:
+    confirmDelete: Are you sure you want to delete this version? This cannot be undone.
+    confirmLoad: 'This will override all active GTFS Editor data for this Feed Source with the data from this version. If there is unsaved work in the Editor you want to keep, you must snapshot the current Editor data first. Are you sure you want to continue?'
+    delete: Delete
+    download: Download
+    feed: Feed
+    load: Load for Editing
+    noVersionsExist: No versions exist for this feed source.
+    status: Status
+    timestamp: File Timestamp
+    version: Version
+  GtfsValidationExplorer:
+    accessibilityValidation: Accessibility Explorer
+    table:
+      count: Count
+      file: File
+      issue: Issue
+      priority: Priority
+    timeValidation: Time-based Validation
+    title: Validation Explorer
+    validationIssues: Validation Issues
+  GtfsValidationViewer:
+    explorer: Validation Explorer
+    noResults: No validation results to show.
+    routeIssues: Route Issues
+    shapeIssues: Shape Issues
+    stopIssues: Stop Issues
+    title: Validation Results
+    tripIssues: Trip Issues
+  LanguageSelect:
+    placeholder: Select language...
+  NotesViewer:
+    all: All Comments
+    feedSource: Feed Source
+    feedVersion: Version
+    new: Post
+    none: No comments.
+    postComment: Post a New Comment
+    refresh: Refresh
+    title: Comments for this
+  OrganizationList:
+    new: Create org
+    search: Search orgs
+  OrganizationSettings:
+    extensions: Extensions
+    logoUrl:
+      label: Logo URL
+      placeholder: 'http://example.com/logo_30x30.png'
+    name:
+      label: Name
+      placeholder: Big City Transit
+    orgDetails: Organization details
+    projects: Projects
+    subDetails: Subscription details
+    subscriptionBeginDate: Subscription begins
+    subscriptionEndDate: Subscription ends
+    usageTier:
+      high: High
+      low: Low
+      medium: Medium
+  ProjectSettings:
+    confirmDelete: Are you sure you want to delete this project? This action cannot be undone and all feed sources and their versions will be permanently deleted.
+    deleteProject: Delete Project?
+    deployment:
+      buildConfig:
+        elevationBucket:
+          accessKey: Access Key
+          bucketName: S3 Bucket Name
+          secretKey: Secret Key
+        fares: Fares
+        fetchElevationUS: Fetch Elevation
+        stationTransfers: Sta. Transfers
+        subwayAccessTime: Subway Access Time
+        title: Build Config
+      osm:
+        bounds: Custom Extract Bounds
+        custom: Use Custom Extract Bounds
+        gtfs: Use GTFS-Derived Extract Bounds
+        title: OSM Extract
+      otpServers:
+        admin: Admin access only?
+        delete: Remove
+        internal: Internal URLs
+        name: Name
+        namePlaceholder: Production
+        new: Add server
+        public: Public URL
+        s3Bucket: S3 bucket name
+        serverPlaceholder: Server name
+        title: Servers
+      routerConfig:
+        brandingUrlRoot: Branding URL Root
+        carDropoffTime: Car Dropoff Time
+        numItineraries: '# of itineraries'
+        requestLogFile: Request log file
+        stairsReluctance: Stairs Reluctance
+        title: Router Config
+        updaters:
+          $index:
+            defaultAgencyId: Default agency ID
+            frequencySec: Frequency (in seconds)
+            sourceType: Source type
+            type: Type
+            url: URL
+          new: Add updater
+          title: Real-time updaters
+        walkSpeed: Walk Speed
+      title: Deployment
+    general:
+      location:
+        boundingBox: 'Bounding box (W,S,E,N)'
+        defaultLanguage: Default language
+        defaultLocation: 'Default location (lat, lng)'
+        defaultTimeZone: Default time zone
+        title: Location
+      title: General
+      updates:
+        autoFetchFeeds: Auto fetch feed sources?
+        title: Updates
+    rename: Rename
+    save: Save
+    title: Project Settings
+  ProjectViewer:
+    feeds:
+      new: New Feed Source
+      search: Search by name
+      table:
+        deployable: Deployable?
+        errorCount: Error Count
+        lastUpdated: GTFS Last Updated
+        name: Name
+        public: Public?
+        retrievalMethod: Retrieval Method
+        validRange: Valid Range
+      title: Feed Sources
+      update: Update all
+    makePublic: Update public feeds
+    mergeFeeds: Merge Feeds
+    settings: Settings
+  ProjectsList:
+    createFirst: Create my first project
+    help:
+      content: 'A project is used to group GTFS feeds. For example, the feeds in a project may be in the same region or they may collectively define a planning scenario.'
+      title: What's a project?
+    new: New Project
+    noProjects: You currently do not have any projects.
+    search: Search by project name
+    table:
+      name: Project Name
+    title: Projects
+  PublicFeedsTable:
+    country: Country
+    lastUpdated: Last Updated
+    link: Link to GTFS
+    name: Feed Name
+    region: Region
+    search: Search
+    stateProvince: State or Province
+  PublicFeedsViewer:
+    title: Catalogue
+  RegionSearch:
+    placeholder: Search for regions or agencies
+  ResultTable:
+    affectedIds: Affected ID(s)
+    description: Description
+    line: Line
+    priority: Priority
+    problemType: Problem Type
+  TimezoneSelect:
+    placeholder: Select timezone...
+  UserAdmin:
+    title: User Management
+  UserHomePage:
+    createFirst: Create my first project
+    help:
+      content: 'A project is used to group GTFS feeds. For example, the feeds in a project may be in the same region or they may collectively define a planning scenario.'
+      title: What's a project?
+    new: New Project
+    noProjects: You currently do not have any projects.
+    search: Search feeds
+    table:
+      name: Project Name
+    title: Projects
+  UserList:
+    filterByOrg: Filter by org.
+    of: of
+    search: Search by username
+    showing: Showing Users
+    title: User Management
+  UserRow:
+    appAdmin: App admin
+    cancel: Cancel
+    delete: Delete
+    deleteConfirm: Are you sure you want to permanently delete this user?
+    edit: Edit
+    orgAdmin: Org admin
+    save: Save
+  UserSettings:
+    admin:
+      description: Application administrators have full access to all projects.
+      title: Application Admininistrator
+    application: Application Settings
+    cancel: Cancel
+    delete: Delete
+    edit: Edit
+    org:
+      admin: Organization administrator
+      billing: Billing admin
+      description: Organization administrators have full access to projects within the organization.
+    project:
+      admin: Admin
+      cannotFetchFeeds: Cannot fetch feeds
+      custom: Custom
+      feeds: Feed Sources
+      noAccess: No Access
+      permissions: Permissions
+      title: Project Settings for
+    save: Save
+  WatchButton:
+    unwatch: Unwatch
+    watch: Watch
diff --git a/lib/common/util/config.js b/lib/common/util/config.js
index c3185cd60..b32cafc71 100644
--- a/lib/common/util/config.js
+++ b/lib/common/util/config.js
@@ -14,7 +14,7 @@ export function getGtfsPlusSpec (): Array<GtfsPlusTable> {
 
 export function getComponentMessages (componentName: string): any {
   return (
-    objectPath.get(window.DT_CONFIG, ['messages', 'active', componentName]) ||
+    objectPath.get(window.DT_CONFIG, ['messages', 'active', 'components', componentName]) ||
     {}
   )
 }
@@ -65,7 +65,7 @@ export function initializeConfig () {
     : navigator.language
 
   config.messages.active =
-    lang.find(l => l.id === languageId) || lang.find(l => l.id === 'en-US')
+    lang.find(l => l._id === languageId) || lang.find(l => l._id === 'en-US')
 
   // console.log('config', config)
   window.DT_CONFIG = config