spree 0.8.5 → 0.9.0

data/config/locales/en-US.yml

@@ -46,10 +46,8 @@ en-US:
         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-US:
         name: Name
         on_hand: "On Hand"
         shipping_category: "Shipping Category"
+        tax_category: "Tax Category"
       property: 
         name: Name
         presentation: Presentation
@@ -68,6 +67,11 @@ en-US:
       state: 
         abbr: Abbreviation
         name: Name
+      tax_category: 
+        description: Description
+        name: Name
+      tax_rate: 
+        amount: Rate        
       taxon: 
         name: Name
         permalink: Permalink
@@ -131,7 +135,13 @@ en-US:
         other: "Shipping Categories"
       state: 
         one: State
-        other: States
+        other: States   
+      tax_category: 
+        one: "Tax Category"
+        other: "Tax Categories"
+      tax_rate: 
+        one: "Tax Rate"
+        other: "Tax Rates"        
       taxon: 
         one: Taxon
         other: Taxons
@@ -157,16 +167,20 @@ en-US:
   add_state: "Add State"
   add_to_cart: "Add To Cart"
   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: "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?"
   are_you_sure_delete_image: "Are you sure you want to delete this image?"
@@ -180,34 +194,47 @@ en-US:
   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: Cart
   categories: Categories
   category: Category
   change: Change
   change_language: "Change Language"
+  charge_total: Charge Total
   charged: Charged
   checkout: Checkout
   city: 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                                                                             
+  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
@@ -215,6 +242,7 @@ en-US:
   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-US:
   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,8 +262,10 @@ en-US:
   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"
   email: Email
@@ -242,6 +273,8 @@ en-US:
   email_server_settings_description: "Set email server settings."
   empty_cart: "Empty Cart"
   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-US:
   extensions: Extensions
   filename: Filename
   final_confirmation: "Final Confirmation"
-  first_name: "First Name"
+  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-US:
   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 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-US:
   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-US:
   login_failed: "Login authentication failed."    
   login_name: Login
   logout: Logout  
+  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-US:
   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"
@@ -325,19 +375,23 @@ en-US:
   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: ""
   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-US:
   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
@@ -373,8 +431,9 @@ en-US:
   payment_information: "Payment Information"
   payments: Payments
   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
   previous: Previous
   price: Price
@@ -385,8 +444,10 @@ en-US:
   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-US:
   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-US:
   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"
@@ -421,6 +484,8 @@ en-US:
   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
@@ -428,14 +493,17 @@ en-US:
   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_category: Shipping Category
   shipping_cost: Cost
   shipping_error: "Shipping Error"
-  shipping_method: Method
+  shipping_instructions: "Shipping Instructions"
+  shipping_method: "Shipping Method"
   shipping_methods: "Shipping Methods"
   shipping_methods_description: "Manage shipping methods"
+  shipping_rates: "Shipping Rates"
+  shipping_rates_description: "Manage shipping rates"
   shipping_total: "Shipping Total"
   shop_by_taxonomy: "Shop by {{taxonomy}}"
   shopping_cart: "Shopping Cart"
@@ -443,6 +511,7 @@ en-US:
   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-US:
   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: State
   state_based: "State Based"
   state_setting_description: "Administer the list of states/provinces associated with each country."
@@ -474,28 +552,39 @@ en-US:
   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 (US)"
+  thumbnail: "Thumbnail"
   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"
+  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"
+  unrecognized_card_type: Unrecognized card type
   update: Update
   update_password: "Update my password and log me in"                    
   updated_successfully: "Updated Successfully"
+  updating: Updating
+  usage_limit: Usage Limit
   use_as_shipping_address: Use as Shipping Address
   use_billing_address: Use Billing Address
   use_different_shipping_address: "Use Different Shipping Address"
@@ -505,6 +594,7 @@ en-US:
   users: Users
   value: Value
   variants: Variants
+  vat: "VAT"           
   version: Version
   website: Website
   weight: Weight
@@ -514,10 +604,11 @@ 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
   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

data/config/locales/es.yml

@@ -46,10 +46,8 @@ es:
         ip_address: "Direccion IP"
         item_total: "Total articulos"
         number: Numero
-        ship_amount: "Coste de envio"
         special_instructions: "Instrucciones especiales"
         state: Provincia
-        tax_amount: "Total impuestos"
         total: Total
       product: 
         available_on: "Disponible en"
@@ -58,6 +56,7 @@ es:
         name: Nombre
         on_hand: "En mano"
         shipping_category: "Categoria de envio"
+        tax_category: "Tax Category"
       property: 
         name: Nombre
         presentation: Presentacion
@@ -68,6 +67,11 @@ es:
       state: 
         abbr: Abreviatura
         name: Nombre
+      tax_category: 
+        description: Description
+        name: Name
+      tax_rate: 
+        amount: Rate        
       taxon: 
         name: Nombre
         permalink: Enlace permanente
@@ -132,6 +136,12 @@ es:
       state: 
         one: Provincia
         other: Provincias
+      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 @@ es:
   add_state: "Añadir provincia"
   add_to_cart: "Añadir a la cesta"
   add_zone: "Añadir zona"
+  additional_item: Additional Item Cost
   address: Dirección
   address_information: "Información de la Dirección"
   adjustment: Ajuste
   administration: Administración
+  all: "All"
   allow_backorders: "Permitir devoluciones"
   allow_ssl_to_be_used_when_in_developement_and_test_modes: Permitir el uso de SSL en los modos de desarrollo y prueba
   allow_ssl_to_be_used_when_in_production_mode: Permitir el uso de SSL en produccion        
+  allowed_ssl_in_production_mode: "SSL will {{not}} be used in production"
   already_registered: Already Registered?
+  alternative_phone: Alternative Phone
   amount: Cuantía
   are_you_sure: "¿Está seguro?"
   are_you_sure_category: "¿Está seguro de que quiere eliminar esta categoría?"
@@ -180,34 +194,47 @@ es:
   available_taxons: "Taxons disponibles"
   back: Atrás
   back_to_store: "Volver a la tienda"
+  backordering_is_allowed: "Backordering {{not}} allowed"
   bill_address: "Dirección de facturación"
   billing_address: "Dirección de facturación"
+  calculator: Calculator
+  calculator_settings_warning: "If you are changing the calculator type, you must save first before you can edit the calculator settings"
   cancel: Cancelar
   canceled: Cancelado
   capture: captura
   card_code: "Código de la tarjeta"
   card_number: "Número de tarjeta"
+  card_type_is: Card type is
   cart: Cesta
   categories: Categorías
   category: Categoría
   change: Cambiar
   change_language: "Cambiar Idioma"
+  charge_total: Charge Total
   charged: Cargado
   checkout: Pagar
   city: Ciudad
+  code: Code
+  combine: Combine
   comp_order: "Pedido completado"
   comp_order_confirmation: "Confirmacion de pedido completado"
+  complete: complete
   complete_list: "Complete List"
   configuration: Configuracion
   configuration_options: "Opciones de configuracion"
   configurations: Configuraciones
   confirm: Confirmar
+  confirm_delete: "Confirm Deletion"
   confirm_password: "Confirme la contraseña"
   continue: Continuar
   continue_shopping: "Seguir comprando"
   copy_all_mails_to: Copiar todos los correos a
   country: País
   country_based: "Pais base"
+  coupon: Coupon                                                                             
+  coupon_code: Coupon Code
+  coupons: Coupons
+  coupons_description: Manage coupons
   create: Crear
   create_a_new_account: "Crear una nueva cuenta"
   create_user_account: Create User Account
@@ -215,6 +242,7 @@ es:
   credit_card: "Tarjeta de credito"
   credit_card_capture_complete: "La tarjeta de credito ha sido registrada"
   credit_card_payment: "Pago con tarjeta de credito"
+  credit_total: Credit Total
   creditcard: "Tarjeta de credito"
   current: Actual
   customer: Cliente
@@ -226,6 +254,7 @@ es:
   display: Mostrar
   edit: Editar
   editing_category: "Editando categoría"
+  editing_coupon: Editing Coupon
   editing_option_type: "Editando tipo de opción"
   editing_option_types: "Editando tipos de opción"
   editing_product: "Editando Producto"
@@ -233,8 +262,10 @@ es:
   editing_prototype: "Editando Prototipo"
   editing_shipping_category: "Editando Categoria de envío"
   editing_shipping_method: "Editando metodo de envío"
+  editing_shipping_rate: Editing Shipping Rate 
   editing_state: "Editando provincia"
   editing_tax_category: "Editando Categoría fiscal"
+  editing_tax_rate: "Editing Tax Rate"
   editing_user: "Editando usuario"
   editing_zone: "Editando zona"
   email: "Correo Electrónico"
@@ -242,6 +273,8 @@ es:
   email_server_settings_description: "Configuración del servidor de correo electrónico"
   empty_cart: "Vaciar Cesta"
   enable_mail_delivery: Habilitar envio por correo      
+  enable_mail_queue: "Enable Mail Queue"
+  enter_exactly_as_shown_on_card: Please enter exactly as shown on the card
   error: error
   event: Evento
   existing_customer: "Cliente existente"
@@ -252,9 +285,17 @@ es:
   extensions: Extensiones
   filename: "Nombre de archivo"
   final_confirmation: "Confirmación Final"
+  first_item: First Item Cost
   first_name: Nombre
+  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: "¿Olvidaste tu contraseña?"
+  full_name: "Full Name"
   gateway: "pasarela"
+  gateway_configuration: "Gateway configuration"
   gateway_error: "Error en la pasarela"
   gateway_setting_description: "Configuracion de la pasarela"
   general: "General"
@@ -271,14 +312,17 @@ es:
   hello_user: "Hola usuario"
   history: Historia
   home: "Inicio"
+  icons_by: "Icons by"
   image: Imágen
   images: Imagenes
+  images_for: "Images for"
   in_progress: "En progreso"
   invalid_search: "Busqueda invalida"
   inventory: Inventario
   inventory_adjustment: "Ajuste de inventario"
   inventory_setting_description: "Configuracion del inventario, Devoluciones, mostrar articulos sin stock"
   inventory_settings: "Configuracion del inventario"
+  issue_number: Issue Number
   item: artículo
   item_description: "Descripción del artículo"
   item_total: "Total de artículos"
@@ -290,6 +334,7 @@ es:
   listing_reports: "Listado de reportes"
   listing_tax_categories: "Listado de Taxons"
   listing_users: "Listado de usuarios"
+  loading: Loading
   locale_changed: "Se ha cambiado el idioma"
   log_in: "Iniciar sesión"
   logged_in_as: "Identificado como"
@@ -299,12 +344,16 @@ es:
   login_failed: "No se ha podido iniciar la sesion, error de autenticacion."      
   login_name: "Nombre de usuario"
   logout: "Cerrar sesión"
+  maestro_or_solo_cards: Maestro/Solo cards
   mail_delivery_enabled: "La entrega de correo está habilitada"
   mail_delivery_not_enabled: "La entrega de correo está deshabilitada"
+  mail_queue_enabled: "Mail queue is enabled"
+  mail_queue_not_enabled: "Mail queue is not enabled (emails are delivered immediately)"
   mail_server_preferences: Preferencias del servidor de correo
   mail_server_settings: "Configuración del servidor de correo"
   mark_shipped: "Marcar como enviado"
   master_price: "Precio principal"
+  max_items: Max Items
   meta_description: "Meta descripcion"
   meta_keywords: "Meta palabras clave"
   metadata: "Metadatos"
@@ -314,6 +363,7 @@ es:
   name: Nombre
   new: Nuevo
   new_category: "Nueva categoría"
+  new_coupon: New Coupon
   new_credit_card_payment: "Nuevo pago con tarjeta de credito"
   new_customer: "Nuevo cliente"
   new_image: "Nueva Imágen"
@@ -325,19 +375,23 @@ es:
   new_shipment: "Nuevo envio"
   new_shipping_category: "Nueva categoria de envio"
   new_shipping_method: "Nueva forma de envio"
+  new_shipping_rate: New Shipping Rate
   new_state: "Nueva provincia"
   new_tax_category: "Nueva categoría"
   new_tax_rate: "Nuevo iipo impositivo"
+  new_taxon: "New Taxon"
   new_taxonomy: "New Taxonomy"
   new_user: "Nuevo usuario"
   new_variant: "Nueva Variante"
   new_zone: "Nueva zona"
   next: próximo
+  no: "No"
   no_items_in_cart: "La cesta está vacía"
   no_match_found: "No se ha encontrado"
   no_user_found: "No se ha encontrado ningun usuario con esa direccion de correo"
   none: "Ninguno"
   none_available: "No hay nada que mostrar"
+  not: not
   on_hand: "En mano"
   operation: Operación
   option_Values: "Valores de opción"
@@ -350,15 +404,19 @@ es:
   order_date: "Fecha de pedido"
   order_details: "Detalles del pedido"
   order_email_resent: "Email de pedido reenviado"
+  order_not_in_system: That order number is not valid on this site.
   order_number: "Pedido #"
   order_operation_authorize: "Autorizar"
   order_processed_successfully: "Su pedido se ha procesado correctamente"
+  order_summary: Order Summary
   order_total: "Total del pedido"
   order_total_message: "El importe total cargado a su tarjeta sera"
   order_updated: "Pedido actualizado"
   orders: Pedidos
   out_of_stock: "Sin stock"
   overview: General
+  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: Pagado
   parent_category: "Categoría padre"
   password: Contraseña
@@ -374,7 +432,8 @@ es:
   payments: Pagos
   phone: Teléfono
   place_order: Hacer pedido
-  please_create_user: "Please create a user account"        
+  please_create_user: "Please create a user account"     
+  powered_by: "Powered by"
   presentation: Presentación
   previous: Anterior
   price: Precio
@@ -385,8 +444,10 @@ es:
   process: Procesar
   product: Producto
   product_details: "Detalles del producto"
+  product_has_no_description: Product has not description
   product_properties: "Propiedades del producto"
   products: Productos
+  products_with_zero_inventory_display: "Products with a zero inventory will {{not}} be displayed"
   properties: "Propiedades"
   property: "Propiedad"
   prototype: Prototipo
@@ -399,6 +460,7 @@ es:
   remember_me: "Recordarme en este equipo"
   remove: "Remover"
   reports: Reportes
+  required_for_solo_and_maestro: Required for Solo and Maestro cards.
   resend: "Volver a enviar"
   reset_password: "Reinicia my contraseña"
   response_code: "Código de respuesta"
@@ -407,6 +469,7 @@ es:
   return: volver
   returned: regresó
   roles: Funciones
+  sales_tax: "Sales Tax"
   sales_total: "Total de ventas"
   sales_total_for_all_orders: "Total de ventas para todos los pedidos"
   sales_totals: "Ventas Totales"
@@ -421,6 +484,8 @@ es:
   send_copy_of_orders_mails_to: Envia una copia de todos los correos de pedidos a         
   send_mails_as: Enviar correos como
   send_order_mails_as: Enviar correos de pedidos como
+  server_error: "The server returned an error"
+  settings: Settings
   ship: enviar
   ship_address: "Direccion de envio"
   shipment: Envio
@@ -428,14 +493,17 @@ es:
   shipped: Enviado
   shipping: Envío
   shipping_address: "Dirección de envío"
-  shipping_calculator: Calculadora
   shipping_categories: "Categorias de envio"
   shipping_categories_description: "Gestionar las categorias de envio para determinar qué categorías de productos pueden ser transportados a través de qué método"
+  shipping_category: Shipping Category
   shipping_cost: Costes de envio
   shipping_error: "Error de envio"
+  shipping_instructions: "Shipping Instructions"
   shipping_method: Metodo de envio
   shipping_methods: "Metodos de envio"
   shipping_methods_description: "Manejar metodos de envio"
+  shipping_rates: "Shipping Rates"
+  shipping_rates_description: "Manage shipping rates"
   shipping_total: "Total de envío"
   shop_by_taxonomy: "Comprar por {{taxonomy}}"
   shopping_cart: "Cesta de compras"
@@ -443,6 +511,7 @@ es:
   show_incomplete_orders: "Mostrar los pedidos incompletos"
   show_only_complete_orders: "Mostrar solo los pedidos completados"
   show_out_of_stock_products: "Mostrar productos sin stock"
+  show_price_inc_vat: "Show price including VAT"
   sign_up: Registrarme
   site_name: "Nombre del sitio"
   site_url: "URL del sitio"
@@ -453,11 +522,20 @@ es:
   smtp_mail_host: SMTP Mail Host                       
   smtp_password: contraseña SMTP
   smtp_port: puerto SMTP          
+  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: nombre de usuario SMTP  
   spree:
     date: Fecha 
     time: Hora                                               
+  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: Inicio
+  start_date: Valid from
   state: Provincia
   state_based: "Provincia"
   state_setting_description: "Administrar la lista de estados o provincias asociados con cada país."
@@ -474,14 +552,22 @@ es:
   tax_categories: "Categorias"
   tax_categories_setting_description: "Establecer categorías para determinar qué productos deben estar sujetos a que categorias"
   tax_category: "Categoria"
+  tax_rates: "Tax Rates"
+  tax_rates_description: Tax rates setup and configuration.
+  tax_settings: "Tax settings"
+  tax_settings_description: Basic tax settings.
   tax_total: "Total impuestos"
   tax_type: "Tipo de impuesto"
   taxon: Taxon
   taxonomies: Taxonomias
   taxonomies_setting_description: "Crear y manejar taxonomias"
+  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: "Gracias por su pedido"
   this_file_language: "Español (España)"
+  thumbnail: "Thumbnail"
   to_add_variants_you_must_first_define: "Para agregar variantes, primero debe definir"
   total: Total
   tracking: Seguimiento
@@ -493,9 +579,12 @@ es:
   unable_to_authorize_credit_card: "No se ha podido autorizar la tarjeta de credito"
   unable_to_capture_credit_card: "No se ha podido capturar la tarjeta de credito"
   unable_to_save_order: "No se ha podido guardar el pedido"
+  unrecognized_card_type: Unrecognized card type
   update: Actualizar
   update_password: "Actualiza mi contraseña y dejame entrar"                    
   updated_successfully: "Actualizado correctamente"
+  updating: Updating
+  usage_limit: Usage Limit
   use_as_shipping_address: Usar como direccion de envio
   use_billing_address: Usar la direccion de facturacion
   use_different_shipping_address: "Usar una dirección de envío diferente"
@@ -505,6 +594,7 @@ es:
   users: Usuarios
   value: "valor"
   variants: Variantes
+  vat: "VAT"           
   version: Versión
   website: "Página web"
   weight: Peso
@@ -514,6 +604,7 @@ es:
   whats_this: "¿Qué es esto?"
   width: Ancho
   year: "Año"
+  yes: "Yes"
   you_have_been_logged_out: "Se ha cerrado la sesión."
   your_cart_is_empty: "Su cesta está vacía"
   zip: "Código postal"