spree 0.7.1 → 0.8.0

data/config/locales/es_rails.yml

@@ -47,6 +47,19 @@ es:
         # separator: 
         delimiter: "" 
         precision: 1
+      # Rails <= v2.2.2
+      # storage_units: [Bytes, KB, MB, GB, TB]
+      # Rails >= v2.3
+      storage_units:
+        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:
@@ -128,9 +141,9 @@ es:
       # 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: "%d de %b" 
-      long: "%d de %B de %Y" 
+      default: "%e/%m/%Y"
+      short: "%e de %b" 
+      long: "%e de %B de %Y" 
 
     day_names: [Domingo, Lunes, Martes, Miércoles, Jueves, Viernes, Sábado]
     abbr_day_names: [Dom, Lun, Mar, Mie, Jue, Vie, Sab]
@@ -139,17 +152,22 @@ es:
     month_names: [~, Enero, Febrero, Marzo, Abril, Mayo, Junio, Julio, Agosto, Setiembre, Octubre, Noviembre, Diciembre]
     abbr_month_names: [~, Ene, Feb, Mar, Abr, May, Jun, Jul, Ago, Set, Oct, Nov, Dic]
     # Used in date_select and datime_select.
-    order: [ :year, :month, :day ]
+    order: [ :day, :month, :year ]
 
   time:
     formats:
-      default: "%A, %d de %B de %Y %H:%M:%S %z"
-      short: "%d de %b %H:%M" 
-      long: "%d de %B de %Y %H:%M" 
+      default: "%A, %e de %B de %Y %H:%M:%S %z"
+      short: "%e de %b %H:%M" 
+      long: "%e de %B de %Y %H:%M" 
     am: "am" 
     pm: "pm" 
 
 # Used in array.to_sentence.
   support:
     array:
-      sentence_connector: "y"
+      # Rails <= v.2.2.2
+      # sentence_connector: "y"
+      # Rails >= v.2.3
+      words_connector: ", "
+      two_words_connector: " y "
+      last_word_connector: " y "

data/config/locales/fr-FR.yml

@@ -4,6 +4,7 @@ fr-FR:
   abbreviation: Abréviation
   access_denied: "Accès interdit"
   account: Compte
+  account_updated: "Account updated!"        
   action: Action
   actions: 
     cancel: Annuler
@@ -56,6 +57,7 @@ fr-FR:
         master_price: "Prix de départ"
         name: Nom
         on_hand: "On Hand"
+        shipping_category: "Shipping Category"
       property: 
         name: Nom
         presentation: Presentation
@@ -124,6 +126,9 @@ fr-FR:
       role: 
         one: Rôles
         other: Rôles
+      shipping_category: 
+        one: "Shipping Category"
+        other: "Shipping Categories"
       state: 
         one: Région
         other: Régions
@@ -159,6 +164,7 @@ fr-FR:
   allow_backorders: "Permettre la rupture de stock"
   allow_ssl_to_be_used_when_in_developement_and_test_modes: Permettre l'utilisation du SSL lors des modes développement et test
   allow_ssl_to_be_used_when_in_production_mode: Permettre l'utilisation du SSL lors du mode production
+  already_registered: Already Registered?
   amount: Montant
   are_you_sure: "Êtes-vous sûr ?"
   are_you_sure_category: "Êtes-vous sûr de vouloir supprimer cette catégorie ?"
@@ -191,6 +197,7 @@ fr-FR:
   city: Ville
   comp_order: "Commande complète"
   comp_order_confirmation: "Le client n'a pas été débité.  Êtes-vous sûr de vouloir valider cette commande ?"
+  complete_list: "Complete List"
   configuration: Configuration
   configuration_options: "Option configuration"
   configurations: Configurations
@@ -203,6 +210,7 @@ fr-FR:
   country_based: "Country Based"
   create: Créer
   create_a_new_account: "Créer un nouveau compte"
+  create_user_account: Create User Account
   created_successfully: "Crée avec succès"
   credit_card: "Carte de crédit"
   credit_card_capture_complete: "La carte de crédit a été acceptée"
@@ -223,6 +231,8 @@ fr-FR:
   editing_product: "Edition du produit"
   editing_property: "Edition de la propriété"
   editing_prototype: "Edition du prototype"
+  editing_shipping_category: "Editing Shipping Category"
+  editing_shipping_method: "Editing Shipping Method"
   editing_state: "Edition de la région"
   editing_tax_category: "Edition de la catégorie de taxe"
   editing_user: "Edition d'un utilisateur"
@@ -243,9 +253,11 @@ fr-FR:
   filename: Nom du fichier
   final_confirmation: "Confirmation finale"
   first_name: "Prenom"
+  forgot_password: "Forgot Password"
   gateway: Passerelle
   gateway_error: "Erreur de la passerelle"
   gateway_setting_description: "Sélectionner une passerelle de paiement et configurez ses paramètres."
+  general: "General"
   general_settings: "Paramètres généraux"
   general_settings_description: "Configuration générale des paramètres Spree."
   google_analytics: "Google Analytics"
@@ -254,8 +266,11 @@ fr-FR:
   google_analytics_id: "Analytics ID"
   google_analytics_new: "Nouveau compte Google Analytics"
   google_analytics_setting_description: "Gestion de l'ID Google Analytics"
+  guest_user_account: Checkout as a Guest
   height: Taille
   hello_user: "Bonjour utilisateur"
+  history: History
+  home: "Home"
   image: Image
   images: Images
   in_progress: "En progression"
@@ -278,13 +293,22 @@ fr-FR:
   locale_changed: "Locale changée"
   log_in: "S'identifier"
   logged_in_as: "Identifié en tant que"
+  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: Identifiant
   logout: Se déconnecter
   mail_delivery_enabled: "Distribution des emails activée"
   mail_delivery_not_enabled: "Distribution des emails est désactivée"
   mail_server_preferences: Préférence du serveur de messagerie
   mail_server_settings: "Paramètres du serveur de messagerie"
+  mark_shipped: "Mark Shipped"
   master_price: "Prix de départ"
+  meta_description: "Meta Description"
+  meta_keywords: "Meta Keywords"
+  metadata: "Metadata"
+  month: "Month"
   my_account: "Mon compte"
   my_orders: "Mes commandes"
   name: Nom
@@ -299,6 +323,8 @@ fr-FR:
   new_property: "Nouvelle proprieté"
   new_prototype: "Nouveau prototype"
   new_shipment: "Nouvelle expédition"
+  new_shipping_category: "New Shipping Category"
+  new_shipping_method: "New Shipping Method"
   new_state: "Nouvelle région"
   new_tax_category: "Nouvelle catégorie de taxes"
   new_tax_rate: "Nouvelle taxe"
@@ -309,6 +335,7 @@ fr-FR:
   next: Suivant
   no_items_in_cart: ""
   no_match_found: "Aucune correspondance trouvée"
+  no_user_found: "No user was found with that email address"
   none: Aucun
   none_available: "Aucun de disponible"
   on_hand: "Disponible"
@@ -335,6 +362,10 @@ fr-FR:
   paid: Payer
   parent_category: "Catégorie racine"
   password: Mot de passe
+  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: Chemin
   pay: payé
   payment: Paiement
@@ -349,6 +380,7 @@ fr-FR:
   problem_authorizing_card: "Probleme d'autorization de votre carte de crédit"
   problem_capturing_card: "Impossible d'utiliser votre carte de crédit"
   problems_processing_order: "Impossible de traiter votre commande"
+  proceed_as_guest: "No Thanks, Proceed as Guest"
   process: Process
   product: Produit
   product_details: "Détails du produit"
@@ -356,13 +388,18 @@ fr-FR:
   products: Produits
   properties: Propriétés
   property: Propriété
+  prototype: Prototype
   prototypes: Prototypes
   qty: Qté
   rate: Taux
+  register: Register as a New User
+  register_or_guest: Checkout as Guest or Register
+  registration: Registration           
   remember_me: "Se souvenir de moi"
   remove: Supprimer
   reports: Statistiques
   resend: Renvoyer
+  reset_password: "Reset my password"
   response_code: "Code de réponse"
   resume: "reprendre"
   resumed: repris
@@ -378,6 +415,7 @@ fr-FR:
   secure_connection_type: Connection de type sécurisée
   select: Selectionner
   select_from_prototype: "Sélectionner d'après le prototype"
+  select_preferred_shipping_option: "Select preferred shipping option"
   send_copy_of_all_mails_to: Envoyer une copie de tous les emails à
   send_copy_of_orders_mails_to: Envoyer une copie des commandes email à
   send_mails_as: Envoyer des mails en tant que
@@ -385,19 +423,30 @@ fr-FR:
   ship: livraison
   ship_address: "Adresse de livraison"
   shipment: Livraison
+  shipment_number: "Shipment #"
   shipped: Livré
   shipping: Frais de livraison
   shipping_address: "Adresse de livraison"
+  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: "Erreur de livraison"
   shipping_method: "Méthode de livraison"
+  shipping_methods: "Shipping Methods"
+  shipping_methods_description: "Manage shipping methods"
   shipping_total: "Total de la livraison"
+  shop_by_taxonomy: "Shop by {{taxonomy}}"
   shopping_cart: "Panier"
   show_deleted: "Afficher les commandes supprimées"
   show_incomplete_orders: "Afficher les commandes imcomplètes"
   show_only_complete_orders: "Afficher seulement les commandes complète"
   show_out_of_stock_products: "Afficher les produits n'étant plus en stock"
   sign_up: "S'inscrire"
+  site_name: "Site Name"
+  site_url: "Site URL"
   sku: Code barre
+  smtp: SMTP
   smtp_authentication_type: Type d'authentification SMTP
   smtp_domain: Domaine SMTP
   smtp_mail_host: Serveur de messagerie
@@ -432,15 +481,19 @@ fr-FR:
   taxons: Arborescence
   thank_you_for_your_order: "Merci de nous avoir fait confiance. Imprimez cette page de confirmation pour vos archives."
   this_file_language: "Français (FR)"
+  to_add_variants_you_must_first_define: "To add variants, you must first define"
   total: Total
+  tracking: Tracking
   transaction: Transaction
   tree: Arborescence
   try_again: "Reessayer"
   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: "Impossible de récupérer votre carte de crédit"
   unable_to_save_order: "Unable to Save Order"
   update: Mise à jour
+  update_password: "Update my password and log me in"                    
   updated_successfully: "Mise à jour effectuée avec succès"
   use_as_shipping_address: Use as Shipping Address
   use_billing_address: Use Billing Address
@@ -459,6 +512,8 @@ fr-FR:
   what_is_this: "Qu'est ce que c'est ?"
   whats_this: "Qu'est ce que"
   width: Largeur
+  year: "Year"
+  you_have_been_logged_out: "You have been logged out."
   your_cart_is_empty: "Votre panier est vide"
   zip: Code postal
   zone: Zone

data/config/locales/fr-FR_rails.yml

@@ -1,10 +1,8 @@
-# French translations for Ruby on Rails
+# French translations for Ruby on Rails 
 # by Christian Lescuyer (christian@flyingcoders.com)
+# contributor: Sebastien Grosjean - ZenCocoon.com
 
-
-fr-FR:
-  switch_language : "Change de langue"
-  this_file_language : "Francais"
+fr:
   date:
     formats:
       default: "%d/%m/%Y"
@@ -18,7 +16,7 @@ fr-FR:
     month_names: [~, janvier, février, mars, avril, mai, juin, juillet, août, septembre, octobre, novembre, décembre]
     abbr_month_names: [~, jan., fév., mar., avr., mai, juin, juil., août, sept., oct., nov., déc.]
     order: [ :day, :month, :year ]
-
+  
   time:
     formats:
       default: "%d %B %Y %H:%M"
@@ -27,72 +25,82 @@ fr-FR:
       long: "%A %d %B %Y %H:%M:%S %Z"
       long_ordinal: "%A %d %B %Y %H:%M:%S %Z"
       only_second: "%S"
-      post_date_time: "le %d %B %Y à %H:%M"
-      event_date_time: "%Y-%m-%d  %H:%M:%S"
     am: 'am'
     pm: 'pm'
-    text: "il y a {{time}}"
 
   datetime:
     distance_in_words:
       half_a_minute: "une demi-minute"
       less_than_x_seconds:
-        zero: "moins d'une seconde"
-        one: "moins de 1 seconde"
-        other: "moins de {{count}} secondes"
+        zero:  "moins d'une seconde"
+        one:   "moins de 1 seconde"
+        other: "moins de {{count}} secondes"
       x_seconds:
-        one: "1 seconde"
-        other: "{{count}} secondes"
+        one:   "1 seconde"
+        other: "{{count}} secondes"
       less_than_x_minutes:
-        zero: "moins d'une minute"
-        one: "moins de 1 minute"
-        other: "moins de {{count}} minutes"
+        zero:  "moins d'une minute"
+        one:   "moins de 1 minute"
+        other: "moins de {{count}} minutes"
       x_minutes:
-        one: "1 minute"
-        other: "{{count}} minutes"
+        one:   "1 minute"
+        other: "{{count}} minutes"
       about_x_hours:
-        one: "environ une heure"
-        other: "environ {{count}} heures"
+        one:   "environ une heure"
+        other: "environ {{count}} heures"
       x_days:
-        one: "1 jour"
-        other: "{{count}} jours"
+        one:   "1 jour"
+        other: "{{count}} jours"
       about_x_months:
-        one: "environ un mois"
-        other: "environ {{count}} mois"
+        one:   "environ un mois"
+        other: "environ {{count}} mois"
       x_months:
-        one: "1 mois"
-        other: "{{count}} mois"
+        one:   "1 mois"
+        other: "{{count}} mois"
       about_x_years:
-        one: "environ un an"
-        other: "environ {{count}} ans"
-      x_years:
-        one: "un an"
-        other: "{{count}} ans"
+        one:   "environ un an"
+        other: "environ {{count}} ans"
       over_x_years:
-        one: "plus d'un an"
-        other: "plus de {{count}} ans"
-
+        one:   "plus d'un an"
+        other: "plus de {{count}} ans"
+    prompts:
+      year:   "Année"
+      month:  "Mois"
+      day:    "Jour"
+      hour:   "Heure"
+      minute: "Minute"
+      second: "Seconde"
+  
   number:
     format:
       precision: 3
       separator: ','
-      delimiter: ' '
+      delimiter: ' '
     currency:
       format:
-        unit: 'EUR'
+        unit: '€'
         precision: 2
-        format: '%n %u'
+        format: '%n %u'
     human:
+      format:
+        precision: 2
       storage_units: [ Octet, ko, Mo, Go, To ]
-
-
+  
+  support:
+    array:
+      sentence_connector: 'et'
+      skip_last_comma: true
+      words_connector: ", "
+      two_words_connector: " et "
+      last_word_connector: " et "
+  
   activerecord:
     errors:
       template:
-        header:
+        header: 
           one: "Impossible d'enregistrer {{model}}: 1 erreur"
           other: "Impossible d'enregistrer {{model}}: {{count}} erreurs."
-        body: "Veuillez vérifier les champs suivants :"
+        body: "Veuillez vérifier les champs suivants :"
       messages:
         inclusion: "n'est pas inclus(e) dans la liste"
         exclusion: "n'est pas disponible"
@@ -112,4 +120,4 @@ fr-FR:
         less_than: "doit être inférieur à {{count}}"
         less_than_or_equal_to: "doit être inférieur ou égal à {{count}}"
         odd: "doit être impair"
-        even: "doit être pair"
+        even: "doit être pair"

data/config/locales/it.yml

@@ -4,6 +4,7 @@ it:
   abbreviation: Abbreviation
   access_denied: "Access Denied"        
   account: Conto
+  account_updated: "Account updated!"        
   action: Azione
   actions: 
     cancel: Cancelare
@@ -56,6 +57,7 @@ it:
         master_price: "Master Price"
         name: Name
         on_hand: "On Hande"
+        shipping_category: "Shipping Category"
       property: 
         name: Name
         presentation: Presentation
@@ -124,6 +126,9 @@ it:
       role: 
         one: Roles
         other: Roles
+      shipping_category: 
+        one: "Shipping Category"
+        other: "Shipping Categories"
       state: 
         one: State
         other: States
@@ -159,6 +164,7 @@ it:
   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: Totale
   are_you_sure: "Are you sure"
   are_you_sure_category: "Sei sicuro di voler cancellare questa categoria?"
@@ -191,6 +197,7 @@ it:
   city: Città
   comp_order: "Cancellare l'ordine"
   comp_order_confirmation: "Customer will not be charged.  Are you sure you want to comp this order?"
+  complete_list: "Complete List"
   configuration: Configurazione
   configuration_options: "Configuration Options"
   configurations: Configurations
@@ -203,6 +210,7 @@ it:
   country_based: "Country Based"
   create: Inserire
   create_a_new_account: "Create a new account"
+  create_user_account: Create User Account
   created_successfully:
   credit_card: ""
   credit_card_capture_complete: "Credit Card Was Captured"
@@ -223,6 +231,8 @@ it:
   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: "Edita l'utente"
@@ -235,7 +245,7 @@ it:
   error: errore
   event: Event
   existing_customer: "Existing Customer"
-  expiration: Expiration
+  expiration: "Expiration"
   expiration_month: "Valido fino (Mese)"
   expiration_year: "Valido fino (Anno)"
   extension: estensione
@@ -243,9 +253,11 @@ it:
   filename: file
   final_confirmation: "Conferma finale"
   first_name: nome
+  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 @@ it:
   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: "Ciao User"
+  history: History
+  home: "Home"
   image: Imagine
   images: Imagini
   in_progress: "In Progress"
@@ -278,13 +293,22 @@ it:
   locale_changed: "Locale Changed"
   log_in: Login
   logged_in_as: "Loggato con"
+  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: Utente
   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: "Prezzo base"
+  meta_description: "Meta Description"
+  meta_keywords: "Meta Keywords"
+  metadata: "Metadata"
+  month: "Month"
   my_account: "Mio conto"
   my_orders: "My Orders"
   name: Name
@@ -299,6 +323,8 @@ it:
   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 @@ it:
   next: continua
   no_items_in_cart: "Carrello vuoto"
   no_match_found: "No Match Found"
+  no_user_found: "No user was found with that email address"
   none: ""
   none_available: "None Available"
   on_hand: "In magazzino"
@@ -335,6 +362,10 @@ it:
   paid: Paid
   parent_category: "Sottocategoria di"
   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: Pagamento
@@ -349,6 +380,7 @@ it:
   problem_authorizing_card: "Problem authorizing credit card"
   problem_capturing_card: ""
   problems_processing_order: "Suo ordine non è stato elaborato"
+  proceed_as_guest: "No Thanks, Proceed as Guest"
   process: Manda
   product: Prodotto
   product_details: "Product Details"
@@ -356,13 +388,18 @@ it:
   products: Prodotti
   properties: ""
   property: ""
+  prototype: Prototype
   prototypes: ""
   qty: Qnt
   rate: Rate
+  register: Register as a New User
+  register_or_guest: Checkout as Guest or Register
+  registration: Registration           
   remember_me: "Salva i dettagli su questo computer"
   remove: ""
   reports: Reports
   resend: Riinvia
+  reset_password: "Reset my password"
   response_code: "Response Code"
   resume: "resume"
   resumed: Resumed
@@ -378,6 +415,7 @@ it:
   secure_connection_type: Secure Connection Type
   select: Seleziona
   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 @@ it:
   ship: ship
   ship_address: "Indirizzo di consegna"
   shipment: Shipment
+  shipment_number: "Shipment #"
   shipped: Shipped
   shipping: Consegna
   shipping_address: "Indirizzo di consegna"
+  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: "Metodo di consegna"
+  shipping_method: Method
+  shipping_methods: "Shipping Methods"
+  shipping_methods_description: "Manage shipping methods"
   shipping_total: "Totale costi di consegna"
+  shop_by_taxonomy: "Shop by {{taxonomy}}"
   shopping_cart: Carrello
   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 @@ it:
   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: Italian
+  to_add_variants_you_must_first_define: "To add variants, you must first define"
   total: Totale
+  tracking: Tracking
   transaction: Transazioni
   tree: Tree
   try_again: Riprova
   type: Tipo
+  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: Salva
+  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 @@ it:
   what_is_this: Cos'è?
   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: CAP
   zone: ""