Merge branch 'oxteam-oxteam-translation-cleanup-2' into develop

src/application/language/arabic/translations_lang.php

@@ -44,8 +44,6 @@ $lang['customer'] = 'الزبون';
 $lang['start'] = 'البداية';
 $lang['end'] = 'النهاية';
 $lang['name'] = 'الإسم';
-$lang['phone'] = 'الهاتف';
-$lang['address'] = 'العنوان';
 $lang['appointment_link_title'] = 'رابط الموعد';
 $lang['success'] = ' !تم بنجاح';
 $lang['appointment_added_to_google_calendar'] = 'تم اضافة الموعد الى تقويم جوجل الخاص بحسابك';

src/application/language/bulgarian/translations_lang.php

@@ -44,8 +44,6 @@ $lang['customer'] = 'Клиент';
 $lang['start'] = 'Начало';
 $lang['end'] = 'Край';
 $lang['name'] = 'Име';
-$lang['phone'] = 'Телефонен номер';
-$lang['address'] = 'Адрес';
 $lang['appointment_link_title'] = 'Линк на часа';
 $lang['success'] = 'Успех!';
 $lang['appointment_added_to_google_calendar'] = 'Вашият час бе успешно добавен във Вашият Google Calendar профил.';

src/application/language/chinese/translations_lang.php

@@ -44,8 +44,6 @@ $lang['customer'] = '客户';
 $lang['start'] = '开始';
 $lang['end'] = '结束';
 $lang['name'] = '名字';
-$lang['phone'] = '电话号码';
-$lang['address'] = '地址';
 $lang['appointment_link_title'] = '预约连接';
 $lang['success'] = '成功!';
 $lang['appointment_added_to_google_calendar'] = '您的预约已经添加到您的谷歌日历.';

src/application/language/danish/translations_lang.php

@@ -44,8 +44,6 @@ $lang['customer'] = 'Customer';
 $lang['start'] = 'Start';
 $lang['end'] = 'Slut';
 $lang['name'] = 'Navn';
-$lang['phone'] = 'Telefon nummer';
-$lang['address'] = 'Adresse';
 $lang['appointment_link_title'] = 'Link til aftale.';
 $lang['success'] = 'Succes.';
 $lang['appointment_added_to_google_calendar'] = 'Din aftale er blevet tilføjet til din Google kalender.';

src/application/language/dutch/translations_lang.php

@@ -44,8 +44,6 @@ $lang['customer'] = 'Klant';
 $lang['start'] = 'Begin';
 $lang['end'] = 'Einde';
 $lang['name'] = 'Naam';
-$lang['phone'] = 'Telefoon';
-$lang['address'] = 'Adres';
 $lang['appointment_link_title'] = 'Afspraak link';
 $lang['success'] = 'Succes!';
 $lang['appointment_added_to_google_calendar'] = 'Uw afspraak is toegevoegd aan het Google Agenda-account.';

src/application/language/english/translations_lang.php

@@ -44,8 +44,6 @@ $lang['customer'] = 'Customer';
 $lang['start'] = 'Start';
 $lang['end'] = 'End';
 $lang['name'] = 'Name';
-$lang['phone'] = 'Phone';
-$lang['address'] = 'Address';
 $lang['appointment_link_title'] = 'Appointment Link';
 $lang['success'] = 'Success!';
 $lang['appointment_added_to_google_calendar'] = 'Your appointment has been added to your Google Calendar account.';
@@ -167,12 +165,12 @@ $lang['general'] = 'General';
 $lang['business_logic'] = 'Business Logic';
 $lang['current_user'] = 'Current User';
 $lang['about_app'] = 'About Easy!Appointments';
-$lang['edit_working_plan_hint'] = 'Mark below the days and hours that your company will accept appointments. You will be able to adjust appointments in non working hours but the customers will not be able to book appointments by themselves in non working periods. This working plan will be the default for every new provider record but you will be able to change each provider\'s plan separately by editing his record. After that you can add break periods.';
+$lang['edit_working_plan_hint'] = 'Mark below the days and hours that your company will accept appointments. You will be able to adjust appointments in non-working hours but the customers will not be able to book appointments by themselves in non-working periods. This working plan will be the default for every new provider record, but you will be able to change each provider\'s plan separately by editing his record. After that you can add break periods.';
 $lang['edit_breaks_hint'] = 'Add the working breaks during each day. These breaks will be applied for all new providers.';
 $lang['book_advance_timeout'] = 'Book Advance Timeout';
 $lang['book_advance_timeout_hint'] = 'Define the timeout (in minutes) before the customers can book or re-arrange appointments with the company.';
 $lang['timeout_minutes'] = 'Timeout (Minutes)';
-$lang['about_app_info'] = 'Easy!Appointments is a highly customizable web application that allows your customers to book appointments with you via the web. Moreover, it provides the ability to sync your data with Google Calendar so you can use them with other services.';
+$lang['about_app_info'] = 'Easy!Appointments is a highly customizable web application that allows your customers to book appointments with you via the web. Moreover, it provides the ability to sync your data with Google Calendar, so you can use them with other services.';
 $lang['current_version'] = 'Current Version';
 $lang['support'] = 'Support';
 $lang['about_app_support'] = 'If you encounter any problems when using Easy!Appointments you can search the official Google Group for answers. You might also need to create a new issue on the Google Code page in order to help the development progress.';

src/application/language/finnish/translations_lang.php

@@ -44,8 +44,6 @@ $lang['customer'] = 'Asiakas';
 $lang['start'] = 'Aloitusaika';
 $lang['end'] = 'Lopetus';
 $lang['name'] = 'Nimi';
-$lang['phone'] = 'Puhelin';
-$lang['address'] = 'Osoite';
 $lang['appointment_link_title'] = 'Varauslinkki';
 $lang['success'] = 'Onnistui!';
 $lang['appointment_added_to_google_calendar'] = 'Varauksesi lisättiin Google-kalenteriisi.';

src/application/language/french/translations_lang.php

@@ -32,7 +32,7 @@ $lang['appointment_cancelled'] = 'Votre rendez-vous a bien été annulé !';
 $lang['appointment_cancelled_title'] = 'Rendez-vous annulé';
 $lang['reason'] = 'Motif';
 $lang['appointment_removed_from_schedule'] = 'Le rendez-vous suivant a été supprimé de l\'agenda.';
-$lang['appointment_details_was_sent_to_you'] = 'Un email reprennant les détails de votre rendez-vous vient de vous être envoyé.';
+$lang['appointment_details_was_sent_to_you'] = 'Un email reprenant les détails de votre rendez-vous vient de vous être envoyé.';
 $lang['add_to_google_calendar'] = 'Ajouter à Google Calendar';
 $lang['appointment_booked'] = 'Votre rendez-vous a été confirmé avec succès !';
 $lang['thank_you_for_appointment'] = 'Merci de votre prise de rendez-vous avec nous. Vous trouvez ci-joint les détails de votre rendez-vous. Si nécessaire, faites les changements souhaités en cliquant sur le lien du rendez-vous.';
@@ -44,8 +44,6 @@ $lang['customer'] = 'Client';
 $lang['start'] = 'Début';
 $lang['end'] = 'Fin';
 $lang['name'] = 'Nom';
-$lang['phone'] = 'Numéro de téléphone';
-$lang['address'] = 'Adresse';
 $lang['appointment_link_title'] = 'Lien du rendez-vous';
 $lang['success'] = 'Réussi !';
 $lang['appointment_added_to_google_calendar'] = 'Votre rendez-vous a été ajouté à votre compte calendrier Google.';
@@ -77,7 +75,7 @@ $lang['all_day'] = 'Toute la journée';
 $lang['manage_appointment_record_hint'] = 'Gérer tous les enregistrements de rendez-vous des exécutants et des prestations actives.';
 $lang['select_filter_item_hint'] = 'Choisir un exécutant ou une prestation et visualisez les rendez-vous sur l\'agenda.';
 $lang['enable_appointment_sync_hint'] = 'Activer la synchronisation des rendez-vous avec le calendrier Google de l\'Exécutant.';
-$lang['manage_customers_hint'] = 'Gérer les clients enregistés et voir leur historique de rendez-vous.';
+$lang['manage_customers_hint'] = 'Gérer les clients enregistrés et voir leur historique de rendez-vous.';
 $lang['manage_services_hint'] = 'Gérer les prestations et les catégories actives du système.';
 $lang['manage_users_hint'] = 'Gérer les utilisateurs back office (administrateurs, exécutant, secrétaires).';
 $lang['settings_hint'] = 'Régler les paramètres système et utilisateurs.';
@@ -124,7 +122,7 @@ $lang['mobile_number'] = 'Téléphone portable';
 $lang['state'] = 'État / Pays';
 $lang['username'] = 'Nom d\'utilisateur';
 $lang['password'] = 'Mot de passe';
-$lang['retype_password'] = 'Ré-inscription du mot de passe';
+$lang['retype_password'] = 'Réinscription du mot de passe';
 $lang['receive_notifications'] = 'Recevoir les notifications';
 $lang['passwords_mismatch'] = 'Les 2 mots de passe ne correspondent pas !';
 $lang['admin_saved'] = 'Administrateur enregistré avec succès !';
@@ -134,7 +132,7 @@ $lang['admin_deleted'] = 'Administrateur supprimé avec succès !';
 $lang['provider_deleted'] = 'Exécutant supprimé avec succès !';
 $lang['secretary_deleted'] = 'Secrétaire supprimée avec succès !';
 $lang['service_saved'] = 'Prestation enregistrée avec succès !';
-$lang['service_category_saved'] = 'Catégorie de prestation enregistrée avec succés !';
+$lang['service_category_saved'] = 'Catégorie de prestation enregistrée avec succès !';
 $lang['service_deleted'] = 'Prestation supprimée avec succès !';
 $lang['service_category_deleted'] = 'Catégorie de prestation supprimée avec succès !';
 $lang['customer_saved'] = 'Client enregistré avec succès !';
@@ -221,7 +219,7 @@ $lang['start_date_time'] = 'Date/Heure de Début';
 $lang['end_date_time'] = 'Date/Heure de Fin';
 $lang['licensed_under'] = 'Licencié sous';
 $lang['unexpected_issues_occurred'] = 'Une erreur inattendue est survenue !';
-$lang['service_communication_error'] = 'Erreur de communication avec le serveur, Veuillez s\'il vous plait ré-essayer.';
+$lang['service_communication_error'] = 'Erreur de communication avec le serveur, Veuillez s\'il vous plait réessayer.';
 $lang['no_privileges_edit_appointments'] = 'Vous n\'avez pas les privilèges nécessaires pour modifier les rendez-vous.';
 $lang['unavailable_updated'] = 'La période d\'indisponibilité a bien été actualisée !';
 $lang['appointments'] = 'Rendez-vous';
@@ -261,7 +259,7 @@ $lang['google_sync_failed'] = 'La synchronisation Google a échoué : Échec de
 $lang['select_google_calendar'] = 'Choisir un calendrier Google';
 $lang['select_google_calendar_prompt'] = 'Sélectionnez le calendrier souhaité pour synchroniser votre rendez-vous. Si vous ne sélectionnez pas de calendrier spécifique, le calendrier par défaut sera sélectionné pour vous.';
 $lang['google_calendar_selected'] = 'Le calendrier Google a été sélectionné avec succès !';
-$lang['oops_something_went_wrong'] = 'Oops! Une erreur s\'est produite !';
+$lang['oops_something_went_wrong'] = 'Oups ! Une erreur s\'est produite !';
 $lang['could_not_add_to_google_calendar'] = 'Votre rendez-vous ne peux pas être ajouté à votre Calendrier Google.';
 $lang['ea_update_success'] = 'Easy!Appointments à été mis à jour avec succès !';
 $lang['require_captcha'] = 'CAPTCHA obligatoire';

src/application/language/german/translations_lang.php

@@ -44,8 +44,6 @@ $lang['customer'] = 'Kunde';
 $lang['start'] = 'Beginn';
 $lang['end'] = 'Ende';
 $lang['name'] = 'Name';
-$lang['phone'] = 'Telefonnummer';
-$lang['address'] = 'Adresse';
 $lang['appointment_link_title'] = 'Termin-Link';
 $lang['success'] = 'Erfolg!';
 $lang['appointment_added_to_google_calendar'] = 'Ihr Termin ist zu Ihrem Google Kalender Konto hinzugefügt worden.';

src/application/language/greek/translations_lang.php

@@ -44,8 +44,6 @@ $lang['customer'] = 'Πελάτης';
 $lang['start'] = 'Έναρξη';
 $lang['end'] = 'Λήξη';
 $lang['name'] = 'Όνομα';
-$lang['phone'] = 'Τηλέφωνο';
-$lang['address'] = 'Διεύθυνση';
 $lang['appointment_link_title'] = 'Σύνδεσμος Ραντεβού';
 $lang['success'] = 'Επιτυχία!';
 $lang['appointment_added_to_google_calendar'] = 'Το ραντεβού έχει προστεθεί στον λογαριασμό σας στο Google Calendar.';

src/application/language/hindi/translations_lang.php

@@ -44,8 +44,6 @@ $lang['customer'] = 'उपभोक्ता';
 $lang['start'] = 'प्रारंभ';
 $lang['end'] = 'समाप्त';
 $lang['name'] = 'नाम';
-$lang['phone'] = 'फ़ोन';
-$lang['address'] = 'पता';
 $lang['appointment_link_title'] = 'अपॉइंटमेंट की लिंक';
 $lang['success'] = 'सफलता!';
 $lang['appointment_added_to_google_calendar'] = 'आपकी अपॉइंटमेंट अपने गूगल कैलेंडर खाते में जोड़ दिया गया है.';

src/application/language/hungarian/translations_lang.php

@@ -44,8 +44,6 @@ $lang['customer'] = 'Vásárló';
 $lang['start'] = 'Kezdés';
 $lang['end'] = 'Vég';
 $lang['name'] = 'Név';
-$lang['phone'] = 'Telefon';
-$lang['address'] = 'Cím';
 $lang['appointment_link_title'] = 'Link a foglaláshoz';
 $lang['success'] = 'Sikerült!';
 $lang['appointment_added_to_google_calendar'] = 'Az időpontod hozzá lett adva a Google naptáradhoz.';

src/application/language/italian/translations_lang.php

@@ -44,8 +44,6 @@ $lang['customer'] = 'Cliente';
 $lang['start'] = 'Inizio';
 $lang['end'] = 'Fine';
 $lang['name'] = 'Nome';
-$lang['phone'] = 'Telefono';
-$lang['address'] = 'Indirizzo';
 $lang['appointment_link_title'] = 'Link appuntamento';
 $lang['success'] = 'Successo!';
 $lang['appointment_added_to_google_calendar'] = 'Il tuo appuntamento è stato aggiunto al tuo account Google Calendar.';

src/application/language/japanese/translations_lang.php

@@ -44,8 +44,6 @@ $lang['customer'] = 'お客様';
 $lang['start'] = '開始';
 $lang['end'] = '終了';
 $lang['name'] = '名前';
-$lang['phone'] = '電話';
-$lang['address'] = '住所';
 $lang['appointment_link_title'] = '予約へのリンク';
 $lang['success'] = '成功';
 $lang['appointment_added_to_google_calendar'] = 'お客様の予約スケジュールがGoogleカレンダーに登録されました。';

src/application/language/luxembourgish/translations_lang.php

@@ -44,8 +44,6 @@ $lang['customer'] = 'Client';
 $lang['start'] = 'Ufank';
 $lang['end'] = 'Enn';
 $lang['name'] = 'Numm';
-$lang['phone'] = 'Telefonsnummer';
-$lang['address'] = 'Adresse';
 $lang['appointment_link_title'] = 'Termäin Link';
 $lang['success'] = 'Erfolleg!';
 $lang['appointment_added_to_google_calendar'] = 'Äre Termäin ass an Ärem Google Kalenner bäigesat ginn.';

src/application/language/polish/translations_lang.php

@@ -44,8 +44,6 @@ $lang['customer'] = 'Klient';
 $lang['start'] = 'Początek';
 $lang['end'] = 'Koniec';
 $lang['name'] = 'Nazwisko';
-$lang['phone'] = 'Numer telefonu';
-$lang['address'] = 'Adres';
 $lang['appointment_link_title'] = 'Link Wizyty';
 $lang['success'] = 'Sukces!';
 $lang['appointment_added_to_google_calendar'] = 'Twoja wizyta została dodana do konta Kalendarza Google.';

src/application/language/portuguese-br/translations_lang.php

@@ -44,8 +44,6 @@ $lang['customer'] = 'Cliente';
 $lang['start'] = 'Inicio';
 $lang['end'] = 'Fim';
 $lang['name'] = 'Nome';
-$lang['phone'] = 'Telefone';
-$lang['address'] = 'Endereço';
 $lang['appointment_link_title'] = 'Link de agendamentos';
 $lang['success'] = 'Sucesso!';
 $lang['appointment_added_to_google_calendar'] = 'O seu evento foi adicionado a sua conta do "Google Calendar".';

src/application/language/portuguese/translations_lang.php

@@ -44,8 +44,6 @@ $lang['customer'] = 'Cliente';
 $lang['start'] = 'Inicio';
 $lang['end'] = 'Fim';
 $lang['name'] = 'Nome';
-$lang['phone'] = 'Telefone';
-$lang['address'] = 'Endereço';
 $lang['appointment_link_title'] = 'Link de apontamentos';
 $lang['success'] = 'Sucesso!';
 $lang['appointment_added_to_google_calendar'] = 'O seu evento foi adicionado a sua conta "Google Calendar".';

src/application/language/romanian/translations_lang.php

@@ -44,8 +44,6 @@ $lang['customer'] = 'Client';
 $lang['start'] = 'Start';
 $lang['end'] = 'Sfârsit';
 $lang['name'] = 'Nume';
-$lang['phone'] = 'Telefon';
-$lang['address'] = 'Adresa';
 $lang['appointment_link_title'] = 'Linkul întâlnirii';
 $lang['success'] = 'Succes!';
 $lang['appointment_added_to_google_calendar'] = 'Întâlnirea a fost adaugata în Calendarul Google.';

src/application/language/russian/translations_lang.php

@@ -44,8 +44,6 @@ $lang['customer'] = 'Заказчик';
 $lang['start'] = 'Начало';
 $lang['end'] = 'Окончание';
 $lang['name'] = 'Имя';
-$lang['phone'] = 'Телефон';
-$lang['address'] = 'Адрес';
 $lang['appointment_link_title'] = 'Ссылка на назначение';
 $lang['success'] = 'Готово!';
 $lang['appointment_added_to_google_calendar'] = 'Ваше назначение было внесено в Google-календарь вашего аккаунта.';

src/application/language/slovak/translations_lang.php

@@ -44,8 +44,6 @@ $lang['customer'] = 'Zákazník';
 $lang['start'] = 'Začiatok';
 $lang['end'] = 'Koniec';
 $lang['name'] = 'Meno';
-$lang['phone'] = 'Telefón';
-$lang['address'] = 'Adresa';
 $lang['appointment_link_title'] = 'Link na rezerváciu';
 $lang['success'] = 'Úspech!';
 $lang['appointment_added_to_google_calendar'] = 'Vaša rezervácia bola pridaná do vášho konta služby Kalendár Google.';

src/application/language/spanish/translations_lang.php

@@ -44,8 +44,6 @@ $lang['customer'] = 'Cliente';
 $lang['start'] = 'Inicio';
 $lang['end'] = 'Final';
 $lang['name'] = 'Nombre';
-$lang['phone'] = 'Número de teléfono';
-$lang['address'] = 'Domicilio';
 $lang['appointment_link_title'] = 'Enlace a la cita';
 $lang['success'] = '¡Cita completada!';
 $lang['appointment_added_to_google_calendar'] = 'Su cita ha sido agregada a su cuenta de Google Calendar.';

src/application/language/turkish/translations_lang.php

@@ -44,8 +44,6 @@ $lang['customer'] = 'Müşteri';
 $lang['start'] = 'Başlangıç';
 $lang['end'] = 'Bitiş';
 $lang['name'] = 'Ad';
-$lang['phone'] = 'Telefon';
-$lang['address'] = 'Adres';
 $lang['appointment_link_title'] = 'Randevunun Bağlantısı';
 $lang['success'] = 'Başarılı!';
 $lang['appointment_added_to_google_calendar'] = 'Randevunuz Google Takvim hesabınıza eklendi.';

src/assets/js/frontend_book.js

@@ -536,7 +536,7 @@ window.FrontendBook = window.FrontendBook || {};
         html =
             '<h4>' + firstName + ' ' + lastName + '</h4>' +
             '<p>' +
-            EALang.phone + ': ' + phoneNumber +
+            EALang.phone_number + ': ' + phoneNumber +
             '<br/>' +
             EALang.email + ': ' + email +
             '<br/>' +

src/engine/Notifications/Email.php

@@ -156,7 +156,7 @@ class Email {
             'Customer Details' => $this->framework->lang->line('customer_details_title'),
             'Name' => $this->framework->lang->line('name'),
             'Email' => $this->framework->lang->line('email'),
-            'Phone' => $this->framework->lang->line('phone'),
+            'Phone' => $this->framework->lang->line('phone_number'),
             'Address' => $this->framework->lang->line('address'),
             'Appointment Link' => $this->framework->lang->line('appointment_link_title')
         ];
@@ -260,7 +260,7 @@ class Email {
             'Customer Details' => $this->framework->lang->line('customer_details_title'),
             'Name' => $this->framework->lang->line('name'),
             'Email' => $this->framework->lang->line('email'),
-            'Phone' => $this->framework->lang->line('phone'),
+            'Phone' => $this->framework->lang->line('phone_number'),
             'Address' => $this->framework->lang->line('address'),
             'Reason' => $this->framework->lang->line('reason')
         ];