spree 0.8.5 → 0.9.0

data/config/locales/en-GB.yml

@@ -46,10 +46,8 @@ en-GB:
         ip_address: "IP Address"
         item_total: "Item Total"
         number: Number
-        ship_amount: "Ship Amount"
         special_instructions: "Special Instructions"
         state: State
-        tax_amount: "Tax Amount"
         total: Total
       product: 
         available_on: "Available On"
@@ -58,6 +56,7 @@ en-GB:
         name: Name
         on_hand: "On Hand"
         shipping_category: "Shipping Category"
+        tax_category: "Tax Category"
       property: 
         name: Name
         presentation: Presentation
@@ -68,6 +67,11 @@ en-GB:
       state: 
         abbr: Abbreviation
         name: Name
+      tax_category: 
+        description: Description
+        name: Name
+      tax_rate: 
+        amount: Rate        
       taxon: 
         name: Name
         permalink: Permalink
@@ -132,6 +136,12 @@ en-GB:
       state: 
         one: State
         other: States
+      tax_category: 
+        one: "Tax Category"
+        other: "Tax Categories"
+      tax_rate: 
+        one: "Tax Rate"
+        other: "Tax Rates"        
       taxon: 
         one: Taxon
         other: Taxons
@@ -157,14 +167,18 @@ en-GB:
   add_state: "Add State"
   add_to_cart: "Add To Basket"
   add_zone: "Add Zone"
+  additional_item: Additional Item Cost
   address: Address
   address_information: "Address Information"
   adjustment: Adjustment
   administration: Administration
+  all: "All"
   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         
+  allowed_ssl_in_production_mode: "SSL will {{not}} be used in production"
   already_registered: Already Registered?
+  alternative_phone: Alternative Phone
   amount: Amount
   are_you_sure: "Are you sure"
   are_you_sure_category: "Are you sure you want to delete this category?"
@@ -180,41 +194,55 @@ en-GB:
   available_taxons: "Available Taxons"
   back: Back
   back_to_store: "Go Back To Store"
+  backordering_is_allowed: "Backordering {{not}} allowed"
   bill_address: "Bill Address"
   billing_address: "Billing Address"
+  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
   card_code: "Card Code"
   card_number: "Card Number"
+  card_type_is: Card type is
   cart: Basket
   categories: Categories
   category: Category
   change: Change
   change_language: "Change Language"
+  charge_total: Charge Total
   charged: Charged
   checkout: Checkout
   city: Town / City
+  code: Code
+  combine: Combine
   comp_order: "Comp Order"
   comp_order_confirmation: "Customer will not be charged.  Are you sure you want to comp this order?"
+  complete: complete
   complete_list: "Complete List"
   configuration: Configuration
   configuration_options: "Configuration Options"
   configurations: Configurations
   confirm: Confirm
+  confirm_delete: "Confirm Deletion"
   confirm_password: "Password Confirmation"
   continue: Continue
   continue_shopping: "Continue shopping"
   copy_all_mails_to: Copy All Mails To                                                                             
   country: Country
   country_based: "Country Based"
+  coupon: Coupon                                                                             
+  coupon_code: Coupon Code
+  coupons: Coupons
+  coupons_description: Manage coupons
   create: Create
   create_a_new_account: "Create a new account"
   create_user_account: Create User Account
-  created_successfully:
+  created_successfully: "Created Successfully"
   credit_card: "Credit Card"
   credit_card_capture_complete: "Credit Card Was Captured"
   credit_card_payment: "Credit Card Payment"
+  credit_total: Credit Total
   creditcard: Creditcard
   current: Current
   customer: Customer
@@ -226,6 +254,7 @@ en-GB:
   display: Display
   edit: Edit
   editing_category: "Editing Category"
+  editing_coupon: Editing Coupon
   editing_option_type: "Editing Option Type"
   editing_option_types: "Editing Option Types"
   editing_product: "Editing Product"
@@ -233,15 +262,19 @@ en-GB:
   editing_prototype: "Editing Prototype"
   editing_shipping_category: "Editing Shipping Category"
   editing_shipping_method: "Editing Shipping Method"
+  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_zone:
+  editing_zone: "Editing Zone"
   email: Email
   email_address: "Email Address"
   email_server_settings_description: "Set email server settings."
   empty_cart: "Empty Basket"
   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
   error: error
   event: Event
   existing_customer: "Existing Customer"
@@ -252,9 +285,17 @@ en-GB:
   extensions: Extensions
   filename: Filename
   final_confirmation: "Final Confirmation"
+  first_item: First Item Cost
   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)"
+  flexible_rate: "Flexible Rate"
   forgot_password: "Forgot Password"
+  full_name: "Full Name"
   gateway: Gateway
+  gateway_configuration: "Gateway configuration"
   gateway_error: "Gateway Error"
   gateway_setting_description: "Select a payment gateway and configure its settings."
   general: "General"
@@ -271,14 +312,17 @@ en-GB:
   hello_user: "Hello User"
   history: History
   home: "Home"
+  icons_by: "Icons by"
   image: Image
   images: Images
+  images_for: "Images for"
   in_progress: "In Progress"
-  invalid_search:
+  invalid_search: "Invalid search criteria."
   inventory: Inventory
   inventory_adjustment: "Inventory Adjustment"
   inventory_setting_description: "Inventory Configuration, Backordering, Zero-Stock Display"
   inventory_settings: "Inventory Settings"
+  issue_number: Issue Number
   item: Item
   item_description: "Item Description"
   item_total: "Item Total"
@@ -290,6 +334,7 @@ en-GB:
   listing_reports: "Listing Reports"
   listing_tax_categories: "Listing Tax Categories"
   listing_users: "Listing Users"
+  loading: Loading
   locale_changed: "Locale Changed"
   log_in: "Log In"
   logged_in_as: "Logged in as"
@@ -299,12 +344,16 @@ en-GB:
   login_failed: "Login authentication failed."      
   login_name: Login
   logout: Logout
-  mail_delivery_enabled:
-  mail_delivery_not_enabled:
+  maestro_or_solo_cards: Maestro/Solo cards
+  mail_delivery_enabled: "Mail delivery is enabled"
+  mail_delivery_not_enabled: "Mail delivery is not enabled"
+  mail_queue_enabled: "Mail queue is enabled"
+  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"
   mark_shipped: "Mark Shipped"
   master_price: "Master Price"
+  max_items: Max Items
   meta_description: "Meta Description"
   meta_keywords: "Meta Keywords"
   metadata: "Metadata"
@@ -314,6 +363,7 @@ en-GB:
   name: Name
   new: New
   new_category: "New category"
+  new_coupon: New Coupon
   new_credit_card_payment: "New Credit Card Payment"
   new_customer: "New Customer"
   new_image: "New Image"
@@ -322,22 +372,26 @@ en-GB:
   new_product: "New Product"
   new_property: "New Property"
   new_prototype: "New Prototype"
-  new_shipment:
+  new_shipment: "New Shipment"
   new_shipping_category: "New Shipping Category"
   new_shipping_method: "New Shipping Method"
+  new_shipping_rate: New Shipping Rate
   new_state: "New State"
   new_tax_category: "New Tax Category"
   new_tax_rate: "New Tax Rate"
+  new_taxon: "New Taxon"
   new_taxonomy: "New Taxonomy"
   new_user: "New User"
   new_variant: "New Variant"
   new_zone: "New Zone"
   next: Next
+  no: "No"
   no_items_in_cart: "Basket is empty."
   no_match_found: "No Match Found"
   no_user_found: "No user was found with that email address"
   none: None
   none_available: "None Available"
+  not: not
   on_hand: "On Hand"
   operation: Operation
   option_Values: "Option Values"
@@ -350,15 +404,19 @@ en-GB:
   order_date: "Order Date"
   order_details: "Order Details"
   order_email_resent: "Order Email Resent"
+  order_not_in_system: That order number is not valid on this site.
   order_number: Order
   order_operation_authorize: Authorize
   order_processed_successfully: "Your order has been processed successfully"
+  order_summary: Order Summary
   order_total: "Order Total"
   order_total_message: "The total amount charged to your card will be"
   order_updated: "Order Updated"
   orders: Orders
   out_of_stock: "Out of Stock"
   overview: Overview
+  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
   parent_category: "Parent Category"
   password: Password
@@ -374,7 +432,8 @@ en-GB:
   payments: Payments
   phone: Phone
   place_order: Place Order        
-  please_create_user: "Please create a user account"        
+  please_create_user: "Please create a user account"     
+  powered_by: "Powered by"
   presentation: Presentation
   previous: Previous
   price: Price
@@ -385,8 +444,10 @@ en-GB:
   process: Process
   product: Product
   product_details: "Product Details"
+  product_has_no_description: Product has not description
   product_properties: "Product Properties"
   products: Products
+  products_with_zero_inventory_display: "Products with a zero inventory will {{not}} be displayed"
   properties: Properties
   property: Property
   prototype: Prototype
@@ -399,6 +460,7 @@ en-GB:
   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"
@@ -407,6 +469,7 @@ en-GB:
   return: return
   returned: Returned
   roles: Roles
+  sales_tax: "Sales Tax"
   sales_total: "Sales Total"
   sales_total_for_all_orders: "Sales total for all orders"
   sales_totals: "Sales Totals"
@@ -416,33 +479,39 @@ en-GB:
   secure_connection_type: Secure Connection Type
   select: Select
   select_from_prototype: "Select From Prototype"
-  select_preferred_shipping_option: "Select preferred shipping option"
+  select_preferred_shipping_option: "Select preferred delivery 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"
+  settings: Settings
   ship: ship
   ship_address: "Ship Address"
   shipment: Shipment
   shipment_number: "Shipment #"
   shipped: Shipped
-  shipping: Shipping
-  shipping_address: "Shipping Address"
-  shipping_calculator: Calculator
+  shipping: Delivery
+  shipping_address: "Delivery Address"
   shipping_categories: "Shipping Categories"
   shipping_categories_description: "Manage shipping categories to identify which products can be shipped via which method"
+  shipping_category: Shipping Category
   shipping_cost: Cost
-  shipping_error: "Shipping Error"
-  shipping_method: Method
-  shipping_methods: "Shipping Methods"
+  shipping_error: "Delivery Error"
+  shipping_instructions: "Delivery Instructions"
+  shipping_method: "Delivery Method"
+  shipping_methods: "Delivery Methods"
   shipping_methods_description: "Manage shipping methods"
-  shipping_total: "Shipping Total"
+  shipping_rates: "Shipping Rates"
+  shipping_rates_description: "Manage shipping rates"
+  shipping_total: "Delivery Total"
   shop_by_taxonomy: "Shop by {{taxonomy}}"
   shopping_cart: "Shopping Basket"
   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"
   sign_up: "Sign up"
   site_name: "Site Name"
   site_url: "Site URL"
@@ -453,11 +522,20 @@ en-GB:
   smtp_mail_host: SMTP Mail Host                       
   smtp_password: SMTP Password
   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_order_mails_as_from_following_address: "Send orders mails as from the following address."
   smtp_username: SMTP Username  
   spree:
     date: Date
     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."
+  ssl_will_not_be_used_in_production_mode: "SSL will not be used in production mode"
   start: Start
+  start_date: Valid from
   state: County
   state_based: "State Based"
   state_setting_description: "Administer the list of states/provinces associated with each country."
@@ -474,14 +552,22 @@ en-GB:
   tax_categories: "Tax Categories"
   tax_categories_setting_description: "Set up tax categories to identify which products should be taxable."
   tax_category: "Tax Category"
+  tax_rates: "Tax Rates"
+  tax_rates_description: Tax rates setup and configuration.
+  tax_settings: "Tax settings"
+  tax_settings_description: Basic tax settings.
   tax_total: "Tax Total"
   tax_type: "Tax Type"
   taxon: 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
   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 (UK)"
+  thumbnail: "Thumbnail"
   to_add_variants_you_must_first_define: "To add variants, you must first define"
   total: Total
   tracking: Tracking
@@ -489,22 +575,26 @@ en-GB:
   tree: Tree
   try_again: "Try Again"
   type: Type
-  unable_ship_method: "Unable to generate shipping methods due to a server error."
+  unable_ship_method: "Unable to generate delivery 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_save_order: "Unable to Save Order"
+  unrecognized_card_type: Unrecognized card type
   update: Update
   update_password: "Update my password and log me in"                    
-  updated_successfully:
-  use_as_shipping_address: Use as Shipping Address
+  updated_successfully: "Updated Successfully"
+  updating: Updating
+  usage_limit: Usage Limit
+  use_as_shipping_address: Use as Delivery Address
   use_billing_address: Use Billing Address
-  use_different_shipping_address: "Use Different Shipping Address"
+  use_different_shipping_address: "Use Different Delivery Address"
   user: User
   user_account: User Account
   user_details: "User Details"
   users: Users
   value: Value
   variants: Variants
+  vat: "VAT"           
   version: Version
   website: Website
   weight: Weight
@@ -514,6 +604,7 @@ en-GB:
   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 basket is empty"
   zip: Post Code

data/config/locales/en-GB_rails.yml

@@ -1,4 +1,37 @@
 en-GB:
+  date:
+    formats:
+      # Use the strftime parameters for formats.
+      # When no format has been given, it uses default.
+      # You can provide other formats here if you like!
+      default: "%Y-%m-%d"
+      short: "%b %d"
+      long: "%B %d, %Y"
+
+    day_names: [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday]
+    abbr_day_names: [Sun, Mon, Tue, Wed, Thu, Fri, Sat]
+
+    # Don't forget the nil at the beginning; there's no such thing as a 0th month
+    month_names: [~, January, February, March, April, May, June, July, August, September, October, November, December]
+    abbr_month_names: [~, Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec]
+    # Used in date_select and datime_select.
+    order: [ :year, :month, :day ]
+
+  time:
+    formats:
+      default: "%a, %d %b %Y %H:%M:%S %z"
+      short: "%d %b %H:%M"
+      long: "%B %d, %Y %H:%M"
+    am: "am"
+    pm: "pm"
+
+# Used in array.to_sentence.
+  support:
+    array:
+      words_connector: ", "
+      two_words_connector: " and "
+      last_word_connector: ", and "
+
   number:
     # Used in number_with_delimiter()
     # These are also the defaults for 'currency', 'percentage', 'precision', and 'human'
@@ -9,7 +42,7 @@ en-GB:
       delimiter: ","
       # Number of decimals, behind the separator (the number 1 with a precision of 2 gives: 1.00)
       precision: 3
-      
+
     # Used in number_to_currency()
     currency:
       format:
@@ -20,15 +53,15 @@ en-GB:
         separator: "."
         delimiter: ","
         precision: 2
-        
+
     # Used in number_to_percentage()
     percentage:
       format:
         # These three are to override number.format and are optional
-        # separator: 
+        # separator:
         delimiter: ""
-        # precision: 
-        
+        # precision:
+
     # Used in number_to_precision()
     precision:
       format:
@@ -36,15 +69,26 @@ en-GB:
         # separator:
         delimiter: ""
         # precision:
-        
+
     # Used in number_to_human_size()
     human:
       format:
         # These three are to override number.format and are optional
-        # separator: 
+        # separator:
         delimiter: ""
         precision: 1
-      storage_units: [Bytes, KB, MB, GB, TB]
+      storage_units:
+        # Storage units output formatting.
+        # %u is the storage unit, %n is the number (default: 2 MB)
+        format: "%n %u"
+        units:
+          byte:
+            one:   "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
 
   # Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()
   datetime:
@@ -96,7 +140,7 @@ en-GB:
           other:  "{{count}} errors prohibited this {{model}} from being saved"
         # The variable :count is also available
         body: "There were problems with the following fields:"
-    
+
       # The values :model, :attribute and :value are always available for interpolation
       # The value :count is available when applicable. Can be used for pluralization.
       messages:
@@ -119,36 +163,34 @@ en-GB:
         less_than_or_equal_to: "must be less than or equal to {{count}}"
         odd: "must be odd"
         even: "must be even"
-    
-    date:
-      formats:
-        # Use the strftime parameters for formats.
-        # When no format has been given, it uses default.
-        # You can provide other formats here if you like!
-        default: "%Y-%m-%d"
-        short: "%b %d"
-        long: "%B %d, %Y"
-
-      day_names: [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday]
-      abbr_day_names: [Sun, Mon, Tue, Wed, Thu, Fri, Sat]
-
-      # Don't forget the nil at the beginning; there's no such thing as a 0th month
-      month_names: [~, January, February, March, April, May, June, July, August, September, October, November, December]
-      abbr_month_names: [~, Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec]
-      # Used in date_select and datime_select.
-      order: [ :year, :month, :day ]
-
-    time:
-      formats:
-        default: "%a, %d %b %Y %H:%M:%S %z"
-        short: "%d %b %H:%M"
-        long: "%B %d, %Y %H:%M"
-      am: "am"
-      pm: "pm"
-
-  # Used in array.to_sentence.
-  support:
-    array:
-      words_connector: ", "
-      two_words_connector: " and "
-      last_word_connector: ", and "
+
+        # Append your own errors here or at the model/attributes scope.
+
+      # You can define own errors for models or model attributes.
+      # The values :model, :attribute and :value are always available for interpolation.
+      #
+      # For example,
+      #   models:
+      #     user:
+      #       blank: "This is a custom blank message for {{model}}: {{attribute}}"
+      #       attributes:
+      #         login:
+      #           blank: "This is a custom blank message for User login"
+      # Will define custom blank validation message for User model and
+      # custom blank validation message for login attribute of User model.
+      #models:
+
+    # Translate model names. Used in Model.human_name().
+    #models:
+      # For example,
+      #   user: "Dude"
+      # will translate User model name to "Dude"
+
+    # Translate model attribute names. Used in Model.human_attribute_name(attribute).
+    #attributes:
+      # For example,
+      #   user:
+      #     login: "Handle"
+      # will translate User attribute "login" as "Handle"
+
+