spree 0.7.1 → 0.8.0

data/config/locales/en-GB.yml

@@ -4,6 +4,7 @@ en-GB:
   abbreviation: Abbreviation
   access_denied: "Access Denied" 
   account: Account
+  account_updated: "Account updated!"        
   action: Action
   actions: 
     cancel: Cancel
@@ -18,7 +19,7 @@ en-GB:
       address: 
         address1: Address
         address2: "Address (contd.)"
-        city: City
+        city: Town / City
         firstname: "First Name"
         lastname: "Last Name"
         phone: Phone
@@ -56,6 +57,7 @@ en-GB:
         master_price: "Master Price"
         name: Name
         on_hand: "On Hand"
+        shipping_category: "Shipping Category"
       property: 
         name: Name
         presentation: Presentation
@@ -124,6 +126,9 @@ en-GB:
       role: 
         one: Roles
         other: Roles
+      shipping_category: 
+        one: "Shipping Category"
+        other: "Shipping Categories"
       state: 
         one: State
         other: States
@@ -159,6 +164,7 @@ en-GB:
   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         
+  already_registered: Already Registered?
   amount: Amount
   are_you_sure: "Are you sure"
   are_you_sure_category: "Are you sure you want to delete this category?"
@@ -188,9 +194,10 @@ en-GB:
   change_language: "Change Language"
   charged: Charged
   checkout: Checkout
-  city: City
+  city: Town / City
   comp_order: "Comp Order"
   comp_order_confirmation: "Customer will not be charged.  Are you sure you want to comp this order?"
+  complete_list: "Complete List"
   configuration: Configuration
   configuration_options: "Configuration Options"
   configurations: Configurations
@@ -203,6 +210,7 @@ en-GB:
   country_based: "Country Based"
   create: Create
   create_a_new_account: "Create a new account"
+  create_user_account: Create User Account
   created_successfully:
   credit_card: "Credit Card"
   credit_card_capture_complete: "Credit Card Was Captured"
@@ -223,6 +231,8 @@ en-GB:
   editing_product: "Editing Product"
   editing_property: "Editing Property"
   editing_prototype: "Editing Prototype"
+  editing_shipping_category: "Editing Shipping Category"
+  editing_shipping_method: "Editing Shipping Method"
   editing_state: "Editing State"
   editing_tax_category: "Editing Tax Category"
   editing_user: "Editing User"
@@ -235,7 +245,7 @@ en-GB:
   error: error
   event: Event
   existing_customer: "Existing Customer"
-  expiration: Expiration
+  expiration: "Expiration"
   expiration_month: "Expiration Month"
   expiration_year: "Expiration Year"
   extension: Extension
@@ -243,9 +253,11 @@ en-GB:
   filename: Filename
   final_confirmation: "Final Confirmation"
   first_name: "First Name"
+  forgot_password: "Forgot Password"
   gateway: Gateway
   gateway_error: "Gateway Error"
   gateway_setting_description: "Select a payment gateway and configure its settings."
+  general: "General"
   general_settings: "General Settings"
   general_settings_description: "Configure general Spree settings."
   google_analytics: "Google Analytics"
@@ -254,8 +266,11 @@ en-GB:
   google_analytics_id: "Analytics ID"
   google_analytics_new: "New Google Analytics Account"
   google_analytics_setting_description: "Manage Google Analytics ID" 
+  guest_user_account: Checkout as a Guest
   height: Height
   hello_user: "Hello User"
+  history: History
+  home: "Home"
   image: Image
   images: Images
   in_progress: "In Progress"
@@ -278,13 +293,22 @@ en-GB:
   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."      
   login_name: Login
   logout: Logout
   mail_delivery_enabled:
   mail_delivery_not_enabled:
   mail_server_preferences: Mail Server Preferences
   mail_server_settings: "Mail Server Settings"
+  mark_shipped: "Mark Shipped"
   master_price: "Master Price"
+  meta_description: "Meta Description"
+  meta_keywords: "Meta Keywords"
+  metadata: "Metadata"
+  month: "Month"
   my_account: "My Account"
   my_orders: "My Orders"
   name: Name
@@ -299,6 +323,8 @@ en-GB:
   new_property: "New Property"
   new_prototype: "New Prototype"
   new_shipment:
+  new_shipping_category: "New Shipping Category"
+  new_shipping_method: "New Shipping Method"
   new_state: "New State"
   new_tax_category: "New Tax Category"
   new_tax_rate: "New Tax Rate"
@@ -309,6 +335,7 @@ en-GB:
   next: Next
   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"
   on_hand: "On Hand"
@@ -335,6 +362,10 @@ en-GB:
   paid: Paid
   parent_category: "Parent Category"
   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
   pay: pay
   payment: Payment
@@ -349,6 +380,7 @@ en-GB:
   problem_authorizing_card: "Problem authorizing credit card"
   problem_capturing_card: "Problem capturing credit card"
   problems_processing_order: "We had problems processing your order"
+  proceed_as_guest: "No Thanks, Proceed as Guest"
   process: Process
   product: Product
   product_details: "Product Details"
@@ -356,13 +388,18 @@ en-GB:
   products: Products
   properties: Properties
   property: Property
+  prototype: Prototype
   prototypes: Prototypes
   qty: Qty
   rate: Rate
+  register: Register as a New User
+  register_or_guest: Checkout as Guest or Register
+  registration: Registration           
   remember_me: "Remember me"
   remove: Remove
   reports: Reports
   resend: Resend
+  reset_password: "Reset my password"
   response_code: "Response Code"
   resume: "resume"
   resumed: Resumed
@@ -378,6 +415,7 @@ en-GB:
   secure_connection_type: Secure Connection Type
   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                    
@@ -385,19 +423,30 @@ en-GB:
   ship: ship
   ship_address: "Ship Address"
   shipment: Shipment
+  shipment_number: "Shipment #"
   shipped: Shipped
   shipping: Shipping
   shipping_address: "Shipping Address"
+  shipping_calculator: Calculator
+  shipping_categories: "Shipping Categories"
+  shipping_categories_description: "Manage shipping categories to identify which products can be shipped via which method"
+  shipping_cost: Cost
   shipping_error: "Shipping Error"
-  shipping_method: "Shipping Method"
+  shipping_method: Method
+  shipping_methods: "Shipping Methods"
+  shipping_methods_description: "Manage shipping methods"
   shipping_total: "Shipping 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"
   sign_up: "Sign up"
+  site_name: "Site Name"
+  site_url: "Site URL"
   sku: SKU
+  smtp: SMTP
   smtp_authentication_type: SMTP Authentication Type         
   smtp_domain: SMTP Domain
   smtp_mail_host: SMTP Mail Host                       
@@ -432,15 +481,19 @@ en-GB:
   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)"
+  to_add_variants_you_must_first_define: "To add variants, you must first define"
   total: Total
+  tracking: Tracking
   transaction: Transaction
   tree: Tree
   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_save_order: "Unable to Save Order"
   update: Update
+  update_password: "Update my password and log me in"                    
   updated_successfully:
   use_as_shipping_address: Use as Shipping Address
   use_billing_address: Use Billing Address
@@ -459,6 +512,8 @@ en-GB:
   what_is_this: "What's This?"
   whats_this: "What's this"
   width: Width
+  year: "Year"
+  you_have_been_logged_out: "You have been logged out."
   your_cart_is_empty: "Your basket is empty"
   zip: Post Code
   zone: Zone

data/config/locales/en-GB_rails.yml

@@ -146,9 +146,9 @@ en-GB:
       am: "am"
       pm: "pm"
 
-    # Used in array.to_sentence.
-    support:
-      array:
-        words_connector: ", "
-        two_words_connector: " and "
-        last_word_connector: ", and "
+  # Used in array.to_sentence.
+  support:
+    array:
+      words_connector: ", "
+      two_words_connector: " and "
+      last_word_connector: ", and "

data/config/locales/en-US.yml

@@ -4,6 +4,7 @@ en-US:
   abbreviation: Abbreviation
   access_denied: "Access Denied"
   account: Account
+  account_updated: "Account updated!"        
   action: Action
   actions: 
     cancel: Cancel
@@ -56,6 +57,7 @@ en-US:
         master_price: "Master Price"
         name: Name
         on_hand: "On Hand"
+        shipping_category: "Shipping Category"
       property: 
         name: Name
         presentation: Presentation
@@ -124,6 +126,9 @@ en-US:
       role: 
         one: Roles
         other: Roles
+      shipping_category: 
+        one: "Shipping Category"
+        other: "Shipping Categories"
       state: 
         one: State
         other: States
@@ -159,6 +164,7 @@ en-US:
   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         
+  already_registered: Already Registered?
   amount: Amount
   are_you_sure: "Are you sure"
   are_you_sure_category: "Are you sure you want to delete this category?"
@@ -191,6 +197,7 @@ en-US:
   city: City
   comp_order: "Comp Order"
   comp_order_confirmation: "Customer will not be charged.  Are you sure you want to comp this order?"
+  complete_list: "Complete List"
   configuration: Configuration
   configuration_options: "Configuration Options"
   configurations: Configurations
@@ -203,6 +210,7 @@ en-US:
   country_based: "Country Based"
   create: Create
   create_a_new_account: "Create a new account"
+  create_user_account: Create User Account
   created_successfully: "Created Successfully"
   credit_card: "Credit Card"
   credit_card_capture_complete: "Credit Card Was Captured"
@@ -223,6 +231,8 @@ en-US:
   editing_product: "Editing Product"
   editing_property: "Editing Property"
   editing_prototype: "Editing Prototype"
+  editing_shipping_category: "Editing Shipping Category"
+  editing_shipping_method: "Editing Shipping Method"
   editing_state: "Editing State"
   editing_tax_category: "Editing Tax Category"
   editing_user: "Editing User"   
@@ -235,7 +245,7 @@ en-US:
   error: error
   event: Event
   existing_customer: "Existing Customer"
-  expiration: Expiration
+  expiration: "Expiration"
   expiration_month: "Expiration Month"
   expiration_year: "Expiration Year"
   extension: Extension
@@ -243,9 +253,11 @@ en-US:
   filename: Filename
   final_confirmation: "Final Confirmation"
   first_name: "First Name"
+  forgot_password: "Forgot Password"
   gateway: Gateway
   gateway_error: "Gateway Error"
   gateway_setting_description: "Select a payment gateway and configure its settings."
+  general: "General"
   general_settings: "General Settings"
   general_settings_description: "Configure general Spree settings."
   google_analytics: "Google Analytics"
@@ -254,8 +266,11 @@ en-US:
   google_analytics_id: "Analytics ID"
   google_analytics_new: "New Google Analytics Account"
   google_analytics_setting_description: "Manage Google Analytics ID" 
+  guest_user_account: Checkout as a Guest
   height: Height
   hello_user: "Hello User"
+  history: History
+  home: "Home"
   image: Image
   images: Images
   in_progress: "In Progress"
@@ -278,13 +293,22 @@ en-US:
   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."    
   login_name: Login
-  logout: Logout
+  logout: Logout  
   mail_delivery_enabled: "Mail delivery is enabled"
   mail_delivery_not_enabled: "Mail delivery is not enabled"
   mail_server_preferences: Mail Server Preferences
   mail_server_settings: "Mail Server Settings"
+  mark_shipped: "Mark Shipped"
   master_price: "Master Price"
+  meta_description: "Meta Description"
+  meta_keywords: "Meta Keywords"
+  metadata: "Metadata"
+  month: "Month"
   my_account: "My Account"
   my_orders: "My Orders"    
   name: Name
@@ -299,6 +323,8 @@ en-US:
   new_property: "New Property"
   new_prototype: "New Prototype"
   new_shipment: "New Shipment"
+  new_shipping_category: "New Shipping Category"
+  new_shipping_method: "New Shipping Method"
   new_state: "New State"
   new_tax_category: "New Tax Category"
   new_tax_rate: "New Tax Rate"
@@ -309,6 +335,7 @@ en-US:
   next: Next
   no_items_in_cart: ""
   no_match_found: "No Match Found"
+  no_user_found: "No user was found with that email address"
   none: None
   none_available: "None Available"
   on_hand: "On Hand"
@@ -335,6 +362,10 @@ en-US:
   paid: Paid
   parent_category: "Parent Category"
   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      
   pay: pay
   payment: Payment
@@ -349,6 +380,7 @@ en-US:
   problem_authorizing_card: "Problem authorizing credit card"
   problem_capturing_card: "Problem capturing credit card"
   problems_processing_order: "We had problems processing your order"
+  proceed_as_guest: "No Thanks, Proceed as Guest"
   process: Process
   product: Product
   product_details: "Product Details"
@@ -356,13 +388,18 @@ en-US:
   products: Products
   properties: Properties
   property: Property
+  prototype: Prototype
   prototypes: Prototypes
   qty: Qty
   rate: Rate
+  register: Register as a New User
+  register_or_guest: Checkout as Guest or Register
+  registration: Registration           
   remember_me: "Remember me"
   remove: Remove
   reports: Reports
   resend: Resend
+  reset_password: "Reset my password"
   response_code: "Response Code"  
   resume: "resume"
   resumed: Resumed
@@ -378,6 +415,7 @@ en-US:
   secure_connection_type: Secure Connection Type
   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                    
@@ -385,19 +423,30 @@ en-US:
   ship: ship
   ship_address: "Ship Address"
   shipment: Shipment
+  shipment_number: "Shipment #"
   shipped: Shipped
   shipping: Shipping
   shipping_address: "Shipping Address"
+  shipping_calculator: Calculator
+  shipping_categories: "Shipping Categories"
+  shipping_categories_description: "Manage shipping categories to identify which products can be shipped via which method"
+  shipping_cost: Cost
   shipping_error: "Shipping Error"
-  shipping_method: "Shipping Method"
+  shipping_method: Method
+  shipping_methods: "Shipping Methods"
+  shipping_methods_description: "Manage shipping methods"
   shipping_total: "Shipping Total"
+  shop_by_taxonomy: "Shop by {{taxonomy}}"
   shopping_cart: "Shopping Cart"
   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"
   sign_up: "Sign up"
+  site_name: "Site Name"
+  site_url: "Site URL"
   sku: SKU
+  smtp: SMTP
   smtp_authentication_type: SMTP Authentication Type         
   smtp_domain: SMTP Domain
   smtp_mail_host: SMTP Mail Host                       
@@ -432,16 +481,20 @@ en-US:
   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 (US)"
+  to_add_variants_you_must_first_define: "To add variants, you must first define"
   total: Total
+  tracking: Tracking
   transaction: Transaction
   tree: Tree
   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_save_order: "Unable to Save Order"
   update: Update
-  updated_successfully: "Updated Successfully"                    
+  update_password: "Update my password and log me in"                    
+  updated_successfully: "Updated Successfully"
   use_as_shipping_address: Use as Shipping Address
   use_billing_address: Use Billing Address
   use_different_shipping_address: "Use Different Shipping Address"
@@ -459,9 +512,11 @@ en-US:
   what_is_this: "What's This?"
   whats_this: "What's this"
   width: Width
+  year: "Year"
+  you_have_been_logged_out: "You have been logged out."
   your_cart_is_empty: "Your cart is empty"
   zip: Zip
   zone: Zone
   zone_based: "Zone Based"
   zone_setting_description: "Collections of countries, states or other zones to be used in various calculations."
-  zones: Zones  
+  zones: Zones