spree_core 4.1.10 → 4.2.0.rc2

data/app/views/spree/shared/_purchased_items_table.html.erb

@@ -0,0 +1,60 @@
+<table class="purchase_content">
+  <%= render collection: line_items, partial: 'spree/shared/purchased_items_table/line_item', as: :line_item %>
+  <%= render 'spree/shared/purchased_items_table/subtotal', order: order %>
+  <% if order.line_item_adjustments.exists? %>
+    <% if order.all_adjustments.promotion.eligible.exists? %>
+      <% order.all_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
+        <tr>
+          <td></td>
+          <td>
+            <p class="f-fallback purchase_total purchase_total--label">
+              <%= Spree.t(:promotion) %> <%= label %>:
+            </p>
+          </td>
+          <td>
+            <p class="f-fallback purchase_total">
+              <%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency) %>
+            </p>
+          </td>
+        </tr>
+      <% end %>
+    <% end %>
+  <% end %>
+  <% order.shipments.group_by { |s| s.selected_shipping_rate&.name }.each do |name, shipments| %>
+    <tr>
+      <td></td>
+      <td>
+        <p class="f-fallback purchase_total purchase_total--label">
+          <%= Spree.t(:shipping) %> <%= name %>:
+        </p>
+      </td>
+      <td>
+        <p class="f-fallback purchase_total">
+          <%= Spree::Money.new(shipments.sum(&:discounted_cost), currency: order.currency) %>
+        </p>
+      </td>
+    </tr>
+  <% end %>
+  <% if order.all_adjustments.eligible.tax.exists? %>
+    <% order.all_adjustments.eligible.tax.group_by(&:label).each do |label, adjustments| %>
+      <tr>
+        <td></td>
+        <td>
+          <p class="f-fallback purchase_total purchase_total--label">
+            <%= Spree.t(:tax) %> <%= label %>:
+          </p>
+        </td>
+        <td>
+          <p class="f-fallback purchase_total">
+            <%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency) %>
+          </p>
+        </td>
+      </tr>
+    <% end %>
+  <% end %>
+  <% order.adjustments.eligible.each do |adjustment| %>
+    <% next if (adjustment.source_type == 'Spree::TaxRate') || (adjustment.amount == 0) %>
+    <%= render 'spree/shared/purchased_items_table/adjustment', adjustment: adjustment, order: order %>
+  <% end %>
+  <%= render 'spree/shared/purchased_items_table/total', order: order %>
+</table>

data/app/views/spree/shared/purchased_items_table/_adjustment.html.erb

@@ -0,0 +1,13 @@
+<tr>
+  <td></td>
+  <td>
+    <p class="f-fallback purchase_total purchase_total--label">
+      <%= raw(adjustment.label) %>:
+    </p>
+  </td>
+  <td>
+    <p class="f-fallback purchase_total">
+      <%= Spree::Money.new(adjustment.amount, currency: order.currency) %>
+    </p>
+  </td>
+</tr>

data/app/views/spree/shared/purchased_items_table/_line_item.html.erb

@@ -0,0 +1,27 @@
+<tr>
+  <td class="purchase_image">
+    <% if frontend_available? %>
+      <%= link_to(image_tag(variant_image_url(line_item.variant)), spree.product_url(line_item.product)) %>
+    <% else %>
+      <%= image_tag(variant_image_url(line_item.variant)) %>
+    <% end %>
+  </td>
+  <td class="purchase_item">
+    <strong>
+      <span class="f-fallback">
+        <% if frontend_available? %>
+          <%= link_to raw(line_item.name), spree.product_url(line_item.product) %>
+        <% else %>
+          <%= raw(line_item.name) %>
+        <% end %>
+      </span>
+    </strong>
+    <p class="purchase_item--additional"><%= raw(line_item.variant.options_text) -%></p>
+  </td>
+  <td class="align-right">
+    <span class="f-fallback purchase_item_price">
+      <%= line_item.quantity %> x <%= line_item.single_money %>
+      <%= line_item.display_amount %>
+    </span>
+  </td>
+</tr>

data/app/views/spree/shared/purchased_items_table/_subtotal.html.erb

@@ -0,0 +1,13 @@
+<tr>
+  <td class="purchase_footer" valign="middle"></td>
+  <td class="purchase_footer" valign="middle">
+    <p class="f-fallback purchase_total purchase_total--label">
+      <%= Spree.t('order_mailer.subtotal') %>
+    </p>
+  </td>
+  <td class="purchase_footer" valign="middle">
+    <p class="f-fallback purchase_total">
+      <%= order.display_item_total %>
+    </p>
+  </td>
+</tr>

data/app/views/spree/shared/purchased_items_table/_total.html.erb

@@ -0,0 +1,13 @@
+<tr>
+  <td></td>
+  <td>
+    <p class="f-fallback purchase_total purchase_total--label">
+      <strong><%= Spree.t('order_mailer.total') %></strong>
+    </p>
+  </td>
+  <td>
+    <p class="f-fallback purchase_total">
+      <strong><%= order.display_total %></strong>
+    </p>
+  </td>
+</tr>

data/app/views/spree/shipment_mailer/shipped_email.html.erb

@@ -1,41 +1,36 @@
-<table class="row header">
+<h1>
+  <%= Spree.t('shipment_mailer.shipped_email.dear_customer', name: name_for(@shipment.order)) %>
+</h1>
+<p>
+  <%= Spree.t('shipment_mailer.shipped_email.instructions', number: @shipment.order.number) %>
+</p>
+<table class="purchase" role="presentation">
   <tr>
     <td>
-      <p class="lede">
-        <%= Spree.t('shipment_mailer.shipped_email.dear_customer') %>
-      </p>
-      <p>
-        <%= Spree.t('shipment_mailer.shipped_email.instructions', number: @shipment.order.number) %>
-      </p>
-      <p>
-        <%= Spree.t('shipment_mailer.shipped_email.shipment_summary') %>
-      </p>
-      <table class="container">
-        <tr>
-          <td class="wrapper last">
-            <table class="twelve columns">
-              <%= render collection: @shipment.manifest.map(&:line_item), partial: 'spree/shared/mailer_line_item', as: :line_item %>
-            </table>
-          </td>
-        </tr>
-      </table>
-      <p>
-        <%= Spree.t('shipment_mailer.shipped_email.shipping_method', shipping_method: @shipment.shipping_method.name) %>
-      </p>
-      <% if @shipment.tracking %>
-        <p>
-          <%= Spree.t('shipment_mailer.shipped_email.track_information', tracking: @shipment.tracking) %>
-        </p>
-      <% end %>
-      <% if @shipment.tracking_url %>
-        <p>
-          <%= Spree.t('shipment_mailer.shipped_email.track_link', url: link_to(@shipment.tracking_url, @shipment.tracking_url)).html_safe %>
-        </p>
-      <% end %>
-      <p>
-        <%= Spree.t('shipment_mailer.shipped_email.thanks') %>
-      </p>
+      <h3><%= Spree.t('shipment_mailer.shipped_email.shipment_summary') %></h3>
+    </td>
+  </tr>
+  <tr>
+    <td colspan="2">
+      <%= render 'spree/shared/purchased_items_table', line_items: @shipment.manifest.map(&:line_item), order: @shipment.order %>
     </td>
-    <td class="expander"></td>
   </tr>
 </table>
+<p>
+  <%= Spree.t('shipment_mailer.shipped_email.shipping_method', shipping_method: @shipment.shipping_method.name) %>
+</p>
+<% if @shipment.tracking %>
+  <p>
+    <%= Spree.t('shipment_mailer.shipped_email.track_information', tracking: @shipment.tracking) %>
+  </p>
+<% end %>
+<% if @shipment.tracking_url %>
+  <p>
+    <%= Spree.t('shipment_mailer.shipped_email.track_link', url: link_to(@shipment.tracking_url, @shipment.tracking_url)).html_safe %>
+  </p>
+<% end %>
+<p>
+  <%= Spree.t('shipment_mailer.shipped_email.thanks') %>
+  <br />
+  <%= Spree.t('shipment_mailer.shipped_email.store_team', store_name: current_store.name) %>
+</p>

data/app/views/spree/shipment_mailer/shipped_email.text.erb

@@ -1,4 +1,4 @@
-<%= Spree.t('shipment_mailer.shipped_email.dear_customer') %>
+<%= Spree.t('shipment_mailer.shipped_email.dear_customer', name: name_for(@shipment.order)) %>
 
 <%= Spree.t('shipment_mailer.shipped_email.instructions', number: @shipment.order.number) %>
 
@@ -14,3 +14,4 @@
 <%= Spree.t('shipment_mailer.shipped_email.track_link', url: @shipment.tracking_url) if @shipment.tracking_url %>
 
 <%= Spree.t('shipment_mailer.shipped_email.thanks') %>
+<%= Spree.t('shipment_mailer.shipped_email.store_team', store_name: current_store.name) %>

data/config/initializers/assets.rb

@@ -1 +1,2 @@
 Rails.application.config.assets.precompile += %w(logo/spree_50.png noimage/*.png)
+Rails.application.config.active_storage.content_types_to_serve_as_binary.delete('image/svg+xml')

data/config/locales/en.yml

@@ -13,6 +13,7 @@ en:
   activerecord:
     attributes:
       spree/address:
+        label: Address name
         address1: Address
         address2: Address (contd.)
         city: City
@@ -51,6 +52,7 @@ en:
       spree/option_type:
         name: Name
         presentation: Presentation
+        filterable: Filterable
       spree/order:
         checkout_complete: Checkout Complete
         completed_at: Completed At
@@ -453,6 +455,7 @@ en:
     acceptance_errors: Acceptance errors
     accepted: Accepted
     account: Account
+    account_info: Account info
     account_updated: Account updated
     action: Action
     actions:
@@ -501,10 +504,14 @@ en:
     address_book:
       other_address: "Other address"
       add_new_shipping_address: "Add new address"
-      new_shipping_address: "New Address"
-      edit_shipping_address: "Edit Address"
+      label: Address Name
+      address_name_label: Address Name
+      address_name_placeholder: Give this address a unique name (Work, Home, etc.)
+      new_address: "New Address"
+      edit_address: "Edit Address"
+      remove_address: Remove Address
       no_shipping_addresses_on_file: "No addresses on file"
-      shipping_addresses: "Addresses"
+      addresses: "Addresses"
       successfully_created: "Address has been successfully created."
       successfully_removed: "Address has been successfully removed."
       successfully_saved: "Saved successfully"
@@ -607,13 +614,16 @@ en:
     balance_due: Balance Due
     base_amount: Base Amount
     base_percent: Base Percent
+    basic_information: Basic Information
     bill_address: Bill Address
     billing: Billing
     billing_address: Billing Address
     both: Both
+    breadcrumbs: Breadcrumbs
     calculated_reimbursements: Calculated Reimbursements
     calculator: Calculator
     calculator_settings_warning: If you are changing the calculator type, you must save first before you can edit the calculator settings
+    call_us_now: 'Call us now: '
     cancel: cancel
     canceled: Canceled
     canceler: Canceler
@@ -627,18 +637,20 @@ en:
     cannot_set_shipping_method_without_address: Cannot set shipping method until customer details are provided.
     capture: Capture
     capture_events: Capture events
-    card_code: Card Code
+    card_code: Card Varification Code (CVC)
     card_number: Card Number
     card_type: Brand
     card_type_is: Card type is
     cart: Cart
     cart_page:
       add_promo_code: ADD PROMO CODE
+      change_quantity: Change quantity
       checkout: checkout
       empty_info: 'Your cart is empty.'
       header: Your shopping cart
       product: product
       quantity: quantity
+      remove_from_cart: Remove from cart
       title: Shopping Cart
     cart_subtotal:
       one: 'Subtotal (1 item)'
@@ -655,6 +667,8 @@ en:
     charged: Charged
     checkout: Checkout
     checkout_page:
+      main_navigation: Main navigation
+      checkout_navigation: Checkout navigation
       back_to_cart: back to the cart
       delivery_method: delivery method
       header: Checkout
@@ -674,12 +688,15 @@ en:
     close_all_adjustments: Close All Adjustments
     code: Code
     company: Company
+    compare_at_price: Compare at price
     complete: complete
     configuration: Configuration
     configurations: Configurations
     confirm: Confirm
     confirm_delete: Confirm Deletion
     confirm_password: Password Confirmation
+    contact_email: Contact email
+    contact_phone: Contact phone
     contact_us: Contact us
     continue: Continue
     continue_as_guest: Continue as a guest
@@ -725,24 +742,56 @@ en:
     credited: Credited
     credits: Credits
     currency: Currency
+    currencies: Currencies
     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
+    customer_support_email: Customer Support Email
+    new_order_notifications_email: New Order Notifications Email
     cut: Cut
     cvv: CVV
     cvv_response: CVV Response
     date: Date
     date_completed: Date Completed
     date_picker:
+      am: 'AM'
       first_day: 0
       format: ! '%Y/%m/%d'
-      js_format: yy/mm/dd
+      hourAriaLabel: 'Hour'
+      js_format: Y/m/d
+      js_date_time: Y/m/d - H:i
+      minuteAriaLabel: 'Minute'
+      pm: 'PM'
+      rangeSeparator: ' to '
+      scrollTitle: 'Scroll to increment'
+      toggleTitle: 'Click to toggle'
+      weekAbbreviation: 'Wk'
+      yearAriaLabel: 'Year'
+      sun: 'Sun'
+      mon: 'Mon'
+      tue: 'Tue'
+      wed: 'Wed'
+      thu: 'Thu'
+      fri: 'Fri'
+      sat: 'Sat'
+      lh_jan: 'January'
+      lh_feb: 'February'
+      lh_mar: 'March'
+      lh_apr: 'April'
+      lh_may: 'May'
+      lh_jun: 'June'
+      lh_jul: 'July'
+      lh_aug: 'August'
+      lh_sep: 'September'
+      lh_oct: 'October'
+      lh_nov: 'November'
+      lh_dec: 'December'
     date_range: Date Range
     default: Default
     default_country_cannot_be_deleted: Default country cannot be deleted
@@ -792,6 +841,8 @@ en:
     empty_cart: Empty Cart
     enable_mail_delivery: Enable Mail Delivery
     end: End
+    ends_at: Ends at
+    ending_at: Ending at
     ending_in: Ending in
     error: error
     errors:
@@ -831,22 +882,27 @@ en:
     extension: Extension
     extensions_directory: Extensions Directory
     existing_shipments: Existing shipments
+    facebook: Facebook
     failed_payment_attempts: Failed Payment Attempts
     filename: Filename
     fill_in_customer_info: Please fill in customer info
     filter: Filter
+    filterable: Filterable
     filter_results: Filter Results
     finalize: Finalize
     find_a_taxon: Find a Taxon
     finalized: Finalized
     first_item: First Item
     first_name: First Name
+    firstname: First Name
     first_name_begins_with: First Name Begins With
     flat_percent: Flat Percent
     flat_rate_per_order: Flat Rate
     flexible_rate: Flexible Rate
     follow_us: Follow us
+    footer_info: Footer info
     forgot_password: Forgot password?
+    free: Free
     free_shipping: Free Shipping
     free_shipping_amount: "-"
     front_end: Front End
@@ -855,6 +911,7 @@ en:
     general: General
     general_settings: General Settings
     generate_code: Generate coupon code
+    get_back_to_the: Get back to the
     go_to_category: Go to category
     go_to_facebook: Go to facebook
     go_to_homepage: Go to Home Page
@@ -863,13 +920,15 @@ en:
     guest_checkout: Guest Checkout
     guest_user_account: Checkout as a Guest
     has_no_shipped_units: has no shipped units
+    header_banner: Header banner
     height: Height
     hide_from_subcategories_nav: Hide from subcategories navigation
     home: Home
+    home_page: homepage
     homepage:
       bestsellers: BESTSELLERS
       fashion_trends: FASHION TRENDS
-      fashion_trends_note: Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam.
+      fashion_trends_note: Want to rock this season’s hottest trend in style? These are the top fashion from Summer 2020 Fashion Weeks that are coming our way this season.
       men: MEN
       new: NEW
       new_collection: NEW COLLECTION
@@ -878,7 +937,7 @@ en:
       shop_now: SHOP NOW
       sportswear: SPORTSWEAR
       streetstyle: STREETSTYLE
-      summer_2019: Summer 2019
+      summer_2020: Summer 2020
       summer_collection:  Summer Collection
       summer_sale: SUMMER SALE
       trending: TRENDING
@@ -889,6 +948,8 @@ en:
       available_locales: Available Locales
       fields: Fields
       language: Language
+      country: Country
+      default_country: Default Country
       localization_settings: Localization Settings
       only_incomplete: Only incomplete
       only_complete: Only complete
@@ -897,6 +958,8 @@ en:
       supported_locales: Supported Locales
       this_file_language: English (US)
       translations: Translations
+      checkout_zone_warning_html: "Selecting a Zone will limit customers on Checkout to Addresses in Countries in that Zone. <br />
+      Please see documentation: <a href='https://guides.spreecommerce.org/user/configuration/configuring_geography.html#zones' target='_blank' class='alert-link'>https://guides.spreecommerce.org/user/configuration/configuring_geography.html#zones</a>"
     icon: Icon
     image: Image
     images: Images
@@ -912,6 +975,7 @@ en:
     info_number_of_skus_not_shown:
       one: "and one other"
       other: "and %{count} others"
+    instagram: Instagram
     instructions_to_reset_password: Please enter your email on the form below
     insufficient_stock: Insufficient stock available, only %{on_hand} remaining
     insufficient_stock_item_quantity: Insufficient stock quantity available
@@ -919,6 +983,7 @@ en:
     intercept_email_address: Intercept Email Address
     intercept_email_instructions: Override email recipient and replace with this address.
     internal_name: Internal Name
+    internationalization: Internationalization
     invalid_credit_card: Invalid credit card.
     invalid_exchange_variant: Invalid exchange variant.
     invalid_payment_provider: Invalid payment provider.
@@ -929,7 +994,9 @@ en:
     inventory_error_flash_for_insufficient_quantity: An item in your cart has become unavailable.
     inventory_state: Inventory State
     is_not_available_to_shipment_address: is not available to shipment address
-    iso_name: Iso Name
+    iso: ISO Alpha-2
+    iso3: ISO Alpha-3
+    iso_name: ISO Name
     issued_on: Issued On
     item: Item
     item_description: Item Description
@@ -946,9 +1013,11 @@ en:
     items_reimbursed: Items reimbursed
     join_slack: Join Slack
     last_name: Last Name
+    lastname: Last Name
     last_name_begins_with: Last Name Begins With
     learn_more: Learn More
     lifetime_stats: Lifetime Stats
+    limit_usage_to: Limit usage to
     line_item_adjustments: "Line item adjustments"
     list: List
     loading: Loading
@@ -967,15 +1036,18 @@ en:
     login_as_existing: Login as Existing Customer
     login_failed: Login authentication failed.
     login_name: Login
+    logo: Logo
     logo_alt: Brand logo
     logout: Logout
     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
     mail_from_address: Mail from address
+    mailer_logo: Mailer logo (JPG or PNG images only)
     manage_promotion_categories: Manage Promotion Categories
     manual_intervention_required: Manual intervention required
     manage_variants: Manage Variants
+    master: Master
     master_price: Master Price
     master_sku: Master SKU
     match_choices:
@@ -1000,6 +1072,8 @@ en:
     name_on_card: Name on card
     name_or_sku: Name or SKU (enter at least first 3 characters of product name)
     nav_bar:
+      admin_panel: Admin Panel
+      change_country: Change country
       close_menu: Close menu
       go_to_previous_menu: Go to previous menu
       log_in: LOG IN
@@ -1010,6 +1084,8 @@ en:
       show_search: Show search
       show_user_menu: Show user menu
       sign_up: SIGN UP
+      desktop: Desktop navigation
+      mobile: Mobile navigation
     new: New
     new_adjustment: New Adjustment
     new_customer: Create new account
@@ -1053,6 +1129,7 @@ en:
     no_actions_added: No actions added
     no_address_given: No address given
     no_available_date_set: No available date set
+    no_country: No country set
     no_payment_found: No payment found
     no_pending_payments: No pending payments
     no_product_available:
@@ -1076,6 +1153,7 @@ en:
     not_found: ! '%{resource} is not found'
     note: Note
     notice_messages:
+      prices_saved: Prices successfully saved
       product_cloned: Product has been cloned
       product_deleted: Product has been deleted
       product_not_cloned: "Product could not be cloned. Reason: %{error}"
@@ -1109,17 +1187,25 @@ en:
     order_mailer:
       subtotal: ! 'Subtotal:'
       total: ! 'Order Total:'
+      store_team: '%{store_name} Team'
       cancel_email:
-        dear_customer: Dear Customer,
+        dear_customer: Dear %{name},
         instructions: Your order has been CANCELED.  Please retain this cancellation information for your records.
         order_summary_canceled: Order %{number} Summary [CANCELED]
         subject: Cancellation of Order
+        thanks: Thank you for your business.
       confirm_email:
-        dear_customer: Dear Customer,
+        dear_customer: Dear %{name},
         instructions: Please review and retain the following order information for your records.
         order_summary: Order %{number} Summary
         subject: Order Confirmation
         thanks: Thank you for your business.
+      store_owner_notification_email:
+        heading: New Order Received
+        instructions: You have received a new order.
+        order_summary: Order %{number} Summary
+        subject: '%{store_name} received a new order'
+        thanks: Thank you for your business.
     order_not_found: We couldn't find your order. Please try that action again.
     order_number: Order %{number}
     order_processed_successfully: Your order has been processed successfully
@@ -1148,6 +1234,7 @@ en:
     backordered_confirm_info: Selected item is backordered so expect delays. Are you sure you want to order it?
     overview: Overview
     package_from: package from
+    page_not_found: Sorry! Page you are looking can’t be found.
     pagination:
       next_page: next page &raquo;
       previous_page: ! '&laquo; previous page'
@@ -1205,7 +1292,6 @@ en:
       done: DONE
       default: DEFAULT
       filter_by: FILTER BY
-      home: Home
       newest_first: NEWEST FIRST
       no_results: No results
       no_results_found: No results found
@@ -1230,9 +1316,12 @@ en:
     preferred_reimbursement_type: Preferred Reimbursement Type
     presentation: Presentation
     preview_product: Preview Product
+    preview_taxon: Preview Taxon
     previous: Previous
     previous_state_missing: "n/a"
+    previously_used_card: Previously Used Cards
     price: Price
+    prices: Prices
     price_range: Price Range
     price_sack: Price Sack
     process: Process
@@ -1378,8 +1467,9 @@ en:
     return_items_cannot_be_associated_with_multiple_orders: Return items cannot be associated with multiple orders.
     reimbursement_mailer:
       reimbursement_email:
+        store_team: '%{store_name} Team'
         days_to_send: ! 'You have %{days} days to send back any items awaiting exchange.'
-        dear_customer: Dear Customer,
+        dear_customer: Dear %{name},
         exchange_summary: Exchange Summary
         for: for
         instructions: Your reimbursement has been processed.
@@ -1417,11 +1507,14 @@ en:
     security_settings: Security Settings
     select: Select
     select_from_prototype: Select From Prototype
+    select_a_date: Select a date
+    select_a_date_range: Select a date range
     select_a_return_authorization_reason: Select a reason for the return authorization
     select_a_stock_location: Select a stock location
     select_a_store_credit_reason: Select a reason for the store credit
     select_stock: Select stock
     selected_quantity_not_available: ! 'selected of %{item} is not available.'
+    seo: SEO
     send_copy_of_all_mails_to: Send Copy of All Mails To
     send_mails_as: Send Mails As
     seo_title: SEO title
@@ -1429,6 +1522,7 @@ en:
     server_error: The server returned an error
     settings: Settings
     ship: Ship
+    ship_to: "Shipping to:"
     ship_address: Ship Address
     ship_total: Ship Total
     shipment: Shipment
@@ -1436,7 +1530,8 @@ en:
     shipment_details: "From %{stock_location} via %{shipping_method}"
     shipment_mailer:
       shipped_email:
-        dear_customer: Dear Customer,
+        store_team: '%{store_name} Team'
+        dear_customer: Dear %{name},
         instructions: Your order %{number} has been shipped
         shipment_summary: Shipment Summary for order
         shipping_method: "Shipping method: %{shipping_method}"
@@ -1480,18 +1575,24 @@ en:
     show_discontinued: Show Discontinued
     show_only_complete_orders: Only show complete orders
     show_only_considered_risky: Only show risky orders
+    show_property: Show Property
     show_rate_in_label: Show rate in label
+    show_store_currency_selector:
+      short: Show Store selector
+      long: Display the Store selector in the main nav bar of Storefront and allow users to change Store and Currency
     sign_up: Sign Up
     sku: SKU
     skus: SKUs
     slug: Slug
     source: Source
+    social: Social
     special_instructions: Special Instructions
     split: Split
     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."
     start: Start
+    starting_from: Starts at
     state: State
     state_based: State Based
     states: States
@@ -1525,6 +1626,7 @@ en:
       reimbursed: Reimbursed
       resumed: Resumed
       returned: Returned
+      shipment: Shipment
       shipped: Shipped
       void: Void
     states_required: States Required
@@ -1542,7 +1644,8 @@ en:
     stock_transfer_name: Stock Transfer
     stock_transfer:
       errors:
-        must_have_variant: You must add atleast one variant.
+        must_have_variant: You must add at least one variant.
+        variants_unavailable: "Some variants are not available on %{stock}"
     stock_transfers: Stock Transfers
     stop: Stop
     store: Store
@@ -1597,6 +1700,8 @@ en:
     successfully_removed: ! '%{resource} has been successfully removed!'
     successfully_updated: ! '%{resource} has been successfully updated!'
     summary: Summary
+    supported_currencies: Supported Currencies
+    supported_currencies_long: A comma separated list of supported currencies
     tax: Tax
     tax_included: "Tax (incl.)"
     tax_categories: Tax Categories
@@ -1621,7 +1726,7 @@ en:
     taxonomy_categories_name: Categories
     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_instruction: ! '* Right click (or double tap on iOS device) a child in the tree to access the menu for adding, deleting or sorting a child.'
     taxons: Taxons
     test: Test
     test_mailer:
@@ -1657,6 +1762,7 @@ en:
     tree: Tree
     type: Type
     type_to_search: Type to search
+    twitter: Twitter
     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.
     under_price: Under %{price}
@@ -1689,6 +1795,7 @@ en:
     value: Value
     variant: Variant
     variant_placeholder: Choose a variant
+    variant_prices_search_placeholder: Search for SKU or variant name...
     variants: Variants
     version: Version
     void: Void
@@ -1702,5 +1809,7 @@ en:
     your_order_is_empty_add_product: Your order is empty, please search for and add a product above
     zip: Zip
     zipcode: Zip Code
+    zipcode_required: Zip Code Required
     zone: Zone
     zones: Zones
+    no_limits_zone: No Limits