spree 0.9.4 → 0.10.0.beta

data/config/locales/en-US.yml

@@ -1,12 +1,15 @@
---- 
+---
 en-US: 
+  'no': "No"
+  'yes': "Yes"
+  5_biggest_spenders: "5 Biggest Spenders"
   a_copy_of_all_mail_will_be_sent_to_the_following_addresses: A copy of all mail be sent to the following addresses
   abbreviation: Abbreviation
   access_denied: "Access Denied"
   account: Account
-  account_updated: "Account updated!"        
+  account_updated: "Account updated!"
   action: Action
-  actions: 
+  actions:
     cancel: Cancel
     create: Create
     destroy: Destroy
@@ -14,34 +17,54 @@ en-US:
     listing: Listing
     new: New
     update: Update
-  activerecord: 
-    attributes: 
-      address: 
+  active: "Active"
+  activerecord:
+    attributes:
+      address:
         address1: Address
         address2: "Address (contd.)"
         city: City
-        firstname: "First Name"
-        lastname: "Last Name"
+        country: "Country"
+        first_name: "First Name"
+        last_name: "Last Name"
         phone: Phone
+        state: "State"
         zipcode: "Zip Code"
-      country: 
+      checkout:
+        bill_address:
+          address1: "Billing address street"
+          city: "Billing address city"
+          firstname: "Billing address first name"
+          lastname: "Billing address last name"
+          phone: "Billing address phone"
+          state: "Billing address state"
+          zipcode: "Billing address zipcode"
+        ship_address:
+          address1: "Shipping address street"
+          city: "Shipping address city"
+          firstname: "Shipping address first name"
+          lastname: "Shipping address last name"
+          phone: "Shipping address phone"
+          state: "Shipping address state"
+          zipcode: "Shipping address zipcode"
+      country:
         iso: ISO
         iso3: ISO3
         iso_name: "ISO Name"
         name: Name
         numcode: "ISO Code"
-      creditcard: 
+      creditcard:
         cc_type: Type
         month: Month
         number: Number
         verification_value: "Verification Value"
         year: Year
-      inventory_unit: 
+      inventory_unit:
         state: State
-      line_item: 
+      line_item:
         price: Price
         quantity: Quantity
-      order: 
+      order:
         checkout_complete: "Checkout Complete"
         ip_address: "IP Address"
         item_total: "Item Total"
@@ -49,112 +72,137 @@ en-US:
         special_instructions: "Special Instructions"
         state: State
         total: Total
-      product: 
+      product:
         available_on: "Available On"
+        cost_price: "Cost Price"
         description: Description
         master_price: "Master Price"
         name: Name
         on_hand: "On Hand"
         shipping_category: "Shipping Category"
         tax_category: "Tax Category"
-      property: 
+      product_group:
+        name: Name
+        product_count: "Product count"
+        product_scopes: "Product scopes"
+        products: "Products"
+        url: URL
+      product_scope:
+        arguments: "Arguments"
+        description: "Description"
+      property:
         name: Name
         presentation: Presentation
-      prototype: 
+      prototype:
         name: Name
-      role: 
+      return_authorization:
+        amount: Amount
+      role:
         name: Name
-      state: 
+      state:
         abbr: Abbreviation
         name: Name
-      tax_category: 
+      tax_category:
         description: Description
         name: Name
-      tax_rate: 
-        amount: Rate        
-      taxon: 
+      tax_rate:
+        amount: Rate
+      taxon:
         name: Name
         permalink: Permalink
         position: Position
-      taxonomy: 
+      taxonomy:
         name: Name
-      user: 
+      user:
         email: Email
-      variant: 
+      variant:
+        cost_price: "Cost Price"
         depth: Depth
         height: Height
         price: Price
         sku: SKU
         weight: Weight
         width: Width
-      zone: 
+      zone:
         description: Description
         name: Name
-    models: 
-      address: 
+    models:
+      address:
         one: Address
         other: Addresses
-      country: 
+      cheque_payment:
+        one: Cheque Payment
+        other: Cheque Payments
+      country:
         one: Country
         other: Countries
-      creditcard: 
+      creditcard:
         one: "Credit Card"
         other: "Credit Cards"
-      creditcard_payment: 
+      creditcard_payment:
         one: "Credit Card Payment"
         other: "Credit Card Payments"
-      creditcard_txn: 
+      creditcard_txn:
         one: "Credit Card Transaction"
         other: "Credit Card Transactions"
-      inventory_unit: 
+      inventory_unit:
         one: "Inventory Unit"
         other: "Inventory Units"
-      line_item: 
+      line_item:
         one: "Line Item"
         other: "Line Items"
-      order: 
+      order:
         one: Order
         other: Orders
-      payment: 
+      payment:
         one: Payment
         other: Payments
-      product: 
+      product:
         one: Product
         other: Products
-      property: 
+      product_group:
+        one: "Product group"
+        other: "Product groups"
+      property:
         one: Property
         other: Properties
-      prototype: 
+      prototype:
         one: Prototype
         other: Prototypes
-      role: 
+      return_authorization:
+        one: Return Authorization
+        other: Return Authorizations
+      role:
         one: Roles
         other: Roles
-      shipping_category: 
+      shipment:
+        one: Shipment
+        other: Shipments
+      shipping_category:
         one: "Shipping Category"
         other: "Shipping Categories"
-      state: 
+      state:
         one: State
-        other: States   
-      tax_category: 
+        other: States
+      tax_category:
         one: "Tax Category"
         other: "Tax Categories"
-      tax_rate: 
+      tax_rate:
         one: "Tax Rate"
-        other: "Tax Rates"        
-      taxon: 
+        other: "Tax Rates"
+      taxon:
         one: Taxon
         other: Taxons
-      taxonomy: 
+      taxonomy:
         one: Taxonomy
         other: Taxonomies
-      user: 
+      user:
         one: User
         other: Users
-      variant: 
+      variant:
         one: Variant
         other: Variants
-      zone: 
+      zone:
         one: Zone
         other: Zones
   add: Add
@@ -163,7 +211,9 @@ en-US:
   add_option_type: "Add Option Type"
   add_option_types: "Add Option Types"
   add_option_value: "Add Option Value"
+  add_product: "Add Product"
   add_product_properties: "Add Product Properties"
+  add_scope: "Add a scope"
   add_state: "Add State"
   add_to_cart: "Add To Cart"
   add_zone: "Add Zone"
@@ -171,15 +221,18 @@ en-US:
   address: Address
   address_information: "Address Information"
   adjustment: Adjustment
+  adjustments: Adjustments
   administration: Administration
   all: "All"
+  all_departments: All departments
   allow_backorders: "Allow Backorders"
   allow_ssl_to_be_used_when_in_developement_and_test_modes: Allow SSL to be used when in development and test modes
-  allow_ssl_to_be_used_when_in_production_mode: Allow SSL to be used in production mode         
+  allow_ssl_to_be_used_when_in_production_mode: Allow SSL to be used in production mode
   allowed_ssl_in_production_mode: "SSL will {{not}} be used in production"
   already_registered: Already Registered?
   alternative_phone: Alternative Phone
   amount: Amount
+  analytics_trackers: Analytics Trackers
   are_you_sure: "Are you sure?"
   are_you_sure_category: "Are you sure you want to delete this category?"
   are_you_sure_delete: "Are you sure you want to delete this record?"
@@ -192,17 +245,26 @@ en-US:
   authorized: Authorized
   available_on: "Available On"
   available_taxons: "Available Taxons"
+  awaiting_return: Awaiting Return
   back: Back
   back_to_store: "Go Back To Store"
+  backordered: Backordered
   backordering_is_allowed: "Backordering {{not}} allowed"
+  balance_due: "Balance Due"
+  best_selling_products: "Best Selling Products"
+  best_selling_taxons: "Best Selling Taxons"
   bill_address: "Bill Address"
+  billing: Billing
   billing_address: "Billing Address"
+  by_day: "by day"
   calculator: Calculator
   calculator_settings_warning: "If you are changing the calculator type, you must save first before you can edit the calculator settings"
   cancel: cancel
   canceled: Canceled
-  capture: capture
+  cannot_create_returns: Cannot create returns as this order has not shipped yet.
+  capture: Capture
   card_code: "Card Code"
+  card_details: "Card details"
   card_number: "Card Number"
   card_type_is: Card type is
   cart: Cart
@@ -210,10 +272,21 @@ en-US:
   category: Category
   change: Change
   change_language: "Change Language"
+  change_my_password: "Change my password"
   charge_total: Charge Total
   charged: Charged
+  charges: Charges
   checkout: Checkout
+  checkout_steps:
+    # keys correspond to Checkout state names:
+    address: Address
+    complete: Complete
+    confirm: Confirm
+    delivery: Delivery
+    payment: Payment
+  cheque: Cheque
   city: City
+  clone: Clone
   code: Code
   combine: Combine
   comp_order: "Comp Order"
@@ -223,15 +296,19 @@ en-US:
   configuration: Configuration
   configuration_options: "Configuration Options"
   configurations: Configurations
+  configured: Configured
   confirm: Confirm
   confirm_delete: "Confirm Deletion"
   confirm_password: "Password Confirmation"
   continue: Continue
   continue_shopping: "Continue shopping"
   copy_all_mails_to: Copy All Mails To
+  cost_price: "Cost Price"
+  count: Count
+  count_of_reduced_by: "count of '{{name}}' reduced by {{count}}"
   country: Country
   country_based: "Country Based"
-  coupon: Coupon                                                                             
+  coupon: Coupon
   coupon_code: Coupon Code
   coupons: Coupons
   coupons_description: Manage coupons
@@ -239,42 +316,57 @@ en-US:
   create_a_new_account: "Create a new account"
   create_user_account: Create User Account
   created_successfully: "Created Successfully"
+  credit: Credit
   credit_card: "Credit Card"
   credit_card_capture_complete: "Credit Card Was Captured"
   credit_card_payment: "Credit Card Payment"
+  credit_owed: "Credit Owed"
   credit_total: Credit Total
   creditcard: Creditcard
+  creditcards: Creditcards
+  credits: Credits
   current: Current
   customer: Customer
+  customer_details: "Customer Details"
+  customer_search: "Customer Search"
+  date_created: Date created
   date_range: "Date Range"
+  debit: Debit
   delete: Delete
   depth: Depth
   description: Description
   destroy: Destroy
   display: Display
   edit: Edit
+  editing_billing_integration: Editing Billing Integration
   editing_category: "Editing Category"
   editing_coupon: Editing Coupon
   editing_option_type: "Editing Option Type"
   editing_option_types: "Editing Option Types"
+  editing_payment_method: Editing Payment Method
   editing_product: "Editing Product"
+  editing_product_group: "Editing Product Group"
   editing_property: "Editing Property"
   editing_prototype: "Editing Prototype"
   editing_shipping_category: "Editing Shipping Category"
   editing_shipping_method: "Editing Shipping Method"
-  editing_shipping_rate: Editing Shipping Rate 
+  editing_shipping_rate: Editing Shipping Rate
   editing_state: "Editing State"
   editing_tax_category: "Editing Tax Category"
   editing_tax_rate: "Editing Tax Rate"
-  editing_user: "Editing User"   
+  editing_tracker: Editing Tracker
+  editing_user: "Editing User"
   editing_zone: "Editing Zone"
   email: Email
   email_address: "Email Address"
   email_server_settings_description: "Set email server settings."
   empty_cart: "Empty Cart"
-  enable_mail_delivery: Enable Mail Delivery      
+  enable_login_via_login_password: "Use standard email/password"
+  enable_login_via_openid: "Use OpenID instead"
+  enable_mail_delivery: Enable Mail Delivery
   enable_mail_queue: "Enable Mail Queue"
   enter_exactly_as_shown_on_card: Please enter exactly as shown on the card
+  environment: "Environment"
   error: error
   event: Event
   existing_customer: "Existing Customer"
@@ -285,9 +377,11 @@ en-US:
   extensions: Extensions
   filename: Filename
   final_confirmation: "Final Confirmation"
+  finalize: Finalize
+  finalized_payments: Finalized Payments
   first_item: First Item Cost
-  first_name: "First Name"                 
-  flat_percent: "Flat Percent"                  
+  first_name: "First Name"
+  flat_percent: "Flat Percent"
   flat_rate_amount: Amount
   flat_rate_per_item: "Flat Rate (per item)"
   flat_rate_per_order: "Flat Rate (per order)"
@@ -298,6 +392,7 @@ en-US:
   gateway_configuration: "Gateway configuration"
   gateway_error: "Gateway Error"
   gateway_setting_description: "Select a payment gateway and configure its settings."
+  gateway_settings_warning: "If you are changing the gateway type, you must save first before you can edit the gateway settings"
   general: "General"
   general_settings: "General Settings"
   general_settings_description: "Configure general Spree settings."
@@ -306,8 +401,9 @@ en-US:
   google_analytics_create: "Create New Google Analytics Account"
   google_analytics_id: "Analytics ID"
   google_analytics_new: "New Google Analytics Account"
-  google_analytics_setting_description: "Manage Google Analytics ID" 
+  google_analytics_setting_description: "Manage Google Analytics ID"
   guest_user_account: Checkout as a Guest
+  has_no_shipped_units: has no shipped units
   height: Height
   hello_user: "Hello User"
   history: History
@@ -317,33 +413,48 @@ en-US:
   images: Images
   images_for: "Images for"
   in_progress: "In Progress"
+  include_in_shipment: Include in Shipment
+  included_in_other_shipment: Included in another Shipment
+  included_in_this_shipment: Included in this Shipment
+  instructions_to_reset_password: "Fill out the form below and instructions to reset your password will be emailed to you:"
+  integration_settings_warning: "If you are changing the billing integration, you must save first before you can edit the integration settings"
   invalid_search: "Invalid search criteria."
   inventory: Inventory
   inventory_adjustment: "Inventory Adjustment"
   inventory_setting_description: "Inventory Configuration, Backordering, Zero-Stock Display"
   inventory_settings: "Inventory Settings"
+  is_not_available_to_shipment_address: is not available to shipment address
   issue_number: Issue Number
   item: Item
   item_description: "Item Description"
   item_total: "Item Total"
+  items: "Items"
+  last_14_days: "Last 14 Days"
+  last_5_orders: "Last 5 Orders"
+  last_7_days: "Last 7 Days"
+  last_month: "Last Month"
   last_name: "Last Name"
+  last_year: "Last Year"
   list: List
   listing_categories: "Listing Categories"
   listing_option_types: "Listing Option Types"
   listing_orders: "Listing Orders"
+  listing_product_groups: "Listing Product Groups"
   listing_reports: "Listing Reports"
   listing_tax_categories: "Listing Tax Categories"
   listing_users: "Listing Users"
+  live: "Live"
   loading: Loading
   locale_changed: "Locale Changed"
   log_in: "Log In"
   logged_in_as: "Logged in as"
   logged_in_succesfully: "Logged in successfully"
-  logged_out: "You have been logged out." 
-  login_as_existing: "Log In as Existing Customer" 
-  login_failed: "Login authentication failed."    
+  logged_out: "You have been logged out."
+  login_as_existing: "Log In as Existing Customer"
+  login_failed: "Login authentication failed."
   login_name: Login
-  logout: Logout  
+  logout: Logout
+  look_for_similar_items: Look for similar items
   maestro_or_solo_cards: Maestro/Solo cards
   mail_delivery_enabled: "Mail delivery is enabled"
   mail_delivery_not_enabled: "Mail delivery is not enabled"
@@ -351,27 +462,35 @@ en-US:
   mail_queue_not_enabled: "Mail queue is not enabled (emails are delivered immediately)"
   mail_server_preferences: Mail Server Preferences
   mail_server_settings: "Mail Server Settings"
+  make_refund: Make refund
   mark_shipped: "Mark Shipped"
   master_price: "Master Price"
   max_items: Max Items
   meta_description: "Meta Description"
   meta_keywords: "Meta Keywords"
   metadata: "Metadata"
+  missing_required_information: "Missing Required Information"
   month: "Month"
   my_account: "My Account"
-  my_orders: "My Orders"    
+  my_orders: "My Orders"
   name: Name
   new: New
+  new_adjustment: "New Adjustment"
+  new_billing_integration: New Billing Integration
   new_category: "New category"
   new_coupon: New Coupon
-  new_credit_card_payment: "New Credit Card Payment"
   new_customer: "New Customer"
   new_image: "New Image"
   new_option_type: "New Option Type"
   new_option_value: "New Option Value"
+  new_order: "New Order"
+  new_payment: "New Payment"
+  new_payment_method: New Payment Method
   new_product: "New Product"
+  new_product_group: New Product Group
   new_property: "New Property"
   new_prototype: "New Prototype"
+  new_return_authorization: New Return Authorization
   new_shipment: "New Shipment"
   new_shipping_category: "New Shipping Category"
   new_shipping_method: "New Shipping Method"
@@ -381,17 +500,21 @@ en-US:
   new_tax_rate: "New Tax Rate"
   new_taxon: "New Taxon"
   new_taxonomy: "New Taxonomy"
+  new_tracker: New Tracker
   new_user: "New User"
   new_variant: "New Variant"
   new_zone: "New Zone"
   next: Next
-  no: "No"
   no_items_in_cart: ""
   no_match_found: "No Match Found"
+  no_payment_methods_available: "Can't check out, no payment methods are configured for this environment"
+  no_products_found: "No products found"
+  no_shipping_methods_available: "No shipping methods available, please change your address and try again."
   no_user_found: "No user was found with that email address"
   none: None
   none_available: "None Available"
   not: not
+  note: Note
   on_hand: "On Hand"
   operation: Operation
   option_Values: "Option Values"
@@ -399,6 +522,8 @@ en-US:
   option_values: "Option Values"
   options: Options
   or: or
+  ord_qty: "Ord. Qty"
+  ord_total: "Ord. Total"
   order: Order
   order_confirmation_note: ""
   order_date: "Order Date"
@@ -407,14 +532,20 @@ en-US:
   order_not_in_system: That order number is not valid on this site.
   order_number: Order
   order_operation_authorize: Authorize
+  order_processed_but_following_items_are_out_of_stock: "Your order has been processed, but following items are out of stock:"
   order_processed_successfully: "Your order has been processed successfully"
   order_summary: Order Summary
+  order_sure_want_to: "Are you sure you want to {{event}} this order?"
   order_total: "Order Total"
   order_total_message: "The total amount charged to your card will be"
   order_updated: "Order Updated"
   orders: Orders
+  other_payment_options: Other Payment Options
   out_of_stock: "Out of Stock"
+  out_of_stock_products: "Out of Stock Products"
+  over_paid: "Over Paid"
   overview: Overview
+  overview_welcome: "Welcome to your store overview, currently we do not have enough data to display the Overiew Dashboard.<br/><br/> The dashboard will display automatically once the system has sufficent orders to allow generation of the statistics."
   page_only_viewable_when_logged_in: You attempted to visit a page which can only be viewed when you are logged in
   page_only_viewable_when_logged_out: You attempted to visit a page which can only be viewed when you are logged out
   paid: Paid
@@ -422,21 +553,29 @@ en-US:
   password: Password
   password_reset_instructions: "Password Reset Instructions"
   password_reset_instructions_are_mailed: "Instructions to reset your password have been emailed to you. Please check your email."
-  password_reset_token_not_found: "We're sorry, but we could not locate your account. If you are having issues try copying and pasting the URL from your email into your browser or restarting the reset password process."    
-  password_updated: "Password successfully updated"  
-  path: Path      
+  password_reset_token_not_found: "We're sorry, but we could not locate your account. If you are having issues try copying and pasting the URL from your email into your browser or restarting the reset password process."
+  password_updated: "Password successfully updated"
+  path: Path
   pay: pay
   payment: Payment
   payment_gateway: "Payment Gateway"
   payment_information: "Payment Information"
+  payment_method: Payment Method
+  payment_methods: Payment Methods
+  payment_methods_setting_description: Configure methods customers can use to pay
+  payment_updated: Payment Updated
   payments: Payments
+  pending_payments: Pending Payments
+  permalink: Permalink
   phone: Phone
-  place_order: Place Order        
-  please_create_user: "Please create a user account"     
+  place_order: Place Order
+  please_create_user: "Please create a user account"
   powered_by: "Powered by"
   presentation: Presentation
+  preview: Preview
   previous: Previous
   price: Price
+  price_with_vat_included: "{{price}} (inc. VAT)"
   problem_authorizing_card: "Problem authorizing credit card"
   problem_capturing_card: "Problem capturing credit card"
   problems_processing_order: "We had problems processing your order"
@@ -444,52 +583,194 @@ en-US:
   process: Process
   product: Product
   product_details: "Product Details"
-  product_has_no_description: Product has not description
+  product_group: Product Group
+  product_group_invalid: Product Group has invalid scopes
+  product_groups: Product Groups
+  product_has_no_description: This product has no description
   product_properties: "Product Properties"
+  product_scopes:
+    groups:
+      price:
+        description: "Scopes for selecting products based on Price"
+        name: Price
+      search:
+        description: "Scopes for selecting products based on name, keywords and description of product"
+        name: "Text search"
+      taxon:
+        description: "Scopes for selecting products based on Taxons"
+        name: Taxon
+      values:
+        description: "Scopes for selecting products based on option and property values"
+        name: Values
+    scopes:
+      ascend_by_master_price:
+        name: Ascend by product master price
+      ascend_by_name:
+        name: Ascend by product name
+      ascend_by_updated_at:
+        name: Ascend by actualization date
+      descend_by_popularity:
+        name: Sort by popularity(most popular first)
+      descend_by_master_price:
+        name: Descend by product master price
+      descend_by_name:
+        name: Descend by product name
+      descend_by_updated_at:
+        name: Descend by actualization date
+      in_name:
+        args:
+          words: Words
+        description: "(separated by space or comma)"
+        name: "Product name have following"
+        sentence: product name contain <em>%s</em>
+      in_name_or_description:
+        args:
+          words: Words
+        description: "(separated by space or comma)"
+        name: "Product name or description have following"
+        sentence: name or description contain <em>%s</em>
+      in_name_or_keywords:
+        args:
+          words: Words
+        description: "(separated by space or comma)"
+        name: "Product name or meta keywords have following"
+        sentence: name or keywords contain <em>%s</em>
+      in_taxons:
+        args:
+          "taxon_names": "Taxon names"
+        description: "Taxon names have to be separated by comma or space(eg. adidas,shoes)"
+        name: "In taxons and all their descendants"
+        sentence: in <em>%s</em> and all their descendants
+      master_price_gte:
+        args:
+          amount: Amount
+        description: ""
+        name: "Master price greater or equal to"
+        sentence: price greater or equal to <em>%.2f</em>
+      master_price_lte:
+        args:
+          amount: Amount
+        description: ""
+        name: "Master price lesser or equal to"
+        sentence: price less or equal to <em>%.2f</em>
+      price_between:
+        args:
+          high: High
+          low: Low
+        description: ""
+        name: "Price between"
+        sentence: price between <em>%.2f</em> and <em>%.2f</em>
+      taxons_name_eq:
+        args:
+          taxon_name: "Taxon name"
+        description: "In specific taxon - without descendants"
+        name: "In Taxon(without descendants)"
+        sentence: in <em>%s</em>
+      with:
+        args:
+          value: Value
+        description: "Selects all products that have at least one variant that have specified value as either option or property (eg. red)"
+        name: With value
+        sentence: with value <em>%s</em>
+      with_option:
+        args:
+          option: Option
+        description: "Selects all products that have specified option(eg. color)"
+        name: "With option"
+        sentence: with option <em>%s</em>
+      with_option_value:
+        args:
+          option: Option
+          value: Value
+        description: "Selects all products that have at least one variant with specified option and value(eg. color:red)"
+        name: "With option and value"
+        sentence: with option <em>%s</em> and value <em>%s</em>
+      with_property:
+        args:
+          property: Property
+        description: "Selects all products that have specified property(eg. weight)"
+        name: "With property"
+        sentence: with property <em>%s</em>
+      with_property_value:
+        args:
+          property: Property
+          value: Value
+        description: "Selects all products that have at least one variant with specified property and value(eg. weight:10kg)"
+        name: "With property value"
+        sentence: with property <em>%s</em> and value <em>%s</em>
   products: Products
   products_with_zero_inventory_display: "Products with a zero inventory will {{not}} be displayed"
   properties: Properties
   property: Property
   prototype: Prototype
   prototypes: Prototypes
+  provider: "Provider"
+  provider_settings_warning: "If you are changing the provider type, you must save first before you can edit the provider settings"
   qty: Qty
+  quantity_shipped: Quantity Shipped
+  range: "Range"
   rate: Rate
+  reason: Reason
+  recalculate_order_total: "Recalculate order total"
+  receive: receive
+  received: Received
+  refund: Refund
   register: Register as a New User
   register_or_guest: Checkout as Guest or Register
-  registration: Registration           
+  registration: Registration
   remember_me: "Remember me"
   remove: Remove
   reports: Reports
   required_for_solo_and_maestro: Required for Solo and Maestro cards.
   resend: Resend
   reset_password: "Reset my password"
-  response_code: "Response Code"  
+  resource_controller:
+    member_object_not_found: "Member object not found."
+    successfully_created: "Successfully created!"
+    successfully_removed: "Successfully removed!"
+    successfully_updated: "Successfully updated!"
+  response_code: "Response Code"
   resume: "resume"
   resumed: Resumed
   return: return
+  return_authorization: Return Authorization
+  return_authorization_updated: Return authorization updated
+  return_authorizations: Return Authorizations
+  return_quantity: Return Quantity
   returned: Returned
+  rma_number: RMA Number
+  rma_value: RMA Value
   roles: Roles
   sales_tax: "Sales Tax"
   sales_total: "Sales Total"
   sales_total_for_all_orders: "Sales total for all orders"
   sales_totals: "Sales Totals"
   sales_totals_description: "Sales Total For All Orders"
-  save_preferences: Save Preferences           
+  save_and_continue: Save and Continue
+  save_preferences: Save Preferences
+  scope: Scope
+  scopes: Scopes
   search: Search
+  search_results: "Search results for '{{keywords}}'"
   secure_connection_type: Secure Connection Type
+  secure_creditcard: Secure Creditcard
   select: Select
   select_from_prototype: "Select From Prototype"
   select_preferred_shipping_option: "Select preferred shipping option"
   send_copy_of_all_mails_to: Send Copy of All Mails To
-  send_copy_of_orders_mails_to: Send Copy of Order Mails To         
-  send_mails_as: Send Mails As                    
-  send_order_mails_as: Send Order Mails As   
-  server_error: "The server returned an error"  
+  send_copy_of_orders_mails_to: Send Copy of Order Mails To
+  send_mails_as: Send Mails As
+  send_order_mails_as: Send Order Mails As
+  server: Server
+  server_error: "The server returned an error"
   settings: Settings
   ship: ship
   ship_address: "Ship Address"
   shipment: Shipment
+  shipment_details: Shipment Details
   shipment_number: "Shipment #"
+  shipment_updated: Shipment Updated
+  shipments: "Shipments"
   shipped: Shipped
   shipping: Shipping
   shipping_address: "Shipping Address"
@@ -507,29 +788,33 @@ en-US:
   shipping_total: "Shipping Total"
   shop_by_taxonomy: "Shop by {{taxonomy}}"
   shopping_cart: "Shopping Cart"
+  show: Show
   show_deleted: "Show Deleted"
   show_incomplete_orders: "Show Incomplete Orders"
   show_only_complete_orders: "Only show complete orders"
   show_out_of_stock_products: "Show out-of-stock products"
   show_price_inc_vat: "Show price including VAT"
+  showing_first_n: "Showing first {{n}}"
   sign_up: "Sign up"
   site_name: "Site Name"
   site_url: "Site URL"
   sku: SKU
   smtp: SMTP
-  smtp_authentication_type: SMTP Authentication Type         
+  smtp_authentication_type: SMTP Authentication Type
   smtp_domain: SMTP Domain
-  smtp_mail_host: SMTP Mail Host                       
+  smtp_mail_host: SMTP Mail Host
   smtp_password: SMTP Password
-  smtp_port: SMTP Port          
+  smtp_port: SMTP Port
   smtp_send_all_emails_as_from_following_address: "Send all mails as from the following address."
   smtp_send_copy_of_orders_to_this_addresses: "Sends a copy of all order's mails to this address. For multiple addresses, separate with commas."
-  smtp_send_copy_to_this_addresses: "Sends a copy of all outgoing mails to this address. For multiple addresses, separate with commas." 
+  smtp_send_copy_to_this_addresses: "Sends a copy of all outgoing mails to this address. For multiple addresses, separate with commas."
   smtp_send_order_mails_as_from_following_address: "Send orders mails as from the following address."
-  smtp_username: SMTP Username  
+  smtp_username: SMTP Username
+  sold: Sold
+  sort_ordering: "Sort ordering"
   spree:
     date: Date
-    time: Time                                               
+    time: Time
   ssl_will_be_used_in_development_and_test_modes: "SSL will be used in development and test mode if necessary."
   ssl_will_be_used_in_production_mode: "SSL will be used in production mode"
   ssl_will_not_be_used_in_development_and_test_modes: "SSL will not be used in development and test mode if necessary."
@@ -559,29 +844,38 @@ en-US:
   tax_total: "Tax Total"
   tax_type: "Tax Type"
   taxon: Taxon
+  taxon_edit: Edit Taxon
   taxonomies: Taxonomies
   taxonomies_setting_description: "Create and manage taxonomies"
   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."
   taxons: Taxons
+  test: "Test"
+  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."
   this_file_language: "English (US)"
+  this_month: "This Month"
+  this_year: "This Year"
   thumbnail: "Thumbnail"
   to_add_variants_you_must_first_define: "To add variants, you must first define"
+  top_grossing_products: "Top Grossing Products"
   total: Total
   tracking: Tracking
   transaction: Transaction
+  transactions: Transactions
   tree: Tree
-  try_again: "Try Again"     
+  try_again: "Try Again"
   type: Type
   unable_ship_method: "Unable to generate shipping methods due to a server error."
   unable_to_authorize_credit_card: "Unable to Authorize Credit Card"
   unable_to_capture_credit_card: "Unable to Capture Credit Card"
+  unable_to_connect_to_gateway: "Unable to connect to gateway."
   unable_to_save_order: "Unable to Save Order"
+  under_paid: "Under Paid"
   unrecognized_card_type: Unrecognized card type
   update: Update
-  update_password: "Update my password and log me in"                    
+  update_password: "Update my password and log me in"
   updated_successfully: "Updated Successfully"
   updating: Updating
   usage_limit: Usage Limit
@@ -590,12 +884,19 @@ en-US:
   use_different_shipping_address: "Use Different Shipping Address"
   user: User
   user_account: User Account
+  user_created_successfully: "User created successfully"
   user_details: "User Details"
   users: Users
+  validation:
+    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"
   value: Value
   variants: Variants
-  vat: "VAT"           
+  vat: "VAT"
   version: Version
+  view_shipping_options: "View shipping options"
+  void: Void
   website: Website
   weight: Weight
   welcome_to_sample_store: "Welcome to the sample store"
@@ -604,7 +905,6 @@ en-US:
   whats_this: "What's this"
   width: Width
   year: "Year"
-  yes: "Yes"
   you_have_been_logged_out: "You have been logged out."
   your_cart_is_empty: "Your cart is empty"
   zip: Zip