solidus_core 2.7.4 → 2.8.0

data/app/models/spree/stock/content_item.rb

@@ -31,7 +31,7 @@ module Spree
       end
 
       def price
-        variant.price
+        line_item.price
       end
 
       def amount

data/app/models/spree/stock/inventory_units_finalizer.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Spree
+  module Stock
+    # Service class to finalize inventory units, it means unstock the desired
+    # quantity from related stock item and updates the given inventory units to
+    # not be pending.
+    class InventoryUnitsFinalizer
+      # @attr_reader [Spree::InventoryUnit] inventory_units to be finalized
+      attr_reader :inventory_units
+
+      # @param [Spree::InventoryUnit] inventory_units to be finalized
+      def initialize(inventory_units)
+        @inventory_units = inventory_units
+      end
+
+      # Finalize the inventory units, unstock and mark them as not pending.
+      def run!
+        Spree::InventoryUnit.transaction do
+          unstock_inventory_units
+          finalize_inventory_units
+        end
+      end
+
+      private
+
+      def finalize_inventory_units
+        inventory_units.map do |iu|
+          iu.update_columns(
+            pending: false,
+            updated_at: Time.current
+          )
+        end
+      end
+
+      def unstock_inventory_units
+        inventory_units.group_by(&:shipment_id).each_value do |inventory_units_for_shipment|
+          inventory_units_for_shipment.group_by(&:line_item_id).each_value do |units|
+            shipment = units.first.shipment
+            line_item = units.first.line_item
+            shipment.stock_location.unstock line_item.variant, inventory_units.count, shipment
+          end
+        end
+      end
+    end
+  end
+end

data/app/models/spree/stock/location_sorter/base.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Spree
+  module Stock
+    module LocationSorter
+      # Stock location sorters are used to determine the order in which
+      # inventory units will be allocated when packaging a shipment.
+      #
+      # This allows you, for example, to allocate inventory from the default
+      # stock location first.
+      #
+      # @abstract To implement your own location sorter, subclass and
+      #   implement {#sort}.
+      class Base
+        # @!attribute [r] stock_locations
+        #   @return [Enumerable<Spree::StockLocation>]
+        #     a collection of locations to sort
+        attr_reader :stock_locations
+
+        # Initializes the stock location sorter.
+        #
+        # @param stock_locations [Enumerable<Spree::StockLocation>]
+        #   a collection of locations to sort
+        def initialize(stock_locations)
+          @stock_locations = stock_locations
+        end
+
+        # Sorts the stock locations.
+        #
+        # @return [Enumerable<Spree::StockLocation>]
+        #   a collection of sorted stock locations
+        def sort
+          raise NotImplementedError
+        end
+      end
+    end
+  end
+end

data/app/models/spree/stock/location_sorter/default_first.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Spree
+  module Stock
+    module LocationSorter
+      # This stock location sorter will give priority to the default stock
+      # location.
+      class DefaultFirst < Spree::Stock::LocationSorter::Base
+        def sort
+          stock_locations.order_default
+        end
+      end
+    end
+  end
+end

data/app/models/spree/stock/location_sorter/unsorted.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Spree
+  module Stock
+    module LocationSorter
+      # This stock location sorter will leave the stock locations unsorted.
+      class Unsorted < Spree::Stock::LocationSorter::Base
+        def sort
+          stock_locations
+        end
+      end
+    end
+  end
+end

data/app/models/spree/stock/simple_coordinator.rb

@@ -11,6 +11,9 @@ module Spree
     #   * Repeat but for backordered inventory
     #   * Combine allocated and on hand inventory into a single shipment per-location
     #
+    # Allocation logic can be changed using a custom class (as
+    # configured in Spree::Config::stock_allocator_class )
+    #
     # After allocation, splitters are run on each Package (as configured in
     # Spree::Config.environment.stock_splitters)
     #
@@ -23,7 +26,7 @@ module Spree
         @order = order
         @inventory_units = inventory_units || InventoryUnitBuilder.new(order).units
         @splitters = Spree::Config.environment.stock_splitters
-        @stock_locations = Spree::StockLocation.active
+        @stock_locations = Spree::Config.stock.location_sorter_class.new(Spree::StockLocation.active).sort
 
         @inventory_units_by_variant = @inventory_units.group_by(&:variant)
         @desired = Spree::StockQuantities.new(@inventory_units_by_variant.transform_values(&:count))
@@ -31,6 +34,8 @@ module Spree
           variants: @desired.variants,
           stock_locations: @stock_locations
         )
+
+        @allocator = Spree::Config.stock.allocator_class.new(@availability)
       end
 
       def shipments
@@ -40,13 +45,10 @@ module Spree
       private
 
       def build_shipments
-        # Allocate any available on hand inventory
-        on_hand_packages = allocate_inventory(@availability.on_hand_by_stock_location_id)
-
-        # allocate any remaining desired inventory from backorders
-        backordered_packages = allocate_inventory(@availability.backorderable_by_stock_location_id)
+        # Allocate any available on hand inventory and remaining desired inventory from backorders
+        on_hand_packages, backordered_packages, leftover = @allocator.allocate_inventory(@desired)
 
-        unless @desired.empty?
+        unless leftover.empty?
           raise Spree::Order::InsufficientStock
         end
 
@@ -85,16 +87,28 @@ module Spree
       end
 
       def allocate_inventory(availability_by_location)
-        availability_by_location.transform_values do |available|
+        sorted_availability = sort_availability(availability_by_location)
+
+        sorted_availability.transform_values do |available|
           # Find the desired inventory which is available at this location
           packaged = available & @desired
-
           # Remove found inventory from desired
           @desired -= packaged
-
           packaged
         end
       end
+      deprecate allocate_inventory: 'allocate_inventory is deprecated. Please write your own allocator defining' \
+        'a Spree::Stock::Allocator::Base subclass', deprecator: Spree::Deprecation
+
+      def sort_availability(availability)
+        sorted_availability = availability.sort_by do |stock_location_id, _|
+          @stock_locations.find_index do |stock_location|
+            stock_location.id == stock_location_id
+          end
+        end
+
+        Hash[sorted_availability]
+      end
 
       def get_units(quantities)
         # Change our raw quantities back into inventory units

data/app/models/spree/stock_location.rb

@@ -7,6 +7,8 @@ module Spree
   class StockLocation < Spree::Base
     class InvalidMovementError < StandardError; end
 
+    acts_as_list
+
     has_many :shipments
     has_many :stock_items, dependent: :delete_all, inverse_of: :stock_location
     has_many :cartons, inverse_of: :stock_location

data/app/models/spree/store_credit.rb

@@ -18,8 +18,6 @@ class Spree::StoreCredit < Spree::PaymentSource
   ADJUSTMENT_ACTION = 'adjustment'
   INVALIDATE_ACTION = 'invalidate'
 
-  DEFAULT_CREATED_BY_EMAIL = "spree@example.com"
-
   belongs_to :user, class_name: Spree::UserClassHandle.new
   belongs_to :created_by, class_name: Spree::UserClassHandle.new
   belongs_to :category, class_name: "Spree::StoreCreditCategory"
@@ -43,7 +41,7 @@ class Spree::StoreCredit < Spree::PaymentSource
   before_destroy :validate_no_amount_used
   validate :validate_no_amount_used, if: :discarded?
 
-  attr_accessor :action, :action_amount, :action_originator, :action_authorization_code, :update_reason
+  attr_accessor :action, :action_amount, :action_originator, :action_authorization_code, :store_credit_reason
 
   extend Spree::DisplayMoney
   money_methods :amount, :amount_used, :amount_authorized
@@ -178,7 +176,7 @@ class Spree::StoreCredit < Spree::PaymentSource
     self.amount = amount
     self.action_amount = self.amount - previous_amount
     self.action = ADJUSTMENT_ACTION
-    self.update_reason = reason
+    self.store_credit_reason = reason
     self.action_originator = user_performing_update
     save
   end
@@ -186,7 +184,7 @@ class Spree::StoreCredit < Spree::PaymentSource
   def invalidate(reason, user_performing_invalidation)
     if invalidateable?
       self.action = INVALIDATE_ACTION
-      self.update_reason = reason
+      self.store_credit_reason = reason
       self.action_originator = user_performing_invalidation
       self.invalidated_at = Time.current
       save
@@ -196,12 +194,6 @@ class Spree::StoreCredit < Spree::PaymentSource
     end
   end
 
-  class << self
-    def default_created_by
-      Spree.user_class.find_by(email: DEFAULT_CREATED_BY_EMAIL)
-    end
-  end
-
   private
 
   def create_credit_record(amount, action_attributes = {})
@@ -249,7 +241,7 @@ class Spree::StoreCredit < Spree::PaymentSource
       amount_remaining: amount_remaining,
       user_total_amount: user.available_store_credit_total(currency: currency),
       originator: action_originator,
-      update_reason: update_reason
+      store_credit_reason: store_credit_reason
     })
   end
 

data/app/models/spree/store_credit_event.rb

@@ -12,9 +12,9 @@ module Spree
 
     belongs_to :store_credit
     belongs_to :originator, polymorphic: true
-    belongs_to :update_reason, class_name: "Spree::StoreCreditUpdateReason"
+    belongs_to :store_credit_reason, class_name: 'Spree::StoreCreditReason', inverse_of: :store_credit_events
 
-    validates_presence_of :update_reason, if: :action_requires_reason?
+    validates_presence_of :store_credit_reason, if: :action_requires_reason?
 
     NON_EXPOSED_ACTIONS = [Spree::StoreCredit::ELIGIBLE_ACTION, Spree::StoreCredit::AUTHORIZE_ACTION]
 

data/app/models/spree/store_credit_reason.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class Spree::StoreCreditReason < Spree::Base
+  include Spree::NamedType
+
+  has_many :store_credit_events, inverse_of: :store_credit_reason
+
+  validates :name, presence: true, uniqueness: { case_sensitive: false, allow_blank: true }
+
+  scope :active, -> { where(active: true) }
+end

data/app/models/spree/taxon.rb

@@ -104,9 +104,14 @@ module Spree
     # @return [String] this taxon's ancestors names followed by its own name,
     #   separated by arrows
     def pretty_name
-      ancestor_chain = ancestors.map(&:name)
-      ancestor_chain << name
-      ancestor_chain.join(" -> ")
+      if parent.present?
+        [
+          parent.pretty_name,
+          name
+        ].compact.join(" -> ")
+      else
+        name
+      end
     end
 
     # @see https://github.com/spree/spree/issues/3390

data/app/models/spree/unit_cancel.rb

@@ -26,6 +26,9 @@ class Spree::UnitCancel < Spree::Base
       eligible: true,
       finalized: true
     )
+
+    inventory_unit.line_item.order.recalculate
+    adjustment
   end
 
   # This method is used by Adjustment#update to recalculate the cost.

data/app/models/spree/variant.rb

@@ -72,14 +72,15 @@ module Spree
       autosave: true
 
     before_validation :set_cost_currency
-    before_validation :set_price
-    before_validation :build_vat_prices, if: -> { rebuild_vat_prices? || new_record? }
+    before_validation :set_price, if: -> { product && product.master }
+    before_validation :build_vat_prices, if: -> { rebuild_vat_prices? || new_record? && product }
 
+    validates :product, presence: true
     validate :check_price
 
     validates :cost_price, numericality: { greater_than_or_equal_to: 0, allow_nil: true }
     validates :price,      numericality: { greater_than_or_equal_to: 0, allow_nil: true }
-    validates_uniqueness_of :sku, allow_blank: true, unless: :deleted_at
+    validates_uniqueness_of :sku, allow_blank: true, if: :enforce_unique_sku?
 
     after_create :create_stock_items
     after_create :set_position
@@ -381,6 +382,7 @@ module Spree
     #   not from this variant
     # @return [Spree::Image] the image to display
     def display_image(fallback: true)
+      Spree::Deprecation.warn('Spree::Variant#display_image is DEPRECATED. Choose an image from Spree::Variant#gallery instead')
       images.first || (fallback && product.variant_images.first) || Spree::Image.new
     end
 
@@ -394,6 +396,14 @@ module Spree
       end.flatten.compact
     end
 
+    # The gallery for the variant, which represents all the images
+    # associated with it
+    #
+    # @return [Spree::Gallery] the media for a variant
+    def gallery
+      @gallery ||= Spree::Config.variant_gallery_class.new(self)
+    end
+
     private
 
     def rebuild_vat_prices?
@@ -409,10 +419,7 @@ module Spree
 
     # Ensures a new variant takes the product master price when price is not supplied
     def set_price
-      if price.nil? && Spree::Config[:require_master_price] && !is_master?
-        raise 'No master variant found to infer price' unless product && product.master
-        self.price = product.master.price
-      end
+      self.price = product.master.price if price.nil? && Spree::Config[:require_master_price] && !is_master?
     end
 
     def check_price
@@ -450,6 +457,10 @@ module Spree
     def destroy_option_values_variants
       option_values_variants.destroy_all
     end
+
+    def enforce_unique_sku?
+      !deleted_at
+    end
   end
 end
 

data/config/initializers/money.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+require 'money'
+
+Money.locale_backend = :i18n

data/config/locales/en.yml

@@ -1,21 +1,24 @@
+---
 en:
   activemodel:
     attributes:
       spree/order_cancellations:
+        cancel: Cancel
         quantity: Quantity
-        state: State
         shipment: Shipment
-        cancel: Cancel
+        state: State
     errors:
       models:
         spree/fulfilment_changer:
           attributes:
-            desired_shipment:
-              can_not_transfer_within_same_shipment: can not be same as current shipment
-              not_enough_stock_at_desired_location: not enough stock in desired stock location
             current_shipment:
+              can_not_have_backordered_inventory_units: has backordered inventory
+                units
               has_already_been_shipped: has already been shipped
-              can_not_have_backordered_inventory_units: has backordered inventory units
+            desired_shipment:
+              can_not_transfer_within_same_shipment: can not be same as current shipment
+              not_enough_stock_at_desired_location: not enough stock in desired stock
+                location
   activerecord:
     attributes:
       spree/address:
@@ -29,11 +32,11 @@ en:
         zipcode: Zip Code
       spree/adjustment:
         adjustable: Adjustable
+        adjustment_reason_id: Reason
         amount: Amount
         label: Label
         name: Name
         state: State
-        adjustment_reason_id: Reason
       spree/adjustment_reason:
         active: Active
         code: Code
@@ -60,8 +63,8 @@ en:
         states_required: States Required
       spree/credit_card:
         base: ''
-        cc_type: Brand
         card_code: Card Code
+        cc_type: Brand
         expiration: Expiration
         month: Month
         name: Name
@@ -69,13 +72,13 @@ en:
         verification_value: Verification Value
         year: Year
       spree/customer_return:
+        created_at: Date/Time
+        name: Name
         number: Return Number
         pre_tax_total: Pre-Tax Total
+        reimbursement_status: Reimbursement status
         total: Total
         total_excluding_vat: Pre-Tax Total
-        created_at: "Date/Time"
-        reimbursement_status: Reimbursement status
-        name: Name
       spree/image:
         alt: Alternative Text
         attachment: Filename
@@ -92,6 +95,8 @@ en:
         price: Price
         quantity: Quantity
         total: Total price
+      spree/log_entry:
+        details: Message
       spree/option_type:
         name: Name
         presentation: Presentation
@@ -105,7 +110,8 @@ en:
         canceled_at: Canceled at
         canceler_id: Canceler
         checkout_complete: Checkout Complete
-        completed_at: Completed At
+        completed_at: Completed at
+        considered_risky: Risky
         coupon_code: Coupon Code
         created_at: Order Date
         email: Customer E-Mail
@@ -119,7 +125,6 @@ en:
         special_instructions: Special Instructions
         state: State
         total: Total
-        considered_risky: Risky
       spree/order/bill_address:
         address1: Billing address street
         city: Billing address city
@@ -145,21 +150,23 @@ en:
       spree/payment_method:
         active: Active
         auto_capture: Auto Capture
+        available_to_admin: Available to Admin
+        available_to_users: Available to Users
         description: Description
         display_on: Display
         name: Name
         preference_source: Preference Source
         type: Type
       spree/price:
-        currency: Currency
         amount: Price
+        currency: Currency
         is_default: Currently Valid
       spree/product:
         available_on: Available On
         cost_currency: Cost Currency
         cost_price: Cost Price
-        description: Description
         depth: Depth
+        description: Description
         height: Height
         master_price: Master Price
         meta_description: Meta Description
@@ -197,34 +204,35 @@ en:
         description: Creates an adjustment on a line item based on quantity
       spree/promotion/actions/free_shipping:
         description: Makes all shipments for the order free
-      spree/promotion/rules/item_total:
-        description: Order total meets these criteria
       spree/promotion/rules/first_order:
         description: Must be the customer's first order
+      spree/promotion/rules/first_repeat_purchase_since:
+        description: Available only to user who have not purchased in a while
+        form_text: 'Apply this promotion to users whose last order was more than X
+          days ago: '
+      spree/promotion/rules/item_total:
+        description: Order total meets these criteria
       spree/promotion/rules/landing_page:
-          description: Customer must have visited the specified page
+        description: Customer must have visited the specified page
+      spree/promotion/rules/nth_order:
+        description: Apply a promotion to every nth order a user has completed.
+        form_text: 'Apply this promotion on the users Nth order: '
       spree/promotion/rules/one_use_per_user:
-        description: Only One Use Per User
+        description: Only one use per user
       spree/promotion/rules/option_value:
         description: Order includes specified product(s) with matching option value(s)
       spree/promotion/rules/product:
         description: Order includes specified product(s)
+      spree/promotion/rules/store:
+        description: Available only to the specified stores
+      spree/promotion/rules/taxon:
+        description: Order includes products with specified taxon(s)
       spree/promotion/rules/user:
         description: Available only to the specified users
       spree/promotion/rules/user_logged_in:
         description: Available only to logged in users
-      spree/promotion/rules/taxon:
-        description: Order includes products with specified taxon(s)
-      spree/promotion/rules/nth_order:
-        description: Apply a promotion to every nth order a user has completed.
-        form_text: "Apply this promotion on the users Nth order: "
-      spree/promotion/rules/first_repeat_purchase_since:
-        description: Available only to user who have not purchased in a while
-        form_text: "Apply this promotion to users whose last order was more than X days ago: "
       spree/promotion/rules/user_role:
         description: Order includes User with specified Role(s)
-      spree/promotion/rules/store:
-        description: Available only to the specified stores
       spree/promotion_category:
         name: Name
       spree/property:
@@ -236,50 +244,50 @@ en:
         refund_reason_id: Reason
       spree/refund_reason:
         active: Active
-        name: Name
         code: Code
+        name: Name
       spree/reimbursement:
-        created_at: "Date/Time"
+        created_at: Date/Time
         number: Number
         reimbursement_status: Status
         total: Total
       spree/reimbursement/credit:
         amount: Amount
       spree/reimbursement_type:
+        created_at: Date/Time
         name: Name
         type: Type
-        created_at: "Date/Time"
       spree/return_authorization:
         amount: Amount
         pre_tax_total: Pre-Tax Total
         total_excluding_vat: Pre-Tax Total
       spree/return_item:
-        acceptance_status: Acceptance status
-        acceptance_status_errors: Acceptance errors
+        acceptance_status: Acceptance Status
+        acceptance_status_errors: Acceptance Errors
         amount: Amount Before Sales Tax
         charged: Charged
-        exchange_variant: Exchange for
+        exchange_variant: Exchange For
         inventory_unit_state: State
-        item_received?: "Item Received?"
+        item_received?: Item Received?
         override_reimbursement_type_id: Reimbursement Type Override
         preferred_reimbursement_type_id: Preferred Reimbursement Type
         reception_status: Reception Status
-        resellable: "Resellable?"
+        resellable: Resellable?
         return_reason: Reason
         total: Total
       spree/return_reason:
-        name: Name
         active: Active
-        created_at: "Date/Time"
+        created_at: Date/Time
         memo: Memo
+        name: Name
         number: RMA Number
         state: State
       spree/role:
         name: Name
-      spree/shipping_category:
-        name: Name
       spree/shipment:
         tracking: Tracking Number
+      spree/shipping_category:
+        name: Name
       spree/shipping_method:
         admin_name: Internal Name
         carrier: Carrier
@@ -289,48 +297,22 @@ en:
         service_level: Service Level
         tracking_url: Tracking URL
       spree/shipping_rate:
+        amount: Amount
         label: Label
-        tax_rate: Tax Rate
         shipping_rate: Shipping Rate
-        amount: Amount
+        tax_rate: Tax Rate
       spree/state:
         abbr: Abbreviation
         name: Name
-      spree/store:
-        url: Site URL
-        default: Default
-        meta_description: Meta Description
-        meta_keywords: Meta Keywords
-        seo_title: Seo Title
-        name: Site Name
-        mail_from_address: Mail From Address
-        cart_tax_country_iso: Tax Country for Empty Carts
-        available_locales: Locales available in the storefront
-      spree/store_credit:
-        amount: Amount
-        amount_authorized: Amount Authorized
-        amount_credited: Amount Credited
-        amount_used: Amount Used
-        category_id: Credit Type
-        created_at: Issued On
-        created_by_id: Created By
-        invalidated_at: Invalidated
-        memo: Memo
-      spree/store_credit_event:
-        action: Action
-        amount_remaining: Total Unused
-        user_total_amount: Total Amount
-      spree/store_credit_update_reason:
-        name: Reason For Updating
       spree/stock_item:
         count_on_hand: Count On Hand
       spree/stock_location:
-        admin_name: Internal Name
         active: Active
         address1: Street Address
         address2: Street Address (cont'd)
-        backorderable_default: Backorderable default
-        check_stock_on_transfer: Check stock on transfer
+        admin_name: Internal Name
+        backorderable_default: Backorderable Default
+        check_stock_on_transfer: Check Stock on Transfer
         city: City
         code: Code
         country_id: Country
@@ -339,7 +321,7 @@ en:
         internal_name: Internal Name
         name: Name
         phone: Phone
-        propagate_all_variants: Propagate all variants
+        propagate_all_variants: Propagate All Variants
         restock_inventory: Restock Inventory
         state_id: State
         zipcode: Zip
@@ -347,18 +329,45 @@ en:
         originated_by: Originated By
         quantity: Quantity
         variant: Variant
+      spree/store:
+        available_locales: Locales Available in the Storefront
+        cart_tax_country_iso: Tax Country for Empty Carts
+        default: Default
+        default_currency: Default Currency
+        mail_from_address: Mail From Address
+        meta_description: Meta Description
+        meta_keywords: Meta Keywords
+        name: Site Name
+        seo_title: Seo Title
+        url: Site URL
+      spree/store_credit:
+        amount: Amount
+        amount_authorized: Amount Authorized
+        amount_credited: Amount Credited
+        amount_used: Amount Used
+        category_id: Credit Type
+        created_at: Issued On
+        created_by_id: Created By
+        invalidated_at: Invalidated
+        memo: Memo
+      spree/store_credit_event:
+        action: Action
+        amount_remaining: Total Unused
+        user_total_amount: Total Amount
+      spree/store_credit_update_reason:
+        name: Name
       spree/tax_category:
         description: Description
-        name: Name
         is_default: Default
+        name: Name
         tax_code: Tax Code
       spree/tax_rate:
         amount: Rate
-        included_in_price: Included In Price
+        expires_at: Expiration Date
+        included_in_price: Included in Price
         name: Name
-        show_rate_in_label: Show Rate In Label
-        starts_at: Start date
-        expires_at: Expiration date
+        show_rate_in_label: Show Rate in Label
+        starts_at: Start Date
       spree/taxon:
         description: Description
         icon: Icon
@@ -371,14 +380,14 @@ en:
       spree/taxonomy:
         name: Name
       spree/tracker:
-        analytics_id: Analytics ID
         active: Active
+        analytics_id: Analytics ID
       spree/user:
         email: Email
+        lifetime_value: Total spent
         password: Password
         password_confirmation: Password Confirmation
         spree_roles: Roles
-        lifetime_value: Total spent
       spree/variant:
         cost_currency: Cost Currency
         cost_price: Cost Price
@@ -386,17 +395,100 @@ en:
         height: Height
         price: Price
         sku: SKU
-        tax_category: Variant tax category
+        tax_category: Variant Tax Category
         weight: Weight
         width: Width
       spree/zone:
         description: Description
         name: Name
+    errors:
+      models:
+        spree/address:
+          attributes:
+            state:
+              does_not_match_country: does not match the country
+        spree/calculator/tiered_flat_rate:
+          attributes:
+            base:
+              keys_should_be_positive_number: Tier keys should all be numbers larger
+                than 0
+            preferred_tiers:
+              should_be_hash: should be a hash
+        spree/calculator/tiered_percent:
+          attributes:
+            base:
+              keys_should_be_positive_number: Tier keys should all be numbers larger
+                than 0
+              values_should_be_percent: Tier values should all be percentages between
+                0% and 100%
+            preferred_tiers:
+              should_be_hash: should be a hash
+        spree/classification:
+          attributes:
+            taxon_id:
+              already_linked: is already linked to this product
+        spree/credit_card:
+          attributes:
+            base:
+              card_expired: Card has expired
+              expiry_invalid: Card expiration is invalid
+        spree/inventory_unit:
+          attributes:
+            base:
+              cannot_destroy_shipment_state: Cannot destroy an inventory unit for
+                a %{state} shipment
+            state:
+              cannot_destroy: Cannot destroy a %{state} inventory unit
+        spree/line_item:
+          attributes:
+            price:
+              not_a_number: is not valid
+        spree/price:
+          attributes:
+            currency:
+              invalid_code: is not a valid currency code
+        spree/promotion:
+          attributes:
+            apply_automatically:
+              disallowed_with_code: Disallowed for promotions with a code
+              disallowed_with_path: Disallowed for promotions with a path
+        spree/refund:
+          attributes:
+            amount:
+              greater_than_allowed: is greater than the allowed amount.
+        spree/reimbursement:
+          attributes:
+            base:
+              return_items_order_id_does_not_match: One or more of the return items
+                specified do not belong to the same order as the reimbursement.
+        spree/return_item:
+          attributes:
+            inventory_unit:
+              other_completed_return_item_exists: "%{inventory_unit_id} has already
+                been taken by return item %{return_item_id}"
+            reimbursement:
+              cannot_be_associated_unless_accepted: cannot be associated to a return
+                item that is not accepted.
+        spree/shipment:
+          attributes:
+            base:
+              cannot_remove_items_shipment_state: Cannot remove items from a %{state}
+                shipment
+            state:
+              cannot_destroy: Cannot destroy a %{state} shipment
+        spree/store:
+          attributes:
+            base:
+              cannot_destroy_default_store: Cannot destroy the default Store.
+        spree/user_address:
+          attributes:
+            user_id:
+              default_address_exists: already has a default address
+        spree/wallet_payment_source:
+          attributes:
+            payment_source:
+              has_to_be_payment_source_class: has to be a Spree::PaymentSource
     models:
-      # LegacyUser maps to this model_name so we want to provide translations for it
-      user:
-        one: User
-        other: Users
       spree/address:
         one: Address
         other: Addresses
@@ -436,12 +528,6 @@ en:
       spree/calculator/price_sack:
         one: Price Sack
         other: Price Sack
-      spree/calculator/tiered_percent:
-        one: Tiered Percent
-        other: Tiered Percent
-      spree/calculator/tiered_flat_rate:
-        one: Tiered Flat Rate
-        other: Tiered Flat Rate
       spree/calculator/returns/default_refund_amount:
         one: Default Refund Amount
         other: Default Refund Amount
@@ -449,17 +535,23 @@ en:
         one: Flat Percent
         other: Flat Percent
       spree/calculator/shipping/flat_rate:
-        one: Flat rate
-        other: Flat rate
+        one: Flat Rate
+        other: Flat Rate
       spree/calculator/shipping/flexi_rate:
-        one: Flexible Rate per package item
-        other: Flexible Rate per package item
+        one: Flexible Rate per Package Item
+        other: Flexible Rate per Package Item
       spree/calculator/shipping/per_item:
-        one: Flat rate per package item
-        other: Flat rate per package item
+        one: Flat Rate per Package Item
+        other: Flat Rate per Package Item
       spree/calculator/shipping/price_sack:
-        one: Price sack
-        other: Price sack
+        one: Price Sack
+        other: Price Sack
+      spree/calculator/tiered_flat_rate:
+        one: Tiered Flat Rate
+        other: Tiered Flat Rate
+      spree/calculator/tiered_percent:
+        one: Tiered Percent
+        other: Tiered Percent
       spree/country:
         one: Country
         other: Countries
@@ -505,10 +597,10 @@ en:
       spree/payment_method:
         one: Payment Method
         other: Payment Methods
-      spree/payment_method/check: Check Payments
-      spree/payment_method/store_credit: Store Credit Payments
       spree/payment_method/bogus_credit_card: Bogus Credit Card Payments
+      spree/payment_method/check: Check Payments
       spree/payment_method/simple_bogus_credit_card: Simple Bogus Credit Card Payments
+      spree/payment_method/store_credit: Store Credit Payments
       spree/price:
         one: Price
         other: Prices
@@ -524,28 +616,28 @@ en:
       spree/promotion/actions/create_adjustment: Create whole-order adjustment
       spree/promotion/actions/create_item_adjustments: Create per-line-item adjustment
       spree/promotion/actions/create_quantity_adjustments: Create per-quantity adjustment
-      spree/promotion/actions/free_shipping: Free shipping
-      spree/promotion/rules/first_order: First order
-      spree/promotion/rules/item_total: Item total
+      spree/promotion/actions/free_shipping: Free Shipping
+      spree/promotion/rules/first_order: First Order
+      spree/promotion/rules/first_repeat_purchase_since: First Repeat Purchase Since
+      spree/promotion/rules/item_total: Item Total
       spree/promotion/rules/landing_page: Landing Page
+      spree/promotion/rules/nth_order: Nth Order
       spree/promotion/rules/one_use_per_user: One Use Per User
       spree/promotion/rules/option_value: Option Value(s)
       spree/promotion/rules/product: Product(s)
+      spree/promotion/rules/taxon: Taxon(s)
       spree/promotion/rules/user: User
       spree/promotion/rules/user_logged_in: User Logged In
-      spree/promotion/rules/taxon: Taxon(s)
-      spree/promotion/rules/nth_order: Nth Order
-      spree/promotion/rules/first_repeat_purchase_since: First Repeat Purchase Since
       spree/promotion/rules/user_role: User Role(s)
       spree/promotion_category:
         one: Promotion Category
         other: Promotion Categories
-      spree/promotion_code_batch:
-        one: Promotion Code Batch
-        other: Promotion Code Batches
       spree/promotion_code:
         one: Promotion Code
         other: Promotion Codes
+      spree/promotion_code_batch:
+        one: Promotion Code Batch
+        other: Promotion Code Batches
       spree/property:
         one: Property Type
         other: Property Types
@@ -586,12 +678,12 @@ en:
       spree/stock_item:
         one: Stock Item
         other: Stock Items
-      spree/stock_movement:
-        one: Stock Movement
-        other: Stock Movements
       spree/stock_location:
         one: Stock Location
         other: Stock Locations
+      spree/stock_movement:
+        one: Stock Movement
+        other: Stock Movements
       spree/store:
         one: Store
         other: Stores
@@ -601,6 +693,9 @@ en:
       spree/store_credit_category:
         one: Category
         other: Categories
+      spree/store_credit_reason:
+        one: Store Credit Reason
+        other: Store Credit Reasons
       spree/tax_category:
         one: Tax Category
         other: Tax Categories
@@ -625,94 +720,14 @@ en:
       spree/zone:
         one: Zone
         other: Zones
-    errors:
-      models:
-        spree/address:
-          attributes:
-            state:
-              does_not_match_country: does not match the country
-        spree/calculator/tiered_flat_rate:
-          attributes:
-            base:
-              keys_should_be_positive_number: "Tier keys should all be numbers larger than 0"
-            preferred_tiers:
-              should_be_hash: "should be a hash"
-        spree/calculator/tiered_percent:
-          attributes:
-            base:
-              keys_should_be_positive_number: "Tier keys should all be numbers larger than 0"
-              values_should_be_percent: "Tier values should all be percentages between 0% and 100%"
-            preferred_tiers:
-              should_be_hash: "should be a hash"
-        spree/classification:
-          attributes:
-            taxon_id:
-              already_linked: "is already linked to this product"
-        spree/credit_card:
-          attributes:
-            base:
-              card_expired: "Card has expired"
-              expiry_invalid: "Card expiration is invalid"
-        spree/inventory_unit:
-          attributes:
-            state:
-              cannot_destroy: "Cannot destroy a %{state} inventory unit"
-            base:
-              cannot_destroy_shipment_state: "Cannot destroy an inventory unit for a %{state} shipment"
-        spree/line_item:
-          attributes:
-            price:
-              not_a_number: "is not valid"
-        spree/price:
-          attributes:
-            currency:
-              invalid_code: "is not a valid currency code"
-        spree/promotion:
-          attributes:
-            apply_automatically:
-              disallowed_with_code: Disallowed for promotions with a code
-              disallowed_with_path: Disallowed for promotions with a path
-        spree/refund:
-          attributes:
-            amount:
-              greater_than_allowed: is greater than the allowed amount.
-        spree/reimbursement:
-          attributes:
-            base:
-              return_items_order_id_does_not_match: One or more of the return items specified do not belong to the same order as the reimbursement.
-        spree/return_item:
-          attributes:
-            reimbursement:
-              cannot_be_associated_unless_accepted: cannot be associated to a return item that is not accepted.
-            inventory_unit:
-              other_completed_return_item_exists: "%{inventory_unit_id} has already been taken by return item %{return_item_id}"
-        spree/shipment:
-          attributes:
-            state:
-              cannot_destroy: "Cannot destroy a %{state} shipment"
-            base:
-              cannot_remove_items_shipment_state: "Cannot remove items from a %{state} shipment"
-        spree/store:
-          attributes:
-            base:
-              cannot_destroy_default_store: Cannot destroy the default Store.
-        spree/user_address:
-          attributes:
-            user_id:
-              default_address_exists: "already has a default address"
-        spree/wallet_payment_source:
-          attributes:
-            payment_source:
-              has_to_be_payment_source_class: "has to be a Spree::PaymentSource"
-  time:
-    formats:
-      solidus:
-        long: '%B %d, %Y %-l:%M %p'
-        short: "%b %-d '%y %-l:%M%P"
+      user:
+        one: User
+        other: Users
   devise:
     confirmations:
       confirmed: Your account was successfully confirmed. You are now signed in.
-      send_instructions: You will receive an email with instructions about how to confirm your account in a few minutes.
+      send_instructions: You will receive an email with instructions about how to
+        confirm your account in a few minutes.
     failure:
       inactive: Your account was not activated yet.
       invalid: Invalid email or password.
@@ -723,25 +738,29 @@ en:
       unconfirmed: You have to confirm your account before continuing.
     mailer:
       confirmation_instructions:
-        subject: Confirmation instructions
+        subject: Confirmation Instructions
       reset_password_instructions:
-        subject: Reset password instructions
+        subject: Reset Password Instructions
       unlock_instructions:
         subject: Unlock Instructions
     oauth_callbacks:
-      failure: "Could not authorize you from %{kind} because %{reason}."
+      failure: Could not authorize you from %{kind} because %{reason}.
       success: Successfully authorized from %{kind} account.
     unlocks:
-      send_instructions: You will receive an email with instructions about how to unlock your account in a few minutes.
+      send_instructions: You will receive an email with instructions about how to
+        unlock your account in a few minutes.
       unlocked: Your account was successfully unlocked. You are now signed in.
     user_passwords:
       user:
         cannot_be_blank: Your password cannot be blank.
-        send_instructions: You will receive an email with instructions about how to reset your password in a few minutes.
+        send_instructions: You will receive an email with instructions about how to
+          reset your password in a few minutes.
         updated: Your password was changed successfully. You are now signed in.
     user_registrations:
-      destroyed: Bye! Your account was successfully cancelled. We hope to see you again soon.
-      inactive_signed_up: You have signed up successfully. However, we could not sign you in because your account is %{reason}.
+      destroyed: Bye! Your account was successfully cancelled. We hope to see you
+        again soon.
+      inactive_signed_up: You have signed up successfully. However, we could not sign
+        you in because your account is %{reason}.
       signed_up: Welcome! You have signed up successfully.
       updated: You updated your account successfully.
     user_sessions:
@@ -753,13 +772,13 @@ en:
       not_found: not found
       not_locked: was not locked
       not_saved:
-        one: ! '1 error prohibited this %{resource} from being saved:'
-        other: ! '%{count} errors prohibited this %{resource} from being saved:'
+        one: '1 error prohibited this %{resource} from being saved:'
+        other: "%{count} errors prohibited this %{resource} from being saved:"
   spree:
     abbreviation: Abbreviation
     accept: Accept
-    acceptance_status: Acceptance status
     acceptance_errors: Acceptance errors
+    acceptance_status: Acceptance status
     accepted: Accepted
     account: Account
     account_updated: Account updated
@@ -785,7 +804,6 @@ en:
     activate: Activate
     active: Active
     add: Add
-    added: Added
     add_action_of_type: Add action of type
     add_country: Add Country
     add_coupon_code: Add Coupon Code
@@ -796,15 +814,16 @@ en:
     add_option_value: Add Option Value
     add_product: Add Product
     add_product_properties: Add Product Properties
-    add_variant_properties: Add Variant Properties
     add_rule_of_type: Add rule of type
     add_state: Add State
     add_stock: Add Stock
     add_stock_management: Add Stock Management
     add_taxon: Add taxon
     add_to_cart: Add To Cart
-    add_to_stock_location: Add to location
+    add_to_stock_location: Select location to propagate stock
     add_variant: Add Variant
+    add_variant_properties: Add Variant Properties
+    added: Added
     adding_match: Adding match
     additional_item: Additional Item
     address1: Address
@@ -813,22 +832,20 @@ en:
     adjustment: Adjustment
     adjustment_amount: Amount
     adjustment_labels:
-      line_item: '%{promotion} (%{promotion_name})'
-      order: '%{promotion} (%{promotion_name})'
+      line_item: "%{promotion} (%{promotion_name})"
+      order: "%{promotion} (%{promotion_name})"
       tax_rates:
-        sales_tax: '%{name}'
-        vat: '%{name} (Included in Price)'
-        sales_tax_with_rate: '%{name} %{amount}'
-        vat_with_rate: '%{name} %{amount} (Included in Price)'
+        sales_tax: "%{name}"
+        sales_tax_with_rate: "%{name} %{amount}"
+        vat: "%{name} (Included in Price)"
+        vat_with_rate: "%{name} %{amount} (Included in Price)"
     adjustment_reasons: Adjustment Reasons
     adjustment_successfully_closed: Adjustment has been successfully closed!
     adjustment_successfully_opened: Adjustment has been successfully opened!
     adjustment_total: Adjustment Total
+    adjustment_type: Adjustment type
     adjustments: Adjustments
     admin:
-      stores:
-        form:
-          no_cart_tax_country: "No taxes on carts without address"
       images:
         index:
           choose_files: Choose files to upload
@@ -838,81 +855,88 @@ en:
       payments:
         source_forms:
           storecredit:
-            not_supported: "Creating store credit payments via the admin is not currently supported."
+            not_supported: Creating store credit payments via the admin is not currently
+              supported.
       prices:
-        any_country: "Any Country"
+        any_country: Any Country
+        edit:
+          edit_price: Edit Price
         index:
           amount_greater_than: Amount greater than
           amount_less_than: Amount less than
           new_price: New Price
-        edit:
-          edit_price: Edit Price
         new:
           new_price: New Price
       promotions:
-        form:
-          starts_at_placeholder: Immediately
-          expires_at_placeholder: Never
-          activation: Activation
-          general: General
+        actions:
+          calculator_label: Calculated by
+        activations_edit:
+          auto: All orders will attempt to use this promotion
+          multiple_codes_html: This promotion uses %{count} promotion codes
+          single_code_html: 'This promotion uses the promotion code: <code>%{code}</code>'
         activations_new:
           auto: Apply to all orders
           multiple_codes: Multiple promotion codes
           single_code: Single promotion code
-        activations_edit:
-          auto: All orders will attempt to use this promotion
-          single_code_html: "This promotion uses the promotion code: <code>%{code}</code>"
-          multiple_codes_html: "This promotion uses %{count} promotion codes"
-        actions:
-          calculator_label: Calculated by
+        form:
+          activation: Activation
+          expires_at_placeholder: Never
+          general: General
+          starts_at_placeholder: Immediately
       stock_locations:
         form:
+          address: Address
           general: General
           settings: Settings
-          address: Address
       store_credits:
-        add: "Add store credit"
+        add: Add store credit
         amount_authorized: Authorized
         amount_credited: Credited
         amount_used: Used
+        back_to_edit: Back to edit
+        back_to_store_credit_list: Store credit list
+        back_to_user_list: Back to user list
+        change_amount: Change amount
         created_at: Issued On
-        back_to_edit: "Back to edit"
-        back_to_user_list: "Back to user list"
-        back_to_store_credit_list: "Store credit list"
-        change_amount: "Change amount"
-        created_by: "Created By"
+        created_by: Created By
         credit_type: Type
-        memo: Memo
-        current_balance: "Current balance:"
-        edit: "Editing store credit"
-        edit_amount: "Editing store credit amount"
-        history: "Store credit history"
-        invalidate_store_credit: "Invalidating store credit"
-        invalidated: "Invalidated"
-        issued_on: "Issued On"
-        new: "New store credit"
-        no_store_credit_selected: "No store credit was selected"
-        payment_originator: "Payment - Order #%{order_number}"
-        reason_for_updating: "Reason for updating"
-        refund_originator: "Refund - Order #%{order_number}"
-        resource_name: "store credits"
-        user_originator: "User - %{email}"
-        unable_to_create: "Unable to create store credit"
-        unable_to_update: "Unable to update store credit"
-        unable_to_delete: "Unable to delete store credit"
-        unable_to_invalidate: "Unable to invalidate store credit"
-        select_reason: "Select a reason for this store credit"
-        select_amount_update_reason: "Select a reason for updating the amount"
-        total_unused: "Total unused"
-        type_html_header: "Credit Type"
-        view: "View store credit"
+        current_balance: 'Current balance:'
+        edit: Editing store credit
+        edit_amount: Editing store credit amount
         errors:
-          cannot_change_used_store_credit: "Store credit that has been claimed cannot be changed"
-          cannot_be_modified: "cannot be modified"
-          amount_used_cannot_be_greater: "cannot be greater than the credited amount"
           amount_authorized_exceeds_total_credit: " exceeds the available credit"
-          amount_used_not_zero: "is greater than zero. Can not delete store credit"
-          update_reason_required: "A reason for the change must be selected"
+          amount_used_cannot_be_greater: cannot be greater than the credited amount
+          amount_used_not_zero: is greater than zero. Can not delete store credit
+          cannot_be_modified: cannot be modified
+          cannot_change_used_store_credit: Store credit that has been claimed cannot
+            be changed
+          update_reason_required: A reason for the change must be selected
+          store_credit_reason_required: A reason for the change must be selected
+        history: Store credit history
+        invalidate_store_credit: Invalidating store credit
+        invalidated: Invalidated
+        issued_on: Issued On
+        memo: Memo
+        new: New store credit
+        no_store_credit_selected: No store credit was selected
+        payment_originator: 'Payment - Order #%{order_number}'
+        reason_for_updating: Reason for updating
+        refund_originator: 'Refund - Order #%{order_number}'
+        resource_name: store credits
+        select_amount_store_credit_reason: Select a reason for updating the amount
+        select_amount_update_reason: Select a reason for updating the amount
+        select_reason: Select a reason for this store credit
+        total_unused: Total unused
+        type_html_header: Credit Type
+        unable_to_create: Unable to create store credit
+        unable_to_delete: Unable to delete store credit
+        unable_to_invalidate: Unable to invalidate store credit
+        unable_to_update: Unable to update store credit
+        user_originator: User - %{email}
+        view: View store credit
+      stores:
+        form:
+          no_cart_tax_country: No taxes on carts without address
       tab:
         checkout: Refunds and Returns
         configuration: Configuration
@@ -922,10 +946,9 @@ en:
         overview: Overview
         payments: Payments
         products: Products
-        promotions: Promotions
         promotion_categories: Promotion Categories
+        promotions: Promotions
         properties: Property Types
-        reports: Reports
         rma: RMA
         settings: Settings
         shipping: Shipping
@@ -945,34 +968,37 @@ en:
         items: Items
         items_purchased: Items Purchased
         order_history: Order History
-        order_num: "Order #"
+        order_num: 'Order #'
         orders: Orders
         store_credit: Store Credit
         user_information: User Information
       users:
+        edit:
+          api_access: API Access
+          clear_key: Clear key
+          confirm_clear_key: Are you sure you want to clear this user's API key? It
+            will invalidate the existing key.
+          confirm_regenerate_key: Are you sure you want to regenerate this user's
+            API key? It will invalidate the existing key.
+          generate_key: Generate API key
+          key: Key
+          no_key: No key
+          regenerate_key: Regenerate key
         user_page_actions:
           create_order: Create order for this user
-        edit:
-          api_access: "API Access"
-          clear_key: "Clear key"
-          confirm_clear_key: "Are you sure you want to clear this user's API key? It will invalidate the existing key."
-          confirm_regenerate_key: "Are you sure you want to regenerate this user's API key? It will invalidate the existing key."
-          generate_key: "Generate API key"
-          key: "Key"
-          no_key: "No key"
-          regenerate_key: "Regenerate key"
       variants:
-        table_filter:
-          show_deleted: Show deleted variants
-        new:
-          new_variant: New variant
         edit:
           edit_variant: Edit Variant
         form:
           dimensions: Dimensions
-          use_product_tax_category: Use Product Tax Category
           pricing: Pricing
-          pricing_hint: These values are populated from the product details page and can be overridden below
+          pricing_hint: These values are populated from the product details page and
+            can be overridden below
+          use_product_tax_category: Use Product Tax Category
+        new:
+          new_variant: New Variant
+        table_filter:
+          show_deleted: Show Deleted Variants
     administration: Administration
     agree_to_privacy_policy: Agree to Privacy Policy
     agree_to_terms_of_service: Agree to Terms of Service
@@ -995,8 +1021,8 @@ en:
     and: and
     apply_code: Apply Code
     approve: Approve
-    approver: Approver
     approved_at: Approved at
+    approver: Approver
     are_you_sure: Are you sure?
     are_you_sure_delete: Are you sure you want to delete this record?
     authorization_failure: Authorization Failure
@@ -1008,9 +1034,8 @@ en:
     avs_response: AVS Response
     back: Back
     back_end: Backend
-    backordered: Backordered
-    back_to_adjustments_list: Back To Adjustments List
     back_to_adjustment_reason_list: Back To Adjustment Reason List
+    back_to_adjustments_list: Back To Adjustments List
     back_to_countries_list: Back To Countries List
     back_to_customer_return: Back To Customer Return
     back_to_customer_return_list: Back To Customer Return List
@@ -1021,12 +1046,12 @@ en:
     back_to_payment_methods_list: Back To Payment Methods List
     back_to_payments_list: Back To Payments List
     back_to_products_list: Back To Products List
-    back_to_promotions_list: Back To Promotions List
     back_to_promotion_categories_list: Back To Promotions Categories List
+    back_to_promotions_list: Back To Promotions List
     back_to_properties_list: Back To Property Types List
-    back_to_reports_list: Back To Reports List
     back_to_refund_reason_list: Back To Refund Reason List
     back_to_reimbursement_type_list: Back To Reimbursement Type List
+    back_to_reports_list: Back To Reports List
     back_to_return_authorizations_list: Back To RMA List
     back_to_rma_reason_list: Back To RMA Reason List
     back_to_shipping_categories: Back To Shipping Categories
@@ -1044,7 +1069,8 @@ en:
     back_to_zones_list: Back To Zones List
     backorderable: Backorderable
     backorderable_default: Backorderable default
-    backorderable_header: Back orderable
+    backorderable_header: Back Orderable
+    backordered: Backordered
     backorders_allowed: backorders allowed
     balance_due: Balance Due
     base_amount: Base Amount
@@ -1055,21 +1081,27 @@ en:
     both: Both
     calculated_reimbursements: Calculated Reimbursements
     calculator: Calculator
-    calculator_settings_warning: If you are changing the calculator type or preference source, you must save first before you can edit the calculator settings
+    calculator_settings_warning: If you are changing the calculator type or preference
+      source, you must save first before you can edit the calculator settings
     cancel: Cancel
-    cancel_inventory: 'Cancel Items'
-    canceled: canceled
+    cancel_inventory: Cancel Items
+    canceled: Canceled
     canceled_at: Canceled at
     canceler: Canceler
     cancellation: Cancellation
-    cannot_create_payment_without_payment_methods_html: You cannot create a payment for an order without any payment methods defined. %{link}
     cannot_create_payment_link: Please define some payment methods first.
+    cannot_create_payment_without_payment_methods_html: You cannot create a payment
+      for an order without any payment methods defined. %{link}
     cannot_create_returns: Cannot create returns as this order has no shipped units.
-    cannot_rebuild_shipments_order_completed: Cannot rebuild shipments for a completed order.
-    cannot_rebuild_shipments_shipments_not_pending: Cannot rebuild shipments for an order with non-pending shipments.
     cannot_perform_operation: Cannot perform requested operation
-    cannot_set_shipping_method_without_address: Cannot set shipping method until customer details are provided.
-    cannot_update_email: You do not have access to update this user's email address. <br />Please contact a superuser if you need to perform this action.
+    cannot_rebuild_shipments_order_completed: Cannot rebuild shipments for a completed
+      order.
+    cannot_rebuild_shipments_shipments_not_pending: Cannot rebuild shipments for an
+      order with non-pending shipments.
+    cannot_set_shipping_method_without_address: Cannot set shipping method until customer
+      details are provided.
+    cannot_update_email: You do not have access to update this user's email address.
+      <br />Please contact a superuser if you need to perform this action.
     capture: Capture
     capture_events: Capture events
     card_code: Card Code
@@ -1078,28 +1110,30 @@ en:
     card_type_is: Card type is
     cart: Cart
     cart_subtotal:
-      one: 'Subtotal (1 item)'
-      other: 'Subtotal (%{count} items)'
+      one: Subtotal (1 item)
+      other: Subtotal (%{count} items)
     carton_external_number: External Number
-    carton_orders: 'Other orders with Carton'
+    carton_orders: Other orders with Carton
     categories: Categories
     category: Category
+    character_limit: Limit of 255 characters
     charged: Charged
     check: Check
     check_stock_on_transfer: Check stock on transfer
     checkout: Checkout
-    choose_a_customer: Choose a customer
-    choose_a_taxon_to_sort_products_for: "Choose a taxon to sort products for"
+    choose_a_customer: Choose a Customer
+    choose_a_taxon_to_sort_products_for: Choose a taxon to sort products for
     choose_currency: Choose Currency
     choose_dashboard_locale: Choose Dashboard Locale
-    choose_location: Choose location
-    choose_promotion_action: Choose action
-    choose_promotion_rule: Choose rule
-    choose_reason: Choose reason
+    choose_location: Choose Location
+    choose_promotion_action: Choose Action
+    choose_promotion_rule: Choose Rule
+    choose_reason: Choose Reason
     city: City
     clear_cache: Clear Cache
     clear_cache_ok: Cache was flushed
-    clear_cache_warning: Clearing cache will temporarily reduce the performance of your store.
+    clear_cache_warning: Clearing cache will temporarily reduce the performance of
+      your store.
     clone: Clone
     close: Close
     closed: Closed
@@ -1117,9 +1151,11 @@ en:
     continue_shopping: Continue shopping
     cost_currency: Cost Currency
     cost_price: Cost Price
-    could_not_connect_to_jirafe: Could not connect to Jirafe to sync data. This will be automatically retried later.
+    could_not_connect_to_jirafe: Could not connect to Jirafe to sync data. This will
+      be automatically retried later.
     could_not_create_customer_return: Could not create customer return
-    could_not_create_stock_movement: There was a problem saving this stock movement. Please try again.
+    could_not_create_stock_movement: There was a problem saving this stock movement.
+      Please try again.
     count_on_hand: Count On Hand
     countries: Countries
     country: Country
@@ -1132,37 +1168,43 @@ en:
       US: United States of America
     coupon: Coupon
     coupon_code: Coupon code
-    coupon_code_already_applied: The coupon code has already been applied to this order
+    coupon_code_already_applied: The coupon code has already been applied to this
+      order
     coupon_code_applied: The coupon code was successfully applied to your order.
-    coupon_code_better_exists: The previously applied coupon code results in a better deal
+    coupon_code_better_exists: The previously applied coupon code results in a better
+      deal
     coupon_code_expired: The coupon code is expired
     coupon_code_max_usage: Coupon code usage limit exceeded
     coupon_code_not_eligible: This coupon code is not eligible for this order
     coupon_code_not_found: The coupon code you entered doesn't exist. Please try again.
-    coupon_code_unknown_error: This coupon code could not be applied to the cart at this time.
-    customer: Customer
-    customer_return: Customer Return
-    customer_returns: Customer Returns
+    coupon_code_not_present: The coupon code you are trying to remove is not present
+      on this order.
+    coupon_code_removed: The coupon code was successfully removed from this order.
+    coupon_code_unknown_error: This coupon code could not be applied to the cart at
+      this time.
     create: Create
     create_a_new_account: Create a new account
-    create_reimbursement: Create reimbursement
     create_one: Create One.
+    create_promotion_code: Create promotion code
+    create_reimbursement: Create reimbursement
     created_at: Created At
     created_by: Created by
     created_successfully: Created successfully
     credit: Credit
-    credits: Credits
     credit_allowed: Credit Allowed
     credit_card: Credit Card
     credit_cards: Credit Cards
     credit_owed: Credit Owed
+    credits: Credits
     currency: Currency
     currency_settings: Currency Settings
     current: Current
-    current_promotion_usage: ! 'Current Usage: %{count}'
+    current_promotion_usage: 'Current Usage: %{count}'
     customer: Customer
     customer_details: Customer Details
     customer_details_updated: Customer Details Updated
+    customer_return: Customer Return
+    customer_returns: Customer Returns
     customer_search: Customer Search
     cut: Cut
     cvv_response: CVV Response
@@ -1170,8 +1212,10 @@ en:
       jirafe:
         app_id: App ID
         app_token: App Token
-        currently_unavailable: Jirafe is currently unavailable. Spree will automatically connect to Jirafe once it is available.
-        explanation: The fields below may already be populated if you chose to register with Jirafe from the admin dashboard.
+        currently_unavailable: Jirafe is currently unavailable. Spree will automatically
+          connect to Jirafe once it is available.
+        explanation: The fields below may already be populated if you chose to register
+          with Jirafe from the admin dashboard.
         header: Jirafe Analytics Settings
         site_id: Site ID
         token: Token
@@ -1180,14 +1224,15 @@ en:
     date_completed: Date Completed
     date_picker:
       first_day: 0
-      format: ! '%Y/%m/%d'
+      format: "%Y/%m/%d"
       js_format: yy/mm/dd
     date_range: Date Range
     default: Default
     default_refund_amount: Default Refund Amount
     delete: Delete
-    deleted_variants_present: Some line items in this order have products that are no longer available.
     deleted_successfully: Deleted successfully
+    deleted_variants_present: Some line items in this order have products that are
+      no longer available.
     delivery: Delivery
     depth: Depth
     description: Description
@@ -1196,19 +1241,20 @@ en:
     destroy: Destroy
     details: Details
     discount_amount: Discount Amount
+    discount_rules: Discount Rules
     dismiss_banner: No. Thanks! I'm not interested, do not display this message again
     display: Display
-    download_promotion_code_list: Download Code List
+    download_promotion_codes_list: Download codes list
     edit: Edit
-    editing_country: Editing Country
+    edit_refund_reason: Edit Refund Reason
     editing_adjustment_reason: Editing Adjustment Reason
+    editing_country: Editing Country
     editing_option_type: Editing Option Type
     editing_payment_method: Editing Payment Method
     editing_product: Editing Product
     editing_promotion: Editing Promotion
     editing_promotion_category: Editing Promotion Category
     editing_property: Editing Property Type
-    edit_refund_reason: Edit Refund Reason
     editing_refund: Editing Refund
     editing_refund_reason: Editing Refund Reason
     editing_reimbursement: Editing Reimbursement
@@ -1226,16 +1272,25 @@ en:
     editing_zone: Editing Zone
     eligibility_errors:
       messages:
-        has_excluded_product: Your cart contains a product that prevents this coupon code from being applied.
-        has_excluded_taxon: Your cart contains a product from an excluded category that prevents this coupon code from being applied.
-        item_total_less_than: This coupon code can't be applied to orders less than %{amount}.
-        item_total_less_than_or_equal: This coupon code can't be applied to orders less than or equal to %{amount}.
+        has_excluded_product: Your cart contains a product that prevents this coupon
+          code from being applied.
+        has_excluded_taxon: Your cart contains a product from an excluded category
+          that prevents this coupon code from being applied.
+        item_total_less_than: This coupon code can't be applied to orders less than
+          %{amount}.
+        item_total_less_than_or_equal: This coupon code can't be applied to orders
+          less than or equal to %{amount}.
         limit_once_per_user: This coupon code can only be used once per user.
-        missing_product: This coupon code can't be applied because you don't have all of the necessary products in your cart.
-        missing_taxon: You need to add a product from all applicable categories before applying this coupon code.
-        no_applicable_products: You need to add an applicable product before applying this coupon code.
-        no_matching_taxons: You need to add a product from an applicable category before applying this coupon code.
-        no_user_or_email_specified: You need to login or provide your email before applying this coupon code.
+        missing_product: This coupon code can't be applied because you don't have
+          all of the necessary products in your cart.
+        missing_taxon: You need to add a product from all applicable categories before
+          applying this coupon code.
+        no_applicable_products: You need to add an applicable product before applying
+          this coupon code.
+        no_matching_taxons: You need to add a product from an applicable category
+          before applying this coupon code.
+        no_user_or_email_specified: You need to login or provide your email before
+          applying this coupon code.
         no_user_specified: You need to login before applying this coupon code.
         not_first_order: This coupon code can only be applied to your first order.
     email: Email
@@ -1247,13 +1302,15 @@ en:
     error: error
     errors:
       messages:
-        cannot_delete_finalized_stock_location: Stock Location cannot be destroyed if you have open stock transfers.
+        cannot_delete_finalized_stock_location: Stock Location cannot be destroyed
+          if you have open stock transfers.
         could_not_create_taxon: Could not create taxon
         no_payment_methods_available: No payment methods are configured for this environment
-        no_shipping_methods_available: No shipping methods available for selected location, please change your address and try again.
+        no_shipping_methods_available: No shipping methods available for selected
+          location, please change your address and try again.
     errors_prohibited_this_record_from_being_saved:
       one: 1 error prohibited this record from being saved
-      other: ! '%{count} errors prohibited this record from being saved'
+      other: "%{count} errors prohibited this record from being saved"
     event: Event
     events:
       spree:
@@ -1269,55 +1326,28 @@ en:
         user:
           signup: User signup
     exceptions:
-      count_on_hand_setter: Cannot set count_on_hand manually, as it is set automatically by the recalculate_count_on_hand callback. Please use `update_column(:count_on_hand, value)` instead.
-    exchange_for: Exchange for
+      count_on_hand_setter: Cannot set count_on_hand manually, as it is set automatically
+        by the recalculate_count_on_hand callback. Please use `update_column(:count_on_hand,
+        value)` instead.
+    exchange_for: Exchange For
     excl: excl.
+    existing_shipments: Existing shipments
     expected: Expected
     expected_items: Expected Items
     expiration: Expiration
     extension: Extension
-    existing_shipments: Existing shipments
-    hints:
-      spree/price:
-        country: "This determines in what country the price is valid.<br/>Default: Any Country"
-        master_variant: "Changing master variant prices will not change variant prices below, but will be used to populate all new variants"
-        options: "These options are used to create variants in the variants table. They can be changed in the variants tab"
-      spree/product:
-        available_on: "This sets the availability date for the product. If this value is not set, or it is set to a date in the future, then the product is not available on the storefront."
-        promotionable: "This determines whether or not promotions can apply to this product.<br/>Default: Checked"
-        shipping_category: "This determines what kind of shipping this product requires.<br/> Default: Default"
-        tax_category: "This determines what kind of taxation is applied to this product.<br/> Default: None"
-      spree/promotion:
-        starts_at: "This determines when the promotion can be applied to orders. <br/> If no value is specified, the promotion will be immediately available."
-        expires_at: "This determines when the promotion expires. <br/> If no value is specified, the promotion will never expire."
-      spree/stock_location:
-        active: "This determines whether stock from this location can be used when building packages.<br/> Default: Checked"
-        backorderable_default: "When checked, stock items in this location will default to allowing backorders.<br/> Default: Unchecked"
-        propagate_all_variants: "When checked, this will create a stock item for in this stock location.<br/> Default: Checked"
-        restock_inventory: "When checked, returned inventory can be added back to this location's stock levels.<br/> Default: checked"
-        fulfillable: "When unchecked, this indicates that items in this location don't require actual fulfilment. Stock will not be checked when shipping and emails will not be sent.<br/> Default: Checked"
-        check_stock_on_transfer: "When checked, inventory levels will be checked when performing stock transfers.<br/> Default: Checked"
-      spree/store:
-        cart_tax_country_iso: "This determines which country is used for taxes on carts (orders which don't yet have an address).<br/> Default: None."
-        available_locales: "This determines which locales are available for your customers to choose from in the storefront."
-      spree/variant:
-        tax_category: "This determines what kind of taxation is applied to this variant.<br/> Default: Use tax category of the product associated with this variant"
-        deleted: "Deleted Variant"
-        deleted_explanation: "This variant was deleted on %{date}."
-        deleted_explanation_with_replacement: "This variant was deleted on %{date}. It has since been replaced by another with the same SKU."
-      spree/tax_rate:
-        validity_period: "This determines the validity period within which the tax rate is valid and will be applied to eligible items. <br /> If no start date value is specified, the tax rate will be immediately available. <br /> If no expiration date value is specified, the tax rate will never expire"
     failed_payment_attempts: Failed Payment Attempts
     failure: Failure
     filename: Filename
     fill_in_customer_info: Please fill in customer info
+    filter: Filter
     filter_results: Filter Results
     finalize: Finalize
     finalize_all_adjustments: Finalize All Adjustments
-    find_a_taxon: Find a Taxon
     finalized: Finalized
     finalized_at: Finalized at
     finalized_by: Finalized by
+    find_a_taxon: Find a Taxon
     first_item: First Item
     first_name: First Name
     first_name_begins_with: First Name Begins With
@@ -1347,14 +1377,68 @@ en:
         price_diff_subtract_html: "(Subtract: %{amount_html})"
     hidden: hidden
     hide_out_of_stock: Hide out of stock
+    hints:
+      spree/price:
+        country: 'This determines in what country the price is valid.<br/>Default:
+          Any Country'
+        master_variant: Changing master variant prices will not change variant prices
+          below, but will be used to populate all new variants
+        options: These options are used to create variants in the variants table.
+          They can be changed in the variants tab
+      spree/product:
+        available_on: This sets the availability date for the product. If this value
+          is not set, or it is set to a date in the future, then the product is not
+          available on the storefront.
+        promotionable: 'This determines whether or not promotions can apply to this
+          product.<br/>Default: Checked'
+        shipping_category: 'This determines what kind of shipping this product requires.<br/>
+          Default: Default'
+        tax_category: 'This determines what kind of taxation is applied to this product.<br/>
+          Default: None'
+      spree/promotion:
+        expires_at: This determines when the promotion expires. <br/> If no value
+          is specified, the promotion will never expire.
+        starts_at: This determines when the promotion can be applied to orders. <br/>
+          If no value is specified, the promotion will be immediately available.
+      spree/stock_location:
+        active: 'This determines whether stock from this location can be used when
+          building packages.<br/> Default: Checked'
+        backorderable_default: 'When checked, stock items in this location will default
+          to allowing backorders.<br/> Default: Unchecked'
+        check_stock_on_transfer: 'When checked, inventory levels will be checked when
+          performing stock transfers.<br/> Default: Checked'
+        fulfillable: 'When unchecked, this indicates that items in this location don''t
+          require actual fulfilment. Stock will not be checked when shipping and emails
+          will not be sent.<br/> Default: Checked'
+        propagate_all_variants: 'When checked, this will create a stock item for in
+          this stock location.<br/> Default: Checked'
+        restock_inventory: 'When checked, returned inventory can be added back to
+          this location''s stock levels.<br/> Default: checked'
+      spree/store:
+        available_locales: This determines which locales are available for your customers
+          to choose from in the storefront.
+        cart_tax_country_iso: 'This determines which country is used for taxes on
+          carts (orders which don''t yet have an address).<br/> Default: None.'
+      spree/tax_rate:
+        validity_period: This determines the validity period within which the tax
+          rate is valid and will be applied to eligible items. <br /> If no start
+          date value is specified, the tax rate will be immediately available. <br
+          /> If no expiration date value is specified, the tax rate will never expire
+      spree/variant:
+        deleted: Deleted Variant
+        deleted_explanation: This variant was deleted on %{date}.
+        deleted_explanation_with_replacement: This variant was deleted on %{date}.
+          It has since been replaced by another with the same SKU.
+        tax_category: 'This determines what kind of taxation is applied to this variant.<br/>
+          Default: Use tax category of the product associated with this variant'
     home: Home
     i18n:
       available_locales: Available Locales
       fields: Fields
       language: Language
       localization_settings: Localization Settings
-      only_incomplete: Only incomplete
       only_complete: Only complete
+      only_incomplete: Only incomplete
       select_locale: Select locale
       show_only: Show only
       supported_locales: Supported Locales
@@ -1365,21 +1449,25 @@ en:
     identifier: Identifier
     image: Image
     images: Images
-    implement_eligible_for_return: "Must implement #eligible_for_return? for your EligibilityValidator."
-    implement_requires_manual_intervention: "Must implement #requires_manual_intervention? for your EligibilityValidator."
+    implement_eligible_for_return: 'Must implement #eligible_for_return? for your
+      EligibilityValidator.'
+    implement_requires_manual_intervention: 'Must implement #requires_manual_intervention?
+      for your EligibilityValidator.'
     inactive: Inactive
     incl: incl.
     included_in_price: Included in Price
-    included_price_validation: cannot be selected unless you have set a Default Tax Zone
+    included_price_validation: cannot be selected unless you have set a Default Tax
+      Zone
     incomplete: Incomplete
-    info_product_has_multiple_skus: "This product has %{count} variants:"
     info_number_of_skus_not_shown:
-      one: "and one other"
-      other: "and %{count} others"
+      one: and one other
+      other: and %{count} others
+    info_product_has_multiple_skus: 'This product has %{count} variants:'
     instructions_to_reset_password: Please enter your email on the form below
     insufficient_stock: Insufficient stock available, only %{on_hand} remaining
     insufficient_stock_for_order: Insufficient stock for order
-    insufficient_stock_lines_present: Some line items in this order have insufficient quantity.
+    insufficient_stock_lines_present: Some line items in this order have insufficient
+      quantity.
     intercept_email_address: Intercept Email Address
     intercept_email_instructions: Override email recipient and replace with this address.
     internal_name: Internal Name
@@ -1392,6 +1480,7 @@ en:
     inventory_adjustment: Inventory Adjustment
     inventory_canceled: Inventory canceled
     inventory_error_flash_for_insufficient_quantity: "%{names} became unavailable."
+    inventory_error_flash_for_insufficient_shipment_quantity: "Quantity selected of %{unavailable_items} is not available. Still, items may be available from another stock location, please try again."
     inventory_not_available: Inventory not available for %{item}.
     inventory_state: Inventory State
     inventory_states:
@@ -1409,10 +1498,11 @@ en:
       operators:
         gt: greater than
         gte: greater than or equal to
-    items_cannot_be_shipped: We are unable to calculate shipping rates for the selected items.
+    items_cannot_be_shipped: We are unable to calculate shipping rates for the selected
+      items.
     items_in_rmas: Items in RMA's (Return Merchandise Authorizations)
-    items_to_be_reimbursed: Items to be reimbursed
     items_reimbursed: Items reimbursed
+    items_to_be_reimbursed: Items to be reimbursed
     jirafe: Jirafe
     landing_page_rule:
       path: Path
@@ -1420,7 +1510,7 @@ en:
     last_name_begins_with: Last Name Begins With
     learn_more: Learn More
     lifetime_stats: Lifetime Stats
-    line_item_adjustments: "Line item adjustments"
+    line_item_adjustments: Line item adjustments
     list: List
     listing_countries: Countries
     listing_orders: Orders
@@ -1432,8 +1522,7 @@ en:
     locale_changed: Locale Changed
     location: Location
     lock: Lock
-    log_entries: "Log Entries"
-    logs: "Logs"
+    log_entries: Log Entries
     logged_in_as: Logged in as
     logged_in_succesfully: Logged in successfully
     logged_out: You have been logged out.
@@ -1442,14 +1531,17 @@ en:
     login_failed: Login authentication failed.
     login_name: Login
     logout: Logout
+    logs: Logs
     look_for_similar_items: Look for similar items
     make_refund: Make refund
-    make_sure_the_above_reimbursement_amount_is_correct: Make sure the above reimbursement amount is correct
+    make_sure_the_above_reimbursement_amount_is_correct: Make sure the above reimbursement
+      amount is correct
     manage_promotion_categories: Manage Promotion Categories
     manage_stock: Store Stock
-    manual_intervention_required: Manual intervention required
     manage_variants: Manage Variants
+    manual_intervention_required: Manual intervention required
     master_price: Master Price
+    master_sku: Master SKU
     master_variant: Master Variant
     match_choices:
       all: All
@@ -1462,6 +1554,7 @@ en:
     meta_title: Meta Title
     metadata: Metadata
     minimal_amount: Minimal Amount
+    modify_stock_count: Modify (+/-)
     month: Month
     more: More
     move_stock_between_locations: Move Stock Between Locations
@@ -1470,13 +1563,14 @@ en:
     name: Name
     name_on_card: Name on card
     name_or_sku: Name or SKU (enter at least first 4 characters of product name)
-    negative_movement_absent_item: Cannot create negative movement for absent stock item.
+    negative_movement_absent_item: Cannot create negative movement for absent stock
+      item.
     new: New
     new_adjustment: New Adjustment
     new_adjustment_reason: New Adjustment Reason
+    new_country: New Country
     new_customer: New Customer
     new_customer_return: New Customer Return
-    new_country: New Country
     new_image: New Image
     new_option_type: New Option Type
     new_order: New Order
@@ -1490,16 +1584,17 @@ en:
     new_property: New Property Type
     new_refund: New Refund
     new_refund_reason: New Refund Reason
-    new_rma_reason: New RMA Reason
     new_return_authorization: New RMA
+    new_rma_reason: New RMA Reason
+    new_shipment_at_location: New shipment at location
     new_shipping_category: New Shipping Category
     new_shipping_method: New Shipping Method
-    new_shipment_at_location: New shipment at location
     new_state: New State
     new_stock_location: New Stock Location
     new_stock_movement: New Stock Movement
-    new_store_credit: New Store Credit
     new_store: New Store
+    new_store_credit: New Store Credit
+    new_store_credit_reason: New Store Credit Reason
     new_tax_category: New Tax Category
     new_tax_rate: New Tax Rate
     new_taxon: New Taxon
@@ -1512,23 +1607,24 @@ en:
     no_actions_added: No actions added
     no_images_found: No images found
     no_inventory_selected: No inventory selected
+    no_option_values_on_product_html: This product has no associated option values.
+      Add some to it through Option Types in the %{link}.
     no_orders_found: No orders found
-    no_option_values_on_product_html: "This product has no associated option values. Add some to it through Option Types in the %{link}."
-    no_payment_methods_found: No payment methods found
     no_payment_found: No payment found
+    no_payment_methods_found: No payment methods found
     no_pending_payments: No pending payments
     no_products_found: No products found
     no_promotions_found: No promotions found
+    no_resource: No %{resource} found.
+    no_resource_found: No %{resource} found
+    no_resource_found_html: No %{resource} found, %{add_one_link}!
+    no_resource_found_link: Add One
     no_results: No results
     no_rules_added: No rules added
-    no_resource: 'No %{resource} found.'
-    no_resource_found_html: 'No %{resource} found, %{add_one_link}!'
-    no_resource_found_link: Add One
-    no_resource_found: ! 'No %{resource} found'
-    no_shipping_methods_found: No shipping methods found
     no_shipping_method_selected: No shipping method selected.
-    no_trackers_found: No Trackers Found
+    no_shipping_methods_found: No shipping methods found
     no_stock_locations_found: No stock locations found
+    no_trackers_found: No Trackers Found
     no_tracking_present: No tracking details provided.
     no_variants_found: No variants found.
     no_variants_found_try_again: No variants found. Try changing the search values.
@@ -1537,10 +1633,12 @@ en:
     normal_amount: Normal Amount
     not: not
     not_available: N/A
-    not_enough_stock: There is not enough inventory at the source location to complete this transfer.
-    not_found: ! '%{resource} is not found'
+    not_enough_stock: There is not enough inventory at the source location to complete
+      this transfer.
+    not_found: "%{resource} is not found"
     note: Note
-    note_already_received_a_refund: "Note: This order has already received a refund.  Make sure the above reimbursement amount is correct."
+    note_already_received_a_refund: 'Note: This order has already received a refund.  Make
+      sure the above reimbursement amount is correct.'
     notice_messages:
       product_cloned: Product has been cloned
       product_deleted: Product has been deleted
@@ -1550,7 +1648,7 @@ en:
       variant_not_deleted: Variant could not be deleted
     num_orders: "# Orders"
     number: Number
-    number_of_codes: ! '%{count} codes'
+    number_of_codes: "%{count} codes"
     on_hand: On Hand
     open: Open
     option_type: Option Type
@@ -1561,7 +1659,7 @@ en:
     optional: Optional
     options: Options
     or: or
-    or_over_price: ! '%{price} or over'
+    or_over_price: "%{price} or over"
     order: Order
     order_adjustments: Order adjustments
     order_already_completed: Order is already completed
@@ -1574,22 +1672,25 @@ en:
     order_mailer:
       cancel_email:
         dear_customer: Dear Customer,
-        instructions: Your order has been CANCELED.  Please retain this cancellation information for your records.
+        instructions: Your order has been CANCELED.  Please retain this cancellation
+          information for your records.
         order_summary_canceled: Order Summary [CANCELED]
         subject: Cancellation of Order
-        subtotal: ! 'Subtotal:'
-        total: ! 'Order Total:'
+        subtotal: 'Subtotal:'
+        total: 'Order Total:'
       confirm_email:
         dear_customer: Dear Customer,
-        instructions: Please review and retain the following order information for your records.
+        instructions: Please review and retain the following order information for
+          your records.
         order_summary: Order Summary
         subject: Order Confirmation
-        subtotal: ! 'Subtotal:'
+        subtotal: 'Subtotal:'
         thanks: Thank you for your business.
-        total: ! 'Order Total:'
+        total: 'Order Total:'
       inventory_cancellation:
         dear_customer: Dear Customer,
-        instructions: Some items in your order have been CANCELED.  Please retain this cancellation information for your records.
+        instructions: Some items in your order have been CANCELED.  Please retain
+          this cancellation information for your records.
         order_summary_canceled: Canceled Items
         subject: Cancellation of Items
     order_mutex_admin_error: Order is being modified by someone else. Please try again.
@@ -1623,8 +1724,8 @@ en:
     package_from: package from
     pagination:
       next_page: next page &raquo;
-      previous_page: ! '&laquo; previous page'
-      truncate: ! '&hellip;'
+      previous_page: "&laquo; previous page"
+      truncate: "&hellip;"
     password: Password
     paste: Paste
     path: Path
@@ -1632,16 +1733,18 @@ en:
     payment: Payment
     payment_amount: Payment Amount
     payment_could_not_be_created: Payment could not be created.
-    payments_failed_count:
-      one: 1 Payment
-      other: '%{count} Payments'
     payment_identifier: Payment Identifier
     payment_information: Payment Information
     payment_method: Payment Method
+    payment_method_not_supported: That payment method is unsupported. Please choose
+      another one.
+    payment_method_settings_warning: If you are changing the payment method type,
+      you must save first before you can edit the payment method settings
     payment_methods: Payment Methods
-    payment_method_not_supported: That payment method is unsupported. Please choose another one.
-    payment_processing_failed: Payment could not be processed, please check the details you entered
-    payment_processor_choose_banner_text: If you need help choosing a payment processor, please visit
+    payment_processing_failed: Payment could not be processed, please check the details
+      you entered
+    payment_processor_choose_banner_text: If you need help choosing a payment processor,
+      please visit
     payment_processor_choose_link: our payments page
     payment_state: Payment State
     payment_states:
@@ -1650,39 +1753,43 @@ en:
       completed: Completed
       credit_owed: Credit owed
       failed: Failed
+      invalid: Invalid
       paid: Paid
       pending: Pending
       processing: Processing
       void: Void
-      invalid: Invalid
     payment_updated: Payment Updated
     payments: Payments
+    payments_failed_count:
+      one: 1 Payment
+      other: "%{count} Payments"
+    pending: Pending
     percent: Percent
     percent_per_item: Percent Per Item
     permalink: Permalink
-    pending: Pending
     phone: Phone
     place_order: Place Order
     please_define_payment_methods: Please define some payment methods first.
     please_enter_reasonable_quantity: Please enter a reasonable quantity.
     populate_get_error: Something went wrong. Please try adding the item again.
     powered_by: Powered by
-    pre_tax_refund_amount: Pre-Tax Refund Amount
     pre_tax_amount: Pre-Tax Amount
+    pre_tax_refund_amount: Pre-Tax Refund Amount
     pre_tax_total: Pre-Tax Total
+    preference_source_none: "(custom)"
+    preference_source_using: Using static preferences "%{name}"
     preferred_reimbursement_type: Preferred Reimbursement Type
     presentation: Presentation
     previous: Previous
     price: Price
     price_range: Price Range
     price_sack: Price Sack
-    preference_source_none: '(custom)'
-    preference_source_using: 'Using static preferences "%{name}"'
     process: Process
     product: Product
     product_details: Product Details
     product_has_no_description: This product has no description
-    product_not_available_in_this_currency: This product is not available in the selected currency.
+    product_not_available_in_this_currency: This product is not available in the selected
+      currency.
     product_properties: Product Properties
     product_rule:
       choose_products: Choose products
@@ -1695,34 +1802,35 @@ en:
         manual: Manually choose
     products: Products
     promotion: Promotion
-    promotionable: Promotable
     promotion_action: Promotion Action
     promotion_actions: Actions
     promotion_code_batch_mailer:
-      promotion_code_batch_finished:
-        subject: Promotion code batch finished
-        message: "All %{number_of_codes} codes have been created for promotion: "
       promotion_code_batch_errored:
+        message: 'Promotion code batch errored (%{error}) for promotion: '
         subject: Promotion code batch errored
-        message: "Promotion code batch errored (%{error}) for promotion: "
+      promotion_code_batch_finished:
+        message: 'All %{number_of_codes} codes have been created for promotion: '
+        subject: Promotion code batch finished
     promotion_code_batches:
-      errored: "Errored: %{error}"
-      finished: "All %{number_of_codes} codes have been created."
-      processing: "Processing: %{number_of_codes_processed} / %{number_of_codes}"
+      errored: 'Errored: %{error}'
+      finished: All %{number_of_codes} codes have been created.
+      processing: 'Processing: %{number_of_codes_processed} / %{number_of_codes}'
     promotion_form:
       match_policies:
         all: Match all of these rules
         any: Match any of these rules
     promotion_rule: Promotion Rule
-    promotions: Promotions
     promotion_successfully_created: Promotion has been successfully created!
-    promotion_total_changed_before_complete: "One or more of the promotions on your order have become ineligible and were removed. Please check the new order amounts and try again."
+    promotion_total_changed_before_complete: One or more of the promotions on your
+      order have become ineligible and were removed. Please check the new order amounts
+      and try again.
     promotion_uses: Promotion uses
+    promotionable: Promotable
+    promotions: Promotions
     propagate_all_variants: Propagate all variants
     properties: Property Types
     property: Property Type
     provider: Provider
-    payment_method_settings_warning: If you are changing the payment method type, you must save first before you can edit the payment method settings
     qty: Qty
     quantity: Quantity
     quantity_returned: Quantity Returned
@@ -1731,12 +1839,12 @@ en:
     ready_to_ship: Ready to ship
     reason: Reason
     receive: receive
-    received: Received
     receive_stock: Receive Stock
+    received: Received
     received_items: Received Items
     received_successfully: Received Successfully
     receiving: Receiving
-    receiving_match: Receiving match
+    receiving_match: Receiving Match
     reception_states:
       awaiting: Awaiting
       cancelled: Canceled
@@ -1755,13 +1863,22 @@ en:
     refund_reasons: Refund Reasons
     refunded_amount: Refunded Amount
     refunds: Refunds
-    refund_amount_must_be_greater_than_zero: Refund amount must be greater than zero
     register: Register
     registration: Registration
     reimburse: Reimburse
     reimbursed: Reimbursed
     reimbursement: Reimbursement
-    reimbursement_perform_failed: "Reimbursement could not be performed.  Error: %{error}"
+    reimbursement_mailer:
+      reimbursement_email:
+        days_to_send: You have %{days} days to send back any items awaiting exchange.
+        dear_customer: Dear Customer,
+        exchange_summary: Exchange Summary
+        for: for
+        instructions: Your reimbursement has been processed.
+        refund_summary: Refund Summary
+        subject: Reimbursement Notification
+        total_refunded: 'Total refunded: %{total}'
+    reimbursement_perform_failed: 'Reimbursement could not be performed.  Error: %{error}'
     reimbursement_states:
       errored: Errored
       pending: Pending
@@ -1776,7 +1893,6 @@ en:
     remember_me: Remember me
     remove: Remove
     rename: Rename
-    reports: Reports
     resend: Resend
     reset_password: Reset my password
     response_code: Response Code
@@ -1785,30 +1901,24 @@ en:
     resumed: Resumed
     return: return
     return_authorization: Return Merchandise Authorization
+    return_authorization_fire_error: Cannot perform this action on return merchandise
+      authorization
     return_authorization_states:
       authorized: Authorized
       canceled: Canceled
-    return_authorizations: Return Merchandise Authorizations
-    return_authorization_fire_error: Cannot perform this action on return merchandise authorization
     return_authorization_updated: Return merchandise authorization updated
+    return_authorizations: Return Merchandise Authorizations
     return_item_inventory_unit_ineligible: Return item's inventory unit must be shipped
-    return_item_inventory_unit_reimbursed: Return item's inventory unit is already reimbursed
+    return_item_inventory_unit_reimbursed: Return item's inventory unit is already
+      reimbursed
     return_item_order_not_completed: Return item's order must be completed
     return_item_rma_ineligible: Return item requires an RMA
     return_item_time_period_ineligible: Return item is outside the eligible time period
     return_items: Return Items
-    return_items_cannot_be_associated_with_multiple_orders: Return items cannot be associated with multiple orders.
-    return_items_cannot_be_created_for_inventory_units_that_are_already_awaiting_exchange: Return items cannot be created for inventory units that are already awaiting exchange.
-    reimbursement_mailer:
-      reimbursement_email:
-        days_to_send: ! 'You have %{days} days to send back any items awaiting exchange.'
-        dear_customer: Dear Customer,
-        exchange_summary: Exchange Summary
-        for: for
-        instructions: Your reimbursement has been processed.
-        refund_summary: Refund Summary
-        subject: Reimbursement Notification
-        total_refunded: ! 'Total refunded: %{total}'
+    return_items_cannot_be_associated_with_multiple_orders: Return items cannot be
+      associated with multiple orders.
+    return_items_cannot_be_created_for_inventory_units_that_are_already_awaiting_exchange: Return
+      items cannot be created for inventory units that are already awaiting exchange.
     return_number: Return Number
     return_quantity: Return Quantity
     return_reasons: Return Reasons
@@ -1839,7 +1949,7 @@ en:
     select_a_reason: Select a reason
     select_a_stock_location: Select a stock location
     select_stock: Select stock
-    selected_quantity_not_available: ! 'selected of %{item} is not available.'
+    selected_quantity_not_available: selected of %{item} is not available.
     send_copy_of_all_mails_to: Send Copy of All Mails To
     send_mailer: Send Mailer
     send_mails_as: Send Mails As
@@ -1850,10 +1960,10 @@ en:
     ship_address: Ship Address
     ship_address_required: Valid shipping address required
     ship_total: Ship Total
-    shipped_at: Shipped At
     shipment: Shipment
-    shipment_adjustments: "Shipment adjustments"
-    shipment_details: "From %{stock_location} via %{shipping_method}"
+    shipment_adjustments: Shipment adjustments
+    shipment_date: Shipment date
+    shipment_details: From %{stock_location} via %{shipping_method}
     shipment_mailer:
       shipped_email:
         dear_customer: Dear Customer,
@@ -1861,9 +1971,8 @@ en:
         shipment_summary: Shipment Summary
         subject: Shipment Notification
         thanks: Thank you for your business.
-        track_information: ! 'Tracking Information: %{tracking}'
-        track_link: ! 'Tracking Link: %{url}'
-    shipment_date: Shipment date
+        track_information: 'Tracking Information: %{tracking}'
+        track_link: 'Tracking Link: %{url}'
     shipment_number: Shipment Number
     shipment_numbers: Shipment numbers
     shipment_state: Shipment State
@@ -1874,17 +1983,18 @@ en:
       pending: Pending
       ready: Ready
       shipped: Shipped
-    shipment_transfer_success: 'Variants successfully transferred'
-    shipment_transfer_error: 'There was an error transferring variants'
+    shipment_transfer_error: There was an error transferring variants
+    shipment_transfer_success: Variants successfully transferred
     shipments: Shipments
     shipped: Shipped
+    shipped_at: Shipped At
     shipping: Shipping
     shipping_address: Shipping Address
     shipping_categories: Shipping Categories
     shipping_category: Shipping Category
-    shipping_flat_rate_per_item: Flat rate per package item
-    shipping_flat_rate_per_order: Flat rate
-    shipping_flexible_rate: Flexible Rate per package item
+    shipping_flat_rate_per_item: Flat Rate per Package Item
+    shipping_flat_rate_per_order: Flat Rate
+    shipping_flexible_rate: Flexible Rate per Package Item
     shipping_instructions: Shipping Instructions
     shipping_method: Shipping Method
     shipping_methods: Shipping Methods
@@ -1896,7 +2006,7 @@ en:
     shipping_rate_tax:
       label:
         sales_tax: "+ %{amount} %{tax_rate_name}"
-        vat: "incl. %{amount} %{tax_rate_name}"
+        vat: incl. %{amount} %{tax_rate_name}
     shipping_total: Shipping total
     shop_by_taxonomy: Shop by %{taxonomy}
     shopping_cart: Shopping Cart
@@ -1915,9 +2025,11 @@ en:
     special_instructions: Special Instructions
     split: Split
     split_failed: Unable to complete split
-    spree_gateway_error_flash_for_checkout: There was a problem with your payment information. Please check your information and try again.
+    spree_gateway_error_flash_for_checkout: There was a problem with your payment
+      information. Please check your information and try again.
     ssl:
-      change_protocol: "Please switch to using HTTP (rather than HTTPS) and retry this request."
+      change_protocol: Please switch to using HTTP (rather than HTTPS) and retry this
+        request.
     start: Start
     state: State
     state_based: State Based
@@ -1927,50 +2039,54 @@ en:
       other: "%{count} States"
     states_required: States Required
     status: Status
+    stock: Stock
     stock_location: Stock Location
     stock_location_info: Stock location info
     stock_locations: Stock Locations
-    stock_locations_need_a_default_country: You must create a default country before creating a stock location.
+    stock_locations_need_a_default_country: You must create a default country before
+      creating a stock location.
     stock_management: Product Stock
-    stock_management_requires_a_stock_location: Please create a stock location in order to manage stock.
+    stock_management_requires_a_stock_location: Please create a stock location in
+      order to manage stock.
     stock_movements: Stock Movements
     stock_movements_for_stock_location: Stock Movements for %{stock_location_name}
     stock_not_below_zero: Stock must not be below zero.
     stock_successfully_transferred: Stock was successfully transferred between locations.
-    stock: Stock
     stop: Stop
     store: Store
     store_credit:
       actions:
         invalidate: Invalidate
-      credit_allocation_memo: "This is a credit from store credit ID %{id}"
-      currency_mismatch: "Store credit currency does not match order currency"
+      credit_allocation_memo: This is a credit from store credit ID %{id}
+      currency_mismatch: Store credit currency does not match order currency
       display_action:
         adjustment: Adjustment
+        admin:
+          authorize: Authorized
+          eligible: Eligibility Verified
+          void: Voided
         allocation: Added
         capture: Used
         credit: Credit
         invalidate: Invalidated
         void: Credit
-        admin:
-          authorize: "Authorized"
-          eligible: "Eligibility Verified"
-          void: "Voided"
       errors:
-        unable_to_fund: "Unable to pay for order using store credits"
-        cannot_invalidate_uncaptured_authorization: "Cannot invalidate a store credit with an uncaptured authorization"
+        cannot_invalidate_uncaptured_authorization: Cannot invalidate a store credit
+          with an uncaptured authorization
+        unable_to_fund: Unable to pay for order using store credits
       expiring: Expiring
-      insufficient_authorized_amount: "Unable to capture more than authorized amount"
-      insufficient_funds: "Store credit amount remaining is not sufficient"
+      insufficient_authorized_amount: Unable to capture more than authorized amount
+      insufficient_funds: Store credit amount remaining is not sufficient
       non_expiring: Non-expiring
-      select_one_store_credit: "Select store credit to go towards remaining balance"
+      select_one_store_credit: Select store credit to go towards remaining balance
       store_credit: Store Credit
-      successful_action: "Successful store credit %{action}"
-      unable_to_credit: "Unable to credit code: %{auth_code}"
-      unable_to_void: "Unable to void code: %{auth_code}"
-      unable_to_find: "Could not find store credit"
-      unable_to_find_for_action: "Could not find store credit for auth code: %{auth_code} for action: %{action}"
-      user_has_no_store_credits: "User does not have any available store credit"
+      successful_action: Successful store credit %{action}
+      unable_to_credit: 'Unable to credit code: %{auth_code}'
+      unable_to_find: Could not find store credit
+      unable_to_find_for_action: 'Could not find store credit for auth code: %{auth_code}
+        for action: %{action}'
+      unable_to_void: 'Unable to void code: %{auth_code}'
+      user_has_no_store_credits: User does not have any available store credit
     store_credit_category:
       default: Default
     store_rule:
@@ -1980,17 +2096,18 @@ en:
     subtotal: Subtotal
     subtract: Subtract
     success: Success
-    successfully_created: ! '%{resource} has been successfully created!'
-    successfully_refunded: ! '%{resource} has been successfully refunded!'
-    successfully_removed: ! '%{resource} has been successfully removed!'
+    successfully_created: "%{resource} has been successfully created!"
+    successfully_refunded: "%{resource} has been successfully refunded!"
+    successfully_removed: "%{resource} has been successfully removed!"
     successfully_signed_up_for_analytics: Successfully signed up for Spree Analytics
-    successfully_updated: ! '%{resource} has been successfully updated!'
+    successfully_updated: "%{resource} has been successfully updated!"
     tax: Tax
-    tax_included: "Tax (incl.)"
     tax_categories: Tax Categories
     tax_category: Tax Category
     tax_code: Tax Code
-    tax_rate_amount_explanation: Tax rates are a decimal amount to aid in calculations, (i.e. if the tax rate is 5% then enter 0.05)
+    tax_included: Tax (incl.)
+    tax_rate_amount_explanation: Tax rates are a decimal amount to aid in calculations,
+      (i.e. if the tax rate is 5% then enter 0.05)
     tax_rates: Tax Rates
     taxon: Taxon
     taxon_edit: Edit Taxon
@@ -2004,8 +2121,10 @@ en:
     taxonomies: Taxonomies
     taxonomy: Taxonomy
     taxonomy_edit: Edit taxonomy
-    taxonomy_tree_error: The requested change has not been accepted and the tree has been returned to its previous state, please try again.
-    taxonomy_tree_instruction: ! '* Right click a child in the tree to access the menu for adding, deleting or sorting a child.'
+    taxonomy_tree_error: The requested change has not been accepted and the tree has
+      been returned to its previous state, please try again.
+    taxonomy_tree_instruction: "* Right click a child in the tree to access the menu
+      for adding, deleting or sorting a child."
     taxons: Taxons
     test: Test
     test_mailer:
@@ -2014,22 +2133,25 @@ en:
         message: If you have received this email, then your email settings are correct.
         subject: Test Mail
     test_mode: Test Mode
-    thank_you_for_your_order: Thank you for your business.  Please print out a copy of this confirmation page for your records.
-    there_are_no_items_for_this_order: There are no items for this order. Please add an item to the order to continue.
-    there_were_problems_with_the_following_fields: There were problems with the following fields
+    thank_you_for_your_order: Thank you for your business.  Please print out a copy
+      of this confirmation page for your records.
+    there_are_no_items_for_this_order: There are no items for this order. Please add
+      an item to the order to continue.
+    there_were_problems_with_the_following_fields: There were problems with the following
+      fields
     this_order_has_already_received_a_refund: This order has already received a refund
     thumbnail: Thumbnail
-    tiers: Tiers
     tiered_flat_rate: Tiered Flat Rate
     tiered_percent: Tiered Percent
+    tiers: Tiers
     time: Time
     to: to
     to_add_variants_you_must_first_define: To add variants, you must first define
     total: Total
     total_excluding_vat: Pre-Tax Total
-    total_per_item: Total per item
+    total_per_item: Total per Item
     total_pre_tax_refund: Total Pre-Tax Refund
-    total_price: Total price
+    total_price: Total Price
     total_sales: Total Sales
     track_inventory: Track Inventory
     tracking: Tracking
@@ -2039,23 +2161,24 @@ en:
     tracking_url_placeholder: e.g. http://quickship.com/package?num=:tracking
     transaction_id: Transaction ID
     transfer_from_location: Transfer From
+    transfer_number: Transfer Number
     transfer_stock: Transfer Stock
     transfer_to_location: Transfer To
-    transfer_number: Transfer Number
     tree: Tree
     try_changing_search_values: Try changing the search values.
     type: Type
     type_to_search: Type to search
-    unable_to_find_all_inventory_units: Unable to find all specified inventory units
     unable_to_connect_to_gateway: Unable to connect to gateway.
-    unable_to_create_reimbursements: Unable to create reimbursements because there are items pending manual intervention.
-    unfinalize_all_adjustments: Unfinalize All Adjustments
+    unable_to_create_reimbursements: Unable to create reimbursements because there
+      are items pending manual intervention.
+    unable_to_find_all_inventory_units: Unable to find all specified inventory units
     under_price: Under %{price}
+    unfinalize_all_adjustments: Unfinalize All Adjustments
     unlock: Unlock
-    unrecognized_card_type: Unrecognized card type
+    unrecognized_card_type: Unrecognized Card Type
     unshippable_items: Unshippable Items
     update: Update
-    updated_successfully: Updated successfully
+    updated_successfully: Updated Successfully
     updating: Updating
     usage_limit: Usage Limit
     use_app_default: Use App Default
@@ -2064,45 +2187,56 @@ en:
     use_new_cc: Use a new card
     use_new_cc_or_payment_method: Use a new card / payment method
     user: User
-    user_rule:
-      choose_users: Choose users
     user_role_rule:
       choose_roles: Choose Roles
       label: User must contain %{select} of these roles
       match_all: all
       match_any: at least one
+    user_rule:
+      choose_users: Choose Users
     users: Users
     validation:
-      unpaid_amount_not_zero: "Amount was not fully reimbursed. Still due: %{amount}"
-      cannot_be_less_than_shipped_units: cannot be less than the number of shipped units.
-      cannot_destroy_line_item_as_inventory_units_have_shipped: Cannot destroy line item as some inventory units have shipped.
-      exceeds_available_stock: exceeds available stock. Please ensure line items have a valid quantity.
+      cannot_be_less_than_shipped_units: cannot be less than the number of shipped
+        units.
+      cannot_destroy_line_item_as_inventory_units_have_shipped: Cannot destroy line
+        item as some inventory units have shipped.
+      exceeds_available_stock: exceeds available stock. Please ensure line items have
+        a valid quantity.
       is_too_large: is too large -- stock on hand cannot cover requested quantity!
       must_be_int: must be an integer
       must_be_non_negative: must be a non-negative value
+      unpaid_amount_not_zero: 'Amount was not fully reimbursed. Still due: %{amount}'
     validity_period: Validity Period
     value: Value
     variant: Variant
-    variant_placeholder: Choose a variant
+    variant_placeholder: Choose a Variant
     variant_pricing: Variant Pricing
     variant_properties: Variant Properties
     variant_search: Variant Search
-    variant_search_placeholder: "SKU or Option Value"
+    variant_search_placeholder: SKU or Option Value
     variant_to_add: Variant to add
     variant_to_be_received: Variant to be received
     variants: Variants
     version: Version
+    view_product: View Product On Store
+    view_promotion_codes_list: View codes list
     void: Void
     weight: Weight
     what_is_a_cvv: What is a (CVV) Credit Card Code?
     what_is_this: What's This?
     width: Width
     year: Year
-    you_have_no_orders_yet: You have no orders yet
     you_cannot_undo_action: You will not be able to undo this action
+    you_have_no_orders_yet: You have no orders yet
     your_cart_is_empty: Your cart is empty
-    your_order_is_empty_add_product: Your order is empty, please search for and add a product above
+    your_order_is_empty_add_product: Your order is empty, please search for and add
+      a product above
     zip: Zip
     zipcode: Zip Code
     zone: Zone
     zones: Zones
+  time:
+    formats:
+      solidus:
+        long: "%B %d, %Y %-l:%M %p"
+        short: "%b %-d '%y %-l:%M%P"