diff --git a/src/application/language/arabic/translations_lang.php b/src/application/language/arabic/translations_lang.php
index 19fdd8f0..712363dd 100755
--- a/src/application/language/arabic/translations_lang.php
+++ b/src/application/language/arabic/translations_lang.php
@@ -88,7 +88,6 @@ $lang['reload_appointments_hint'] = 'اعادة تحميل تقويم الموا
 $lang['trigger_google_sync_hint'] = 'تشغيل عملية مزامنة تقويم جوجل.';
 $lang['appointment_updated'] = 'تم تحديث الموعد بنجاح!';
 $lang['undo'] = 'تراجع';
-$lang['cancel'] = 'إلغاء';
 $lang['appointment_details_changed'] = 'تم تعديل تفاصيل الموعد بنجاح';
 $lang['appointment_changes_saved'] = 'تم حفظ التعديلات على الموعد بنجاح!';
 $lang['save'] = 'تخزين';
@@ -167,22 +166,22 @@ $lang['settings_saved'] = 'تم حفظ الاعدادات بنجاح';
 $lang['general'] = 'عام';
 $lang['business_logic'] = 'منطق الأعمال';
 $lang['current_user'] = 'المستخدم الحالي';
-$lang['about_ea'] = 'About E!A';
+$lang['about_app'] = 'About E!A';
 $lang['edit_working_plan_hint'] = 'ضع علامة أسفل الأيام والساعات التي تقبل فيها شركتك المواعيد سوف تكون قادرا على ضبط المواعيد في غير ساعات العمل ولكن الزبائن لن يكونون قادرين على حجز المواعيد في غير فترات العمل  ستكون خطة العمل هذه هي الطريقة الافتراضية لكل مزود خدمة جديد ولكنك ستتمكن من تغيير خطة كل مزود خدمة بشكل منفصل عن طريق تعديل سجله بعد ذلك يمكنك إضافة فترات استراحة';
 $lang['edit_breaks_hint'] = 'اضافة فترات الاستراحة لكل يوم. فترات الاستراحة هذه سيتم تطبيقها لكل مزودي الخدمات';
 $lang['book_advance_timeout'] = 'حجز مهلة مسبقا';
 $lang['book_advance_timeout_hint'] = 'تعريف المهلة (بالدقائق) قبل أن يحجز الزبائن الموعد او يقومون باعادة ترتيب حجزهم';
 $lang['timeout_minutes'] = 'المهلة (الدقائق)';
-$lang['about_ea_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'] = 'النسخة الحالية';
 $lang['support'] = 'الدعم';
-$lang['about_ea_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.';
+$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.';
 $lang['official_website'] = 'الموقع الرسمي';
 $lang['google_plus_community'] = 'Google+ مجتمع';
 $lang['support_group'] = 'مجموعة الدعم';
 $lang['project_issues'] = 'مشاكل المشروع';
 $lang['license'] = 'الرخصة';
-$lang['about_ea_license'] = 'Easy!Appointments is licensed under the GPLv3 license. By using the code of Easy!Appointments in any way you are agreeing to the terms described in the following url:';
+$lang['about_app_license'] = 'Easy!Appointments is licensed under the GPLv3 license. By using the code of Easy!Appointments in any way you are agreeing to the terms described in the following url:';
 $lang['logout_success'] = 'تم تسجيل الخروج بنجاح';
 $lang['book_appointment_title'] = 'احجز موعد';
 $lang['backend_section'] = 'صفحة الدخول للبرنامج';
@@ -216,7 +215,7 @@ $lang['page_not_found'] = 'لم يتم الحثور على الصفحة';
 $lang['page_not_found_message'] = 'لم يتم العثور على الصفحة للأسف .يرجى التاكد من الرابط في المتصفح او الذهاب الى مكان آخر باستخدام الازرار أدناه';
 $lang['error'] = 'خطأ';
 $lang['no_privileges'] = 'لا يوجد صلاحيات';
-$lang['no_provileges_message'] = 'لا يوجد لك صلاحيات لمعاينة هذه الصفحة . يرجى التوجه الى مكان آخر';
+$lang['no_privileges_message'] = 'لا يوجد لك صلاحيات لمعاينة هذه الصفحة . يرجى التوجه الى مكان آخر';
 $lang['backend_calendar'] = 'التقويم الخاص بالمستخدمين ';
 $lang['start_date_time'] = 'وقت البداية / الوقت';
 $lang['end_date_time'] = 'وقت النهاية / الوقت';
diff --git a/src/application/language/bulgarian/translations_lang.php b/src/application/language/bulgarian/translations_lang.php
index ddc7dd70..34256468 100755
--- a/src/application/language/bulgarian/translations_lang.php
+++ b/src/application/language/bulgarian/translations_lang.php
@@ -88,7 +88,6 @@ $lang['reload_appointments_hint'] = 'Презареждане на календ
 $lang['trigger_google_sync_hint'] = 'Изпълнение на процес по синхронизация с Google Calendar.';
 $lang['appointment_updated'] = 'Часът е актуализиран успешно!';
 $lang['undo'] = 'Отмяна';
-$lang['cancel'] = 'Отказ';
 $lang['appointment_details_changed'] = 'Информацията относно часът е променена.';
 $lang['appointment_changes_saved'] = 'Промените на часът са успешно запазени!';
 $lang['save'] = 'Запис';
@@ -266,12 +265,12 @@ $lang['oops_something_went_wrong'] = 'Опааа! Нещо се обърка!О
 $lang['could_not_add_to_google_calendar'] = 'Вашият час не бе добавен във Вашият Google Calendar.';
 $lang['ea_update_success'] = 'Системата Обновена успешно';
 $lang['require_captcha'] = 'Изискване на CAPTCHA';
-$lang['captcha_is_wrong'] = 'CAPTCHA verification failed, please try again.';
 $lang['require_captcha_hint'] = 'Когато е активно, потребителя , ще трябва да въведе произволно генерирани символи за да запише или промени час.';
+$lang['captcha_is_wrong'] = 'CAPTCHA verification failed, please try again.';
 $lang['any_provider'] = 'Произволен Изпълнител';
 $lang['requested_hour_is_unavailable'] = 'Заявеният от Вас час не е наличен. Моля изберете друг час.';
-$lang['customer_notifications_hint'] = 'Дефинира дали клиентът ще получава известия посредством електронна поща, когато има промяна в графика, съдържащ негов запазен час.';
 $lang['customer_notifications'] = 'Клиентски Известия';
+$lang['customer_notifications_hint'] = 'Дефинира дали клиентът ще получава известия посредством електронна поща, когато има промяна в графика, съдържащ негов запазен час.';
 $lang['date_format'] = 'Формат на Дата';
 $lang['date_format_hint'] = 'Промяна на дормат за показ на дата (D - дата, M - месец, Y - година).';
 $lang['time_format'] = 'Time Format';
diff --git a/src/application/language/chinese/translations_lang.php b/src/application/language/chinese/translations_lang.php
index edc0951a..e14c9d6b 100755
--- a/src/application/language/chinese/translations_lang.php
+++ b/src/application/language/chinese/translations_lang.php
@@ -88,7 +88,6 @@ $lang['reload_appointments_hint'] = '刷新日历.';
 $lang['trigger_google_sync_hint'] = '激活谷歌日历同步进程.';
 $lang['appointment_updated'] = '预约成功更新!';
 $lang['undo'] = '撤销';
-$lang['cancel'] = '取消';
 $lang['appointment_details_changed'] = '预约信息已经修改.';
 $lang['appointment_changes_saved'] = '预约已成功修改并保存!';
 $lang['save'] = '保存';
diff --git a/src/application/language/danish/translations_lang.php b/src/application/language/danish/translations_lang.php
index 5e4ac1ac..593f7a53 100755
--- a/src/application/language/danish/translations_lang.php
+++ b/src/application/language/danish/translations_lang.php
@@ -88,7 +88,6 @@ $lang['reload_appointments_hint'] = 'Gendan kalender aftaler.';
 $lang['trigger_google_sync_hint'] = 'Udløs Google kalender synkroniseringen processen.';
 $lang['appointment_updated'] = 'Tiden er opdateret.';
 $lang['undo'] = 'Fortryd';
-$lang['cancel'] = 'Slet';
 $lang['appointment_details_changed'] = 'Tidens oplysninger er ændret.';
 $lang['appointment_changes_saved'] = 'Aftalens ændring er blevet gemt';
 $lang['save'] = 'Gem';
diff --git a/src/application/language/dutch/translations_lang.php b/src/application/language/dutch/translations_lang.php
index a1dbd5e8..20827257 100755
--- a/src/application/language/dutch/translations_lang.php
+++ b/src/application/language/dutch/translations_lang.php
@@ -88,7 +88,6 @@ $lang['reload_appointments_hint'] = 'Herlaad de afspraken.';
 $lang['trigger_google_sync_hint'] = 'Start het Google Agenda synchronisatieproces.';
 $lang['appointment_updated'] = 'Afspraak succesvol bijgewerkt!';
 $lang['undo'] = 'Ongedaan maken';
-$lang['cancel'] = 'Annuleren';
 $lang['appointment_details_changed'] = 'Afspraakgegevens veranderd.';
 $lang['appointment_changes_saved'] = 'De wijzigingen in de afspraak zijn succesvol opgeslagen!';
 $lang['save'] = 'Opslaan';
diff --git a/src/application/language/english/translations_lang.php b/src/application/language/english/translations_lang.php
index fcb7c6e5..551aeb61 100755
--- a/src/application/language/english/translations_lang.php
+++ b/src/application/language/english/translations_lang.php
@@ -88,7 +88,6 @@ $lang['reload_appointments_hint'] = 'Reload calendar appointments.';
 $lang['trigger_google_sync_hint'] = 'Trigger the Google Calendar synchronization process.';
 $lang['appointment_updated'] = 'Appointment updated successfully!';
 $lang['undo'] = 'Undo';
-$lang['cancel'] = 'Cancel';
 $lang['appointment_details_changed'] = 'Appointment details have changed.';
 $lang['appointment_changes_saved'] = 'Appointment changes have been successfully saved!';
 $lang['save'] = 'Save';
diff --git a/src/application/language/finnish/translations_lang.php b/src/application/language/finnish/translations_lang.php
index 3112c095..cb7d51f1 100755
--- a/src/application/language/finnish/translations_lang.php
+++ b/src/application/language/finnish/translations_lang.php
@@ -88,7 +88,6 @@ $lang['reload_appointments_hint'] = 'Uudelleenlataa varaukset.';
 $lang['trigger_google_sync_hint'] = 'Käynnistä Google-kalenterin synkronointi.';
 $lang['appointment_updated'] = 'Varaus päivitetty onnistuneesti!';
 $lang['undo'] = 'Kumoa';
-$lang['cancel'] = 'Peruuta';
 $lang['appointment_details_changed'] = 'Varaustiedot ovat muuttuneet';
 $lang['appointment_changes_saved'] = 'Varauksen muutokset tallennettiin onnistuneesti!';
 $lang['save'] = 'Tallenna';
diff --git a/src/application/language/french/translations_lang.php b/src/application/language/french/translations_lang.php
index 1197dd1b..5c592769 100755
--- a/src/application/language/french/translations_lang.php
+++ b/src/application/language/french/translations_lang.php
@@ -10,7 +10,7 @@ $lang['price'] = 'Prix';
 $lang['back'] = 'Retour';
 $lang['step_two_title'] = 'Choisissez la date et l\'heure de votre rendez-vous';
 $lang['no_available_hours'] = 'Il n\'y a pas d\'heures de rendez-vous disponibles pour la date sélectionnée. Choisissez une autre date s\'il vous plaît.';
-$lang['appointment_hour_missing'] = 'S\'il vous plaît, choisissez une heure de rendez-vous avant de pouvoir poursuivre';
+$lang['appointment_hour_missing'] = 'S\'il vous plaît, choisissez une heure de rendez-vous avant de pouvoir poursuivre.';
 $lang['step_three_title'] = 'Remplissez vos informations';
 $lang['first_name'] = 'Prénom';
 $lang['last_name'] = 'Nom';
@@ -19,8 +19,8 @@ $lang['phone_number'] = 'Numéro de téléphone';
 $lang['address'] = 'Adresse';
 $lang['city'] = 'Ville';
 $lang['zip_code'] = 'Code postal';
-$lang['notes'] = 'Informations';
-$lang['fields_are_required'] = 'Les champs avec une * sont obligatoires';
+$lang['notes'] = 'Commentaires';
+$lang['fields_are_required'] = 'Les champs avec * sont obligatoires';
 $lang['step_four_title'] = 'Confirmez votre rendez-vous';
 $lang['confirm'] = 'Confirmation';
 $lang['update'] = 'Mise à jour';
@@ -32,12 +32,12 @@ $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 reprennant 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.';
 $lang['appointment_details_title'] = 'Détails du rendez-vous';
-$lang['customer_details_title'] = 'Vos informations';
+$lang['customer_details_title'] = 'Informations client';
 $lang['service'] = 'Prestations';
 $lang['provider'] = 'Exécutant';
 $lang['customer'] = 'Client';
@@ -75,7 +75,7 @@ $lang['edit'] = 'Editer';
 $lang['hello'] = 'Bonjour';
 $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'] = 'Choisisez un exécutant ou une prestation et visualisez les rendez-vous sur l\'agenda.';
+$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_services_hint'] = 'Gérer les prestations et les catégories actives du système.';
@@ -95,7 +95,7 @@ $lang['new'] = 'Nouveau';
 $lang['select'] = 'Choisir';
 $lang['hide'] = 'Cacher';
 $lang['type_to_filter_customers'] = 'Filtrer les clients.';
-$lang['clear_fields_add_existing_customer_hint'] = 'Effacez tous les champs et entrez un nouveau client.';
+$lang['clear_fields_add_existing_customer_hint'] = 'Effacer tous les champs et entrer un nouveau client.';
 $lang['pick_existing_customer_hint'] = 'Rechercher un client existant.';
 $lang['new_appointment_title'] = 'Nouveau rendez-vous';
 $lang['edit_appointment_title'] = 'Editer rendez-vous';
@@ -167,8 +167,8 @@ $lang['general'] = 'Général';
 $lang['business_logic'] = 'Logique commerciale';
 $lang['current_user'] = 'Utilisateur actuel';
 $lang['about_app'] = 'Au sujet d\'Easy!Appointments';
-$lang['edit_working_plan_hint'] = 'Indiquez ici les jours et les heures pendant lesquels votre société accepte les rendez-vous. Il est possible de fixer vous-même un rendez-vous en dehors des heures de travail tandis que les clients ne pourront pas prendre d\'eux-mêmes un rendez-vous en dehors des périodes de travail indiquées ici. Ce planning de travail sera celui proposé par défaut pour chaque nouvel enregistrement. Toutefois il vous sera possible de changer séparément chaque planning de travail individuel en l\'éditant. Après cela vous pouvez encore ajouter les périodes de pause.';
-$lang['edit_breaks_hint'] = 'Indiquez ici les périodes des pauses quotidiennes. Ces pauses seront disponibles à chaque nouvel exécutant.';
+$lang['edit_working_plan_hint'] = 'Indiquer ici les jours et les heures pendant lesquels votre société accepte les rendez-vous. Il est possible de fixer vous-même un rendez-vous en dehors des heures de travail tandis que les clients ne pourront pas prendre d\'eux-mêmes un rendez-vous en dehors des périodes de travail indiquées ici. Ce planning de travail sera celui proposé par défaut pour chaque nouvel enregistrement. Toutefois il vous sera possible de changer séparément chaque planning de travail individuel en l\'éditant. Après cela vous pouvez encore ajouter les périodes de pause.';
+$lang['edit_breaks_hint'] = 'Indiquer ici les périodes des pauses quotidiennes. Ces pauses seront disponibles à chaque nouvel exécutant.';
 $lang['book_advance_timeout'] = 'Temporisation avancée de l\'agenda';
 $lang['book_advance_timeout_hint'] = 'Définir la temporisation (en minutes) avant que les clients ne puissent prendre ou modifier les rendez-vous avec la société.';
 $lang['timeout_minutes'] = 'Temporisation (Minutes)';
@@ -189,7 +189,7 @@ $lang['you_need_to_login'] = 'Bonjour ! Vous devez vous connecter pour voir les
 $lang['enter_username_here'] = 'Entrez votre nom d\'utilisateur ici ...';
 $lang['enter_password_here'] = 'Entrez votre mot de passe ici ...';
 $lang['login'] = 'Connexion ';
-$lang['forgot_your_password'] = 'Mot de passe oublié?';
+$lang['forgot_your_password'] = 'Mot de passe oublié ?';
 $lang['login_failed'] = 'La connexion a échoué. S\'il vous plait entrez les informations d\'identification correctes et ré-essayez.';
 $lang['type_username_and_email_for_new_password'] = 'Inscrivez votre nom d\'utilisateur et adresse email pour recevoir un nouveau mot de passe.';
 $lang['enter_email_here'] = 'Entrez votre email ici ...';
@@ -198,7 +198,7 @@ $lang['go_to_login'] = 'Retourner à la page de connexion';
 $lang['new_password_sent_with_email'] = 'Votre nouveau mot de passe vous a été envoyé par email.';
 $lang['new_account_password'] = 'Nouveau mot de passe du compte';
 $lang['new_password_is'] = 'Votre nouveau mot de passe est $password. Conservez cet email afin de pouvoir retrouver votre mot de passe si nécessaire. Vous pouvez aussi modifier ce mot de passe par un nouveau dans la page des paramètres.';
-$lang['delete_record_prompt'] = 'Êtes-vous sûr de vouloir supprimer cet enregistrement? Cette action est irréversible !';
+$lang['delete_record_prompt'] = 'Êtes-vous sûr de vouloir supprimer cet enregistrement ? Cette action est irréversible !';
 $lang['delete_admin'] = 'Supprimer l\'administrateur';
 $lang['delete_customer'] = 'Supprimer le client';
 $lang['delete_service'] = 'Supprimer la prestation';
@@ -235,7 +235,7 @@ $lang['password_length_notice'] = 'Le mot de passe doit avoir au moins $number c
 $lang['general_settings'] = 'Paramètres généraux';
 $lang['personal_information'] = 'Informations personnelles';
 $lang['system_login'] = 'Connexion système';
-$lang['user_settings_are_invalid'] = 'Paramètres utilisateur non valides! Vérifiez vos paramètres et essayez de nouveau.';
+$lang['user_settings_are_invalid'] = 'Paramètres utilisateur non valides ! Vérifiez vos paramètres et essayez de nouveau.';
 $lang['add_break'] = 'Ajouter une Pause';
 $lang['january'] = 'Janvier';
 $lang['february'] = 'Février';
@@ -249,11 +249,11 @@ $lang['september'] = 'Septembre';
 $lang['october'] = 'Octobre';
 $lang['november'] = 'Novembre';
 $lang['december'] = 'Décembre';
-$lang['previous'] = 'Précédent'; // @TODO check -e form
-$lang['next'] = 'Suivant'; // @TODO check -e form
+$lang['previous'] = 'Précédent';
+$lang['next'] = 'Suivant';
 $lang['now'] = 'Maintenant';
 $lang['select_time'] = 'Choisir l\'Heure';
-$lang['time'] = 'Heure du RDV'; // @TODO to check ;  was 'Temps'
+$lang['time'] = 'Heure du RDV';
 $lang['hour'] = 'Heure';
 $lang['minute'] = 'Minute';
 $lang['google_sync_completed'] = 'La synchronisation Google s\'est terminée avec succès !';
@@ -265,17 +265,17 @@ $lang['oops_something_went_wrong'] = 'Oops! 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';
-$lang['require_captcha_hint'] = 'Lorsqu\'elle est activée, les clients auront à taper un code de vérification CAPTCHA avant de pouvoir réserver / mettre à jour un rendez-vous.';
-$lang['captcha_is_wrong'] = 'Le code de vérification CAPTCHA est erroné, veuillez svp recommencer.';
-$lang['any_provider'] = 'Any Provider';
-$lang['requested_hour_is_unavailable'] = 'La demande de rendez n\'est malheureusement pas disponible. Veuillez svp sélectionner une autre heure pour votre rendez-vous.';
+$lang['require_captcha_hint'] = 'Lorsque l\'option est activée, les clients doivent taper un code de vérification CAPTCHA avant de pouvoir réserver ou mettre à jour un rendez-vous.';
+$lang['captcha_is_wrong'] = 'Le code de vérification CAPTCHA est erroné, merci de réessayer.';
+$lang['any_provider'] = 'Toute personne disponible';
+$lang['requested_hour_is_unavailable'] = 'Cette heure de rendez n\'est malheureusement pas disponible. Merci de sélectionner une autre heure pour votre rendez-vous.';
 $lang['customer_notifications'] = 'Notifications aux clients';
 $lang['customer_notifications_hint'] = 'Définit si les clients reçoivent des notifications par email chaque fois qu\'il y a un changement d\'horaire de l\'un de leurs rendez-vous.';
 $lang['date_format'] = 'Format des Dates';
 $lang['date_format_hint'] = 'Change le format d\'affichage des dates (D - Jour, M - Mois, Y - Année).';
 $lang['time_format'] = 'Format de l\'Heure';
 $lang['time_format_hint'] = 'Change le format d\'affichage de l\'Heure (H - Heures, M - Minutes).';
-$lang['google_analytics_code_hint'] = 'Renseignez l\'ID Google Analytics à utiliser dans la page des réservations.';
+$lang['google_analytics_code_hint'] = 'Renseigner l\'ID Google Analytics à utiliser dans la page des réservations.';
 $lang['availabilities_type'] = 'Type de disponibilités';
 $lang['flexible'] = 'Flexible';
 $lang['fixed'] = 'Fixe';
diff --git a/src/application/language/german/translations_lang.php b/src/application/language/german/translations_lang.php
index a9470edb..c1ff67cd 100755
--- a/src/application/language/german/translations_lang.php
+++ b/src/application/language/german/translations_lang.php
@@ -88,7 +88,6 @@ $lang['reload_appointments_hint'] = 'Kalendertermine neu laden.';
 $lang['trigger_google_sync_hint'] = 'Starten Sie den Synchronisationsprozess von Google Kalender.';
 $lang['appointment_updated'] = 'Die Termine sind erfolgreich erneuert worden!';
 $lang['undo'] = 'Schritt zurück';
-$lang['cancel'] = 'Abbrechen';
 $lang['appointment_details_changed'] = 'Die Termindetails haben sich geändert.';
 $lang['appointment_changes_saved'] = 'Die Terminänderungen sind erfolgreich gespeichert worden!';
 $lang['save'] = 'Speichern';
diff --git a/src/application/language/greek/translations_lang.php b/src/application/language/greek/translations_lang.php
index f09c8115..607726ba 100755
--- a/src/application/language/greek/translations_lang.php
+++ b/src/application/language/greek/translations_lang.php
@@ -88,7 +88,6 @@ $lang['reload_appointments_hint'] = 'Επαναφορτώστε τα ραντε
 $lang['trigger_google_sync_hint'] = 'Εκκινήστε την διαδικασία συγχρονισμού με το Google Calendar.';
 $lang['appointment_updated'] = 'Το ραντεβού ενημερώθηκε επιτυχώς!';
 $lang['undo'] = 'Αναίρεση';
-$lang['cancel'] = 'Ακύρωση';
 $lang['appointment_details_changed'] = 'Τα στοιχεία του ραντεβού έχουν αλλάξει.';
 $lang['appointment_changes_saved'] = 'Οι αλλαγές του ραντεβού αποθηκεύτηκαν επιτυχώς.';
 $lang['save'] = 'Αποθήκευση';
diff --git a/src/application/language/hindi/translations_lang.php b/src/application/language/hindi/translations_lang.php
index 0f0906b7..39e912e3 100755
--- a/src/application/language/hindi/translations_lang.php
+++ b/src/application/language/hindi/translations_lang.php
@@ -88,7 +88,6 @@ $lang['reload_appointments_hint'] = 'कैलेंडर अपॉइंटम
 $lang['trigger_google_sync_hint'] = 'गूगल कैलेंडर तुल्यकालन प्रक्रिया को ट्रिगर करें.';
 $lang['appointment_updated'] = 'अपॉइंटमेंट अप्डैटिड सक्सेस्फल!';
 $lang['undo'] = 'अन्डू';
-$lang['cancel'] = 'कैन्सल';
 $lang['appointment_details_changed'] = 'अपॉइंटमेंट विवरण बदल गया है.';
 $lang['appointment_changes_saved'] = 'अपॉइंटमेंट परिवर्तन सफलतापूर्वक बचा लिया गया है!';
 $lang['save'] = 'सेव';
diff --git a/src/application/language/hungarian/translations_lang.php b/src/application/language/hungarian/translations_lang.php
index 7acf24a7..1b07fb87 100755
--- a/src/application/language/hungarian/translations_lang.php
+++ b/src/application/language/hungarian/translations_lang.php
@@ -88,7 +88,6 @@ $lang['reload_appointments_hint'] = 'Az időpontok újra töltése.';
 $lang['trigger_google_sync_hint'] = 'Google naptárral való szinkronizálás indítása.';
 $lang['appointment_updated'] = 'Az időpont sikeresen frissítve!';
 $lang['undo'] = 'Undo';
-$lang['cancel'] = 'Mégse';
 $lang['appointment_details_changed'] = 'A foglalás részletei megváltoztak.';
 $lang['appointment_changes_saved'] = 'A változtatások sikeresen elmentve!';
 $lang['save'] = 'Mentés';
diff --git a/src/application/language/italian/translations_lang.php b/src/application/language/italian/translations_lang.php
index 1de9ad9c..8911eded 100755
--- a/src/application/language/italian/translations_lang.php
+++ b/src/application/language/italian/translations_lang.php
@@ -7,7 +7,6 @@ $lang['select_provider'] = 'Seleziona un fornitore';
 $lang['duration'] = 'Durata';
 $lang['minutes'] = 'Minuti';
 $lang['price'] = 'Prezzo';
-$lang['next'] = 'Successivo';
 $lang['back'] = 'Precedente';
 $lang['step_two_title'] = 'Seleziona data e ora dell\'appuntamento';
 $lang['no_available_hours'] = 'Non ci sono appuntamenti disponibili per la data selezionata. Si prega di scegliere un\'altra data.';
@@ -56,10 +55,7 @@ $lang['appointment_link_description'] = 'Puoi modificare l\'appuntamento facendo
 $lang['appointment_not_found'] = 'Appuntamento non trovato!';
 $lang['appointment_does_not_exist_in_db'] = 'L\'appuntamento da te richiesto non esiste più sul database di sistema.';
 $lang['display_calendar'] = 'Mostra calendario';
-$lang['providers'] = 'Fornitori';
-$lang['services'] = 'Servizi';
 $lang['calendar'] = 'Calendario';
-$lang['customers'] = 'Clienti';
 $lang['users'] = 'Utenti';
 $lang['settings'] = 'Impostazioni';
 $lang['log_out'] = 'Esci';
@@ -69,7 +65,6 @@ $lang['disable_sync'] = 'Disabilita sincronizzazione';
 $lang['reload'] = 'Reload';
 $lang['appointment'] = 'Appointment';
 $lang['unavailable'] = 'Non disponibile';
-$lang['day'] = 'Giorno';
 $lang['week'] = 'Settimana';
 $lang['month'] = 'Mese';
 $lang['today'] = 'Giorno';
@@ -77,7 +72,6 @@ $lang['not_working'] = 'Non lavorativo';
 $lang['break'] = 'Pausa';
 $lang['add'] = 'Aggiungi';
 $lang['edit'] = 'Modifica';
-$lang['delete'] = 'Cancella';
 $lang['hello'] = 'Ciao';
 $lang['all_day'] = 'Tutto il giorno';
 $lang['manage_appointment_record_hint'] = 'Gestisci tutti gli appuntamenti dei fornitori e servizi disponibili.';
@@ -94,7 +88,6 @@ $lang['reload_appointments_hint'] = 'Ricarica gli appuntamenti a calendario.';
 $lang['trigger_google_sync_hint'] = 'Avvia il processo di sincronizzazione con Google Calendar.';
 $lang['appointment_updated'] = 'Appuntamento aggiornato con successo!';
 $lang['undo'] = 'Annulla';
-$lang['cancel'] = 'Annulla';
 $lang['appointment_details_changed'] = 'I dettagli dell\'appuntamento sono cambiati.';
 $lang['appointment_changes_saved'] = 'Le modifiche all\'appuntamento sono state salvate con successo!';
 $lang['save'] = 'Salva';
diff --git a/src/application/language/japanese/translations_lang.php b/src/application/language/japanese/translations_lang.php
index 71100c88..be8d7909 100755
--- a/src/application/language/japanese/translations_lang.php
+++ b/src/application/language/japanese/translations_lang.php
@@ -88,7 +88,6 @@ $lang['reload_appointments_hint'] = 'カレンダーを再読み込みします
 $lang['trigger_google_sync_hint'] = 'Googleカレンダーとの同期を開始します。';
 $lang['appointment_updated'] = '予約情報が更新されました。';
 $lang['undo'] = 'やり直し';
-$lang['cancel'] = 'キャンセル';
 $lang['appointment_details_changed'] = '予約情報が変更されました。';
 $lang['appointment_changes_saved'] = '予約の変更が保存されました。';
 $lang['save'] = '保存';
diff --git a/src/application/language/luxembourgish/translations_lang.php b/src/application/language/luxembourgish/translations_lang.php
index c6404b37..d742dc4d 100755
--- a/src/application/language/luxembourgish/translations_lang.php
+++ b/src/application/language/luxembourgish/translations_lang.php
@@ -55,7 +55,6 @@ $lang['appointment_link_description'] = 'Dir kënnt Ännerungen duerch klicken o
 $lang['appointment_not_found'] = 'Termäin konnt net fonnt ginn!';
 $lang['appointment_does_not_exist_in_db'] = 'Dee vun Iech gefrote Termäin gëtt et net an eiser Datebank.';
 $lang['display_calendar'] = 'Kalenner uweisen';
-$lang['providers'] = 'Mataarbechter';
 $lang['calendar'] = 'Kalenner';
 $lang['users'] = 'Benotzer';
 $lang['settings'] = 'Astellungen';
@@ -73,7 +72,6 @@ $lang['not_working'] = 'Sonndeg a Feierdeeg';
 $lang['break'] = 'Paus';
 $lang['add'] = 'Bäisetzen';
 $lang['edit'] = 'Änneren';
-$lang['delete'] = 'Läschen';
 $lang['hello'] = 'Moien';
 $lang['all_day'] = 'Dee ganzen Dag';
 $lang['manage_appointment_record_hint'] = 'Verwalt all Termäiner vun den disponibele Mataarbechter an Dingschtleeschtungen.';
@@ -90,7 +88,6 @@ $lang['reload_appointments_hint'] = 'Terminkalenner nei lueden.';
 $lang['trigger_google_sync_hint'] = 'Start de Synchronisatiounsprozess vum Google Kalenner.';
 $lang['appointment_updated'] = 'D\'Termäiner sinn erfollegräich erneiert ginn!';
 $lang['undo'] = 'Schrëtt zeréck';
-$lang['cancel'] = 'Ofbriechen';
 $lang['appointment_details_changed'] = 'D\'Detailer vum Termäin si geännert ginn.';
 $lang['appointment_changes_saved'] = 'D\'Detailer vum Termäin sinn erfollegräich gespäichert ginn!';
 $lang['save'] = 'Späicheren';
@@ -121,6 +118,7 @@ $lang['no_category'] = 'Keng Kategorie';
 $lang['description'] = 'Beschreiwung';
 $lang['categories'] = 'Kategorien';
 $lang['admins'] = 'Administrator';
+$lang['providers'] = 'Mataarbechter';
 $lang['secretaries'] = 'Büropersonal';
 $lang['mobile_number'] = 'Handynummer';
 $lang['state'] = 'Regioun / Land';
@@ -209,6 +207,7 @@ $lang['delete_provider'] = 'Zäitraum läschen';
 $lang['delete_secretary'] = 'Beaarbechter läschen';
 $lang['delete_appointment'] = 'Termäin läschen';
 $lang['delete_unavailable'] = 'Blockéierten Zäitraum läschen';
+$lang['delete'] = 'Läschen';
 $lang['unexpected_issues'] = 'Onvirhärgesinne Virfäll';
 $lang['unexpected_issues_message'] = 'Dëse Virgang konnt opgrond vun onvirhegesehenen Virfäll net op en Enn brucht ginn.';
 $lang['close'] = 'Zoumaachen';
diff --git a/src/application/language/polish/translations_lang.php b/src/application/language/polish/translations_lang.php
index 5d3e3f78..1066dbe1 100755
--- a/src/application/language/polish/translations_lang.php
+++ b/src/application/language/polish/translations_lang.php
@@ -88,7 +88,6 @@ $lang['reload_appointments_hint'] = 'Przeładuj wizyty kalendarza.';
 $lang['trigger_google_sync_hint'] = 'Przełącz proces synchronizacji Kalendarza Google';
 $lang['appointment_updated'] = 'Wizyta zaktualizowana poprawnie!';
 $lang['undo'] = 'Cofnij';
-$lang['cancel'] = 'Anuluj';
 $lang['appointment_details_changed'] = 'Szczegóły wizyty zostały zmienione.';
 $lang['appointment_changes_saved'] = 'Zmiany zostały zapisane!';
 $lang['save'] = 'Zapisz';
diff --git a/src/application/language/portuguese-br/translations_lang.php b/src/application/language/portuguese-br/translations_lang.php
index f106171b..3ba9c118 100755
--- a/src/application/language/portuguese-br/translations_lang.php
+++ b/src/application/language/portuguese-br/translations_lang.php
@@ -88,7 +88,6 @@ $lang['reload_appointments_hint'] = 'atualizar os agentamentos do calendario.';
 $lang['trigger_google_sync_hint'] = 'Disparar o processo de sincronização do Google Calendar.';
 $lang['appointment_updated'] = 'Atualizado com sucesso!';
 $lang['undo'] = 'Desfazer';
-$lang['cancel'] = 'Cancelar';
 $lang['appointment_details_changed'] = 'Detalhes do agendamento foram alterados.';
 $lang['appointment_changes_saved'] = 'Detalhes do agendamento foram guardados com sucesso!';
 $lang['save'] = 'Salvar';
diff --git a/src/application/language/portuguese/translations_lang.php b/src/application/language/portuguese/translations_lang.php
index 39550c76..15b29a0e 100755
--- a/src/application/language/portuguese/translations_lang.php
+++ b/src/application/language/portuguese/translations_lang.php
@@ -88,7 +88,6 @@ $lang['reload_appointments_hint'] = 'Carregar eventos do calendario.';
 $lang['trigger_google_sync_hint'] = 'Desencadear o processo de sincronização do Google Calendar.';
 $lang['appointment_updated'] = 'Evento actualizado com sucesso!';
 $lang['undo'] = 'Desfazer';
-$lang['cancel'] = 'Cancelar';
 $lang['appointment_details_changed'] = 'Detalhes do evento foram alterados.';
 $lang['appointment_changes_saved'] = 'Detalhes do evento foram guardados com sucesso!';
 $lang['save'] = 'Guardar';
diff --git a/src/application/language/romanian/translations_lang.php b/src/application/language/romanian/translations_lang.php
index 43ea9d19..7c9a63a3 100755
--- a/src/application/language/romanian/translations_lang.php
+++ b/src/application/language/romanian/translations_lang.php
@@ -7,7 +7,6 @@ $lang['select_provider'] = 'Selecteaza Furnizor';
 $lang['duration'] = 'Durata';
 $lang['minutes'] = 'Minute';
 $lang['price'] = 'Pret';
-$lang['next'] = 'Urmatorul';
 $lang['back'] = 'Anteriorul';
 $lang['step_two_title'] = 'Selecteaza data si ora întâlnirii';
 $lang['no_available_hours'] = 'Nu este timp disponibil pentru data selectata. Va rugam sa selectati alta data.';
@@ -56,10 +55,7 @@ $lang['appointment_link_description'] = 'Puteti face modificari  apasând pe lin
 $lang['appointment_not_found'] = 'Întâlnire negasita!';
 $lang['appointment_does_not_exist_in_db'] = 'Întâlnirea pe care o cautati nu mai exista în baza de date.';
 $lang['display_calendar'] = 'Afiseaza Calendar';
-$lang['providers'] = 'Furnizor';
-$lang['services'] = 'Servicii';
 $lang['calendar'] = 'Calendar';
-$lang['customers'] = 'Clienti';
 $lang['users'] = 'Utilizatori';
 $lang['settings'] = 'Setari';
 $lang['log_out'] = 'Iesire';
@@ -69,7 +65,6 @@ $lang['disable_sync'] = 'Dezactiveaza Sincronizare';
 $lang['reload'] = 'Reîncarcare';
 $lang['appointment'] = 'Întâlnire';
 $lang['unavailable'] = 'Indisponibil';
-$lang['day'] = 'Zi';
 $lang['week'] = 'Saptamâna';
 $lang['month'] = 'Luna';
 $lang['today'] = 'Azi';
@@ -77,7 +72,6 @@ $lang['not_working'] = 'Nu lucreaza';
 $lang['break'] = 'Pauza';
 $lang['add'] = 'Adauga';
 $lang['edit'] = 'Editare';
-$lang['delete'] = 'Sterge';
 $lang['hello'] = 'Buna';
 $lang['all_day'] = 'Toata ziua';
 $lang['manage_appointment_record_hint'] = 'Gestioneaza toate înregistrarile furnizorilor si serviciilor disponibile.';
@@ -94,7 +88,6 @@ $lang['reload_appointments_hint'] = 'Reîncarca întâlnirile din calendar.';
 $lang['trigger_google_sync_hint'] = 'Porneste procesul de sincronizare cu Calendarul Google.';
 $lang['appointment_updated'] = 'Întâlnire actualizata cu succes!';
 $lang['undo'] = 'Înapoi';
-$lang['cancel'] = 'Anulare';
 $lang['appointment_details_changed'] = 'Detaliile întâlnirii au fost modificate.';
 $lang['appointment_changes_saved'] = 'Modificarile întâlnirii au fost salvate cu succes!';
 $lang['save'] = 'Salvare';
diff --git a/src/application/language/russian/translations_lang.php b/src/application/language/russian/translations_lang.php
index 3d267e23..2076bfd5 100755
--- a/src/application/language/russian/translations_lang.php
+++ b/src/application/language/russian/translations_lang.php
@@ -88,7 +88,6 @@ $lang['reload_appointments_hint'] = 'Перезагрузить календар
 $lang['trigger_google_sync_hint'] = 'Инициировать процесс синхронизации Google-календаря.';
 $lang['appointment_updated'] = 'Назначение успешно обновлено!';
 $lang['undo'] = 'Вернуть';
-$lang['cancel'] = 'Отмена';
 $lang['appointment_details_changed'] = 'Детали назначения изменены.';
 $lang['appointment_changes_saved'] = 'Назначение успешно изменено и сохранено!';
 $lang['save'] = 'Сохранить';
diff --git a/src/application/language/slovak/translations_lang.php b/src/application/language/slovak/translations_lang.php
index 17e0b90b..3881b6bb 100755
--- a/src/application/language/slovak/translations_lang.php
+++ b/src/application/language/slovak/translations_lang.php
@@ -88,7 +88,6 @@ $lang['reload_appointments_hint'] = 'Obnoviť rezervácie v kalendári.';
 $lang['trigger_google_sync_hint'] = 'Trigger proces synchronizácie kalendára Google.';
 $lang['appointment_updated'] = 'Rezervácia úspešne aktualizovaná!';
 $lang['undo'] = 'Odvolať akciu';
-$lang['cancel'] = 'Zrušiť';
 $lang['appointment_details_changed'] = 'Podrobnosti rezervácie boli zmenené';
 $lang['appointment_changes_saved'] = 'Zmeny rezervácie boli úspešne uložené!';
 $lang['save'] = 'Uložiť';
diff --git a/src/application/language/spanish/translations_lang.php b/src/application/language/spanish/translations_lang.php
index c8659ff6..e3f2ea3c 100755
--- a/src/application/language/spanish/translations_lang.php
+++ b/src/application/language/spanish/translations_lang.php
@@ -88,7 +88,6 @@ $lang['reload_appointments_hint'] = 'Cargar nuevamente citas del calendario.';
 $lang['trigger_google_sync_hint'] = 'Iniciar el proceso de sinconización de Google Calendar.';
 $lang['appointment_updated'] = 'Cita actualizada exitosamente';
 $lang['undo'] = 'Deshacer';
-$lang['cancel'] = 'Cancelar';
 $lang['appointment_details_changed'] = 'Se han modificado los detalles de la cita.';
 $lang['appointment_changes_saved'] = 'Se han guardado exitosamente los cambios en la cita';
 $lang['save'] = 'Guardar';
diff --git a/src/application/language/turkish/translations_lang.php b/src/application/language/turkish/translations_lang.php
index 48bb8e0c..35f199be 100755
--- a/src/application/language/turkish/translations_lang.php
+++ b/src/application/language/turkish/translations_lang.php
@@ -88,7 +88,6 @@ $lang['reload_appointments_hint'] = 'Takvim randevularını tekrar yükle.';
 $lang['trigger_google_sync_hint'] = 'Google Takvim eşitlemeyi başlat.';
 $lang['appointment_updated'] = 'Randevu başarıyla güncellendi!';
 $lang['undo'] = 'Geri al';
-$lang['cancel'] = 'İptal';
 $lang['appointment_details_changed'] = 'Randevu detayları değiştirildi.';
 $lang['appointment_changes_saved'] = 'Randevu değişiklikleri başarıyla kaydedildi!';
 $lang['save'] = 'Kaydet';