Merge branch 'master' into release-1.1

This commit is contained in:
Alex Tselegidis 2016-01-16 11:51:07 +01:00
commit 35d69d3b4c
3 changed files with 28 additions and 28 deletions

View file

@ -1,13 +1,13 @@
<?php
$lang['migration_none_found'] = "No migrations were found.";
$lang['migration_not_found'] = "This migration could not be found.";
$lang['migration_multiple_version'] = "This are multiple migrations with the same version number: %d.";
$lang['migration_class_doesnt_exist'] = "The migration class \"%s\" could not be found.";
$lang['migration_missing_up_method'] = "The migration class \"%s\" is missing an 'up' method.";
$lang['migration_missing_down_method'] = "The migration class \"%s\" is missing an 'down' method.";
$lang['migration_invalid_filename'] = "Migration \"%s\" has an invalid filename.";
$lang['migration_none_found'] = "Nessun migration trovato.";
$lang['migration_not_found'] = "Questo migration non può essere trovato.";
$lang['migration_multiple_version'] = "Ci sono più migrations con lo stesso numero di versione: %d.";
$lang['migration_class_doesnt_exist'] = "La migration class \"%s\" non può essere trovata.";
$lang['migration_missing_up_method'] = "La migration class \"%s\" non dispone del metodo 'up'.";
$lang['migration_missing_down_method'] = "La migration class \"%s\" non dispone del metodo 'down'.";
$lang['migration_invalid_filename'] = "Il migration \"%s\" ha un filename non valido.";
/* End of file migration_lang.php */
/* Location: ./system/language/italian/migration_lang.php */
/* Location: ./system/language/italian/migration_lang.php */

View file

@ -270,13 +270,13 @@ $lang['google_calendar_selected'] = 'Il calendario Google è stato selezionato c
$lang['oops_something_went_wrong'] = 'Oops! Qualcosa è andato storto!';
$lang['could_not_add_to_google_calendar'] = 'Il tuo appuntamento potrebbe non essere stato aggiunto al tuo account Google Calendar.';
$lang['ea_update_success'] = 'Easy!Appointments è stato aggiornato con successo!';
$lang['require_captcha'] = 'Require CAPTCHA';
$lang['require_captcha_hint'] = 'When enabled, the customers will have to type a random generated CAPTCHA string before booking/updating an appointment.';
$lang['captcha_is_wrong'] = 'CAPTCHA verification failed, please try again.';
$lang['any_provider'] = 'Any Provider';
$lang['requested_hour_is_unavailable'] = 'The requested appointment is unfornately not available. Please select a different hour for your appointment.';
$lang['customer_notifications'] = 'Customer Notifications';
$lang['customer_notifications_hint'] = 'Defines whether the customer will receive email notifications whenever there is a schedule change on one of his appointments.';
$lang['date_format'] = 'Date Format';
$lang['date_format_hint'] = 'Change the date display format (D - Date, M - Month, Y - Year).';
$lang['google_analytics_code_hint'] = 'Add your Google Analytics ID to be included in the booking page.';
$lang['require_captcha'] = 'Richiedi CAPTCHA';
$lang['require_captcha_hint'] = 'Quando abilitato, i clienti dovranno digitare il codice CAPTCHA prima di prenotare/aggiornare un appuntamento.';
$lang['captcha_is_wrong'] = 'Verifica del CAPTCHA fallita, prova di nuovo.';
$lang['any_provider'] = 'Qualsiasi provider';
$lang['requested_hour_is_unavailable'] = 'Sfortunatamente l\'appuntamento richiesto non è disponibile. Per cortesia seleziona un orario diverso per il tuo appuntamento.';
$lang['customer_notifications'] = 'Notifiche cliente';
$lang['customer_notifications_hint'] = 'Definisce se il cliente riceverà notifiche email ogni volta che c\'è un cambiamento di programma su uno dei suoi appuntamenti.';
$lang['date_format'] = 'Formato data';
$lang['date_format_hint'] = 'Cambia il formato di visualizzazione della data (D - Giorno, M - Mese, Y - Anno).';
$lang['google_analytics_code_hint'] = 'Aggiunti il tuo ID di Google Analytics per includerlo nella pagina di prenotazione.';

View file

@ -264,13 +264,13 @@ $lang['google_calendar_selected'] = 'Calendario do google foi selecionado com su
$lang['oops_something_went_wrong'] = 'Ops! Algo deu errado!';
$lang['could_not_add_to_google_calendar'] = 'Não foi possível adicionar à sua conta do Google Calendar.';
$lang['ea_update_success'] = 'Easy!Appointments foi atualizado com sucesso!';
$lang['require_captcha'] = 'Require CAPTCHA';
$lang['require_captcha_hint'] = 'When enabled, the customers will have to type a random generated CAPTCHA string before booking/updating an appointment.';
$lang['captcha_is_wrong'] = 'CAPTCHA verification failed, please try again.';
$lang['any_provider'] = 'Any Provider';
$lang['requested_hour_is_unavailable'] = 'The requested appointment is unfornately not available. Please select a different hour for your appointment.';
$lang['customer_notifications'] = 'Customer Notifications';
$lang['customer_notifications_hint'] = 'Defines whether the customer will receive email notifications whenever there is a schedule change on one of his appointments.';
$lang['date_format'] = 'Date Format';
$lang['date_format_hint'] = 'Change the date display format (D - Date, M - Month, Y - Year).';
$lang['google_analytics_code_hint'] = 'Add your Google Analytics ID to be included in the booking page.';
$lang['require_captcha'] = 'Requer CAPTCHA';
$lang['require_captcha_hint'] = 'Quando habilitado, os clientes terão que digitar um código CAPTCHA gerado randomicamente antes de cadastrar/atualizar um agendamento.';
$lang['captcha_is_wrong'] = 'Verificação do CAPTCHA falhou, favor tente novamente.';
$lang['any_provider'] = 'Qualquer Atendente';
$lang['requested_hour_is_unavailable'] = 'Infelizmente, o agendamento solicitado não está disponível. Por favor selecione um horário diferente para o seu agendamento.';
$lang['customer_notifications'] = 'Notificações de Clientes';
$lang['customer_notifications_hint'] = 'Define se o cliente receberá ou não, notificações por email sempre que um de seus agendamentos sejam alterados de horário.';
$lang['date_format'] = 'Formato da Data';
$lang['date_format_hint'] = 'Altera o formato de visualização da Data (D - Data, M - Mes, Y - Ano).';
$lang['google_analytics_code_hint'] = 'Adicione o seu ID do Google Analytics para ser incluido na pagina de agendamentos.';