diff --git a/CHANGELOG.md b/CHANGELOG.md
index 93dd100a..18f56fe2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@ developers to maintain and readjust their custom modifications on the main proje
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [1.3.2] - Unreleased
+## [1.3.2]
 
 ## Fixed
 
@@ -14,7 +14,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - #485: Make REST API search check with "q" parameter case insensitive. 
 - #489: REST API response headers must use the Content-Type application/json value.
 - #500: Performance optimization in backend calendar page, after the user clicks the insert appointment button.
- 
+- #510: Providers should not be able to create appointments for other providers in the backend calendar page.
+- #512: Only show appointments of the currently logged in provider.
+
 ## [1.3.1]
 
 ### Added
diff --git a/doc/docker.md b/doc/docker.md
index c003cab0..7f8dd398 100644
--- a/doc/docker.md
+++ b/doc/docker.md
@@ -39,6 +39,6 @@ class Config {
 }
 ```
 
-*This document applies to Easy!Appointments v1.3.1.*
+*This document applies to Easy!Appointments v1.3.2.*
 
 [Back](readme.md)
diff --git a/doc/faq.md b/doc/faq.md
index 80e80ff1..82ebfa96 100644
--- a/doc/faq.md
+++ b/doc/faq.md
@@ -54,6 +54,6 @@ You get this warning because PHP is not configured with a timezone setting. This
  `date_default_timezone_set('America/Los_Angeles'); // Use your own timezone string.`
 
 
-*This document applies to Easy!Appointments v1.3.1.*
+*This document applies to Easy!Appointments v1.3.2.*
 
 [Back](readme.md)
diff --git a/doc/get-involved.md b/doc/get-involved.md
index fd59790d..aaf48e80 100644
--- a/doc/get-involved.md
+++ b/doc/get-involved.md
@@ -20,6 +20,6 @@ You are more than welcome to help with the translation progress of the user inte
 
 It would be much appreciated if you would take 5 minutes of your time to fill this small form on your experience with Easy!Appointments. User feedback is very important and will help with the future planning of the project. Fill the [E!A Feedback Form](https://docs.google.com/forms/d/15dw1jl7lUgw4q-XXMn13Gx_e8zJxAiyWYMOdqtZqIHU/viewform).
 
-*This document applies to Easy!Appointments v1.3.1.*
+*This document applies to Easy!Appointments v1.3.2.*
 
 [Back](readme.md)
diff --git a/doc/google-calendar-sync.md b/doc/google-calendar-sync.md
index 8e2ccb55..214a1856 100644
--- a/doc/google-calendar-sync.md
+++ b/doc/google-calendar-sync.md
@@ -49,6 +49,6 @@ Google Developers – https://developers.google.com/google-apps/calendar
 
 E!A Support Group – https://groups.google.com/forum/#!forum/easy-appointments
 
-*This document applies to Easy!Appointments v1.3.1.*
+*This document applies to Easy!Appointments v1.3.2.*
 
 [Back](readme.md)
diff --git a/doc/installation-guide.md b/doc/installation-guide.md
index 468fbef9..0f25c405 100644
--- a/doc/installation-guide.md
+++ b/doc/installation-guide.md
@@ -8,7 +8,7 @@ Easy!Appointments is a web appointment scheduler that can be installed and run i
 ### Installation
 There are 6 steps you must follow during the installation process.
 
-  1. **Make sure that your server has at least the following applications/tools installed: Apache(v2.4), PHP(v5.6) and MySQL(v5.5).** Easy!Appointments needs these programs to run. Most of the web hosting companies provide these tools within their Linux hosting plans. If you want to install Easy!Appointments on your local server use one of the pre-made bundles available on the web (XAMPP, MAMP, WAMP ...), all of which are free to use. If you plan to use the Google Calendar synchronization you will need the **php_curl** extension installed and enabled as well.
+  1. **Make sure that your server has at least the following applications/tools installed: Apache(v2.4), PHP(v5.6) and MySQL(v5.7).** Easy!Appointments needs these programs to run. Most of the web hosting companies provide these tools within their Linux hosting plans. If you want to install Easy!Appointments on your local server use one of the pre-made bundles available on the web (XAMPP, MAMP, WAMP ...), all of which are free to use. If you plan to use the Google Calendar synchronization you will need the **php_curl** extension installed and enabled as well.
   2. **Create a new database (or use an existing one).** The database is necessary for storing the system data. Therefore your hosting plan must include at least one MySQL database. You must also get the database administration credentials because they will be needed later on.
   3. **Upload the Easy!Appointments source files to your server.** You can place the files into a directory with named "easyappointments" or "appointments" or "book" etc. Make sure that you mark the Easy!Appointments folder URL because it will be needed in the following step. For example if the system files are placed in the this directory ".../httpdocs/easyappointments/" then the URL to this folder will be "http://your-domain.com/easyappointments". This URL will be needed in the following steps.
   4. **Ensure that the "storage" directory is writable.** Session information, logs and any other kind of files will land into the "storage" directory so make sure that it has the correct permissions and that is writable. 
@@ -29,6 +29,6 @@ Finally just add a link in your website that points to your Easy!Appointments in
 
 Happy Bookin'!
 
-*This document applies to Easy!Appointments v1.3.1.*
+*This document applies to Easy!Appointments v1.3.2.*
 
 [Back](readme.md)
diff --git a/doc/manage-translations.md b/doc/manage-translations.md
index 7a9e4269..62569b2c 100644
--- a/doc/manage-translations.md
+++ b/doc/manage-translations.md
@@ -14,6 +14,6 @@ Easy!Appointments is based upon CodeIgniter (PHP Framework) and it uses its buil
 
 Follow these steps in order to add or adjust your translations and modify the message of the user interface of Easy!Appointments. If you want contribute to the translation process of Easy!Appointments please read the [Get Involved](https://github.com/alextselegidis/easyappointments/wiki/Get-Involved!) wiki page for more information. Please share your translations with the user community. 
 
-*This document applies to Easy!Appointments v1.3.1.*
+*This document applies to Easy!Appointments v1.3.2.*
 
 [Back](readme.md)
diff --git a/doc/readme.md b/doc/readme.md
index 7e38ac41..2bd9b6d1 100644
--- a/doc/readme.md
+++ b/doc/readme.md
@@ -10,4 +10,4 @@ Welcome to the documentation pages of Easy!Appointments. Navigate through the av
 - [Docker](docker.md)
 - [FAQ](faq.md)
 
-*This document applies to Easy!Appointments v1.3.1.*
+*This document applies to Easy!Appointments v1.3.2.*
diff --git a/doc/rest-api.md b/doc/rest-api.md
index 07ff031a..45cb04fe 100644
--- a/doc/rest-api.md
+++ b/doc/rest-api.md
@@ -443,6 +443,6 @@ fastcgi_param PHP_AUTH_PW $http_authorization;
 
 [[Source]](http://serverfault.com/a/520943)
 
-*This document applies to Easy!Appointments v1.3.1.*
+*This document applies to Easy!Appointments v1.3.2.*
 
 [Back](readme.md)
diff --git a/doc/update-guide.md b/doc/update-guide.md
index 4e698035..ca24db11 100644
--- a/doc/update-guide.md
+++ b/doc/update-guide.md
@@ -16,6 +16,6 @@ Version v1.2 introduces two new folders in the root directory of the project, th
 
 Many core files were changed in v1.1 and it would be better if you replace all the Easy!Appointments files of version 1.0 with the new ones. Use the data of the old `configuration.php` file in the new `config.php` and open the `http://url-to-ea-installation/index.php/backend/update` as already mentioned. Your new version should work just fine!
 
-*This document applies to Easy!Appointments v1.3.1.*
+*This document applies to Easy!Appointments v1.3.2.*
 
 [Back](readme.md)
diff --git a/src/application/config/config.php b/src/application/config/config.php
index 61ffc8b4..17936c94 100644
--- a/src/application/config/config.php
+++ b/src/application/config/config.php
@@ -9,7 +9,7 @@
 |
 */
 $config['version'] = '1.3.2'; // This must be changed manually.
-$config['release_label'] = 'Beta 1'; // Leave empty for no title or add Alpha, Beta etc ...
+$config['release_label'] = ''; // Leave empty for no title or add Alpha, Beta etc ...
 $config['google_sync_feature'] = Config::GOOGLE_SYNC_FEATURE;
 
 /*
@@ -273,7 +273,7 @@ $config['cache_path'] = __DIR__ . '/../../storage/cache/';
 | new release.
 |
 */
-$config['cache_busting_token'] = '93GT3';
+$config['cache_busting_token'] = '52FX8';
 
 /*
 |--------------------------------------------------------------------------
diff --git a/src/application/controllers/Backend.php b/src/application/controllers/Backend.php
index fc0c33a2..71ee1319 100755
--- a/src/application/controllers/Backend.php
+++ b/src/application/controllers/Backend.php
@@ -122,6 +122,7 @@ class Backend extends CI_Controller {
 
         $this->load->model('providers_model');
         $this->load->model('customers_model');
+        $this->load->model('secretaries_model');
         $this->load->model('services_model');
         $this->load->model('settings_model');
         $this->load->model('user_model');
@@ -135,6 +136,17 @@ class Backend extends CI_Controller {
         $view['customers'] = $this->customers_model->get_batch();
         $view['available_providers'] = $this->providers_model->get_available_providers();
         $view['available_services'] = $this->services_model->get_available_services();
+
+        if ($this->session->userdata('role_slug') === DB_SLUG_SECRETARY)
+        {
+            $secretary = $this->secretaries_model->get_row($this->session->userdata('user_id'));
+            $view['secretary_providers'] = $secretary['providers'];
+        }
+        else
+        {
+            $view['secretary_providers'] = [];
+        }
+
         $this->set_user_data($view);
 
         $this->load->view('backend/header', $view);
diff --git a/src/application/language/arabic/db_lang.php b/src/application/language/arabic/db_lang.php
index b9da89b1..94044736 100644
--- a/src/application/language/arabic/db_lang.php
+++ b/src/application/language/arabic/db_lang.php
@@ -1,63 +1,35 @@
 <?php
 /**
- * CodeIgniter
+ * System messages translation for CodeIgniter(tm)
  *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright    Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright    Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT	MIT License
- * @link    https://codeigniter.com
- * @since    Version 1.0.0
- * @filesource
+ * @author	CodeIgniter community
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['db_invalid_connection_str'] = 'Unable to determine the database settings based on the connection string you submitted.';
-$lang['db_unable_to_connect'] = 'Unable to connect to your database server using the provided settings.';
-$lang['db_unable_to_select'] = 'Unable to select the specified database: %s';
-$lang['db_unable_to_create'] = 'Unable to create the specified database: %s';
-$lang['db_invalid_query'] = 'The query you submitted is not valid.';
-$lang['db_must_set_table'] = 'You must set the database table to be used with your query.';
-$lang['db_must_use_set'] = 'You must use the "set" method to update an entry.';
-$lang['db_must_use_index'] = 'You must specify an index to match on for batch updates.';
-$lang['db_batch_missing_index'] = 'One or more rows submitted for batch updating is missing the specified index.';
-$lang['db_must_use_where'] = 'Updates are not allowed unless they contain a "where" clause.';
-$lang['db_del_must_use_where'] = 'Deletes are not allowed unless they contain a "where" or "like" clause.';
-$lang['db_field_param_missing'] = 'To fetch fields requires the name of the table as a parameter.';
-$lang['db_unsupported_function'] = 'This feature is not available for the database you are using.';
-$lang['db_transaction_failure'] = 'Transaction failure: Rollback performed.';
-$lang['db_unable_to_drop'] = 'Unable to drop the specified database.';
-$lang['db_unsupported_feature'] = 'Unsupported feature of the database platform you are using.';
-$lang['db_unsupported_compression'] = 'The file compression format you chose is not supported by your server.';
-$lang['db_filepath_error'] = 'Unable to write data to the file path you have submitted.';
-$lang['db_invalid_cache_path'] = 'The cache path you submitted is not valid or writable.';
-$lang['db_table_name_required'] = 'A table name is required for that operation.';
-$lang['db_column_name_required'] = 'A column name is required for that operation.';
-$lang['db_column_definition_required'] = 'A column definition is required for that operation.';
-$lang['db_unable_to_set_charset'] = 'Unable to set client connection character set: %s';
-$lang['db_error_heading'] = 'A Database Error Occurred';
+$lang['db_invalid_connection_str'] = 'غير قادر على إيجاد إعدادات الإتصال بقواعد البيانات بناء على البيانات المرسلة.';
+$lang['db_unable_to_connect'] = 'غير قادر على الإتصال بقواعد البيانات بناء على الإعدادات المقدمة.';
+$lang['db_unable_to_select'] = 'غير قادر على تحديد قاعدة البيانات التالية: %s';
+$lang['db_unable_to_create'] = 'غير قادر على إنشاء قاعدة البيانات التالية: %s';
+$lang['db_invalid_query'] = 'الإستعلام المرسل غير صحيح.';
+$lang['db_must_set_table'] = 'يجب وضع جدول قاعدة بيانات للإستخدام مع الإستعلام.';
+$lang['db_must_use_set'] = 'يجب إستخدام خاصية "set" لتحديث السجل.';
+$lang['db_must_use_index'] = 'يجب تحديد رقم للتحديثات.';
+$lang['db_batch_missing_index'] = 'سجل أو أكثر لا يحتوي على رقم التحديث.';
+$lang['db_must_use_where'] = 'التحديث غير مسموح به ما لم يحتوي على جملة "where" أو "like".';
+$lang['db_del_must_use_where'] = 'الحذف غير مسموح به ما لم يحتوي على جملة "where" أو "like".';
+$lang['db_field_param_missing'] = 'لجلب أسماء الحقول يجب إرسال اسم الجدول بصفته متغيرا.';
+$lang['db_unsupported_function'] = 'هذه الميزة غير متوفرة في قاعدة البيانات التي تستخدمها.';
+$lang['db_transaction_failure'] = 'فشل في الإجراء: تم التراجع عن الإجراء.';
+$lang['db_unable_to_drop'] = 'غير قادر على إزالة قاعدة البيانات المحددة.';
+$lang['db_unsupported_feature'] = 'ميزة غير متوفرة في قاعدة البيانات التي تستخدمها.';
+$lang['db_unsupported_compression'] = 'نوع ضغط الملف المحدد غير مدعوم على الخادم.';
+$lang['db_filepath_error'] = 'غير قادر على كتابة الملف في المسار المحدد.';
+$lang['db_invalid_cache_path'] = 'مسار التخزين المؤقت غير صحيح أو غير قابل للكتابة.';
+$lang['db_table_name_required'] = 'اسم الجدول مطلوب لهذه العملية.';
+$lang['db_column_name_required'] = 'اسم العمود مطلوب لهذه العملية.';
+$lang['db_column_definition_required'] = 'تعريف العمود مطلوب لهذه العملية.';
+$lang['db_unable_to_set_charset'] = 'غير قادر على تحديد نوع الترميز: %s';
+$lang['db_error_heading'] = 'حصل خطأ في قاعدة البيانات';
diff --git a/src/application/language/arabic/email_lang.php b/src/application/language/arabic/email_lang.php
index e104db52..b087eda5 100644
--- a/src/application/language/arabic/email_lang.php
+++ b/src/application/language/arabic/email_lang.php
@@ -1,58 +1,30 @@
 <?php
 /**
- * CodeIgniter
+ * System messages translation for CodeIgniter(tm)
  *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright    Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright    Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT	MIT License
- * @link    https://codeigniter.com
- * @since    Version 1.0.0
- * @filesource
+ * @author	CodeIgniter community
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['email_must_be_array'] = 'The email validation method must be passed an array.';
-$lang['email_invalid_address'] = 'Invalid email address: %s';
-$lang['email_attachment_missing'] = 'Unable to locate the following email attachment: %s';
-$lang['email_attachment_unreadable'] = 'Unable to open this attachment: %s';
-$lang['email_no_from'] = 'Cannot send mail with no "From" header.';
-$lang['email_no_recipients'] = 'You must include recipients: To, Cc, or Bcc';
-$lang['email_send_failure_phpmail'] = 'Unable to send email using PHP mail(). Your server might not be configured to send mail using this method.';
-$lang['email_send_failure_sendmail'] = 'Unable to send email using PHP Sendmail. Your server might not be configured to send mail using this method.';
-$lang['email_send_failure_smtp'] = 'Unable to send email using PHP SMTP. Your server might not be configured to send mail using this method.';
-$lang['email_sent'] = 'Your message has been successfully sent using the following protocol: %s';
-$lang['email_no_socket'] = 'Unable to open a socket to Sendmail. Please check settings.';
-$lang['email_no_hostname'] = 'You did not specify a SMTP hostname.';
-$lang['email_smtp_error'] = 'The following SMTP error was encountered: %s';
-$lang['email_no_smtp_unpw'] = 'Error: You must assign a SMTP username and password.';
-$lang['email_failed_smtp_login'] = 'Failed to send AUTH LOGIN command. Error: %s';
-$lang['email_smtp_auth_un'] = 'Failed to authenticate username. Error: %s';
-$lang['email_smtp_auth_pw'] = 'Failed to authenticate password. Error: %s';
-$lang['email_smtp_data_failure'] = 'Unable to send data: %s';
-$lang['email_exit_status'] = 'Exit status code: %s';
+$lang['email_must_be_array'] = 'يجب تمرير مصفوفة إلى دالة التحقق من البريد الإلكتروني.';
+$lang['email_invalid_address'] = 'عنوان بريد إلكتروني خاطئ: %s';
+$lang['email_attachment_missing'] = 'غير قادر على إيجاد الملف المرفق: %s';
+$lang['email_attachment_unreadable'] = 'غير قاد على فتح الملف المرفق: %s';
+$lang['email_no_from'] = 'لا يمكن إرسال البريد الإلكتروني بدون تحديد المرسل.';
+$lang['email_no_recipients'] = 'يجب إضافة مستقبلين: To, Cc, or Bcc';
+$lang['email_send_failure_phpmail'] = 'غير قادر على الإرسال باستخدام PHP mail(). قد يكون الخادم غير معد للإرسال باستخدام هذه الطريقة.';
+$lang['email_send_failure_sendmail'] = 'غير قادر على الإرسال باستخدام PHP Sendmail. قد يكون الخادم غير معد للإرسال باستخدام هذه الطريقة.';
+$lang['email_send_failure_smtp'] = 'غير قادر على الإرسال باستخدام PHP SMTP. قد يكون الخادم غير معد للإرسال باستخدام هذه الطريقة.';
+$lang['email_sent'] = 'تم إرسال الرسالة بنجاح باستخدام البروتوكول التالي: %s';
+$lang['email_no_socket'] = 'غير قادر على فتح إتصال مع Sendmail. الرجاء التأكد من الإعدادات.';
+$lang['email_no_hostname'] = 'لم تحدد إسم المضيف لـ SMTP.';
+$lang['email_smtp_error'] = 'خطأ SMTP حدث: %s';
+$lang['email_no_smtp_unpw'] = 'خطأ: يجب تحديد إسم مستخدم وكلمة مرور لـ SMTP.';
+$lang['email_failed_smtp_login'] = 'فشل في إرسال أمر AUTH LOGIN command. الخطأ: %s';
+$lang['email_smtp_auth_un'] = 'فشل في التحقق من اسم المستخدم. الخطأ: %s';
+$lang['email_smtp_auth_pw'] = 'فشل في التحقق من كلمة مرور. الخطأ: %s';
+$lang['email_smtp_data_failure'] = 'غير قادر على إرسال البيانات: %s';
+$lang['email_exit_status'] = 'رمز الخطأ: %s';
diff --git a/src/application/language/arabic/migration_lang.php b/src/application/language/arabic/migration_lang.php
index 52873dbc..06b88f95 100644
--- a/src/application/language/arabic/migration_lang.php
+++ b/src/application/language/arabic/migration_lang.php
@@ -1,13 +1,19 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php
+/**
+ * System messages translation for CodeIgniter(tm)
+ *
+ * @author	CodeIgniter community
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
+ */
+defined('BASEPATH') OR exit('No direct script access allowed');
 
-$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.";
-
-
-/* End of file migration_lang.php */
-/* Location: ./system/language/chinese/migration_lang.php */
+$lang['migration_none_found'] = "لا يوجد أي عمليات ترحيل.";
+$lang['migration_not_found'] = "تعذر العثور على عملية الترحيل هذه.";
+$lang['migration_sequence_gap'] = 'هناك فجوة بين تسلسل عمليات الترحيل عند الرقم : %s.';
+$lang['migration_multiple_version'] = "هناك عدة عمليات ترحيل لها نفس التعداد: %d.";
+$lang['migration_class_doesnt_exist'] = "تعذر العثور على صنف الترحيل \"%s\".";
+$lang['migration_missing_up_method'] = "صنف الترحيل \"%s\" يفتقد إلى دالة 'up'.";
+$lang['migration_missing_down_method'] = "صنف الترحيل \"%s\" يفتقد إلى دالة 'down'.";
+$lang['migration_invalid_filename'] = "اسم الملف الخاص بالترحيل \"%s\" غير صحيح.";
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/db_lang.php b/src/application/language/bulgarian/db_lang.php
index b9da89b1..a5583a54 100644
--- a/src/application/language/bulgarian/db_lang.php
+++ b/src/application/language/bulgarian/db_lang.php
@@ -1,63 +1,36 @@
 <?php
 /**
- * CodeIgniter
+ * System messages translation for CodeIgniter(tm)
  *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright    Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright    Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT	MIT License
- * @link    https://codeigniter.com
- * @since    Version 1.0.0
- * @filesource
+ * @author	CodeIgniter community
+ * @author	Ivan Tcholakov
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['db_invalid_connection_str'] = 'Unable to determine the database settings based on the connection string you submitted.';
-$lang['db_unable_to_connect'] = 'Unable to connect to your database server using the provided settings.';
-$lang['db_unable_to_select'] = 'Unable to select the specified database: %s';
-$lang['db_unable_to_create'] = 'Unable to create the specified database: %s';
-$lang['db_invalid_query'] = 'The query you submitted is not valid.';
-$lang['db_must_set_table'] = 'You must set the database table to be used with your query.';
-$lang['db_must_use_set'] = 'You must use the "set" method to update an entry.';
-$lang['db_must_use_index'] = 'You must specify an index to match on for batch updates.';
-$lang['db_batch_missing_index'] = 'One or more rows submitted for batch updating is missing the specified index.';
-$lang['db_must_use_where'] = 'Updates are not allowed unless they contain a "where" clause.';
-$lang['db_del_must_use_where'] = 'Deletes are not allowed unless they contain a "where" or "like" clause.';
-$lang['db_field_param_missing'] = 'To fetch fields requires the name of the table as a parameter.';
-$lang['db_unsupported_function'] = 'This feature is not available for the database you are using.';
-$lang['db_transaction_failure'] = 'Transaction failure: Rollback performed.';
-$lang['db_unable_to_drop'] = 'Unable to drop the specified database.';
-$lang['db_unsupported_feature'] = 'Unsupported feature of the database platform you are using.';
-$lang['db_unsupported_compression'] = 'The file compression format you chose is not supported by your server.';
-$lang['db_filepath_error'] = 'Unable to write data to the file path you have submitted.';
-$lang['db_invalid_cache_path'] = 'The cache path you submitted is not valid or writable.';
-$lang['db_table_name_required'] = 'A table name is required for that operation.';
-$lang['db_column_name_required'] = 'A column name is required for that operation.';
-$lang['db_column_definition_required'] = 'A column definition is required for that operation.';
-$lang['db_unable_to_set_charset'] = 'Unable to set client connection character set: %s';
-$lang['db_error_heading'] = 'A Database Error Occurred';
+$lang['db_invalid_connection_str'] = 'Невъзможно е да се определят настройките за базата данни от "connection string"-a, който сте въвели.';
+$lang['db_unable_to_connect'] = 'Не може да се осъществи връзка с Вашата база данни чрез посочените данни.';
+$lang['db_unable_to_select'] = 'Не може да избере посочената база данни: %s';
+$lang['db_unable_to_create'] = 'Не може да бъде създадена посочената база данни: %s';
+$lang['db_invalid_query'] = 'Подадената заявка не е валидна.';
+$lang['db_must_set_table'] = 'Трябва да зададете таблица за да се използва от Вашата заявка.';
+$lang['db_must_use_set'] = 'Трябва да използвате "set" метод за актуализиране на данните.';
+$lang['db_must_use_index'] = 'Трябва да посочите съответен индекс за пакетно обновяване.';
+$lang['db_batch_missing_index'] = 'Един или повече редове, представени за актуализиране на пакетното обновяване са с липсващ индекс.';
+$lang['db_must_use_where'] = 'Актуализации не са позволени, освен ако не съдържат "WHERE" клауза.';
+$lang['db_del_must_use_where'] = 'Изтриването не е позволено, освен ако не съдържа "WHERE" или "LIKE" клауза.';
+$lang['db_field_param_missing'] = 'При изтеглянето на полета се изисква името на таблицата като параметър.';
+$lang['db_unsupported_function'] = 'Функцията не е достъпна за вида база данни, която използвате.';
+$lang['db_transaction_failure'] = 'Грешка в транзакция: Връщане на предишното състояние.';
+$lang['db_unable_to_drop'] = 'Не може да се изтрие посочената база данни.';
+$lang['db_unsupported_feature'] = 'Неподдържана функционалност от Вашата база данни.';
+$lang['db_unsupported_compression'] = 'Форматът за компресиране, който сте избрали не се поддържа от вашия сървър.';
+$lang['db_filepath_error'] = 'Не е възможно записването на данни в пътя на файла, който сте посочили.';
+$lang['db_invalid_cache_path'] = 'Пътят до кеш директорията, който сте описали не е правилен или без права.';
+$lang['db_table_name_required'] = 'Името на таблицата е задължително за тази операция.';
+$lang['db_column_name_required'] = 'Името на колоната е задължително за тази операция.';
+$lang['db_column_definition_required'] = 'Дефинирането на колоната е задължително за тази операция.';
+$lang['db_unable_to_set_charset'] = 'Не може да настрои клиентът с правилен енкодинг: %s';
+$lang['db_error_heading'] = 'Възникна грешка в базата данни';
diff --git a/src/application/language/bulgarian/email_lang.php b/src/application/language/bulgarian/email_lang.php
index e104db52..72739cf0 100644
--- a/src/application/language/bulgarian/email_lang.php
+++ b/src/application/language/bulgarian/email_lang.php
@@ -1,58 +1,31 @@
 <?php
 /**
- * CodeIgniter
+ * System messages translation for CodeIgniter(tm)
  *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright    Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright    Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT	MIT License
- * @link    https://codeigniter.com
- * @since    Version 1.0.0
- * @filesource
+ * @author	CodeIgniter community
+ * @author	Ivan Tcholakov
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['email_must_be_array'] = 'The email validation method must be passed an array.';
-$lang['email_invalid_address'] = 'Invalid email address: %s';
-$lang['email_attachment_missing'] = 'Unable to locate the following email attachment: %s';
-$lang['email_attachment_unreadable'] = 'Unable to open this attachment: %s';
-$lang['email_no_from'] = 'Cannot send mail with no "From" header.';
-$lang['email_no_recipients'] = 'You must include recipients: To, Cc, or Bcc';
-$lang['email_send_failure_phpmail'] = 'Unable to send email using PHP mail(). Your server might not be configured to send mail using this method.';
-$lang['email_send_failure_sendmail'] = 'Unable to send email using PHP Sendmail. Your server might not be configured to send mail using this method.';
-$lang['email_send_failure_smtp'] = 'Unable to send email using PHP SMTP. Your server might not be configured to send mail using this method.';
-$lang['email_sent'] = 'Your message has been successfully sent using the following protocol: %s';
-$lang['email_no_socket'] = 'Unable to open a socket to Sendmail. Please check settings.';
-$lang['email_no_hostname'] = 'You did not specify a SMTP hostname.';
-$lang['email_smtp_error'] = 'The following SMTP error was encountered: %s';
-$lang['email_no_smtp_unpw'] = 'Error: You must assign a SMTP username and password.';
-$lang['email_failed_smtp_login'] = 'Failed to send AUTH LOGIN command. Error: %s';
-$lang['email_smtp_auth_un'] = 'Failed to authenticate username. Error: %s';
-$lang['email_smtp_auth_pw'] = 'Failed to authenticate password. Error: %s';
-$lang['email_smtp_data_failure'] = 'Unable to send data: %s';
-$lang['email_exit_status'] = 'Exit status code: %s';
+$lang['email_must_be_array'] = 'Email-адресът трябва да се предаде за валидиране чрез масив (array).';
+$lang['email_invalid_address'] = 'Грешен email-адрес: %s';
+$lang['email_attachment_missing'] = 'Не може да се намери прикачения файл: %s';
+$lang['email_attachment_unreadable'] = 'Не може да се отвори прикачения файл: %s';
+$lang['email_no_from'] = 'Не е посочен подателят на съобщението (From).';
+$lang['email_no_recipients'] = 'Трябва да включите получателите: To, Cc или Bcc';
+$lang['email_send_failure_phpmail'] = 'Съобщението не може да бъде изпратено чрез PHP mail(). Вашият сървър може да не е конфигуриран да изпраща поща, използвайки този метод.';
+$lang['email_send_failure_sendmail'] = 'Съобщението не може да бъде изпратено чрез PHP Sendmail. Вашият сървър може да не е конфигуриран да изпраща поща, използвайки този метод.';
+$lang['email_send_failure_smtp'] = 'Съобщението не може да бъде изпратено чрез PHP SMTP. Вашият сървър може да не е конфигуриран да изпраща поща, използвайки този метод.';
+$lang['email_sent'] = 'Вашето съобщение е изпратено успешно и използва следния протокол: %s';
+$lang['email_no_socket'] = 'Не може да се отвори връзка към Sendmail. Моля, проверете настройките.';
+$lang['email_no_hostname'] = 'Не сте посочили SMTP сървър.';
+$lang['email_smtp_error'] = 'Получи се следната SMTP грешка: %s';
+$lang['email_no_smtp_unpw'] = 'Грешка: Трябва да посочите име и парола за SMTP.';
+$lang['email_failed_smtp_login'] = 'Не може да се изпрати AUTH LOGIN. Грешка: %s';
+$lang['email_smtp_auth_un'] = 'Не може да се удостовери потребителското име. Грешка: %s';
+$lang['email_smtp_auth_pw'] = 'Не може да се удостовери паролата. Грешка: %s';
+$lang['email_smtp_data_failure'] = 'Не могат да се изпращат данни: %s';
+$lang['email_exit_status'] = 'Код на завършване: %s';
diff --git a/src/application/language/bulgarian/migration_lang.php b/src/application/language/bulgarian/migration_lang.php
index 52873dbc..db92704f 100644
--- a/src/application/language/bulgarian/migration_lang.php
+++ b/src/application/language/bulgarian/migration_lang.php
@@ -1,13 +1,20 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php
+/**
+ * System messages translation for CodeIgniter(tm)
+ *
+ * @author	CodeIgniter community
+ * @author	Ivan Tcholakov
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
+ */
+defined('BASEPATH') OR exit('No direct script access allowed');
 
-$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.";
-
-
-/* End of file migration_lang.php */
-/* Location: ./system/language/chinese/migration_lang.php */
+$lang['migration_none_found'] = 'Не са намерени миграции.';
+$lang['migration_not_found'] = 'Миграцията %s не може да бъде намерена.';
+$lang['migration_sequence_gap'] = 'Има липса в последователносста за миграция близо до версия: %s.';
+$lang['migration_multiple_version'] = 'Има няколко миграции с една и съща версия: %s.';
+$lang['migration_class_doesnt_exist'] = 'Класът за миграция "%s" не може да бъде намерен.';
+$lang['migration_missing_up_method'] = 'В класа за миграция "%s" липсва методът "up".';
+$lang['migration_missing_down_method'] = 'В класа за миграция "%s" липсва методът "down".';
+$lang['migration_invalid_filename'] = 'Миграцията "%s" е с невалидно име на файл.';
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/db_lang.php b/src/application/language/chinese/db_lang.php
index a549f6eb..ac184b7c 100644
--- a/src/application/language/chinese/db_lang.php
+++ b/src/application/language/chinese/db_lang.php
@@ -1,64 +1,35 @@
 <?php
 /**
- * db_lang.php
- * email_lang.php * CodeIgniter
+ * System messages translation for CodeIgniter(tm)
  *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright    Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright    Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT	MIT License
- * @link    https://codeigniter.com
- * @since    Version 1.0.0
- * @filesource
+ * @author	CodeIgniter community
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['db_invalid_connection_str'] = 'Unable to determine the database settings based on the connection string you submitted.';
-$lang['db_unable_to_connect'] = 'Unable to connect to your database server using the provided settings.';
-$lang['db_unable_to_select'] = 'Unable to select the specified database: %s';
-$lang['db_unable_to_create'] = 'Unable to create the specified database: %s';
-$lang['db_invalid_query'] = 'The query you submitted is not valid.';
-$lang['db_must_set_table'] = 'You must set the database table to be used with your query.';
-$lang['db_must_use_set'] = 'You must use the "set" method to update an entry.';
-$lang['db_must_use_index'] = 'You must specify an index to match on for batch updates.';
-$lang['db_batch_missing_index'] = 'One or more rows submitted for batch updating is missing the specified index.';
-$lang['db_must_use_where'] = 'Updates are not allowed unless they contain a "where" clause.';
-$lang['db_del_must_use_where'] = 'Deletes are not allowed unless they contain a "where" or "like" clause.';
-$lang['db_field_param_missing'] = 'To fetch fields requires the name of the table as a parameter.';
-$lang['db_unsupported_function'] = 'This feature is not available for the database you are using.';
-$lang['db_transaction_failure'] = 'Transaction failure: Rollback performed.';
-$lang['db_unable_to_drop'] = 'Unable to drop the specified database.';
-$lang['db_unsupported_feature'] = 'Unsupported feature of the database platform you are using.';
-$lang['db_unsupported_compression'] = 'The file compression format you chose is not supported by your server.';
-$lang['db_filepath_error'] = 'Unable to write data to the file path you have submitted.';
-$lang['db_invalid_cache_path'] = 'The cache path you submitted is not valid or writable.';
-$lang['db_table_name_required'] = 'A table name is required for that operation.';
-$lang['db_column_name_required'] = 'A column name is required for that operation.';
-$lang['db_column_definition_required'] = 'A column definition is required for that operation.';
-$lang['db_unable_to_set_charset'] = 'Unable to set client connection character set: %s';
-$lang['db_error_heading'] = 'A Database Error Occurred';
+$lang['db_invalid_connection_str'] = '无法根据提交的连接字符串确定数据库设置。  ';
+$lang['db_unable_to_connect'] = '无法使用提供的设置连接到数据库服务器。';
+$lang['db_unable_to_select'] = '无法选择指定的数据库： %s';
+$lang['db_unable_to_create'] = '无法创建指定的数据库：%s';
+$lang['db_invalid_query'] = '提交的查询无效。';
+$lang['db_must_set_table'] = '查询中必须设置要查询的表名。';
+$lang['db_must_use_set'] = '更新数据请使用 Set 方法。';
+$lang['db_must_use_index'] = '必须指定索引以匹配批量更新。';
+$lang['db_batch_missing_index'] = '批量更新操作中一个或多个行缺少指定的索引。';
+$lang['db_must_use_where'] = '更新操作必须包含 Where 条件。';
+$lang['db_del_must_use_where'] = '删除操作必须包含 Where 或 Like 条件。';
+$lang['db_field_param_missing'] = '获取字段需要指定表名。';
+$lang['db_unsupported_function'] = '功能不被您当前使用的数据库支持。';
+$lang['db_transaction_failure'] = '事务失败：执行回滚。';
+$lang['db_unable_to_drop'] = '无法删除指定的数据库。';
+$lang['db_unsupported_feature'] = '特性不被您当前使用的数据库支持。  ';
+$lang['db_unsupported_compression'] = '您选择的文件压缩格式不被服务器支持。  ';
+$lang['db_filepath_error'] = '提交的文件路径无法写入。  ';
+$lang['db_invalid_cache_path'] = '提交的缓存路径无效或无法写入。';
+$lang['db_table_name_required'] = '操作需要指定表名。 ';
+$lang['db_column_name_required'] = '操作需要指定列名。  ';
+$lang['db_column_definition_required'] = '操作需要指定列定义。';
+$lang['db_unable_to_set_charset'] = '无法设置字符集： %s';
+$lang['db_error_heading'] = '数据库发生错误。';
diff --git a/src/application/language/chinese/email_lang.php b/src/application/language/chinese/email_lang.php
index e104db52..ecc3eb78 100644
--- a/src/application/language/chinese/email_lang.php
+++ b/src/application/language/chinese/email_lang.php
@@ -1,58 +1,30 @@
 <?php
 /**
- * CodeIgniter
+ * System messages translation for CodeIgniter(tm)
  *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright    Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright    Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT	MIT License
- * @link    https://codeigniter.com
- * @since    Version 1.0.0
- * @filesource
+ * @author	CodeIgniter community
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['email_must_be_array'] = 'The email validation method must be passed an array.';
-$lang['email_invalid_address'] = 'Invalid email address: %s';
-$lang['email_attachment_missing'] = 'Unable to locate the following email attachment: %s';
-$lang['email_attachment_unreadable'] = 'Unable to open this attachment: %s';
-$lang['email_no_from'] = 'Cannot send mail with no "From" header.';
-$lang['email_no_recipients'] = 'You must include recipients: To, Cc, or Bcc';
-$lang['email_send_failure_phpmail'] = 'Unable to send email using PHP mail(). Your server might not be configured to send mail using this method.';
-$lang['email_send_failure_sendmail'] = 'Unable to send email using PHP Sendmail. Your server might not be configured to send mail using this method.';
-$lang['email_send_failure_smtp'] = 'Unable to send email using PHP SMTP. Your server might not be configured to send mail using this method.';
-$lang['email_sent'] = 'Your message has been successfully sent using the following protocol: %s';
-$lang['email_no_socket'] = 'Unable to open a socket to Sendmail. Please check settings.';
-$lang['email_no_hostname'] = 'You did not specify a SMTP hostname.';
-$lang['email_smtp_error'] = 'The following SMTP error was encountered: %s';
-$lang['email_no_smtp_unpw'] = 'Error: You must assign a SMTP username and password.';
-$lang['email_failed_smtp_login'] = 'Failed to send AUTH LOGIN command. Error: %s';
-$lang['email_smtp_auth_un'] = 'Failed to authenticate username. Error: %s';
-$lang['email_smtp_auth_pw'] = 'Failed to authenticate password. Error: %s';
-$lang['email_smtp_data_failure'] = 'Unable to send data: %s';
-$lang['email_exit_status'] = 'Exit status code: %s';
+$lang['email_must_be_array'] = 'E-mail 效验方法必须传入一个 Array';
+$lang['email_invalid_address'] = '无效的 E-mail 地址： %s';
+$lang['email_attachment_missing'] = '无法找到以下的 E-mail 附件： %s';
+$lang['email_attachment_unreadable'] = '无法读取以下的 E-mail 附件： %s';
+$lang['email_no_from'] = '无法发送没有 "From" 头的 E-mail';
+$lang['email_no_recipients'] = 'E-mail 必须包含收件人（To, Cc, or Bcc）';
+$lang['email_send_failure_phpmail'] = '无法使用 PHP 的 mail() 函数。  您的服务器设置禁止使用此函数发送 E-mail。';
+$lang['email_send_failure_sendmail'] = '无法使用 PHP sendmail。您的服务器设置禁止使用此方法发送 E-mail。';
+$lang['email_send_failure_smtp'] = '无法使用 PHP SMTP。您的服务器设置禁止使用此方法发送 E-mail。';
+$lang['email_sent'] = 'E-mail 成功发送： %s';
+$lang['email_no_socket'] = '无法打开 Socket 发送 E-mail，检查设置。';
+$lang['email_no_hostname'] = '没有指定 SMTP 服务器的主机名';
+$lang['email_smtp_error'] = '发生错误，SMTP 错误信息为： %s';
+$lang['email_no_smtp_unpw'] = '错误：必须指定 SMTP 的用户名及密码。';
+$lang['email_failed_smtp_login'] = '发送时 AUTH 命令失败，错误：%s';
+$lang['email_smtp_auth_un'] = '用户名认证失败，错误：%s';
+$lang['email_smtp_auth_pw'] = '密码认证失败，错误：%s';
+$lang['email_smtp_data_failure'] = '无法发送数据：%s';
+$lang['email_exit_status'] = '退出状态码：%s';
diff --git a/src/application/language/chinese/migration_lang.php b/src/application/language/chinese/migration_lang.php
index 52873dbc..dbb529b7 100644
--- a/src/application/language/chinese/migration_lang.php
+++ b/src/application/language/chinese/migration_lang.php
@@ -1,13 +1,19 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php
+/**
+ * System messages translation for CodeIgniter(tm)
+ *
+ * @author	CodeIgniter community
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
+ */
+defined('BASEPATH') OR exit('No direct script access allowed');
 
-$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.";
-
-
-/* End of file migration_lang.php */
-/* Location: ./system/language/chinese/migration_lang.php */
+$lang['migration_none_found'] = '不需迁移。  ';
+$lang['migration_not_found'] = '无法根据版本号找到迁移方法： %s。';
+$lang['migration_sequence_gap'] = '版本迁移存在鸿沟：%s。';
+$lang['migration_multiple_version'] = '多个迁移对应同一版本号：%s。';
+$lang['migration_class_doesnt_exist'] = '无法找到迁移类 "%s"。';
+$lang['migration_missing_up_method'] = '无法找到迁移类 "%s" 中的 "up" 方法。';
+$lang['migration_missing_down_method'] = '无法找到迁移类 "%s" 中的 " 方法。';
+$lang['migration_invalid_filename'] = '无效的迁移文件名："%s"。';
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/db_lang.php b/src/application/language/danish/db_lang.php
index b9da89b1..b3785ea2 100644
--- a/src/application/language/danish/db_lang.php
+++ b/src/application/language/danish/db_lang.php
@@ -1,63 +1,35 @@
 <?php
 /**
- * CodeIgniter
+ * System messages translation for CodeIgniter(tm)
  *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright    Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright    Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT	MIT License
- * @link    https://codeigniter.com
- * @since    Version 1.0.0
- * @filesource
+ * @author	CodeIgniter community
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['db_invalid_connection_str'] = 'Unable to determine the database settings based on the connection string you submitted.';
-$lang['db_unable_to_connect'] = 'Unable to connect to your database server using the provided settings.';
-$lang['db_unable_to_select'] = 'Unable to select the specified database: %s';
-$lang['db_unable_to_create'] = 'Unable to create the specified database: %s';
-$lang['db_invalid_query'] = 'The query you submitted is not valid.';
-$lang['db_must_set_table'] = 'You must set the database table to be used with your query.';
-$lang['db_must_use_set'] = 'You must use the "set" method to update an entry.';
-$lang['db_must_use_index'] = 'You must specify an index to match on for batch updates.';
-$lang['db_batch_missing_index'] = 'One or more rows submitted for batch updating is missing the specified index.';
-$lang['db_must_use_where'] = 'Updates are not allowed unless they contain a "where" clause.';
-$lang['db_del_must_use_where'] = 'Deletes are not allowed unless they contain a "where" or "like" clause.';
-$lang['db_field_param_missing'] = 'To fetch fields requires the name of the table as a parameter.';
-$lang['db_unsupported_function'] = 'This feature is not available for the database you are using.';
-$lang['db_transaction_failure'] = 'Transaction failure: Rollback performed.';
-$lang['db_unable_to_drop'] = 'Unable to drop the specified database.';
-$lang['db_unsupported_feature'] = 'Unsupported feature of the database platform you are using.';
-$lang['db_unsupported_compression'] = 'The file compression format you chose is not supported by your server.';
-$lang['db_filepath_error'] = 'Unable to write data to the file path you have submitted.';
-$lang['db_invalid_cache_path'] = 'The cache path you submitted is not valid or writable.';
-$lang['db_table_name_required'] = 'A table name is required for that operation.';
-$lang['db_column_name_required'] = 'A column name is required for that operation.';
-$lang['db_column_definition_required'] = 'A column definition is required for that operation.';
-$lang['db_unable_to_set_charset'] = 'Unable to set client connection character set: %s';
-$lang['db_error_heading'] = 'A Database Error Occurred';
+$lang['db_invalid_connection_str'] = 'Kan ikke fastsætte database indstillingerne baseret på forbindelsen strengen du angav.';
+$lang['db_unable_to_connect'] = 'Kan ikke forbinde til din database server udfra de angivne indstillinger.';
+$lang['db_unable_to_select'] = 'Kan ikke vælge den angivne database: %s';
+$lang['db_unable_to_create'] = 'Kunne ikke oprette den angivne database: %s';
+$lang['db_invalid_query'] = 'Forespørgslen du sendte er ikke gyldig.';
+$lang['db_must_set_table'] = 'Du skal angive databasetabellen, der skal bruges i din forespørgsel.';
+$lang['db_must_use_set'] = 'Du skal anvende "set" metoden for at opdatere en post.';
+$lang['db_must_use_index'] = 'Du skal angive et indeks til at matche på for batch opdateringer.';
+$lang['db_batch_missing_index'] = 'En eller flere rækker indsendt til batch opdatering mangler det angivne indeks.';
+$lang['db_must_use_where'] = 'Opdateringer er ikke tilladt, medmindre de indeholder en "where" klausul.';
+$lang['db_del_must_use_where'] = 'Sletning er ikke tilladt, medmindre de indeholder en "where" eller "like" klausul.';
+$lang['db_field_param_missing'] = 'For at hente felter kræves navnet på tabellen som en parameter.';
+$lang['db_unsupported_function'] = 'Denne funktion er ikke tilgængelig for den database du anvender.';
+$lang['db_transaction_failure'] = 'Transaktion fejl: Tilbagerulning udføres';
+$lang['db_unable_to_drop'] = 'Kan ikke slette den angivne database.';
+$lang['db_unsupported_feature'] = 'Ikke-understøttet funktion på databaseplatformen du anvender.';
+$lang['db_unsupported_compression'] = 'Filkompression formattet du har valgt er ikke understøttet af din server.';
+$lang['db_filepath_error'] = 'Kan ikke skrive data til filen stien du har angivet.';
+$lang['db_invalid_cache_path'] = 'Cache stien du angivet er ikke gyldig eller skrivbar.';
+$lang['db_table_name_required'] = 'Et tabelnavn er nødvendig for denne operation.';
+$lang['db_column_name_required'] = 'Et kolonnenavn er nødvendig for denne operation.';
+$lang['db_column_definition_required'] = 'Der kræves en kolonnedefinition for denne operation.';
+$lang['db_unable_to_set_charset'] = 'Kan ikke sætte klientforbindelsens tegnsæt: %s';
+$lang['db_error_heading'] = 'Der opstod en Databasefejl';
diff --git a/src/application/language/danish/email_lang.php b/src/application/language/danish/email_lang.php
index e104db52..d172305d 100644
--- a/src/application/language/danish/email_lang.php
+++ b/src/application/language/danish/email_lang.php
@@ -1,58 +1,30 @@
 <?php
 /**
- * CodeIgniter
+ * System messages translation for CodeIgniter(tm)
  *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright    Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright    Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT	MIT License
- * @link    https://codeigniter.com
- * @since    Version 1.0.0
- * @filesource
+ * @author	CodeIgniter community
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['email_must_be_array'] = 'The email validation method must be passed an array.';
-$lang['email_invalid_address'] = 'Invalid email address: %s';
-$lang['email_attachment_missing'] = 'Unable to locate the following email attachment: %s';
-$lang['email_attachment_unreadable'] = 'Unable to open this attachment: %s';
-$lang['email_no_from'] = 'Cannot send mail with no "From" header.';
-$lang['email_no_recipients'] = 'You must include recipients: To, Cc, or Bcc';
-$lang['email_send_failure_phpmail'] = 'Unable to send email using PHP mail(). Your server might not be configured to send mail using this method.';
-$lang['email_send_failure_sendmail'] = 'Unable to send email using PHP Sendmail. Your server might not be configured to send mail using this method.';
-$lang['email_send_failure_smtp'] = 'Unable to send email using PHP SMTP. Your server might not be configured to send mail using this method.';
-$lang['email_sent'] = 'Your message has been successfully sent using the following protocol: %s';
-$lang['email_no_socket'] = 'Unable to open a socket to Sendmail. Please check settings.';
-$lang['email_no_hostname'] = 'You did not specify a SMTP hostname.';
-$lang['email_smtp_error'] = 'The following SMTP error was encountered: %s';
-$lang['email_no_smtp_unpw'] = 'Error: You must assign a SMTP username and password.';
-$lang['email_failed_smtp_login'] = 'Failed to send AUTH LOGIN command. Error: %s';
-$lang['email_smtp_auth_un'] = 'Failed to authenticate username. Error: %s';
-$lang['email_smtp_auth_pw'] = 'Failed to authenticate password. Error: %s';
-$lang['email_smtp_data_failure'] = 'Unable to send data: %s';
-$lang['email_exit_status'] = 'Exit status code: %s';
+$lang['email_must_be_array'] = 'Email valideringsmetoden kræver at modtage et array.';
+$lang['email_invalid_address'] = 'Ugyldig email adresse: %s';
+$lang['email_attachment_missing'] = 'Fandt ikke følgende email vedhæftning: %s';
+$lang['email_attachment_unreadable'] = 'Kan ikke åbne denne vedhæftning: %s';
+$lang['email_no_from'] = 'Kan ikke sende mail uden "From"-header.';
+$lang['email_no_recipients'] = 'Du skal angive for modtager: To, Cc, or Bcc';
+$lang['email_send_failure_phpmail'] = 'Kan ikke sende email med PHP mail(). Din server er måske ikke konfigurerettil at sende mail med denne metode.';
+$lang['email_send_failure_sendmail'] = 'Kan ikke sende email med PHP Sendmail. Din server er måske ikke konfigurerettil at sende mail med denne metode.';
+$lang['email_send_failure_smtp'] = 'Kan ikke sende email med PHP SMTP. Din server er måske ikke konfigurerettil at sende mail med denne metode.';
+$lang['email_sent'] = 'Din meddelelse blev sendt med denne protokol: %s';
+$lang['email_no_socket'] = 'Kan ikke åbne kontakt til Sendmail. Prøv at checke dine indstillinger.';
+$lang['email_no_hostname'] = 'Du mangler at angive et SMTP værtsnavn.';
+$lang['email_smtp_error'] = 'Følgende SMTP-fejl opstod: %s';
+$lang['email_no_smtp_unpw'] = 'Fejl: Du skal angive et SMTP brugernavn og password.';
+$lang['email_failed_smtp_login'] = 'Fejl ved afsendelse af AUTH LOGIN kommando. Fejl: %s';
+$lang['email_smtp_auth_un'] = 'Fejl ved autentificering af brugernavn. Fejl: %s';
+$lang['email_smtp_auth_pw'] = 'Fejl ved autentificering af password. Fejl: %s';
+$lang['email_smtp_data_failure'] = 'Kunne ikke sende dataene: %s';
+$lang['email_exit_status'] = 'Afslutende statuskode: %s';
diff --git a/src/application/language/danish/migration_lang.php b/src/application/language/danish/migration_lang.php
index 67e4ea0d..3a8a0e6b 100644
--- a/src/application/language/danish/migration_lang.php
+++ b/src/application/language/danish/migration_lang.php
@@ -1,13 +1,19 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php
+/**
+ * System messages translation for CodeIgniter(tm)
+ *
+ * @author	CodeIgniter community
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
+ */
+defined('BASEPATH') OR exit('No direct script access allowed');
 
-$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.";
-
-
-/* End of file migration_lang.php */
-/* Location: ./system/language/danish/migration_lang.php */
+$lang['migration_none_found'] = 'Ingen migrationer blev fundet.';
+$lang['migration_not_found'] = 'Ingen migrationer blev fundet med versionsnummeret: %s.';
+$lang['migration_sequence_gap'] = 'Der er et gab i migrationsekvensen i version nummer: %s.';
+$lang['migration_multiple_version'] = 'Der er flere migrationer med samme versionsnummer: %s.';
+$lang['migration_class_doesnt_exist'] = 'Migration klassen "%s" kunne ikke findes.';
+$lang['migration_missing_up_method'] = 'Migration klassen "%s" mangler "up" metoden.';
+$lang['migration_missing_down_method'] = 'Migration klassen "%s" mangler "down" metoden.';
+$lang['migration_invalid_filename'] = 'Migration "%s" har et ugyldigt filnavn.';
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/db_lang.php b/src/application/language/dutch/db_lang.php
index b9da89b1..e4c7590b 100644
--- a/src/application/language/dutch/db_lang.php
+++ b/src/application/language/dutch/db_lang.php
@@ -1,63 +1,36 @@
 <?php
 /**
- * CodeIgniter
+ * System messages translation for CodeIgniter(tm)
  *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright    Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright    Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT	MIT License
- * @link    https://codeigniter.com
- * @since    Version 1.0.0
- * @filesource
+ * @author	CodeIgniter community
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Pieter Krul
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
  */
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') OR exit('Directe toegang tot scripts is niet toegestaan');
 
-$lang['db_invalid_connection_str'] = 'Unable to determine the database settings based on the connection string you submitted.';
-$lang['db_unable_to_connect'] = 'Unable to connect to your database server using the provided settings.';
-$lang['db_unable_to_select'] = 'Unable to select the specified database: %s';
-$lang['db_unable_to_create'] = 'Unable to create the specified database: %s';
-$lang['db_invalid_query'] = 'The query you submitted is not valid.';
-$lang['db_must_set_table'] = 'You must set the database table to be used with your query.';
-$lang['db_must_use_set'] = 'You must use the "set" method to update an entry.';
-$lang['db_must_use_index'] = 'You must specify an index to match on for batch updates.';
-$lang['db_batch_missing_index'] = 'One or more rows submitted for batch updating is missing the specified index.';
-$lang['db_must_use_where'] = 'Updates are not allowed unless they contain a "where" clause.';
-$lang['db_del_must_use_where'] = 'Deletes are not allowed unless they contain a "where" or "like" clause.';
-$lang['db_field_param_missing'] = 'To fetch fields requires the name of the table as a parameter.';
-$lang['db_unsupported_function'] = 'This feature is not available for the database you are using.';
-$lang['db_transaction_failure'] = 'Transaction failure: Rollback performed.';
-$lang['db_unable_to_drop'] = 'Unable to drop the specified database.';
-$lang['db_unsupported_feature'] = 'Unsupported feature of the database platform you are using.';
-$lang['db_unsupported_compression'] = 'The file compression format you chose is not supported by your server.';
-$lang['db_filepath_error'] = 'Unable to write data to the file path you have submitted.';
-$lang['db_invalid_cache_path'] = 'The cache path you submitted is not valid or writable.';
-$lang['db_table_name_required'] = 'A table name is required for that operation.';
-$lang['db_column_name_required'] = 'A column name is required for that operation.';
-$lang['db_column_definition_required'] = 'A column definition is required for that operation.';
-$lang['db_unable_to_set_charset'] = 'Unable to set client connection character set: %s';
-$lang['db_error_heading'] = 'A Database Error Occurred';
+$lang['db_invalid_connection_str'] = 'Het lukt niet om de instellingen voor de database te kunnen bepalen via de connectiegegevens.';
+$lang['db_unable_to_connect'] = 'Het lukt niet om een verbinding naar de database te maken met de opgegeven informatie.';
+$lang['db_unable_to_select'] = 'Benaderen van de database is mislukt: %s';
+$lang['db_unable_to_create'] = 'Aanmaken van de database is mislukt: %s';
+$lang['db_invalid_query'] = 'De aan de database gestelde query is niet juist geformuleerd.';
+$lang['db_must_set_table'] = 'Het is verplicht de naam van de tabel uit de database te noemen.';
+$lang['db_must_use_set'] = 'De database vindt dat, als je een regel wilt veranderen, het "SET"-commando hiervoor bedoeld is.';
+$lang['db_must_use_index'] = 'De database vindt dat de naam van een INDEX genoemd moet voor deze batch-updates.';
+$lang['db_batch_missing_index'] = 'De opgegeven INDEX ontbreekt, terwijl er wel regels voor een batch update zijn.';
+$lang['db_must_use_where'] = 'Updates zijn niet toegestaan zonder een "WHERE" clausule.';
+$lang['db_del_must_use_where'] = 'Verwijderingen zijn niet toegestaan zonder een "WHERE" of "LIKE" clausule.';
+$lang['db_field_param_missing'] = 'Om velden op te kunnen halen dient de naam van de tabel ook genoemd te worden.';
+$lang['db_unsupported_function'] = 'Die functie wordt door deze versie van de database niet ondersteund.';
+$lang['db_transaction_failure'] = 'Transactiefout: Rollback is uitgevoerd.';
+$lang['db_unable_to_drop'] = 'Het lukt niet om de opgegeven database te verwijderen van het systeem.';
+$lang['db_unsupported_feature'] = 'Deze mogelijkheid wordt niet door het databaseplatform ondersteund.';
+$lang['db_unsupported_compression'] = 'De server kent deze compressiemethode niet.';
+$lang['db_filepath_error'] = 'Het systeem kan niet schrijven naar het genoemde bestand.';
+$lang['db_invalid_cache_path'] = 'Het systeem kan niet schrijven naar dit cachebestand en het is onduidelijk of dit het juiste bestand is.';
+$lang['db_table_name_required'] = 'Voor deze actie is de naam van de tabel verplicht.';
+$lang['db_column_name_required'] = 'Voor deze actie is de kolomnaam verplicht.';
+$lang['db_column_definition_required'] = 'Voor deze actie is het opgeven van een kolomdefinitie verplicht.';
+$lang['db_unable_to_set_charset'] = 'Het systeem kan de karakterset voor de clientverbinding niet instellen: %s';
+$lang['db_error_heading'] = 'Er is een database fout opgetreden.';
\ No newline at end of file
diff --git a/src/application/language/dutch/email_lang.php b/src/application/language/dutch/email_lang.php
index e104db52..3c0f8fc1 100644
--- a/src/application/language/dutch/email_lang.php
+++ b/src/application/language/dutch/email_lang.php
@@ -1,58 +1,31 @@
 <?php
 /**
- * CodeIgniter
+ * System messages translation for CodeIgniter(tm)
  *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright    Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright    Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT	MIT License
- * @link    https://codeigniter.com
- * @since    Version 1.0.0
- * @filesource
+ * @author	CodeIgniter community
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Pieter Krul
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
  */
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') OR exit('Directe toegang tot scripts is niet toegestaan');
 
-$lang['email_must_be_array'] = 'The email validation method must be passed an array.';
-$lang['email_invalid_address'] = 'Invalid email address: %s';
-$lang['email_attachment_missing'] = 'Unable to locate the following email attachment: %s';
-$lang['email_attachment_unreadable'] = 'Unable to open this attachment: %s';
-$lang['email_no_from'] = 'Cannot send mail with no "From" header.';
-$lang['email_no_recipients'] = 'You must include recipients: To, Cc, or Bcc';
-$lang['email_send_failure_phpmail'] = 'Unable to send email using PHP mail(). Your server might not be configured to send mail using this method.';
-$lang['email_send_failure_sendmail'] = 'Unable to send email using PHP Sendmail. Your server might not be configured to send mail using this method.';
-$lang['email_send_failure_smtp'] = 'Unable to send email using PHP SMTP. Your server might not be configured to send mail using this method.';
-$lang['email_sent'] = 'Your message has been successfully sent using the following protocol: %s';
-$lang['email_no_socket'] = 'Unable to open a socket to Sendmail. Please check settings.';
-$lang['email_no_hostname'] = 'You did not specify a SMTP hostname.';
-$lang['email_smtp_error'] = 'The following SMTP error was encountered: %s';
-$lang['email_no_smtp_unpw'] = 'Error: You must assign a SMTP username and password.';
-$lang['email_failed_smtp_login'] = 'Failed to send AUTH LOGIN command. Error: %s';
-$lang['email_smtp_auth_un'] = 'Failed to authenticate username. Error: %s';
-$lang['email_smtp_auth_pw'] = 'Failed to authenticate password. Error: %s';
-$lang['email_smtp_data_failure'] = 'Unable to send data: %s';
-$lang['email_exit_status'] = 'Exit status code: %s';
+$lang['email_must_be_array']		= 'De e-mail validatie methode moet de array passeren.';
+$lang['email_invalid_address']		= 'De opgegeven waarde is geen geldig e-mailadres: %s';
+$lang['email_attachment_missing']	= 'De bijlage bij dit bericht kan niet gevonden worden: %s';
+$lang['email_attachment_unreadable']	= 'De bijlage kan niet worden gelezen: %s';
+$lang['email_no_from']			= 'E-mail kan niet verstuurd worden zonder "From"-header.';
+$lang['email_no_recipients']		= 'Ontvangers (Naar, Cc, of Bcc) zijn verplicht.';
+$lang['email_send_failure_phpmail']	= 'Het lukt niet om de e-mail te versturen met PHP mail(). Deze server zou wel eens een andere methode gebruiken om berichten te sturen.';
+$lang['email_send_failure_sendmail']	= 'Het lukt niet om de e-mail te versturen met PHP Sendmail. Deze server zou wel eens een andere methode gebruiken om berichten te sturen.';
+$lang['email_send_failure_smtp']	= 'Het lukt niet om de e-mail te versturen met PHP SMTP.  Deze server zou wel eens een andere methode gebruiken om berichten te sturen.';
+$lang['email_sent']			= 'Het bericht is verstuurd, via het volgende protocol: %s';
+$lang['email_no_socket']		= 'Het lukt niet om een socket naar Sendmail te openen.  Controleer instellingen.';
+$lang['email_no_hostname']		= 'Specifieer een SMTP-hostnaam.';
+$lang['email_smtp_error']		= 'Tegengehouden door een SMTP-foutmelding: %s';
+$lang['email_no_smtp_unpw']		= 'Fout: geef een SMTP-gebruikersnaam met wachtwoord op.';
+$lang['email_failed_smtp_login']	= 'De "AUTH LOGIN"-opdracht gaf een foutmelding bij het versturen: %s';
+$lang['email_smtp_auth_un']		= 'Bij het authenticeren gaf de gebruikersnaam een foutmelding: %s';
+$lang['email_smtp_auth_pw']		= 'Bij het authenticeren gaf het wachtwoord een foutmelding:  %s';
+$lang['email_smtp_data_failure']	= 'Versturen van data is mislukt: %s';
+$lang['email_exit_status']		= 'Exit statuscode: %s.';
\ No newline at end of file
diff --git a/src/application/language/dutch/migration_lang.php b/src/application/language/dutch/migration_lang.php
index 7ac324d6..88372746 100644
--- a/src/application/language/dutch/migration_lang.php
+++ b/src/application/language/dutch/migration_lang.php
@@ -1,13 +1,20 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php
+/**
+ * System messages translation for CodeIgniter(tm)
+ *
+ * @author	CodeIgniter community
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Pieter Krul
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
+ */
+defined('BASEPATH') OR exit('Directe toegang tot scripts is niet toegestaan');
 
-$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.";
-
-
-/* End of file migration_lang.php */
-/* Location: ./system/language/dutch/migration_lang.php */
+$lang['migration_none_found']		= 'Er is geen enkele migratie gevonden.';
+$lang['migration_not_found']		= 'Een migratie met dit versienummer is onvindbaar. %s.';
+$lang['migration_sequence_gap']		= 'Er ontbreekt een deel in de migratiereeks omstreeks dit versienummer. %s.';
+$lang['migration_multiple_version']	= 'Er zijn meerdere migraties met hetzelfde versienummer: %s.';
+$lang['migration_class_doesnt_exist']	= 'De migratie-class "%s" kon niet worden gevonden.';
+$lang['migration_missing_up_method']	= 'De migratie-class "%s" mist een "up"-methode';
+$lang['migration_missing_down_method']	= 'De migratie-class "%s" mist een "down"-methode.';
+$lang['migration_invalid_filename']	= 'De migratie "%s" heeft een ongeldige bestandsnaam.';
\ No newline at end of file
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/migration_lang.php b/src/application/language/finnish/migration_lang.php
index 98dbd49f..188e14d3 100644
--- a/src/application/language/finnish/migration_lang.php
+++ b/src/application/language/finnish/migration_lang.php
@@ -1,13 +1,47 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php
+/**
+ * CodeIgniter
+ *
+ * An open source application development framework for PHP
+ *
+ * This content is released under the MIT License (MIT)
+ *
+ * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @package	CodeIgniter
+ * @author	EllisLab Dev Team
+ * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
+ * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
+ * @since	Version 3.0.0
+ * @filesource
+ */
+defined('BASEPATH') OR exit('No direct script access allowed');
 
-$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.";
-
-
-/* End of file migration_lang.php */
-/* Location: ./system/language/finnish/migration_lang.php */
+$lang['migration_none_found'] = 'No migrations were found.';
+$lang['migration_not_found'] = 'No migration could be found with the version number: %s.';
+$lang['migration_sequence_gap'] = 'There is a gap in the migration sequence near version number: %s.';
+$lang['migration_multiple_version'] = 'There are multiple migrations with the same version number: %s.';
+$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 a "down" method.';
+$lang['migration_invalid_filename'] = 'Migration "%s" has an invalid filename.';
\ No newline at end of file
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/db_lang.php b/src/application/language/french/db_lang.php
index b9da89b1..2d8b6e0a 100644
--- a/src/application/language/french/db_lang.php
+++ b/src/application/language/french/db_lang.php
@@ -1,63 +1,34 @@
 <?php
 /**
- * CodeIgniter
- *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright    Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright    Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT	MIT License
- * @link    https://codeigniter.com
- * @since    Version 1.0.0
- * @filesource
+ * System messages translation for CodeIgniter(tm)
+ * @author	CodeIgniter community
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['db_invalid_connection_str'] = 'Unable to determine the database settings based on the connection string you submitted.';
-$lang['db_unable_to_connect'] = 'Unable to connect to your database server using the provided settings.';
-$lang['db_unable_to_select'] = 'Unable to select the specified database: %s';
-$lang['db_unable_to_create'] = 'Unable to create the specified database: %s';
-$lang['db_invalid_query'] = 'The query you submitted is not valid.';
-$lang['db_must_set_table'] = 'You must set the database table to be used with your query.';
-$lang['db_must_use_set'] = 'You must use the "set" method to update an entry.';
-$lang['db_must_use_index'] = 'You must specify an index to match on for batch updates.';
-$lang['db_batch_missing_index'] = 'One or more rows submitted for batch updating is missing the specified index.';
-$lang['db_must_use_where'] = 'Updates are not allowed unless they contain a "where" clause.';
-$lang['db_del_must_use_where'] = 'Deletes are not allowed unless they contain a "where" or "like" clause.';
-$lang['db_field_param_missing'] = 'To fetch fields requires the name of the table as a parameter.';
-$lang['db_unsupported_function'] = 'This feature is not available for the database you are using.';
-$lang['db_transaction_failure'] = 'Transaction failure: Rollback performed.';
-$lang['db_unable_to_drop'] = 'Unable to drop the specified database.';
-$lang['db_unsupported_feature'] = 'Unsupported feature of the database platform you are using.';
-$lang['db_unsupported_compression'] = 'The file compression format you chose is not supported by your server.';
-$lang['db_filepath_error'] = 'Unable to write data to the file path you have submitted.';
-$lang['db_invalid_cache_path'] = 'The cache path you submitted is not valid or writable.';
-$lang['db_table_name_required'] = 'A table name is required for that operation.';
-$lang['db_column_name_required'] = 'A column name is required for that operation.';
-$lang['db_column_definition_required'] = 'A column definition is required for that operation.';
-$lang['db_unable_to_set_charset'] = 'Unable to set client connection character set: %s';
-$lang['db_error_heading'] = 'A Database Error Occurred';
+$lang['db_invalid_connection_str']      = "Impossible de déterminer les paramètres d'accès à la base de données en se basant sur la chaîne de connexion que vous avez fournie.";
+$lang['db_unable_to_connect']           = "Impossible de se connecter à la base de données en utilisant les paramètres fournis.";
+$lang['db_unable_to_select']            = "Impossible de sélectionner cette base de données : %s";
+$lang['db_unable_to_create']            = "Impossible de créer cette base de données : %s";
+$lang['db_invalid_query']               = "La requête que vous avez fournie est invalide.";
+$lang['db_must_set_table']              = "Vous devez spécifier une table pour effectuer votre requête.";
+$lang['db_must_use_set']                = "Vous devez utiliser la méthode \"set()\" pour mettre à jour une entrée.";
+$lang['db_must_use_index']              = "Vous devez spécifier un index pour les mises à jour groupées.";
+$lang['db_batch_missing_index']         = "Une ou plusieurs rangées de la mise à jour groupée ne disposent pas de l'index requis.";
+$lang['db_must_use_where']              = "Il faut obligatoirement spécifier la clause \"WHERE\" pour mettre à jour une entrée.";
+$lang['db_del_must_use_where']          = "Il faut obligatoirement spécifier la clause \"WHERE\" pour supprimer une entrée.";
+$lang['db_field_param_missing']         = "La méthode \"fetch_fields()\" requiert le nom de la table cible en paramètre.";
+$lang['db_unsupported_function']        = "Cette fonctionnalité n'est pas disponible pour la base de données utilisée.";
+$lang['db_transaction_failure']         = "Erreur de transaction : la transaction est annulée.";
+$lang['db_unable_to_drop']              = "Impossible d'effacer la base de données spécifiée.";
+$lang['db_unsupported_feature']         = "Cette fonctionnalité n'est pas supportée par le système de gestion de bases de données utilisé.";
+$lang['db_unsupported_compression']     = "Le format de compression choisi n'est pas supporté par votre serveur.";
+$lang['db_filepath_error']              = "Impossible d'écrire des données au chemin de fichiers indiqué.";
+$lang['db_invalid_cache_path']          = "Le chemin de mise en cache indiqué n'est pas valide ou inscriptible.";
+$lang['db_table_name_required']         = "Un nom de table est requis pour cette opération.";
+$lang['db_column_name_required']        = "Un nom de champ est requis pour cette opération.";
+$lang['db_column_definition_required']  = "Une définition de champ est requise pour cette opération.";
+$lang['db_unable_to_set_charset']       = "Impossible de définir le jeu de caractères de la connexion client : %s";
+$lang['db_error_heading']               = "Une erreur de la base de données s'est produite.";
diff --git a/src/application/language/french/email_lang.php b/src/application/language/french/email_lang.php
index e104db52..fde0248f 100644
--- a/src/application/language/french/email_lang.php
+++ b/src/application/language/french/email_lang.php
@@ -1,58 +1,29 @@
 <?php
 /**
- * CodeIgniter
- *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright    Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright    Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT	MIT License
- * @link    https://codeigniter.com
- * @since    Version 1.0.0
- * @filesource
+ * System messages translation for CodeIgniter(tm)
+ * @author	CodeIgniter community
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['email_must_be_array'] = 'The email validation method must be passed an array.';
-$lang['email_invalid_address'] = 'Invalid email address: %s';
-$lang['email_attachment_missing'] = 'Unable to locate the following email attachment: %s';
-$lang['email_attachment_unreadable'] = 'Unable to open this attachment: %s';
-$lang['email_no_from'] = 'Cannot send mail with no "From" header.';
-$lang['email_no_recipients'] = 'You must include recipients: To, Cc, or Bcc';
-$lang['email_send_failure_phpmail'] = 'Unable to send email using PHP mail(). Your server might not be configured to send mail using this method.';
-$lang['email_send_failure_sendmail'] = 'Unable to send email using PHP Sendmail. Your server might not be configured to send mail using this method.';
-$lang['email_send_failure_smtp'] = 'Unable to send email using PHP SMTP. Your server might not be configured to send mail using this method.';
-$lang['email_sent'] = 'Your message has been successfully sent using the following protocol: %s';
-$lang['email_no_socket'] = 'Unable to open a socket to Sendmail. Please check settings.';
-$lang['email_no_hostname'] = 'You did not specify a SMTP hostname.';
-$lang['email_smtp_error'] = 'The following SMTP error was encountered: %s';
-$lang['email_no_smtp_unpw'] = 'Error: You must assign a SMTP username and password.';
-$lang['email_failed_smtp_login'] = 'Failed to send AUTH LOGIN command. Error: %s';
-$lang['email_smtp_auth_un'] = 'Failed to authenticate username. Error: %s';
-$lang['email_smtp_auth_pw'] = 'Failed to authenticate password. Error: %s';
-$lang['email_smtp_data_failure'] = 'Unable to send data: %s';
-$lang['email_exit_status'] = 'Exit status code: %s';
+$lang['email_must_be_array']         = "La méthode de validation d'email n'accepte que les tableaux associatifs (array).";
+$lang['email_invalid_address']       = "Adresse email invalide : %s";
+$lang['email_attachment_missing']    = "Impossible de localiser le fichier joint suivant : %s";
+$lang['email_attachment_unreadable'] = "Impossible d'ouvrir ce fichier joint : %s";
+$lang['email_no_from']               = "Impossible d'envoyer un email sans en-tête \"From\".";
+$lang['email_no_recipients']         = "Vous devez spécifier des destinataires: To, Cc, ou Bcc";
+$lang['email_send_failure_phpmail']  = "Impossible d'envoyer des emails avec la fonction mail() de PHP. Votre serveur ne doit pas être configuré pour pouvoir utiliser cette méthode.";
+$lang['email_send_failure_sendmail'] = "Impossible d'envoyer des emails avec la méthode Sendmail de PHP. Votre serveur ne doit pas être configuré pour pouvoir utiliser cette méthode.";
+$lang['email_send_failure_smtp']     = "Impossible d'envoyer des emails avec la méthode SMTP de PHP. Votre serveur ne doit pas être configuré pour pouvoir utiliser cette méthode.";
+$lang['email_sent']                  = "Votre message a bien été expédié par le protocole suivant : %s";
+$lang['email_no_socket']             = "Impossible d'ouvrir un socket avec Sendmail. Veuillez vérifier la configuration de votre environnement.";
+$lang['email_no_hostname']           = "Vous n'avez pas spécificé d'hôte SMTP.";
+$lang['email_smtp_error']            = "L'erreur SMTP suivante s'est produite : %s";
+$lang['email_no_smtp_unpw']          = "Erreur : Vous devez spécifier un nom d'utilisateur et un mot de passe SMTP.";
+$lang['email_failed_smtp_login']     = "Échec lors de l'envoi de la commande AUTH LOGIN. Erreur : %s";
+$lang['email_smtp_auth_un']          = "Impossible d'identifier le nom d'utilisateur. Erreur : %s";
+$lang['email_smtp_auth_pw']          = "Impossible d'identifier le mot de passe. Erreur : %s";
+$lang['email_smtp_data_failure']     = "Impossible d'envoyer les données : %s";
+$lang['email_exit_status']           = "Code de retour : %s";
diff --git a/src/application/language/french/migration_lang.php b/src/application/language/french/migration_lang.php
index b5e1b911..77672ca2 100644
--- a/src/application/language/french/migration_lang.php
+++ b/src/application/language/french/migration_lang.php
@@ -1,13 +1,18 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php
+/**
+ * System messages translation for CodeIgniter(tm)
+ * @author	CodeIgniter community
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
+ */
+defined('BASEPATH') OR exit('No direct script access allowed');
 
-$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.";
-
-
-/* End of file migration_lang.php */
-/* Location: ./system/language/english/migration_lang.php */
+$lang['migration_none_found']            = "Aucune migration trouvée.";
+$lang['migration_not_found']             = "Aucune migration n'a été trouvée avec le numéro de version : %d.";
+$lang['migration_sequence_gap']          = "Il y a un trou dans la séquence de migration près de la version numéro : %s.";
+$lang['migration_multiple_version']      = "Il y a plusieurs migrations avec le même numéro de version : %d.";
+$lang['migration_class_doesnt_exist']    = "La classe de migration \"%s\" n'a pas pu être trouvée.";
+$lang['migration_missing_up_method']     = "La classe de migration \"%s\" ne dispose pas d'une méthode 'up'.";
+$lang['migration_missing_down_method']   = "La classe de migration \"%s\" ne dispose pas d'une méthode 'down'.";
+$lang['migration_invalid_filename']      = "Le nom de fichier de la migration \"%s\" n'est pas valide.";
diff --git a/src/application/language/french/translations_lang.php b/src/application/language/french/translations_lang.php
index 355ae447..cb1ea145 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';
@@ -64,7 +64,7 @@ $lang['enable_sync'] = 'Activer la synchronisation';
 $lang['disable_sync'] = 'Désactiver la synchronisation';
 $lang['reload'] = 'Actualiser';
 $lang['appointment'] = 'Rendez-vous';
-$lang['unavailable'] = 'Non valable';
+$lang['unavailable'] = 'Indisponible';
 $lang['week'] = 'Semaine';
 $lang['month'] = 'Mois';
 $lang['today'] = 'Ajourd\'hui';
@@ -75,14 +75,14 @@ $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.';
 $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.';
 $lang['log_out_hint'] = 'Déconnexion du système.';
-$lang['unavailable_periods_hint'] = 'Durant les périodes non disponibles l\'Exécutant n\'acceptera pas de nouvelle prestation.';
+$lang['unavailable_periods_hint'] = 'Durant les périodes d\'indisponibilité l\'Exécutant n\'acceptera pas de nouvelle prestation.';
 $lang['new_appointment_hint'] = 'Créer un nouveau rendez-vous et stocker le dans la base de données.';
 $lang['reload_appointments_hint'] = 'Actualiser le calendrier des rendez-vous.';
 $lang['trigger_google_sync_hint'] = 'Démarrer la procédure de synchronisation du calendrier Google.';
@@ -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';
@@ -152,7 +152,7 @@ $lang['sunday'] = 'Dimanche';
 $lang['breaks'] = 'Pauses';
 $lang['add_breaks_during_each_day'] = 'Ajoutez ici les périodes de pause pour chaque jour. Pendant ces pauses l\'exécutant n\'acceptera pas de rendez-vous...';
 $lang['day'] = 'Jour';
-$lang['days'] = 'Days';
+$lang['days'] = 'Jours';
 $lang['actions'] = 'Actions';
 $lang['reset_working_plan_hint'] = 'Restaurer les valeurs d\'origine du planning de travail.';
 $lang['company_name'] = 'Nom de la société';
@@ -160,14 +160,15 @@ $lang['company_name_hint'] = 'Le nom de la société sera affiché et utilisé u
 $lang['company_email'] = 'Email de la société';
 $lang['company_email_hint'] = 'Ceci sera l\'adresse email de la société. Elle sera utilisée comme adresse d\'envoi et de réponse par le système de messagerie électronique (obligatoire).';
 $lang['company_link'] = 'Site web de la société';
+$lang['company_link_hint'] = 'Le lien de la société doit pointer vers le site web officiel de la société (obligatoire).';
 $lang['go_to_booking_page'] = 'Aller à la page de rendez-vous';
 $lang['settings_saved'] = 'Paramètres sauvegardés avec succès !';
 $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)';
@@ -188,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 ...';
@@ -197,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';
@@ -205,7 +206,7 @@ $lang['delete_category'] = 'Supprimer la catégorie de prestation';
 $lang['delete_provider'] = 'Supprimer un exécutant';
 $lang['delete_secretary'] = 'Supprimer une secrétaire';
 $lang['delete_appointment'] = 'Supprimer un rendez-vous';
-$lang['delete_unavailable'] = 'Supprimer une période de temps non valide';
+$lang['delete_unavailable'] = 'Supprimer une période d\'indisponibilité';
 $lang['delete'] = 'Supprimer';
 $lang['unexpected_issues'] = 'Résultats inattendus';
 $lang['unexpected_issues_message'] = 'L\'opération n\'a pu être terminée à cause de résultats inattendus.';
@@ -234,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';
@@ -248,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 !';
@@ -264,35 +265,35 @@ $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';
 $lang['attendants_number'] = 'Nombre de participants';
 $lang['reset_working_plan'] = 'Restaurer les valeurs d\'origine du planning de travail.';
-$lang['legal_contents'] = 'Legal Contents';
-$lang['cookie_notice'] = 'Cookie Notice';
-$lang['display_cookie_notice'] = 'Display Cookie Notice';
-$lang['cookie_notice_content'] = 'Cookie Notice Content';
-$lang['terms_and_conditions'] = 'Terms & Conditions';
-$lang['display_terms_and_conditions'] = 'Display Terms & Conditions';
-$lang['terms_and_conditions_content'] = 'Terms & Conditions Content';
-$lang['privacy_policy'] = 'Privacy Policy';
-$lang['display_privacy_policy'] = 'Display Privacy Policy';
-$lang['privacy_policy_content'] = 'Privacy Policy Content';
-$lang['website_using_cookies_to_ensure_best_experience'] = 'This website uses cookies to ensure you get the best experience on our website.';
-$lang['read_and_agree_to_terms_and_conditions'] = 'I have read and agree to the {$link}Terms & Conditions{/$link}.';
-$lang['read_and_agree_to_privacy_policy'] = 'I have read and agree to the {$link}Privacy Policy{/$link}.';
-$lang['delete_personal_information_hint'] = 'Delete all personal information from the system.';
-$lang['delete_personal_information'] = 'Delete Personal Information';
-$lang['delete_personal_information_prompt'] = 'Are you sure that you want to delete your personal information? This action cannot be undone.';
+$lang['legal_contents'] = 'Contenu juridique';
+$lang['cookie_notice'] = 'Informations sur les Cookies';
+$lang['display_cookie_notice'] = 'Afficher les informations sur les cookies';
+$lang['cookie_notice_content'] = 'Description de la politique d\'utilisation des cookies';
+$lang['terms_and_conditions'] = 'Conditions générales';
+$lang['display_terms_and_conditions'] = 'Afficher les conditions générales';
+$lang['terms_and_conditions_content'] = 'Description des conditions générales';
+$lang['privacy_policy'] = 'Politique de confidentialité';
+$lang['display_privacy_policy'] = 'Afficher la politique de confidentialité';
+$lang['privacy_policy_content'] = 'Description de la politique de confidentialité';
+$lang['website_using_cookies_to_ensure_best_experience'] = 'Ce site web utilise des cookies pour vous assurer la meilleure expérience utilisateur.';
+$lang['read_and_agree_to_terms_and_conditions'] = 'J\'ai lu, compris et accepte les {$link}Conditions Générales{/$link}.';
+$lang['read_and_agree_to_privacy_policy'] = 'J\'ai lu, compris et accepte la {$link}politique de confidentialité{/$link}.';
+$lang['delete_personal_information_hint'] = 'Effacer toutes vos données personnelles du système.';
+$lang['delete_personal_information'] = 'Effacer toutes mes données personnelles';
+$lang['delete_personal_information_prompt'] = 'Etes-vous sûr(e) de vouloir effacer toutes vos données personnelles ? Cette action est irréversible.';
diff --git a/src/application/language/german/db_lang.php b/src/application/language/german/db_lang.php
index b9da89b1..d54faf01 100644
--- a/src/application/language/german/db_lang.php
+++ b/src/application/language/german/db_lang.php
@@ -1,63 +1,35 @@
 <?php
 /**
- * CodeIgniter
+ * System messages translation for CodeIgniter(tm)
  *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright    Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright    Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT	MIT License
- * @link    https://codeigniter.com
- * @since    Version 1.0.0
- * @filesource
+ * @author	CodeIgniter community
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['db_invalid_connection_str'] = 'Unable to determine the database settings based on the connection string you submitted.';
-$lang['db_unable_to_connect'] = 'Unable to connect to your database server using the provided settings.';
-$lang['db_unable_to_select'] = 'Unable to select the specified database: %s';
-$lang['db_unable_to_create'] = 'Unable to create the specified database: %s';
-$lang['db_invalid_query'] = 'The query you submitted is not valid.';
-$lang['db_must_set_table'] = 'You must set the database table to be used with your query.';
-$lang['db_must_use_set'] = 'You must use the "set" method to update an entry.';
-$lang['db_must_use_index'] = 'You must specify an index to match on for batch updates.';
-$lang['db_batch_missing_index'] = 'One or more rows submitted for batch updating is missing the specified index.';
-$lang['db_must_use_where'] = 'Updates are not allowed unless they contain a "where" clause.';
-$lang['db_del_must_use_where'] = 'Deletes are not allowed unless they contain a "where" or "like" clause.';
-$lang['db_field_param_missing'] = 'To fetch fields requires the name of the table as a parameter.';
-$lang['db_unsupported_function'] = 'This feature is not available for the database you are using.';
-$lang['db_transaction_failure'] = 'Transaction failure: Rollback performed.';
-$lang['db_unable_to_drop'] = 'Unable to drop the specified database.';
-$lang['db_unsupported_feature'] = 'Unsupported feature of the database platform you are using.';
-$lang['db_unsupported_compression'] = 'The file compression format you chose is not supported by your server.';
-$lang['db_filepath_error'] = 'Unable to write data to the file path you have submitted.';
-$lang['db_invalid_cache_path'] = 'The cache path you submitted is not valid or writable.';
-$lang['db_table_name_required'] = 'A table name is required for that operation.';
-$lang['db_column_name_required'] = 'A column name is required for that operation.';
-$lang['db_column_definition_required'] = 'A column definition is required for that operation.';
-$lang['db_unable_to_set_charset'] = 'Unable to set client connection character set: %s';
-$lang['db_error_heading'] = 'A Database Error Occurred';
+$lang['db_invalid_connection_str'] = 'Die Datenbank-Einstellungen sind anhand der vorliegenden Verbindungsdaten nicht zu ermitteln.';
+$lang['db_unable_to_connect'] = 'Mit den vorliegenden Einstellungen ist keine Verbindung zum Datenbank-Server möglich.';
+$lang['db_unable_to_select'] = 'Die folgende Datenbank kann nicht gewählt werden: %s';
+$lang['db_unable_to_create'] = 'Die folgende Datenbank kann nicht erstellt werden: %s';
+$lang['db_invalid_query'] = 'Die vorliegende SQL-Abfrage ist ungültig.';
+$lang['db_must_set_table'] = 'Sie müssen die Tabelle der Datenbank für Ihre Abfrage angegeben.';
+$lang['db_must_use_set'] = 'Zum Aktualisieren eines Eintrages müssen Sie die "set" Methode verwenden.';
+$lang['db_must_use_index'] = 'Für eine Stapelaktualisierung müssen Sie einen passenden Index bestimmen.';
+$lang['db_batch_missing_index'] = 'Eine oder mehrere angegebene Zeilen für eine Stapelaktualisierung haben einen fehlenden Index.';
+$lang['db_must_use_where'] = 'Aktualisierungen sind nicht erlaubt, solange Sie nicht eine "where" Bedingung enthalten.';
+$lang['db_del_must_use_where'] = 'Löschungen sind nicht erlaubt, solange Sie nicht eine Bedingung wie "where" oder "like" enthalten.';
+$lang['db_field_param_missing'] = 'Um Felder abzufragen benötigen Sie den Namen der Tabelle als Parameter.';
+$lang['db_unsupported_function'] = 'Die verwendete Datenbank-Plattform unterstützt diese Funktion nicht.';
+$lang['db_transaction_failure'] = 'Transaktions-Fehler: Veränderungen wurden zurückgesetzt.';
+$lang['db_unable_to_drop'] = 'Die angegebene Datenbank kann nicht gelöscht werden.';
+$lang['db_unsupported_feature'] = 'Ihre Datenbank-Plattform unterstützt diese Funktion nicht.';
+$lang['db_unsupported_compression'] = 'Das angegebene Format für die Daten-Komprimierung wird auf Ihrem Server nicht unterstützt.';
+$lang['db_filepath_error'] = 'Die Daten konnten nicht in das angegebene Verzeichnis geschrieben werden.';
+$lang['db_invalid_cache_path'] = 'Der angegebene Pfad für den Cache ist ungültig oder nicht beschreibbar.';
+$lang['db_table_name_required'] = 'Ein Tabellenname wird für diesen Vorgang benötigt.';
+$lang['db_column_name_required'] = 'Ein Spaltenname wird für diesen Vorgang benötigt.';
+$lang['db_column_definition_required'] = 'Eine Spalten-Definition wird für diesen Vorgang benötigt.';
+$lang['db_unable_to_set_charset'] = 'Der Verbindungs-Zeichensatz konnte nicht gesetzt werden: %s';
+$lang['db_error_heading'] = 'Es ist ein Datenbank-Fehler aufgetreten.';
diff --git a/src/application/language/german/email_lang.php b/src/application/language/german/email_lang.php
index e104db52..21e86d17 100644
--- a/src/application/language/german/email_lang.php
+++ b/src/application/language/german/email_lang.php
@@ -1,58 +1,30 @@
 <?php
 /**
- * CodeIgniter
+ * System messages translation for CodeIgniter(tm)
  *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright    Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright    Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT	MIT License
- * @link    https://codeigniter.com
- * @since    Version 1.0.0
- * @filesource
+ * @author	CodeIgniter community
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['email_must_be_array'] = 'The email validation method must be passed an array.';
-$lang['email_invalid_address'] = 'Invalid email address: %s';
-$lang['email_attachment_missing'] = 'Unable to locate the following email attachment: %s';
-$lang['email_attachment_unreadable'] = 'Unable to open this attachment: %s';
-$lang['email_no_from'] = 'Cannot send mail with no "From" header.';
-$lang['email_no_recipients'] = 'You must include recipients: To, Cc, or Bcc';
-$lang['email_send_failure_phpmail'] = 'Unable to send email using PHP mail(). Your server might not be configured to send mail using this method.';
-$lang['email_send_failure_sendmail'] = 'Unable to send email using PHP Sendmail. Your server might not be configured to send mail using this method.';
-$lang['email_send_failure_smtp'] = 'Unable to send email using PHP SMTP. Your server might not be configured to send mail using this method.';
-$lang['email_sent'] = 'Your message has been successfully sent using the following protocol: %s';
-$lang['email_no_socket'] = 'Unable to open a socket to Sendmail. Please check settings.';
-$lang['email_no_hostname'] = 'You did not specify a SMTP hostname.';
-$lang['email_smtp_error'] = 'The following SMTP error was encountered: %s';
-$lang['email_no_smtp_unpw'] = 'Error: You must assign a SMTP username and password.';
-$lang['email_failed_smtp_login'] = 'Failed to send AUTH LOGIN command. Error: %s';
-$lang['email_smtp_auth_un'] = 'Failed to authenticate username. Error: %s';
-$lang['email_smtp_auth_pw'] = 'Failed to authenticate password. Error: %s';
-$lang['email_smtp_data_failure'] = 'Unable to send data: %s';
-$lang['email_exit_status'] = 'Exit status code: %s';
+$lang['email_must_be_array'] = 'Die Methode zur Überprüfung der E-Mail muss in einem Array übergeben werden.';
+$lang['email_invalid_address'] = 'Ungültige E-Mail-Adresse: %s';
+$lang['email_attachment_missing'] = 'Der folgende E-Mail-Anhang konnte nicht gefunden werden: %s';
+$lang['email_attachment_unreadable'] = 'Der folgende Anhang konnte nicht geöffnet werden: %s';
+$lang['email_no_from'] = 'Die E-Mail kann nicht ohne "Absender"-Kopfzeile verschickt werden.';
+$lang['email_no_recipients'] = 'Sie müssen mindestens einen der folgenden Empfänger angeben: To, Cc, oder Bcc';
+$lang['email_send_failure_phpmail'] = 'Die E-Mail konnte mit PHP mail() nicht gesendet werden. Ihr Server ist offenbar nicht konfiguriert, um mit dieser Methode E-Mails zu versenden.';
+$lang['email_send_failure_sendmail'] = 'Die E-Mail konnte mit PHP Sendmail nicht gesendet werden. Der Server ist offenbar nicht konfiguriert, um mit dieser Methode E-Mails zu versenden.';
+$lang['email_send_failure_smtp'] = 'E-Mail konnte mit PHP SMTP nicht gesendet werden. Der Server ist offenbar nicht konfiguriert, um mit dieser Methode E-Mails zu versenden.';
+$lang['email_sent'] = 'Ihre Nachricht wurde erfolgreich über das folgenden Protokoll verschickt: %s';
+$lang['email_no_socket'] = 'Es konnte keine Socket-Verbindung zu Sendmail hergestellt werden. Bitte überprüfen Sie Ihre Einstellungen.';
+$lang['email_no_hostname'] = 'Sie haben keine Angaben zum SMTP-Server vorgenommen.';
+$lang['email_smtp_error'] = 'Der folgenden SMTP-Fehler ist aufgetreten: %s';
+$lang['email_no_smtp_unpw'] = 'Fehler: Sie müssen einen SMTP Usernamen und ein Passwort angeben.';
+$lang['email_failed_smtp_login'] = 'Das Senden des Kommandos AUTH LOGIN ist fehlgeschlagen. Fehler: %s';
+$lang['email_smtp_auth_un'] = 'Der angegebene  Username konnte nicht authentifiziert werden. Fehler: %s';
+$lang['email_smtp_auth_pw'] = 'Das angegebene Passwort konnte nicht authentifiziert werden. Fehler: %s';
+$lang['email_smtp_data_failure'] = 'Die Daten konnten nicht gesendet werden: %s';
+$lang['email_exit_status'] = 'Abbruch Status-Code: %s';
diff --git a/src/application/language/german/migration_lang.php b/src/application/language/german/migration_lang.php
index 66aafa3b..fd0d499c 100644
--- a/src/application/language/german/migration_lang.php
+++ b/src/application/language/german/migration_lang.php
@@ -1,13 +1,19 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php
+/**
+ * System messages translation for CodeIgniter(tm)
+ *
+ * @author	CodeIgniter community
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
+ */
+defined('BASEPATH') OR exit('No direct script access allowed');
 
-$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.";
-
-
-/* End of file migration_lang.php */
-/* Location: ./system/language/german/migration_lang.php */
+$lang['migration_none_found']		= 'Es wurde keine Migration gefunden.';
+$lang['migration_not_found']		= 'Die Migration mit der Versionsnummer %s wurde nicht gefunden.';
+$lang['migration_sequence_gap']		= 'Es besteht eine Lücke in der Migrationsfolge nahe der Versionsnummer: %s.';
+$lang['migration_multiple_version']	= 'Es existieren mehrere Migrationen mit der gleichen Versionsnummer: %s.';
+$lang['migration_class_doesnt_exist']	= 'Die Migrationsklasse "%s" konnte nicht gefunden werden.';
+$lang['migration_missing_up_method']	= 'Der Migrationsklasse "%s" fehlt eine "up" Methode.';
+$lang['migration_missing_down_method']	= 'Der Migrationsklasse "%s" fehlt eine "down" Methode.';
+$lang['migration_invalid_filename']	= 'Migration "%s" hat einen ungültigen Dateinamen.';
diff --git a/src/application/language/german/translations_lang.php b/src/application/language/german/translations_lang.php
index c6e469ed..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';
@@ -225,7 +224,7 @@ $lang['unexpected_issues_occurred'] = 'Unerwartete Probleme aufgetreten!';
 $lang['service_communication_error'] = 'Während der Kommunikation mit dem Server ist ein Fehler aufgetreten, bitte versuchen Sie es erneut.';
 $lang['no_privileges_edit_appointments'] = 'Sie haben nicht die Berechtigung, um Termine zu bearbeiten.';
 $lang['unavailable_updated'] = 'Nicht zur Verfügung stehender Zeitraum erfolgreich erneuert worden!';
-$lang['appointments'] = 'Terminen';
+$lang['appointments'] = 'Termine';
 $lang['unexpected_warnings'] = 'Unerwartete Warnungen';
 $lang['unexpected_warnings_message'] = 'Der Vorgang wurde abgeschlossen, aber einige Warnungen erscheint.';
 $lang['filter'] = 'Filtern';
diff --git a/src/application/language/greek/db_lang.php b/src/application/language/greek/db_lang.php
index b9da89b1..a3310352 100644
--- a/src/application/language/greek/db_lang.php
+++ b/src/application/language/greek/db_lang.php
@@ -1,63 +1,36 @@
-<?php
+<?php 
 /**
- * CodeIgniter
+ * System messages translation for CodeIgniter(tm)
  *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright    Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright    Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT	MIT License
- * @link    https://codeigniter.com
- * @since    Version 1.0.0
- * @filesource
+ * @author	CodeIgniter community
+ * @author	Grigoris Charamidis
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['db_invalid_connection_str'] = 'Unable to determine the database settings based on the connection string you submitted.';
-$lang['db_unable_to_connect'] = 'Unable to connect to your database server using the provided settings.';
-$lang['db_unable_to_select'] = 'Unable to select the specified database: %s';
-$lang['db_unable_to_create'] = 'Unable to create the specified database: %s';
-$lang['db_invalid_query'] = 'The query you submitted is not valid.';
-$lang['db_must_set_table'] = 'You must set the database table to be used with your query.';
-$lang['db_must_use_set'] = 'You must use the "set" method to update an entry.';
-$lang['db_must_use_index'] = 'You must specify an index to match on for batch updates.';
-$lang['db_batch_missing_index'] = 'One or more rows submitted for batch updating is missing the specified index.';
-$lang['db_must_use_where'] = 'Updates are not allowed unless they contain a "where" clause.';
-$lang['db_del_must_use_where'] = 'Deletes are not allowed unless they contain a "where" or "like" clause.';
-$lang['db_field_param_missing'] = 'To fetch fields requires the name of the table as a parameter.';
-$lang['db_unsupported_function'] = 'This feature is not available for the database you are using.';
-$lang['db_transaction_failure'] = 'Transaction failure: Rollback performed.';
-$lang['db_unable_to_drop'] = 'Unable to drop the specified database.';
-$lang['db_unsupported_feature'] = 'Unsupported feature of the database platform you are using.';
-$lang['db_unsupported_compression'] = 'The file compression format you chose is not supported by your server.';
-$lang['db_filepath_error'] = 'Unable to write data to the file path you have submitted.';
-$lang['db_invalid_cache_path'] = 'The cache path you submitted is not valid or writable.';
-$lang['db_table_name_required'] = 'A table name is required for that operation.';
-$lang['db_column_name_required'] = 'A column name is required for that operation.';
-$lang['db_column_definition_required'] = 'A column definition is required for that operation.';
-$lang['db_unable_to_set_charset'] = 'Unable to set client connection character set: %s';
-$lang['db_error_heading'] = 'A Database Error Occurred';
+$lang['db_invalid_connection_str'] = 'Αδυναμία να ρυθμιστεί η βάση δεδομένων με τα στοιχεία σύνδεσης που υποβάλλονται.';
+$lang['db_unable_to_connect'] = 'Δεν είναι δυνατή η σύνδεση με την βάση δεδομένων σας, παρακαλώ ελέγξτε τα στοιχεία σύνδεσης.';
+$lang['db_unable_to_select'] = 'Αδυναμία να επιλέξετε την βάση δεδομένων: %s';
+$lang['db_unable_to_create'] = 'Αδυναμία δημιουργίας βάσης δεδομένων: %s';
+$lang['db_invalid_query'] = 'Λανθασμένο ερώτημα στην βάση δεδομένων.';
+$lang['db_must_set_table'] = 'Θα πρέπει να ορίσετε τον πίνακα της βάσης δεδομένων σας στο ερωτημά σας.';
+$lang['db_must_use_set'] = 'Θα πρέπει να χρησιμοποιήσετε το "set" για να ενημερώσετε μια καταχώρηση.';
+$lang['db_must_use_index'] = 'Θα πρέπει να ορίσετε ένα δείκτη για να ταιριάζει στις μαζικές ενημερώσεις.';
+$lang['db_batch_missing_index'] = 'Σε μία ή περισσότερες εγγραφές που υποβλήθηκαν για ανανέωση λείπει ο δείκτης';
+$lang['db_must_use_where'] = 'Η ενημέρωση δεν επιτρέπεται γιατί λείπει το "where" απο το ερώτημα.';
+$lang['db_del_must_use_where'] = 'Η διαγραφή δεν επιτρέπεται εαν δεν περιέχει το "where" ή το "like".';
+$lang['db_field_param_missing'] = 'Για να δείτε τα πεδία απαιτείται το όνομα του πίνακα ως παράμετρος.';
+$lang['db_unsupported_function'] = 'Αυτή η λειτουργία δεν είναι διαθέσιμη για τη βάση δεδομένων που χρησιμοποιείτε.';
+$lang['db_transaction_failure'] = 'Αποτυχημένη συναλλαγή: Επαναφορά εκτέλεσης.';
+$lang['db_unable_to_drop'] = 'Αδυναμία διαγραφής της συγκεκριμένης βάσης δεδομένων.';
+$lang['db_unsupported_feature'] = 'Μη υποστηριζόμενη λειτουργία για την βάση δεδομένων που χρησιμοποιείτε.';
+$lang['db_unsupported_compression'] = 'Η μορφή συμπίεσης αρχείων που επιλέξατε δεν υποστηρίζεται από το διακομιστή σας.';
+$lang['db_filepath_error'] = 'Δεν είναι δυνατή η εγγραφή δεδομένων στην διαδρομή του αρχείου που έχετε υποβάλει.';
+$lang['db_invalid_cache_path'] = 'Η διαδρομή της μνήμης cache που υποβάλατε δεν είναι έγκυρη ή εγγράψιμη.';
+$lang['db_table_name_required'] = 'Το όνομα του πίνακα απαιτείται για την εν λόγω διαδικασία.';
+$lang['db_column_name_required'] = 'Το όνομα του πεδίου απαιτείται για την εν λόγω διαδικασία.';
+$lang['db_column_definition_required'] = 'Για αυτην την διαδικασία απαιτείται ο ορισμός του πεδίου.';
+$lang['db_unable_to_set_charset'] = 'Δεν είναι δυνατό να ορίσετε το σύνολο χαρακτήρων σύνδεσης πελάτη: %s';
+$lang['db_error_heading'] = 'Δημιουργήθηκε λάθος στην βάση δεδομένων';
diff --git a/src/application/language/greek/email_lang.php b/src/application/language/greek/email_lang.php
index e104db52..009ee0e8 100644
--- a/src/application/language/greek/email_lang.php
+++ b/src/application/language/greek/email_lang.php
@@ -1,58 +1,31 @@
 <?php
 /**
- * CodeIgniter
+ * System messages translation for CodeIgniter(tm)
  *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright    Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright    Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT	MIT License
- * @link    https://codeigniter.com
- * @since    Version 1.0.0
- * @filesource
+ * @author	CodeIgniter community
+ * @author	Grigoris Charamidis
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['email_must_be_array'] = 'The email validation method must be passed an array.';
-$lang['email_invalid_address'] = 'Invalid email address: %s';
-$lang['email_attachment_missing'] = 'Unable to locate the following email attachment: %s';
-$lang['email_attachment_unreadable'] = 'Unable to open this attachment: %s';
-$lang['email_no_from'] = 'Cannot send mail with no "From" header.';
-$lang['email_no_recipients'] = 'You must include recipients: To, Cc, or Bcc';
-$lang['email_send_failure_phpmail'] = 'Unable to send email using PHP mail(). Your server might not be configured to send mail using this method.';
-$lang['email_send_failure_sendmail'] = 'Unable to send email using PHP Sendmail. Your server might not be configured to send mail using this method.';
-$lang['email_send_failure_smtp'] = 'Unable to send email using PHP SMTP. Your server might not be configured to send mail using this method.';
-$lang['email_sent'] = 'Your message has been successfully sent using the following protocol: %s';
-$lang['email_no_socket'] = 'Unable to open a socket to Sendmail. Please check settings.';
-$lang['email_no_hostname'] = 'You did not specify a SMTP hostname.';
-$lang['email_smtp_error'] = 'The following SMTP error was encountered: %s';
-$lang['email_no_smtp_unpw'] = 'Error: You must assign a SMTP username and password.';
-$lang['email_failed_smtp_login'] = 'Failed to send AUTH LOGIN command. Error: %s';
-$lang['email_smtp_auth_un'] = 'Failed to authenticate username. Error: %s';
-$lang['email_smtp_auth_pw'] = 'Failed to authenticate password. Error: %s';
-$lang['email_smtp_data_failure'] = 'Unable to send data: %s';
-$lang['email_exit_status'] = 'Exit status code: %s';
+$lang['email_must_be_array'] = 'Η μέθοδος email validation πρέπει να περάσει απο έναν πίνακα.';
+$lang['email_invalid_address'] = 'Μη έγκυρη διεύθυνση e-mail: %s';
+$lang['email_attachment_missing'] = 'Αδυναμία να εντοπιστεί το ακόλουθο συνημμένο ηλεκτρονικού ταχυδρομείου: %s';
+$lang['email_attachment_unreadable'] = 'Δεν είναι δυνατό να ανοίξει αυτό το συνημμένο: %s';
+$lang['email_no_from'] = 'Δεν μπορείτε να στείλετε email χωρίς την "From" κεφαλίδα.';
+$lang['email_no_recipients'] = 'Θα πρέπει να συμπεριλάβετε αποδέκτες: To, Cc, or Bcc';
+$lang['email_send_failure_phpmail'] = 'Δεν μπορεί να σταλθεί e-mail χρησιμοποιώντας την PHP mail(). Ο διακομιστής σας δεν έχει ρυθμιστεί για να στέλνει email με αυτήν την μέθοδο.';
+$lang['email_send_failure_sendmail'] = 'Δεν μπορεί να σταλθεί e-mail χρησιμοποιώντας την PHP Sendmail. Ο διακομιστής σας δεν έχει ρυθμιστεί για να στέλνει email με αυτήν την μέθοδο.';
+$lang['email_send_failure_smtp'] = 'Δεν μπορεί να σταλθεί e-mail χρησιμοποιώντας την PHP SMTP. Ο διακομιστής σας δεν έχει ρυθμιστεί για να στέλνει email με αυτήν την μέθοδο.';
+$lang['email_sent'] = 'Το μήνυμά σας έχει σταλεί με επιτυχία χρησιμοποιώντας το ακόλουθο πρωτόκολλο: %s';
+$lang['email_no_socket'] = 'Δεν είναι δυνατό να ανοίξει μια υποδοχή με το Sendmail. Παρακαλώ ελέγξτε τις ρυθμίσεις του.';
+$lang['email_no_hostname'] = 'Δεν καθορίσατε ένα όνομα SMTP.';
+$lang['email_smtp_error'] = 'Το ακόλουθο σφάλμα SMTP έχει εμφανιστεί: %s';
+$lang['email_no_smtp_unpw'] = 'Σφάλμα: Θα πρέπει να ορίσετε ένα όνομα χρήστη και κωδικό πρόσβασης SMTP.';
+$lang['email_failed_smtp_login'] = 'Αποτυχία ελέγχου ταυτότητας που στείλατε. Σφαλμα: %s';
+$lang['email_smtp_auth_un'] = 'Αποτυχία ελέγχου ταυτότητας username. Σφάλμα: %s';
+$lang['email_smtp_auth_pw'] = 'Αποτυχία ελέγχου ταυτότητας password. Σφάλμα: %s';
+$lang['email_smtp_data_failure'] = 'Αδυναμία αποστολής δεδομένων: %s';
+$lang['email_exit_status'] = 'Κωδικός εξόδου κατάστασης: %s';
diff --git a/src/application/language/greek/migration_lang.php b/src/application/language/greek/migration_lang.php
index bb6cb2c3..b6871839 100644
--- a/src/application/language/greek/migration_lang.php
+++ b/src/application/language/greek/migration_lang.php
@@ -1,13 +1,20 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php
+/**
+ * System messages translation for CodeIgniter(tm)
+ *
+ * @author	CodeIgniter community
+ * @author	Grigoris Charamidis
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
+ */
+defined('BASEPATH') OR exit('No direct script access allowed');
 
-$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.";
-
-
-/* End of file migration_lang.php */
-/* Location: ./system/language/greek/migration_lang.php */
+$lang['migration_none_found'] = 'Δεν βρέθηκαν migrations.';
+$lang['migration_not_found'] = 'Όχι migrations, θα μπορούσε να βρεθεί με τον αριθμό έκδοσης: %s.';
+$lang['migration_sequence_gap'] = 'Υπάρχει ένα κενό στην ακολουθία του migration στους κοντινούς αριθμούς έκδοσης: %s.';
+$lang['migration_multiple_version'] = 'Υπάρχουν πολλαπλά migrations με τον ίδιο αριθμό έκδοσης: %s.';
+$lang['migration_class_doesnt_exist'] = 'Η migration class "%s" δεν μπορεί να βρεθεί.';
+$lang['migration_missing_up_method'] = 'Απο την migration class "%s" λείπει η "up" μέθοδος.';
+$lang['migration_missing_down_method'] = 'Απο την migration class "%s" λείπει η "down" μέθοδος.';
+$lang['migration_invalid_filename'] = 'Migration "%s" έχει ένα μη εγκυρο όνομα.';
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/db_lang.php b/src/application/language/hindi/db_lang.php
index b9da89b1..cf4c8fd3 100644
--- a/src/application/language/hindi/db_lang.php
+++ b/src/application/language/hindi/db_lang.php
@@ -1,63 +1,35 @@
 <?php
 /**
- * CodeIgniter
+ * System messages translation for CodeIgniter(tm)
  *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright    Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright    Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT	MIT License
- * @link    https://codeigniter.com
- * @since    Version 1.0.0
- * @filesource
+ * @author	CodeIgniter community
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Pieter Krul
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
  */
-defined('BASEPATH') OR exit('No direct script access allowed');
-
-$lang['db_invalid_connection_str'] = 'Unable to determine the database settings based on the connection string you submitted.';
-$lang['db_unable_to_connect'] = 'Unable to connect to your database server using the provided settings.';
-$lang['db_unable_to_select'] = 'Unable to select the specified database: %s';
-$lang['db_unable_to_create'] = 'Unable to create the specified database: %s';
-$lang['db_invalid_query'] = 'The query you submitted is not valid.';
-$lang['db_must_set_table'] = 'You must set the database table to be used with your query.';
-$lang['db_must_use_set'] = 'You must use the "set" method to update an entry.';
-$lang['db_must_use_index'] = 'You must specify an index to match on for batch updates.';
-$lang['db_batch_missing_index'] = 'One or more rows submitted for batch updating is missing the specified index.';
-$lang['db_must_use_where'] = 'Updates are not allowed unless they contain a "where" clause.';
-$lang['db_del_must_use_where'] = 'Deletes are not allowed unless they contain a "where" or "like" clause.';
-$lang['db_field_param_missing'] = 'To fetch fields requires the name of the table as a parameter.';
-$lang['db_unsupported_function'] = 'This feature is not available for the database you are using.';
-$lang['db_transaction_failure'] = 'Transaction failure: Rollback performed.';
-$lang['db_unable_to_drop'] = 'Unable to drop the specified database.';
-$lang['db_unsupported_feature'] = 'Unsupported feature of the database platform you are using.';
-$lang['db_unsupported_compression'] = 'The file compression format you chose is not supported by your server.';
-$lang['db_filepath_error'] = 'Unable to write data to the file path you have submitted.';
-$lang['db_invalid_cache_path'] = 'The cache path you submitted is not valid or writable.';
-$lang['db_table_name_required'] = 'A table name is required for that operation.';
-$lang['db_column_name_required'] = 'A column name is required for that operation.';
-$lang['db_column_definition_required'] = 'A column definition is required for that operation.';
-$lang['db_unable_to_set_charset'] = 'Unable to set client connection character set: %s';
-$lang['db_error_heading'] = 'A Database Error Occurred';
+defined('BASEPATH') OR exit('Directe toegang tot scripts is niet toegestaan');
+$lang['db_invalid_connection_str'] = 'मैं कनेक्शन डेटा का उपयोग कर डेटाबेस के लिए सेटिंग्स का निर्धारण करने में असमर्थ हूँ।';
+$lang['db_unable_to_connect'] = 'मैं निर्दिष्ट जानकारी के साथ डेटाबेस से कनेक्ट करने में असमर्थ हूँ।';
+$lang['db_unable_to_select'] = 'मैं डेटाबेस का उपयोग करने में असमर्थ हूँ:% s';
+$lang['db_unable_to_create'] = 'मैं डेटाबेस बनाने के लिए असमर्थ हूँ:% s';
+$lang['db_invalid_query'] = 'डेटाबेस के लिए बनाया क्वेरी अच्छी तरह से तैयार नहीं है।';
+$lang['db_must_set_table'] = 'यह डेटाबेस से मेज के नाम का उल्लेख करना अनिवार्य है।';
+$lang['db_must_use_set'] = 'डेटाबेस आप एक नियम बदलना चाहते हैं, तो "सेट" आदेश में नामित है कि मिल जाएगा।एगा।';
+$lang['db_must_use_index'] = 'डेटाबेस एक सूचकांक के नाम इस बैच के अपडेट के लिए आवश्यकता का उल्लेख किया जा सकता है।';
+$lang['db_batch_missing_index'] = 'एक बैच अद्यतन करने के लिए नियम हैं, जबकि निर्दिष्ट सूचकांक, लापता।';
+$lang['db_must_use_where'] = 'अद्यतन एक "Where" खंड के बिना अनुमति नहीं है।';
+$lang['db_del_must_use_where'] = 'हटाना एक "WHERE" या "LIKE" खंड के बिना अनुमति नहीं है।';
+$lang['db_field_param_missing'] = 'यह भी उल्लेख किया जाना चाहिए टेबल क्षेत्रों के नाम को पुनः प्राप्त करने में सक्षम हो।';
+$lang['db_unsupported_function'] = 'यही कारण है कि इस सुविधा का डेटाबेस के इस संस्करण के द्वारा समर्थित नहीं है।';
+$lang['db_transaction_failure'] = 'ट्रांजेक्शन में त्रुटि: रॉलबैक किया गया है';
+$lang['db_unable_to_drop'] = 'मैं इस प्रणाली की निर्दिष्ट डेटाबेस को नष्ट करने में असमर्थ हूँ।';
+$lang['db_unsupported_feature'] = 'इस डेटाबेस प्लेटफॉर्म नहीं की अनुमति देता है।';
+$lang['db_unsupported_compression'] = 'सर्वर इस संपीड़न विधि नहीं जानता है।';
+$lang['db_filepath_error'] = 'सिस्टम निर्दिष्ट फ़ाइल के लिए नहीं लिख सकता।';
+$lang['db_invalid_cache_path'] = 'सिस्टम कैश करने के लिए नहीं लिख सकते हैं, और यह सही फ़ाइल है कि क्या यह स्पष्ट नहीं है।';
+$lang['db_table_name_required'] = 'इस कार्रवाई के लिए, टेबल नाम की आवश्यकता है।';
+$lang['db_column_name_required'] = 'इस कार्रवाई के लिए, स्तंभ नाम की आवश्यकता है।';
+$lang['db_column_definition_required'] = 'यह क्रिया एक स्तंभ परिभाषा अनिवार्य निर्दिष्ट करना आवश्यक है।';
+$lang['db_unable_to_set_charset'] = 'अक्षर समूह (कैरक्टर सेट ) सेट करने के लिए असमर्थ ';
+$lang['db_error_heading'] = 'एक डेटाबेस त्रुटि पायी गयी है ';
diff --git a/src/application/language/hindi/email_lang.php b/src/application/language/hindi/email_lang.php
index e104db52..6f873793 100644
--- a/src/application/language/hindi/email_lang.php
+++ b/src/application/language/hindi/email_lang.php
@@ -1,58 +1,30 @@
 <?php
 /**
- * CodeIgniter
- *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright    Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright    Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT	MIT License
- * @link    https://codeigniter.com
- * @since    Version 1.0.0
- * @filesource
- */
-defined('BASEPATH') OR exit('No direct script access allowed');
-
-$lang['email_must_be_array'] = 'The email validation method must be passed an array.';
-$lang['email_invalid_address'] = 'Invalid email address: %s';
-$lang['email_attachment_missing'] = 'Unable to locate the following email attachment: %s';
-$lang['email_attachment_unreadable'] = 'Unable to open this attachment: %s';
-$lang['email_no_from'] = 'Cannot send mail with no "From" header.';
-$lang['email_no_recipients'] = 'You must include recipients: To, Cc, or Bcc';
-$lang['email_send_failure_phpmail'] = 'Unable to send email using PHP mail(). Your server might not be configured to send mail using this method.';
-$lang['email_send_failure_sendmail'] = 'Unable to send email using PHP Sendmail. Your server might not be configured to send mail using this method.';
-$lang['email_send_failure_smtp'] = 'Unable to send email using PHP SMTP. Your server might not be configured to send mail using this method.';
-$lang['email_sent'] = 'Your message has been successfully sent using the following protocol: %s';
-$lang['email_no_socket'] = 'Unable to open a socket to Sendmail. Please check settings.';
-$lang['email_no_hostname'] = 'You did not specify a SMTP hostname.';
-$lang['email_smtp_error'] = 'The following SMTP error was encountered: %s';
-$lang['email_no_smtp_unpw'] = 'Error: You must assign a SMTP username and password.';
-$lang['email_failed_smtp_login'] = 'Failed to send AUTH LOGIN command. Error: %s';
-$lang['email_smtp_auth_un'] = 'Failed to authenticate username. Error: %s';
-$lang['email_smtp_auth_pw'] = 'Failed to authenticate password. Error: %s';
-$lang['email_smtp_data_failure'] = 'Unable to send data: %s';
-$lang['email_exit_status'] = 'Exit status code: %s';
+* System messages translation for CodeIgniter(tm)
+*
+* @author	CodeIgniter community
+* @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+* @copyright	Pieter Krul
+* @license	http://opensource.org/licenses/MIT MIT License
+* @link	https://codeigniter.com
+*/
+defined('BASEPATH') OR exit('Directe toegang tot scripts is niet toegestaan');
+$lang['email_must_be_array'] = 'ईमेल सत्यापन विधि को  सरणी (array) भेजी जानी चाहिए।';
+$lang['email_invalid_address'] = 'अवैध ईमेल पता है:% s';
+$lang['email_attachment_missing'] = '% S: निम्नलिखित ईमेल संलग्नक (अटैचमेंट) पता लगाने में असमर्थ';
+$lang['email_attachment_unreadable'] = 'अटैचमेंट खोलने के  असमर्थ :% s';
+$lang['email_no_from'] = 'From हेडर के बिना मेल नहीं भेज सकते हैं।';
+$lang['email_no_recipients'] = 'To, CC, BCC  प्राप्तकर्ताओं को शामिल करना जरुरी है ';
+$lang['email_send_failure_phpmail'] = 'PHP mail() का उपयोग करके ईमेल  भेजने में असमर्थ। आपका सर्वर इस पद्धति का उपयोग करके मेल भेजने के लिए शायद  कॉन्फ़िगर नहीं किया गया है';
+$lang['email_send_failure_sendmail'] = 'PHP sendmail का उपयोग करके ईमेल  भेजने में असमर्थ। आपका सर्वर इस पद्धति का उपयोग करके मेल भेजने के लिए शायद  कॉन्फ़िगर नहीं किया गया है';
+$lang['email_send_failure_smtp'] = 'PHP SMTP  का उपयोग करके ईमेल  भेजने में असमर्थ। आपका सर्वर इस पद्धति का उपयोग करके मेल भेजने के लिए शायद  कॉन्फ़िगर नहीं किया गया है';
+$lang['email_sent'] = 'आपका संदेश सफलतापूर्वक दिए गए प्रोटोकॉल का उपयोग करके भेज दिया गया है:% s';
+$lang['email_no_socket'] = 'सेंडमेल करने के लिए सॉकेट खोलने में असमर्थ। सेटिंग्स की जाँच करें।';
+$lang['email_no_hostname'] = 'आपने SMTP होस्टनेम  निर्दिष्ट नहीं किया है';
+$lang['email_smtp_error'] = 'निम्नलिखित एसएमटीपी त्रुटि आई है:% s';
+$lang['email_no_smtp_unpw'] = 'त्रुटि: एसएमटीपी यूज़रनेम और पासवर्ड प्रदान करना जरुरी है';
+$lang['email_failed_smtp_login'] = 'Auth लॉग इन कमांड भेजने में विफल। त्रुटि:% s';
+$lang['email_smtp_auth_un'] = 'उपयोगकर्ता नाम को प्रमाणित करने में विफल। त्रुटि:% s';
+$lang['email_smtp_auth_pw'] = 'पासवर्ड प्रमाणित करने में विफल। त्रुटि:% s';
+$lang['email_smtp_data_failure'] = 'डेटा भेजने के लिए असमर्थ : % s';
+$lang['email_exit_status'] = 'एग्जिट स्थिति कोड है:% s';
diff --git a/src/application/language/hindi/migration_lang.php b/src/application/language/hindi/migration_lang.php
index b5e1b911..ca07441b 100644
--- a/src/application/language/hindi/migration_lang.php
+++ b/src/application/language/hindi/migration_lang.php
@@ -1,13 +1,19 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php
+/**
+* System messages translation for CodeIgniter(tm)
+*
+* @author	CodeIgniter community
+* @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+* @license	http://opensource.org/licenses/MIT MIT License
+* @link	https://codeigniter.com
+*/
+defined('BASEPATH') OR exit('No direct script access allowed');
 
-$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.";
-
-
-/* End of file migration_lang.php */
-/* Location: ./system/language/english/migration_lang.php */
+$lang['migration_none_found'] = 'कोई माइग्रेशन नहीं पाए गए।';
+$lang['migration_not_found'] = 'कोई माइग्रेशन वर्जन नंबर के साथनहीं नहीं पाया जा सका:% s।';
+$lang['migration_sequence_gap'] = 'वर्जन नंबर %s के निकट माइग्रेशन अनुक्रम में एक अंतर है। ';
+$lang['migration_multiple_version'] = 'वर्जन नंबर %s के जैसे कई माइग्रेशन पाये गए हैं।';
+$lang['migration_class_doesnt_exist'] = 'माइग्रेशन क्लास "%s" नहीं पाया जा सका।';
+$lang['migration_missing_up_method'] = 'माइग्रेशन क्लास "%s" में "up" मेथड मौजूद नहीं है।';
+$lang['migration_missing_down_method'] = 'माइग्रेशन क्लास "%s" में "down" मेथड मौजूद नहीं है।';
+$lang['migration_invalid_filename'] = 'माइग्रेशन "%s" एक अवैध फाइल नाम है।';
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/db_lang.php b/src/application/language/hungarian/db_lang.php
index b9da89b1..a2aa47ea 100644
--- a/src/application/language/hungarian/db_lang.php
+++ b/src/application/language/hungarian/db_lang.php
@@ -1,63 +1,35 @@
 <?php
 /**
- * CodeIgniter
+ * System messages translation for CodeIgniter(tm)
  *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright    Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright    Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT	MIT License
- * @link    https://codeigniter.com
- * @since    Version 1.0.0
- * @filesource
+ * @author		CodeIgniter community
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license		http://opensource.org/licenses/MIT	MIT License
+ * @link		https://codeigniter.com
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['db_invalid_connection_str'] = 'Unable to determine the database settings based on the connection string you submitted.';
-$lang['db_unable_to_connect'] = 'Unable to connect to your database server using the provided settings.';
-$lang['db_unable_to_select'] = 'Unable to select the specified database: %s';
-$lang['db_unable_to_create'] = 'Unable to create the specified database: %s';
-$lang['db_invalid_query'] = 'The query you submitted is not valid.';
-$lang['db_must_set_table'] = 'You must set the database table to be used with your query.';
-$lang['db_must_use_set'] = 'You must use the "set" method to update an entry.';
-$lang['db_must_use_index'] = 'You must specify an index to match on for batch updates.';
-$lang['db_batch_missing_index'] = 'One or more rows submitted for batch updating is missing the specified index.';
-$lang['db_must_use_where'] = 'Updates are not allowed unless they contain a "where" clause.';
-$lang['db_del_must_use_where'] = 'Deletes are not allowed unless they contain a "where" or "like" clause.';
-$lang['db_field_param_missing'] = 'To fetch fields requires the name of the table as a parameter.';
-$lang['db_unsupported_function'] = 'This feature is not available for the database you are using.';
-$lang['db_transaction_failure'] = 'Transaction failure: Rollback performed.';
-$lang['db_unable_to_drop'] = 'Unable to drop the specified database.';
-$lang['db_unsupported_feature'] = 'Unsupported feature of the database platform you are using.';
-$lang['db_unsupported_compression'] = 'The file compression format you chose is not supported by your server.';
-$lang['db_filepath_error'] = 'Unable to write data to the file path you have submitted.';
-$lang['db_invalid_cache_path'] = 'The cache path you submitted is not valid or writable.';
-$lang['db_table_name_required'] = 'A table name is required for that operation.';
-$lang['db_column_name_required'] = 'A column name is required for that operation.';
-$lang['db_column_definition_required'] = 'A column definition is required for that operation.';
-$lang['db_unable_to_set_charset'] = 'Unable to set client connection character set: %s';
-$lang['db_error_heading'] = 'A Database Error Occurred';
+$lang['db_invalid_connection_str']		= 'A megadott karaterláncből nem sikerült megállapítani az adatbázis beállításait.';
+$lang['db_unable_to_connect']			= 'Nem sikerült az adatbázishoz kapcsolódni a megadott beállításokkal.';
+$lang['db_unable_to_select']			= 'A megadott adatbázis kiválasztása sikertelen: %s';
+$lang['db_unable_to_create']			= 'A megadott adatbázis létrehozása sikertelen: %s';
+$lang['db_invalid_query']				= 'A megadott lekérdezés nem érvényes.';
+$lang['db_must_set_table']				= 'Az adatbázis táblát meg kell adni a lekérdezés futtatásához.';
+$lang['db_must_use_set']				= 'A "set" metódust kell használni egy bejegyzés frissítéséhez.';
+$lang['db_must_use_index']				= 'A kötegelt frissítéshez egy egyező index megadása szükséges.';
+$lang['db_batch_missing_index']			= 'A kötegelt frissítés egy vagy több sorában hiányzik az index megadása.';
+$lang['db_must_use_where']				= 'A frissítések csak akkor engedélyezettek, ha tartalmaznak "where" szelekciót.';
+$lang['db_del_must_use_where']			= 'A törlések csak akkor engedélyezettek, ha tartalmaznak "where" vagy "like" szelekciót.';
+$lang['db_field_param_missing']			= 'A mezők lekéréséhez a tábla nevének paraméterként történő megadása szükséges.';
+$lang['db_unsupported_function']		= 'Ez a függvény nem elérhető a használt adatbázis esetén.';
+$lang['db_transaction_failure']			= 'Tranzakció hiba, a visszavonás (rollback) megtörtént.';
+$lang['db_unable_to_drop']				= 'A megadott adatbázis eldobása sikertelen.';
+$lang['db_unsupported_feature']			= 'Ez a szolgáltatás nem elérhető a használt adatbázis esetén.';
+$lang['db_unsupported_compression']		= 'A választott fájl tömörítési eljárást nem támogatja a szerver.';
+$lang['db_filepath_error']				= 'Nem sikerült adatot írni a megadott könyvtárba.';
+$lang['db_invalid_cache_path']			= 'A megadott gyorsítótár könyvtár érvénytelen vagy nem írható.';
+$lang['db_table_name_required']			= 'Ehhez a művelethez egy táblanév megadása szükséges.';
+$lang['db_column_name_required']		= 'Ehhez a művelethez egy oszlopnév megadása szükséges.';
+$lang['db_column_definition_required']	= 'Ehhez a művelethez egy oszlop specifikáció megadása szükséges.';
+$lang['db_unable_to_set_charset']		= 'Nem sikerült az adatbázis kapcsolat karakterkódolását beállítani: %s';
+$lang['db_error_heading']				= 'Adatbázis hiba';
\ No newline at end of file
diff --git a/src/application/language/hungarian/email_lang.php b/src/application/language/hungarian/email_lang.php
index e104db52..d4eb7752 100644
--- a/src/application/language/hungarian/email_lang.php
+++ b/src/application/language/hungarian/email_lang.php
@@ -1,58 +1,30 @@
 <?php
 /**
- * CodeIgniter
+ * System messages translation for CodeIgniter(tm)
  *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright    Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright    Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT	MIT License
- * @link    https://codeigniter.com
- * @since    Version 1.0.0
- * @filesource
+ * @author		CodeIgniter community
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license		http://opensource.org/licenses/MIT	MIT License
+ * @link		https://codeigniter.com
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['email_must_be_array'] = 'The email validation method must be passed an array.';
-$lang['email_invalid_address'] = 'Invalid email address: %s';
-$lang['email_attachment_missing'] = 'Unable to locate the following email attachment: %s';
-$lang['email_attachment_unreadable'] = 'Unable to open this attachment: %s';
-$lang['email_no_from'] = 'Cannot send mail with no "From" header.';
-$lang['email_no_recipients'] = 'You must include recipients: To, Cc, or Bcc';
-$lang['email_send_failure_phpmail'] = 'Unable to send email using PHP mail(). Your server might not be configured to send mail using this method.';
-$lang['email_send_failure_sendmail'] = 'Unable to send email using PHP Sendmail. Your server might not be configured to send mail using this method.';
-$lang['email_send_failure_smtp'] = 'Unable to send email using PHP SMTP. Your server might not be configured to send mail using this method.';
-$lang['email_sent'] = 'Your message has been successfully sent using the following protocol: %s';
-$lang['email_no_socket'] = 'Unable to open a socket to Sendmail. Please check settings.';
-$lang['email_no_hostname'] = 'You did not specify a SMTP hostname.';
-$lang['email_smtp_error'] = 'The following SMTP error was encountered: %s';
-$lang['email_no_smtp_unpw'] = 'Error: You must assign a SMTP username and password.';
-$lang['email_failed_smtp_login'] = 'Failed to send AUTH LOGIN command. Error: %s';
-$lang['email_smtp_auth_un'] = 'Failed to authenticate username. Error: %s';
-$lang['email_smtp_auth_pw'] = 'Failed to authenticate password. Error: %s';
-$lang['email_smtp_data_failure'] = 'Unable to send data: %s';
-$lang['email_exit_status'] = 'Exit status code: %s';
+$lang['email_must_be_array']			= 'Az email validációs metódusnak tömböt kell átadni.';
+$lang['email_invalid_address']			= 'Érvénytelen email cím: %s';
+$lang['email_attachment_missing']		= 'Nem találhatóak a következő email csatolmányok: %s';
+$lang['email_attachment_unreadable']	= 'A következő csatolmányt nem sikerült megnyitni: %s';
+$lang['email_no_from']					= 'Nem lehetséges emailt küldeni a "From" fejléc megadása nélkül.';
+$lang['email_no_recipients']			= 'Címzetteket meg kell adni: To, Cc, vagy Bcc';
+$lang['email_send_failure_phpmail']		= 'Nem sikerült emailt küldeni a PHP mail() függvénnyel.  Lehetséges, hogy a szerver nincs ennek a módszernek a használatára beállítva.';
+$lang['email_send_failure_sendmail']	= 'Nem sikerült emailt küldeni a PHP Sendmail használatával.  Lehetséges, hogy a szerver nincs ennek a módszernek a használatára beállítva.';
+$lang['email_send_failure_smtp']		= 'Nem sikerült emailt küldeni a PHP SMTP használatával.  Lehetséges, hogy a szerver nincs ennek a módszernek a használatára beállítva.';
+$lang['email_sent']						= 'Az üzenet sikeresen elküldésre került a következő protokoll használatával: %s';
+$lang['email_no_socket']				= 'Nem sikerült socketet nyitni a Sendmailhez. Kérjük ellenőrizze a beállításokat!';
+$lang['email_no_hostname']				= 'Nem adott meg SMTP kiszolgálónevet.';
+$lang['email_smtp_error']				= 'A következő SMTP hiba következett be: %s';
+$lang['email_no_smtp_unpw']				= 'Hiba: Az SMTP felhasználónév és jelszó megadása kötelező.';
+$lang['email_failed_smtp_login']		= 'Nem sikerült az AUTH LOGIN parancs küldése. Hiba: %s';
+$lang['email_smtp_auth_un']				= 'A felhasználónév hitelesítése sikertelen. Hiba: %s';
+$lang['email_smtp_auth_pw']				= 'A jelszó hitelesítése sikertelen. Hiba: %s';
+$lang['email_smtp_data_failure']		= 'Az adatküldés nem lehetséges: %s';
+$lang['email_exit_status']				= 'Kilépési kód: %s';
\ No newline at end of file
diff --git a/src/application/language/hungarian/migration_lang.php b/src/application/language/hungarian/migration_lang.php
index 23a96f0b..a86265e2 100644
--- a/src/application/language/hungarian/migration_lang.php
+++ b/src/application/language/hungarian/migration_lang.php
@@ -1,13 +1,19 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php
+/**
+ * System messages translation for CodeIgniter(tm)
+ *
+ * @author		CodeIgniter community
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license		http://opensource.org/licenses/MIT	MIT License
+ * @link		https://codeigniter.com
+ */
+defined('BASEPATH') OR exit('No direct script access allowed');
 
-$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.";
-
-
-/* End of file migration_lang.php */
-/* Location: ./system/language/hungarian/migration_lang.php */
+$lang['migration_none_found']			= 'Nem találhatóak migrációk.';
+$lang['migration_not_found']			= 'A megadott verziószámú migráció nem található: %s.';
+$lang['migration_sequence_gap']			= 'A migrációk verziószámainak sorrendjében kihagyás található, a következő verziónál: %s.';
+$lang['migration_multiple_version']		= 'Különöböző migrációk egyező verziószámmal: %s.';
+$lang['migration_class_doesnt_exist']	= 'A(z) "%s" migrációs osztály nem található.';
+$lang['migration_missing_up_method']	= 'A(z) "%s" migrációs osztály "up" metódusa nem található.';
+$lang['migration_missing_down_method']	= 'A(z) "%s" migrációs osztály "down" metódusa nem található.';
+$lang['migration_invalid_filename']		= 'A(z) "%s" migráció hibás fájlnévvel rendelkezik.';
\ No newline at end of file
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/db_lang.php b/src/application/language/italian/db_lang.php
index b9da89b1..e6121f6a 100644
--- a/src/application/language/italian/db_lang.php
+++ b/src/application/language/italian/db_lang.php
@@ -1,63 +1,36 @@
 <?php
 /**
- * CodeIgniter
+ * System messages translation for CodeIgniter(tm)
  *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright    Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright    Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT	MIT License
- * @link    https://codeigniter.com
- * @since    Version 1.0.0
- * @filesource
+ * @author	CodeIgniter community
+ * @author	Stefano Mazzega
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['db_invalid_connection_str'] = 'Unable to determine the database settings based on the connection string you submitted.';
-$lang['db_unable_to_connect'] = 'Unable to connect to your database server using the provided settings.';
-$lang['db_unable_to_select'] = 'Unable to select the specified database: %s';
-$lang['db_unable_to_create'] = 'Unable to create the specified database: %s';
-$lang['db_invalid_query'] = 'The query you submitted is not valid.';
-$lang['db_must_set_table'] = 'You must set the database table to be used with your query.';
-$lang['db_must_use_set'] = 'You must use the "set" method to update an entry.';
-$lang['db_must_use_index'] = 'You must specify an index to match on for batch updates.';
-$lang['db_batch_missing_index'] = 'One or more rows submitted for batch updating is missing the specified index.';
-$lang['db_must_use_where'] = 'Updates are not allowed unless they contain a "where" clause.';
-$lang['db_del_must_use_where'] = 'Deletes are not allowed unless they contain a "where" or "like" clause.';
-$lang['db_field_param_missing'] = 'To fetch fields requires the name of the table as a parameter.';
-$lang['db_unsupported_function'] = 'This feature is not available for the database you are using.';
-$lang['db_transaction_failure'] = 'Transaction failure: Rollback performed.';
-$lang['db_unable_to_drop'] = 'Unable to drop the specified database.';
-$lang['db_unsupported_feature'] = 'Unsupported feature of the database platform you are using.';
-$lang['db_unsupported_compression'] = 'The file compression format you chose is not supported by your server.';
-$lang['db_filepath_error'] = 'Unable to write data to the file path you have submitted.';
-$lang['db_invalid_cache_path'] = 'The cache path you submitted is not valid or writable.';
-$lang['db_table_name_required'] = 'A table name is required for that operation.';
-$lang['db_column_name_required'] = 'A column name is required for that operation.';
-$lang['db_column_definition_required'] = 'A column definition is required for that operation.';
-$lang['db_unable_to_set_charset'] = 'Unable to set client connection character set: %s';
-$lang['db_error_heading'] = 'A Database Error Occurred';
+$lang['db_invalid_connection_str'] = 'Impossibile determinare i parametri del database dalla stringa di connessione immessa.';
+$lang['db_unable_to_connect'] = 'Impossibile connettersi al database utilizzando i parametri inseriti.';
+$lang['db_unable_to_select'] = 'Impossibile selezionare il database specificato: %s';
+$lang['db_unable_to_create'] = 'Impossibile creare il database specificato: %s';
+$lang['db_invalid_query'] = 'La query immessa non è valida.';
+$lang['db_must_set_table'] = 'Impostare il database da utilizzare per la query immessa.';
+$lang['db_must_use_set'] = 'Devi utilizzare il metodo "set" per eseguire l\'update del tuo record.';
+$lang['db_must_use_index'] = 'Devi specificare un indice per poter effettuare l\'aggiornamento in batch.';
+$lang['db_batch_missing_index'] = 'Una o più righe presenti per l\'aggiornamento in batch non contengono l\'indice specificato.';
+$lang['db_must_use_where'] = 'Le query di "Update" sono consentite solo se contengono la clausola "where".';
+$lang['db_del_must_use_where'] = 'Le query di "Delete" sono consentite solo se contengono la clausola "where".';
+$lang['db_field_param_missing'] = 'Per eseguire il fetch dei campi è necessario il nome della tabella passato come parametro.';
+$lang['db_unsupported_function'] = 'Funzionalità';
+$lang['db_transaction_failure'] = 'Transazione fallita: Rollback eseguito.';
+$lang['db_unable_to_drop'] = 'Impossibile eliminare il database selezionato.';
+$lang['db_unsupported_feature'] = 'Funzionalità non supportata dalla piattaforma di database in uso.';
+$lang['db_unsupported_compression'] = 'Il formato di compressione dei file che è stato scelto non è supportato dal server in uso.';
+$lang['db_filepath_error'] = 'Impossibile scrivere i dati nel percorso che è stato immesso.';
+$lang['db_invalid_cache_path'] = 'Il percorso della cache che è stato immesso non è valido o non è scrivibile.';
+$lang['db_table_name_required'] = 'E\' necessario specificare una tabella per questa operazione.';
+$lang['db_column_name_required'] = 'E\' necessario specificare il nome di una colonna per questa operazione';
+$lang['db_column_definition_required'] = 'E\' necessario specificare la definizione di una colonna per questa operazione.';
+$lang['db_unable_to_set_charset'] = 'Impossibile impostare il set di caratteri per la connessione: %s';
+$lang['db_error_heading'] = 'Errore del database';
diff --git a/src/application/language/italian/email_lang.php b/src/application/language/italian/email_lang.php
index e104db52..a6f95995 100644
--- a/src/application/language/italian/email_lang.php
+++ b/src/application/language/italian/email_lang.php
@@ -1,58 +1,31 @@
 <?php
 /**
- * CodeIgniter
+ * System messages translation for CodeIgniter(tm)
  *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright    Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright    Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT	MIT License
- * @link    https://codeigniter.com
- * @since    Version 1.0.0
- * @filesource
+ * @author	CodeIgniter community
+ * @author	Stefano Mazzega
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['email_must_be_array'] = 'The email validation method must be passed an array.';
-$lang['email_invalid_address'] = 'Invalid email address: %s';
-$lang['email_attachment_missing'] = 'Unable to locate the following email attachment: %s';
-$lang['email_attachment_unreadable'] = 'Unable to open this attachment: %s';
-$lang['email_no_from'] = 'Cannot send mail with no "From" header.';
-$lang['email_no_recipients'] = 'You must include recipients: To, Cc, or Bcc';
-$lang['email_send_failure_phpmail'] = 'Unable to send email using PHP mail(). Your server might not be configured to send mail using this method.';
-$lang['email_send_failure_sendmail'] = 'Unable to send email using PHP Sendmail. Your server might not be configured to send mail using this method.';
-$lang['email_send_failure_smtp'] = 'Unable to send email using PHP SMTP. Your server might not be configured to send mail using this method.';
-$lang['email_sent'] = 'Your message has been successfully sent using the following protocol: %s';
-$lang['email_no_socket'] = 'Unable to open a socket to Sendmail. Please check settings.';
-$lang['email_no_hostname'] = 'You did not specify a SMTP hostname.';
-$lang['email_smtp_error'] = 'The following SMTP error was encountered: %s';
-$lang['email_no_smtp_unpw'] = 'Error: You must assign a SMTP username and password.';
-$lang['email_failed_smtp_login'] = 'Failed to send AUTH LOGIN command. Error: %s';
-$lang['email_smtp_auth_un'] = 'Failed to authenticate username. Error: %s';
-$lang['email_smtp_auth_pw'] = 'Failed to authenticate password. Error: %s';
-$lang['email_smtp_data_failure'] = 'Unable to send data: %s';
-$lang['email_exit_status'] = 'Exit status code: %s';
+$lang['email_must_be_array'] = 'Il metodo di validazione delle email deve essere inviato come array.';
+$lang['email_invalid_address'] = 'Indirizzo email non valido: %s';
+$lang['email_attachment_missing'] = 'Impossibile trovare il seguente allegato dell\'email: %s';
+$lang['email_attachment_unreadable'] = 'Impossibile aprire il seguente alleato: %s';
+$lang['email_no_from'] = 'Impossibile inviare l\'email senza il campo header "Da".';
+$lang['email_no_recipients'] = 'E\' necessario includere le informazioni: A, Cc, or Ccn';
+$lang['email_send_failure_phpmail'] = 'Impossibile inviare una mail utilizzando la funzione PHP mail(). Il server sembra non essere configurato per inviare mail utilizzando questo metodo.';
+$lang['email_send_failure_sendmail'] = 'Impossibile inviare una mail utilizzando la funzione Sendmail(). Il server sembra non essere configurato per inviare mail utilizzando questo metodo.';
+$lang['email_send_failure_smtp'] = 'Impossibile inviare una mail utilizzando la funzione PHP SMTP. Il server sembra non essere configurato per inviare mail utilizzando questo metodo.';
+$lang['email_sent'] = 'Il tuo messaggio è stato inviato con successo utilizzando il seguente protocollo: %s';
+$lang['email_no_socket'] = 'Impossibile aprire un socket con Sendmail. Controllare i settaggi.';
+$lang['email_no_hostname'] = 'Non è stato specificato un hostname SMTP.';
+$lang['email_smtp_error'] = 'E\' stato riscontrato il seguente errore SMTP: %s';
+$lang['email_no_smtp_unpw'] = 'Errore: occorre assegnare un SMTP username e password.';
+$lang['email_failed_smtp_login'] = 'Invio del comando AUTH LOGIN fallito. Errore: %s';
+$lang['email_smtp_auth_un'] = 'Autenticazione dell\'username fallita. Errore: %s';
+$lang['email_smtp_auth_pw'] = 'Autenticazione della password fallita. Errore: %s';
+$lang['email_smtp_data_failure'] = 'Impossibile inviare i dati: %s';
+$lang['email_exit_status'] = 'Codice di status di uscita: %s';
diff --git a/src/application/language/italian/migration_lang.php b/src/application/language/italian/migration_lang.php
index bb0c6ae0..f9506107 100644
--- a/src/application/language/italian/migration_lang.php
+++ b/src/application/language/italian/migration_lang.php
@@ -1,13 +1,20 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php
+/**
+ * System messages translation for CodeIgniter(tm)
+ *
+ * @author	CodeIgniter community
+ * @author	Stefano Mazzega
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
+ */
+defined('BASEPATH') OR exit('No direct script access allowed');
 
-$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 */
+$lang['migration_none_found'] = 'Non ci sono migrazioni disponibili.';
+$lang['migration_not_found'] = 'Non è stato possibile trovare la migrazione numero: %s.';
+$lang['migration_sequence_gap'] = 'C\'è un divario nella sequenza di migrazione nei pressi del numero di versione: %s.';
+$lang['migration_multiple_version'] = 'Ci sono differenti migrazioni con lo stesso numero di versione: %s.';
+$lang['migration_class_doesnt_exist'] = 'Non è possibile trovare la classe migrazione "%s".';
+$lang['migration_missing_up_method'] = 'La classe migrazione "%s" è sprovvista del metodo "up".';
+$lang['migration_missing_down_method'] = 'La classe migrazione "%s" è sprovvista del metodo "down".';
+$lang['migration_invalid_filename'] = 'La migrazione "%s" ha un nome file non valido.';
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/db_lang.php b/src/application/language/japanese/db_lang.php
index b9da89b1..79c244ce 100644
--- a/src/application/language/japanese/db_lang.php
+++ b/src/application/language/japanese/db_lang.php
@@ -1,63 +1,35 @@
 <?php
 /**
- * CodeIgniter
+ * System messages translation for CodeIgniter(tm)
  *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright    Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright    Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT	MIT License
- * @link    https://codeigniter.com
- * @since    Version 1.0.0
- * @filesource
+ * @author	CodeIgniter community
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['db_invalid_connection_str'] = 'Unable to determine the database settings based on the connection string you submitted.';
-$lang['db_unable_to_connect'] = 'Unable to connect to your database server using the provided settings.';
-$lang['db_unable_to_select'] = 'Unable to select the specified database: %s';
-$lang['db_unable_to_create'] = 'Unable to create the specified database: %s';
-$lang['db_invalid_query'] = 'The query you submitted is not valid.';
-$lang['db_must_set_table'] = 'You must set the database table to be used with your query.';
-$lang['db_must_use_set'] = 'You must use the "set" method to update an entry.';
-$lang['db_must_use_index'] = 'You must specify an index to match on for batch updates.';
-$lang['db_batch_missing_index'] = 'One or more rows submitted for batch updating is missing the specified index.';
-$lang['db_must_use_where'] = 'Updates are not allowed unless they contain a "where" clause.';
-$lang['db_del_must_use_where'] = 'Deletes are not allowed unless they contain a "where" or "like" clause.';
-$lang['db_field_param_missing'] = 'To fetch fields requires the name of the table as a parameter.';
-$lang['db_unsupported_function'] = 'This feature is not available for the database you are using.';
-$lang['db_transaction_failure'] = 'Transaction failure: Rollback performed.';
-$lang['db_unable_to_drop'] = 'Unable to drop the specified database.';
-$lang['db_unsupported_feature'] = 'Unsupported feature of the database platform you are using.';
-$lang['db_unsupported_compression'] = 'The file compression format you chose is not supported by your server.';
-$lang['db_filepath_error'] = 'Unable to write data to the file path you have submitted.';
-$lang['db_invalid_cache_path'] = 'The cache path you submitted is not valid or writable.';
-$lang['db_table_name_required'] = 'A table name is required for that operation.';
-$lang['db_column_name_required'] = 'A column name is required for that operation.';
-$lang['db_column_definition_required'] = 'A column definition is required for that operation.';
-$lang['db_unable_to_set_charset'] = 'Unable to set client connection character set: %s';
-$lang['db_error_heading'] = 'A Database Error Occurred';
+$lang['db_invalid_connection_str'] = '指定された接続文字列では、データベース設定を特定できません。';
+$lang['db_unable_to_connect'] = '指定された設定でデータベースサーバに接続できません。';
+$lang['db_unable_to_select'] = '指定されたデータベースを選択できません: %s';
+$lang['db_unable_to_create'] = '指定されたデータベースを作成できません: %s';
+$lang['db_invalid_query'] = '指定されたクエリは正しくありません。';
+$lang['db_must_set_table'] = '指定したクエリを利用するには、データベーステーブルを指定する必要があります。';
+$lang['db_must_use_set'] = 'レコードを更新するには、"set" メソッドを使う必要があります。';
+$lang['db_must_use_index'] = 'バッチ更新のためのマッチするインデックスを指定する必要があります。';
+$lang['db_batch_missing_index'] = 'バッチ更新で指定された 1つ以上の行に対するインデックスがありません。';
+$lang['db_must_use_where'] = '"where"句が指定されていないデータベースの更新は許可されません。';
+$lang['db_del_must_use_where'] = '"where"もしくは"like"句が指定されていない削除は許可されません。';
+$lang['db_field_param_missing'] = 'フィールドを取り出すには、テーブル名をパラメータで指定する必要があります。';
+$lang['db_unsupported_function'] = 'この機能はお使いのデータベースでは利用できません。';
+$lang['db_transaction_failure'] = 'トランザクションが失敗しました: ロールバックが実行されました。';
+$lang['db_unable_to_drop'] = '指定したデータベースを削除できません。';
+$lang['db_unsupported_feature'] = 'お使いのデータベースプラットフォームではサポートされない機能です。';
+$lang['db_unsupported_compression'] = 'お使いのサーバでは、選択したファイル圧縮フォーマットはサポートされていません。';
+$lang['db_filepath_error'] = '指定したファイルパスにデータを書き込むことができませんでした。';
+$lang['db_invalid_cache_path'] = '指定したキャッシュパスは正しくないか書き込みできません。';
+$lang['db_table_name_required'] = 'この操作にはテーブル名が必要です。';
+$lang['db_column_name_required'] = 'この操作にはコラム名が必要です。';
+$lang['db_column_definition_required'] = 'この操作にはカランの定義が必要です。';
+$lang['db_unable_to_set_charset'] = 'クライアント接続文字エンコードを設定できませんでした: %s';
+$lang['db_error_heading'] = 'データベースエラーが発生しました。';
diff --git a/src/application/language/japanese/email_lang.php b/src/application/language/japanese/email_lang.php
index e104db52..75799910 100644
--- a/src/application/language/japanese/email_lang.php
+++ b/src/application/language/japanese/email_lang.php
@@ -1,58 +1,30 @@
 <?php
 /**
- * CodeIgniter
+ * System messages translation for CodeIgniter(tm)
  *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright    Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright    Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT	MIT License
- * @link    https://codeigniter.com
- * @since    Version 1.0.0
- * @filesource
+ * @author	CodeIgniter community
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['email_must_be_array'] = 'The email validation method must be passed an array.';
-$lang['email_invalid_address'] = 'Invalid email address: %s';
-$lang['email_attachment_missing'] = 'Unable to locate the following email attachment: %s';
-$lang['email_attachment_unreadable'] = 'Unable to open this attachment: %s';
-$lang['email_no_from'] = 'Cannot send mail with no "From" header.';
-$lang['email_no_recipients'] = 'You must include recipients: To, Cc, or Bcc';
-$lang['email_send_failure_phpmail'] = 'Unable to send email using PHP mail(). Your server might not be configured to send mail using this method.';
-$lang['email_send_failure_sendmail'] = 'Unable to send email using PHP Sendmail. Your server might not be configured to send mail using this method.';
-$lang['email_send_failure_smtp'] = 'Unable to send email using PHP SMTP. Your server might not be configured to send mail using this method.';
-$lang['email_sent'] = 'Your message has been successfully sent using the following protocol: %s';
-$lang['email_no_socket'] = 'Unable to open a socket to Sendmail. Please check settings.';
-$lang['email_no_hostname'] = 'You did not specify a SMTP hostname.';
-$lang['email_smtp_error'] = 'The following SMTP error was encountered: %s';
-$lang['email_no_smtp_unpw'] = 'Error: You must assign a SMTP username and password.';
-$lang['email_failed_smtp_login'] = 'Failed to send AUTH LOGIN command. Error: %s';
-$lang['email_smtp_auth_un'] = 'Failed to authenticate username. Error: %s';
-$lang['email_smtp_auth_pw'] = 'Failed to authenticate password. Error: %s';
-$lang['email_smtp_data_failure'] = 'Unable to send data: %s';
-$lang['email_exit_status'] = 'Exit status code: %s';
+$lang['email_must_be_array'] = "メールアドレスのバリデーションは、配列でデータを渡す必要があります。";
+$lang['email_invalid_address'] = 'メールアドレスの形式が違います: %s';
+$lang['email_attachment_missing'] = '次のメールの添付が見つかりません: %s';
+$lang['email_attachment_unreadable'] = '次の添付ファイルが開けません: %s';
+$lang['email_no_from'] = ' "From"ヘッダーがないためメールを送信できません';
+$lang['email_no_recipients'] = '宛先 (To,Cc,Bcc) が指定されていません';
+$lang['email_send_failure_phpmail'] = 'PHP mail() を使ってメールを送信できません。お使いのサーバでは、PHP mail() でメールを送信できるよう設定されていない可能性があります。';
+$lang['email_send_failure_sendmail'] = 'PHP Sendmail を使ってメールを送信できません。お使いのサーバでは、PHP Sendmail でメールを送信できるよう設定されていない可能性があります。';
+$lang['email_send_failure_smtp'] = 'PHP SMTP を使ってメールを送信できません。お使いのサーバでは、PHP SMTP でメールを送信できるよう設定されていない可能性があります';
+$lang['email_sent'] = 'メッセージは次のプロトコルを使って正常に送信されました: %s';
+$lang['email_no_socket'] = 'Sendmail に対しソケットを開くことができません。設定を見直してください。';
+$lang['email_no_hostname'] = 'SMTP ホスト名が指定されていません';
+$lang['email_smtp_error'] = '次の SMTP エラーが発生しました: %s';
+$lang['email_no_smtp_unpw'] = 'エラー: SMTP のユーザ名とパスワードを指定する必要があります';
+$lang['email_failed_smtp_login'] = 'AUTH LOGIN コマンドの送信に失敗しました。エラー: %s';
+$lang['email_smtp_auth_un'] = 'ユーザ名の認証に失敗しました。エラー: %s';
+$lang['email_smtp_auth_pw'] = 'パスワードの認証に失敗しました。エラー: %s';
+$lang['email_smtp_data_failure'] = 'データを送信できません: %s';
+$lang['email_exit_status'] = '終了ステータスコード: %s';
diff --git a/src/application/language/japanese/migration_lang.php b/src/application/language/japanese/migration_lang.php
index ed2405c1..df245023 100644
--- a/src/application/language/japanese/migration_lang.php
+++ b/src/application/language/japanese/migration_lang.php
@@ -1,13 +1,19 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php
+/**
+ * System messages translation for CodeIgniter(tm)
+ *
+ * @author	CodeIgniter community
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
+ */
+defined('BASEPATH') OR exit('No direct script access allowed');
 
-$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.";
-
-
-/* End of file migration_lang.php */
-/* Location: ./system/language/japanese/migration_lang.php */
+$lang['migration_none_found'] = 'マイグレーション対象は見つかりませんでした';
+$lang['migration_not_found'] = '%sのバージョンではマイグレーション対象は見つかりませんでした';
+$lang['migration_sequence_gap'] = '%sのバージョンではマイグレーション順序にギャップがあります';
+$lang['migration_multiple_version'] = '複数のマイグレーションが%sのバージョンであります';
+$lang['migration_class_doesnt_exist'] = 'マイグレーションクラス "%s"が見つかりません';
+$lang['migration_missing_up_method'] = '"up"メソッドではマイグレーションクラス "%s" は見つかりません';
+$lang['migration_missing_down_method'] = '"down"メソッドではマイグレーションクラス "%s" は見つかりません';
+$lang['migration_invalid_filename'] = 'マイグレーション "%s" に不正なファイル名があります';
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/migration_lang.php b/src/application/language/luxembourgish/migration_lang.php
index 17fed6ea..188e14d3 100644
--- a/src/application/language/luxembourgish/migration_lang.php
+++ b/src/application/language/luxembourgish/migration_lang.php
@@ -1,13 +1,47 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php
+/**
+ * CodeIgniter
+ *
+ * An open source application development framework for PHP
+ *
+ * This content is released under the MIT License (MIT)
+ *
+ * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @package	CodeIgniter
+ * @author	EllisLab Dev Team
+ * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
+ * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
+ * @since	Version 3.0.0
+ * @filesource
+ */
+defined('BASEPATH') OR exit('No direct script access allowed');
 
-$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.";
-
-
-/* End of file migration_lang.php */
-/* Location: ./system/language/luxembourgish/migration_lang.php */
+$lang['migration_none_found'] = 'No migrations were found.';
+$lang['migration_not_found'] = 'No migration could be found with the version number: %s.';
+$lang['migration_sequence_gap'] = 'There is a gap in the migration sequence near version number: %s.';
+$lang['migration_multiple_version'] = 'There are multiple migrations with the same version number: %s.';
+$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 a "down" method.';
+$lang['migration_invalid_filename'] = 'Migration "%s" has an invalid filename.';
\ No newline at end of file
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/db_lang.php b/src/application/language/polish/db_lang.php
index b9da89b1..5a6fbafb 100644
--- a/src/application/language/polish/db_lang.php
+++ b/src/application/language/polish/db_lang.php
@@ -1,63 +1,35 @@
 <?php
 /**
- * CodeIgniter
+ * System messages translation for CodeIgniter(tm)
  *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright    Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright    Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT	MIT License
- * @link    https://codeigniter.com
- * @since    Version 1.0.0
- * @filesource
+ * @author	CodeIgniter community
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['db_invalid_connection_str'] = 'Unable to determine the database settings based on the connection string you submitted.';
-$lang['db_unable_to_connect'] = 'Unable to connect to your database server using the provided settings.';
-$lang['db_unable_to_select'] = 'Unable to select the specified database: %s';
-$lang['db_unable_to_create'] = 'Unable to create the specified database: %s';
-$lang['db_invalid_query'] = 'The query you submitted is not valid.';
-$lang['db_must_set_table'] = 'You must set the database table to be used with your query.';
-$lang['db_must_use_set'] = 'You must use the "set" method to update an entry.';
-$lang['db_must_use_index'] = 'You must specify an index to match on for batch updates.';
-$lang['db_batch_missing_index'] = 'One or more rows submitted for batch updating is missing the specified index.';
-$lang['db_must_use_where'] = 'Updates are not allowed unless they contain a "where" clause.';
-$lang['db_del_must_use_where'] = 'Deletes are not allowed unless they contain a "where" or "like" clause.';
-$lang['db_field_param_missing'] = 'To fetch fields requires the name of the table as a parameter.';
-$lang['db_unsupported_function'] = 'This feature is not available for the database you are using.';
-$lang['db_transaction_failure'] = 'Transaction failure: Rollback performed.';
-$lang['db_unable_to_drop'] = 'Unable to drop the specified database.';
-$lang['db_unsupported_feature'] = 'Unsupported feature of the database platform you are using.';
-$lang['db_unsupported_compression'] = 'The file compression format you chose is not supported by your server.';
-$lang['db_filepath_error'] = 'Unable to write data to the file path you have submitted.';
-$lang['db_invalid_cache_path'] = 'The cache path you submitted is not valid or writable.';
-$lang['db_table_name_required'] = 'A table name is required for that operation.';
-$lang['db_column_name_required'] = 'A column name is required for that operation.';
-$lang['db_column_definition_required'] = 'A column definition is required for that operation.';
-$lang['db_unable_to_set_charset'] = 'Unable to set client connection character set: %s';
-$lang['db_error_heading'] = 'A Database Error Occurred';
+$lang['db_invalid_connection_str']      = 'Nie można ustalić ustawień bazy danych na podstawie konfiguracji połączenia.';
+$lang['db_unable_to_connect']           = 'Nie można połączyć się z serwerem bazy danych używając podanych ustawień.';
+$lang['db_unable_to_select']            = 'Nie można wybrać następującej bazy danych: %s';
+$lang['db_unable_to_create']            = 'Nie można utworzyć następującej bazy dancyh: %s';
+$lang['db_invalid_query']               = 'Zapytanie jest nieprawidłowe.';
+$lang['db_must_set_table']              = 'Musisz wybrać tabelę z bazy danych, dla której ma zostać wykonane zapytanie.';
+$lang['db_must_use_set']                = 'Musisz użyć metody "set" by uaktualnić wpis.';
+$lang['db_must_use_index']              = 'Musisz wyznaczyć indeks dla przetwarzania wsadowego.';
+$lang['db_batch_missing_index']         = 'Jeden lub więcej wierszy wysłanych do przetwarzania wsadowego jest nieprawidłowy, albo nie ma ustalonego indeksu.';
+$lang['db_must_use_where']              = 'Polecenia "Update" nie są dozwolone dopóki nie posiadają klauzuli "where".';
+$lang['db_del_must_use_where']          = 'Polecenia "Delete" nie są dozwolone dopóki nie posiadają klauzuli "where" albo "like".';
+$lang['db_field_param_missing']         = 'Do tej operacji wymagana jest nazwa tabeli jako parametr.';
+$lang['db_unsupported_function']        = 'Ta funkcjonalność jest niedostępna dla bazy danych której używasz.';
+$lang['db_transaction_failure']         = 'Błąd transakcji. Wykonano rollback.';
+$lang['db_unable_to_drop']              = 'Nie można usunąć danej bazy danych.';
+$lang['db_unsupported_feature']          = 'Platforma bazy danych, z której korzystasz nie obsługuje tej funkcjonalności.';
+$lang['db_unsupported_compression']      = 'Format kompresji plików, który został wybrany nie jest obsługiwany przez serwer.';
+$lang['db_filepath_error']              = 'Nie można zapisać danych do ścieżki która została podana.';
+$lang['db_invalid_cache_path']          = 'Ścieżka cache jest nieprawidłowa lub nie posiada praw zapisu.';
+$lang['db_table_name_required']         = 'Nazwa tabeli jest wymagana do wykonania tej operacji.';
+$lang['db_column_name_required']        = 'Nazwa kolumny jest wymagana do wykonania tej operacji.';
+$lang['db_column_definition_required']  = 'Definicja kolumny jest wymagana do wykonania tej operacji.';
+$lang['db_unable_to_set_charset']       = 'Nie można ustanowić połączenia w kodowaniu znaków: %s';
+$lang['db_error_heading']               = 'Wystąpił błąd bazy danych.';
diff --git a/src/application/language/polish/email_lang.php b/src/application/language/polish/email_lang.php
index e104db52..fb01c31a 100644
--- a/src/application/language/polish/email_lang.php
+++ b/src/application/language/polish/email_lang.php
@@ -1,58 +1,30 @@
 <?php
 /**
- * CodeIgniter
+ * System messages translation for CodeIgniter(tm)
  *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright    Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright    Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT	MIT License
- * @link    https://codeigniter.com
- * @since    Version 1.0.0
- * @filesource
+ * @author	CodeIgniter community
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['email_must_be_array'] = 'The email validation method must be passed an array.';
-$lang['email_invalid_address'] = 'Invalid email address: %s';
-$lang['email_attachment_missing'] = 'Unable to locate the following email attachment: %s';
-$lang['email_attachment_unreadable'] = 'Unable to open this attachment: %s';
-$lang['email_no_from'] = 'Cannot send mail with no "From" header.';
-$lang['email_no_recipients'] = 'You must include recipients: To, Cc, or Bcc';
-$lang['email_send_failure_phpmail'] = 'Unable to send email using PHP mail(). Your server might not be configured to send mail using this method.';
-$lang['email_send_failure_sendmail'] = 'Unable to send email using PHP Sendmail. Your server might not be configured to send mail using this method.';
-$lang['email_send_failure_smtp'] = 'Unable to send email using PHP SMTP. Your server might not be configured to send mail using this method.';
-$lang['email_sent'] = 'Your message has been successfully sent using the following protocol: %s';
-$lang['email_no_socket'] = 'Unable to open a socket to Sendmail. Please check settings.';
-$lang['email_no_hostname'] = 'You did not specify a SMTP hostname.';
-$lang['email_smtp_error'] = 'The following SMTP error was encountered: %s';
-$lang['email_no_smtp_unpw'] = 'Error: You must assign a SMTP username and password.';
-$lang['email_failed_smtp_login'] = 'Failed to send AUTH LOGIN command. Error: %s';
-$lang['email_smtp_auth_un'] = 'Failed to authenticate username. Error: %s';
-$lang['email_smtp_auth_pw'] = 'Failed to authenticate password. Error: %s';
-$lang['email_smtp_data_failure'] = 'Unable to send data: %s';
-$lang['email_exit_status'] = 'Exit status code: %s';
+$lang['email_must_be_array']            = 'Metoda weryfikacji e-maila musi być przekazana w tablicy.';
+$lang['email_invalid_address']          = 'Niepoprawny adres e-mail: %s';
+$lang['email_attachment_missing']       = 'Nie można zlokalizować następujących załączników: %s';
+$lang['email_attachment_unreadable']    = 'Nie można otworzyć następujących załączników: %s';
+$lang['email_no_from']                  = 'Nie można wysłać wiadomości bez nagłówka "From".';
+$lang['email_no_recipients']            = 'Należy dodać odbiorców: To, Cc lub Bcc';
+$lang['email_send_failure_phpmail']     = 'Nie można wysłać e-maila za pomocą PHP mail(). Twój serwer może nie być skonfigurowany by wysyłać e-maile za pomocą tej metody.';
+$lang['email_send_failure_sendmail']    = 'Nie można wysłać e-maila za pomocą PHP Sendmail. Twój serwer może nie być skonfigurowany by wysyłać e-maile za pomocą tej metody.';
+$lang['email_send_failure_smtp']        = 'Nie można wysłać e-maila za pomoc PHP SMTP. Twój serwer może nie być skonfigurowany by wysyłać e-maile za pomocą tej metody.';
+$lang['email_sent']                     = 'Twój e-mail został pomyślnie wysłany za pomocą metody: %s';
+$lang['email_no_socket']                = 'Nie można otworzyć socketu do Sendmail. Proszę sprawdzić ustawienia.';
+$lang['email_no_hostname']              = 'Nie podano nazwy hosta SMTP.';
+$lang['email_smtp_error']               = 'Wystąpił następujący błąd SMTP: %s';
+$lang['email_no_smtp_unpw']             = 'Błąd: Należy podać nazwę użytkownika i hasło SMTP.';
+$lang['email_failed_smtp_login']        = 'Błąd przy wysyłaniu komendy AUTH LOGIN. Błąd: %s';
+$lang['email_smtp_auth_un']             = 'Błąd autentykacji nazwy użytkownika. Błąd: %s';
+$lang['email_smtp_auth_pw']             = 'Błąd autentykacji hasła. Błąd: %s';
+$lang['email_smtp_data_failure']        = 'Nie można wysłać danych: %s';
+$lang['email_exit_status']              = 'Status kodu wyjścia: %s';
diff --git a/src/application/language/polish/migration_lang.php b/src/application/language/polish/migration_lang.php
index bfd72f8e..b56af4dc 100644
--- a/src/application/language/polish/migration_lang.php
+++ b/src/application/language/polish/migration_lang.php
@@ -1,13 +1,19 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php
+/**
+ * System messages translation for CodeIgniter(tm)
+ *
+ * @author	CodeIgniter community
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
+ */
+defined('BASEPATH') OR exit('No direct script access allowed');
 
-$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.";
-
-
-/* End of file migration_lang.php */
-/* Location: ./system/language/polish/migration_lang.php */
+$lang['migration_none_found']           = 'Nie znaleziono żadnych migracji.';
+$lang['migration_not_found']            = 'Nie można znaleźć migracji o numerze wersji: %s.';
+$lang['migration_sequence_gap']         = 'Istnieje luka w wersjach migracji, koło numeru: %s.';
+$lang['migration_multiple_version']     = 'Jest wiele migracji o tym samym numerze wersji: %d.';
+$lang['migration_class_doesnt_exist']   = 'Klasa migracji %s nie mogła zostać znaleziona.';
+$lang['migration_missing_up_method']    = 'Klasie migracji %s brakuje metody "up".';
+$lang['migration_missing_down_method']  = 'Klasie migracji %s brakuje metody "down".';
+$lang['migration_invalid_filename']     = 'Migracja %s ma niepoprawną nazwę pliku.';
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/db_lang.php b/src/application/language/portuguese-br/db_lang.php
index b9da89b1..684c1ac5 100644
--- a/src/application/language/portuguese-br/db_lang.php
+++ b/src/application/language/portuguese-br/db_lang.php
@@ -1,63 +1,35 @@
 <?php
 /**
- * CodeIgniter
+ * System messages translation for CodeIgniter(tm)
  *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright    Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright    Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT	MIT License
- * @link    https://codeigniter.com
- * @since    Version 1.0.0
- * @filesource
+ * @author	CodeIgniter community
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['db_invalid_connection_str'] = 'Unable to determine the database settings based on the connection string you submitted.';
-$lang['db_unable_to_connect'] = 'Unable to connect to your database server using the provided settings.';
-$lang['db_unable_to_select'] = 'Unable to select the specified database: %s';
-$lang['db_unable_to_create'] = 'Unable to create the specified database: %s';
-$lang['db_invalid_query'] = 'The query you submitted is not valid.';
-$lang['db_must_set_table'] = 'You must set the database table to be used with your query.';
-$lang['db_must_use_set'] = 'You must use the "set" method to update an entry.';
-$lang['db_must_use_index'] = 'You must specify an index to match on for batch updates.';
-$lang['db_batch_missing_index'] = 'One or more rows submitted for batch updating is missing the specified index.';
-$lang['db_must_use_where'] = 'Updates are not allowed unless they contain a "where" clause.';
-$lang['db_del_must_use_where'] = 'Deletes are not allowed unless they contain a "where" or "like" clause.';
-$lang['db_field_param_missing'] = 'To fetch fields requires the name of the table as a parameter.';
-$lang['db_unsupported_function'] = 'This feature is not available for the database you are using.';
-$lang['db_transaction_failure'] = 'Transaction failure: Rollback performed.';
-$lang['db_unable_to_drop'] = 'Unable to drop the specified database.';
-$lang['db_unsupported_feature'] = 'Unsupported feature of the database platform you are using.';
-$lang['db_unsupported_compression'] = 'The file compression format you chose is not supported by your server.';
-$lang['db_filepath_error'] = 'Unable to write data to the file path you have submitted.';
-$lang['db_invalid_cache_path'] = 'The cache path you submitted is not valid or writable.';
-$lang['db_table_name_required'] = 'A table name is required for that operation.';
-$lang['db_column_name_required'] = 'A column name is required for that operation.';
-$lang['db_column_definition_required'] = 'A column definition is required for that operation.';
-$lang['db_unable_to_set_charset'] = 'Unable to set client connection character set: %s';
-$lang['db_error_heading'] = 'A Database Error Occurred';
+$lang['db_invalid_connection_str'] = 'Não foi possível determinar as configurações do banco de dados baseado na string de conexão que você submeteu.';
+$lang['db_unable_to_connect'] = 'Não foi possível conectar com seu banco de dados usando as configurações fornecidas.';
+$lang['db_unable_to_select'] = 'Não foi possível selecionar o banco de dados especificado: %s';
+$lang['db_unable_to_create'] = 'Não foi possível criar o banco de dados especificado: %s';
+$lang['db_invalid_query'] = 'A consulta(query) que você submeteu não é válida.';
+$lang['db_must_set_table'] = 'Você deve configurar a tabela em seu banco de dados para ser usada com sua consulta(query).';
+$lang['db_must_use_set'] = 'Você deve usar o método "set" para atualizar um registro.';
+$lang['db_must_use_index'] = 'Você deve especificar um índice(index) para corresponder com as suas atualizações em lote.';
+$lang['db_batch_missing_index'] = 'Uma ou mais linhas enviadas para atualização em lote está faltando o índice(index) especificado.';
+$lang['db_must_use_where'] = 'Atualizações(Updates) não são permitidas a menos que exista a clausula "where".';
+$lang['db_del_must_use_where'] = 'Exclusões(Deletes) não são permitidos a menos que exista a clausula "where" ou "like".';
+$lang['db_field_param_missing'] = 'Para buscar campos requer o nome da tabela como um parâmetro.';
+$lang['db_unsupported_function'] = 'Esta funcionalidade não está disponível para o banco de dados que você está usando.';
+$lang['db_transaction_failure'] = 'Falha na Transação: Rollback executado.';
+$lang['db_unable_to_drop'] = 'Não foi possível deletar(drop) o banco de dados especificado.';
+$lang['db_unsupported_feature'] = 'Funcionalidade não suportada no banco de dados que você está usando.';
+$lang['db_unsupported_compression'] = 'O formato de compressão de arquivo que você escolheu não é suportado pelo seu servidor.';
+$lang['db_filepath_error'] = 'Não foi possível escrever os dados para o arquivo que você enviou.';
+$lang['db_invalid_cache_path'] = 'O caminho do cache(cache path) que você enviou não é válido ou gravável.';
+$lang['db_table_name_required'] = 'O nome da tabela é obrigatório para esta operação.';
+$lang['db_column_name_required'] = 'O nome da coluna é obrigatório para esta operação.';
+$lang['db_column_definition_required'] = 'A definição da coluna é obrigatória para esta operação.';
+$lang['db_unable_to_set_charset'] = 'Não é possível configurar o character set da conexão cliente: %s';
+$lang['db_error_heading'] = 'Um erro no Banco de Dados aconteceu';
diff --git a/src/application/language/portuguese-br/email_lang.php b/src/application/language/portuguese-br/email_lang.php
index e104db52..4a163eeb 100644
--- a/src/application/language/portuguese-br/email_lang.php
+++ b/src/application/language/portuguese-br/email_lang.php
@@ -1,58 +1,30 @@
 <?php
 /**
- * CodeIgniter
+ * System messages translation for CodeIgniter(tm)
  *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright    Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright    Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT	MIT License
- * @link    https://codeigniter.com
- * @since    Version 1.0.0
- * @filesource
+ * @author	CodeIgniter community
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['email_must_be_array'] = 'The email validation method must be passed an array.';
-$lang['email_invalid_address'] = 'Invalid email address: %s';
-$lang['email_attachment_missing'] = 'Unable to locate the following email attachment: %s';
-$lang['email_attachment_unreadable'] = 'Unable to open this attachment: %s';
-$lang['email_no_from'] = 'Cannot send mail with no "From" header.';
-$lang['email_no_recipients'] = 'You must include recipients: To, Cc, or Bcc';
-$lang['email_send_failure_phpmail'] = 'Unable to send email using PHP mail(). Your server might not be configured to send mail using this method.';
-$lang['email_send_failure_sendmail'] = 'Unable to send email using PHP Sendmail. Your server might not be configured to send mail using this method.';
-$lang['email_send_failure_smtp'] = 'Unable to send email using PHP SMTP. Your server might not be configured to send mail using this method.';
-$lang['email_sent'] = 'Your message has been successfully sent using the following protocol: %s';
-$lang['email_no_socket'] = 'Unable to open a socket to Sendmail. Please check settings.';
-$lang['email_no_hostname'] = 'You did not specify a SMTP hostname.';
-$lang['email_smtp_error'] = 'The following SMTP error was encountered: %s';
-$lang['email_no_smtp_unpw'] = 'Error: You must assign a SMTP username and password.';
-$lang['email_failed_smtp_login'] = 'Failed to send AUTH LOGIN command. Error: %s';
-$lang['email_smtp_auth_un'] = 'Failed to authenticate username. Error: %s';
-$lang['email_smtp_auth_pw'] = 'Failed to authenticate password. Error: %s';
-$lang['email_smtp_data_failure'] = 'Unable to send data: %s';
-$lang['email_exit_status'] = 'Exit status code: %s';
+$lang['email_must_be_array'] = 'O método de validação de email deve ser passado um array.';
+$lang['email_invalid_address'] = 'Endereço de email inválido: %s';
+$lang['email_attachment_missing'] = 'Não é possível localizar o seguinte arquivo em anexo: %s';
+$lang['email_attachment_unreadable'] = 'Não é possível abrir o anexo: %s';
+$lang['email_no_from'] = 'Não é possível enviar email sem email de origem.';
+$lang['email_no_recipients'] = 'Você deve incluir os destinatários: To(para), Cc(cópia), ou Bcc(cópia oculta)';
+$lang['email_send_failure_phpmail'] = 'Não é possível enviar email usando PHP mail(). Seu servidor talvez não esteja configurado para enviar email usando este método.';
+$lang['email_send_failure_sendmail'] = 'Não é possível enviar email usando PHP Sendmail. Seu servidor talvez não esteja configurado para enviar email usando este método.';
+$lang['email_send_failure_smtp'] = 'Não é possível enviar email usando PHP SMTP. Seu servidor talvez não esteja configurado para enviar email usando este método.';
+$lang['email_sent'] = 'Sua mensagem foi enviada com sucesso usando o seguinte protocolo: %s';
+$lang['email_no_socket'] = 'Não é possível abrir um socket para o Sendmail. Por favor verifique as configurações.';
+$lang['email_no_hostname'] = 'Você não especificou um endereço SMTP.';
+$lang['email_smtp_error'] = 'Os seguintes erros SMTP ocorreram: %s';
+$lang['email_no_smtp_unpw'] = 'Erro: Você deve atribuir um usuário e senha do SMTP.';
+$lang['email_failed_smtp_login'] = 'Falha ao enviar comando AUTH LOGIN. Erro: %s';
+$lang['email_smtp_auth_un'] = 'Falha ao autenticar usuário. Erro: %s';
+$lang['email_smtp_auth_pw'] = 'Falha ao autenticar senha. Erro: %s';
+$lang['email_smtp_data_failure'] = 'Não foi possível enviar dados: %s';
+$lang['email_exit_status'] = 'Código de status de saída: %s';
diff --git a/src/application/language/portuguese-br/migration_lang.php b/src/application/language/portuguese-br/migration_lang.php
index a4fe17f9..3eb311c6 100644
--- a/src/application/language/portuguese-br/migration_lang.php
+++ b/src/application/language/portuguese-br/migration_lang.php
@@ -1,13 +1,19 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php
+/**
+ * System messages translation for CodeIgniter(tm)
+ *
+ * @author	CodeIgniter community
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
+ */
+defined('BASEPATH') OR exit('No direct script access allowed');
 
-$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.";
-
-
-/* End of file migration_lang.php */
-/* Location: ./system/language/portuguese-br/migration_lang.php */
+$lang['migration_none_found'] = 'Nenhuma migração foi encontrada.';
+$lang['migration_not_found'] = 'Nenhuma migração foi encontrada com o número da versão: %s.';
+$lang['migration_sequence_gap'] = 'Na sequência de migração Gap o próximo número da versão não existe.: %s.';
+$lang['migration_multiple_version'] = 'Esta são as múltiplas migrações com o mesmo número de versão: %s.';
+$lang['migration_class_doesnt_exist'] = 'A classe de migração "%s" não pode ser encontrada.';
+$lang['migration_missing_up_method'] = 'A classe de migração "%s" está faltando o método "up".';
+$lang['migration_missing_down_method'] = 'A classe de migração "%s" está faltando o método "down".';
+$lang['migration_invalid_filename'] = 'A migração "%s" tem nome de arquivo inválido.';
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/db_lang.php b/src/application/language/portuguese/db_lang.php
index b9da89b1..89235c4e 100644
--- a/src/application/language/portuguese/db_lang.php
+++ b/src/application/language/portuguese/db_lang.php
@@ -1,63 +1,35 @@
 <?php
 /**
- * CodeIgniter
+ * System messages translation for CodeIgniter(tm)
  *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright    Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright    Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT	MIT License
- * @link    https://codeigniter.com
- * @since    Version 1.0.0
- * @filesource
+ * @author	CodeIgniter community
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['db_invalid_connection_str'] = 'Unable to determine the database settings based on the connection string you submitted.';
-$lang['db_unable_to_connect'] = 'Unable to connect to your database server using the provided settings.';
-$lang['db_unable_to_select'] = 'Unable to select the specified database: %s';
-$lang['db_unable_to_create'] = 'Unable to create the specified database: %s';
-$lang['db_invalid_query'] = 'The query you submitted is not valid.';
-$lang['db_must_set_table'] = 'You must set the database table to be used with your query.';
-$lang['db_must_use_set'] = 'You must use the "set" method to update an entry.';
-$lang['db_must_use_index'] = 'You must specify an index to match on for batch updates.';
-$lang['db_batch_missing_index'] = 'One or more rows submitted for batch updating is missing the specified index.';
-$lang['db_must_use_where'] = 'Updates are not allowed unless they contain a "where" clause.';
-$lang['db_del_must_use_where'] = 'Deletes are not allowed unless they contain a "where" or "like" clause.';
-$lang['db_field_param_missing'] = 'To fetch fields requires the name of the table as a parameter.';
-$lang['db_unsupported_function'] = 'This feature is not available for the database you are using.';
-$lang['db_transaction_failure'] = 'Transaction failure: Rollback performed.';
-$lang['db_unable_to_drop'] = 'Unable to drop the specified database.';
-$lang['db_unsupported_feature'] = 'Unsupported feature of the database platform you are using.';
-$lang['db_unsupported_compression'] = 'The file compression format you chose is not supported by your server.';
-$lang['db_filepath_error'] = 'Unable to write data to the file path you have submitted.';
-$lang['db_invalid_cache_path'] = 'The cache path you submitted is not valid or writable.';
-$lang['db_table_name_required'] = 'A table name is required for that operation.';
-$lang['db_column_name_required'] = 'A column name is required for that operation.';
-$lang['db_column_definition_required'] = 'A column definition is required for that operation.';
-$lang['db_unable_to_set_charset'] = 'Unable to set client connection character set: %s';
-$lang['db_error_heading'] = 'A Database Error Occurred';
+$lang['db_invalid_connection_str'] = 'Definições de ligação à base de dados insuficientes, com base na string que introduziu.';
+$lang['db_unable_to_connect'] = 'Incapaz de fazer uma ligação ao servidor da base de dados, com base nas definições que forneceu.';
+$lang['db_unable_to_select'] = 'Incapaz de selecionar a base de dados indicada: %s';
+$lang['db_unable_to_create'] = 'Incapaz de criar a base de dados indicada: %s';
+$lang['db_invalid_query'] = 'A query que introduziu não é válida.';
+$lang['db_must_set_table'] = 'Tem que especificar a tabela da base dados à qual quer fazer a query.';
+$lang['db_must_use_set'] = 'Tem que usar o método "set" para atualizar uma entrada.';
+$lang['db_must_use_index'] = 'Tem que indicar o index que quer comparar nas atualizações em massa.';
+$lang['db_batch_missing_index'] = 'Falta o index a uma ou mais linhas submetidas para a atualização em massa.';
+$lang['db_must_use_where'] = 'Só é possível fazer atualizações se tiver a cláusula "where".';
+$lang['db_del_must_use_where'] = 'Só é possível apagar se tiver a cláulusa "where" ou "like".';
+$lang['db_field_param_missing'] = 'É necessário o nome da tabela como um parâmetro para conseguir ir buscar os campos.';
+$lang['db_unsupported_function'] = 'Esta funcionalidade não está disponível para a base de dados que está a usar.';
+$lang['db_transaction_failure'] = 'Falha de transação. Foi reposto o estado anterior (rollback).';
+$lang['db_unable_to_drop'] = 'Não é possível apagar a base de dados indicada';
+$lang['db_unsupported_feature'] = 'Esta funcionalidade não é suportada pela plataforma de base de dados que está a usar.';
+$lang['db_unsupported_compression'] = 'O formato de compressão de ficheiros que escolheu não é suportado pelo seu servidor.';
+$lang['db_filepath_error'] = 'Incapaz de escrever dados no caminho de ficheiro que indicou.';
+$lang['db_invalid_cache_path'] = 'O cainho da cache que indicou não é válido ou não é tem permissões de escrita.';
+$lang['db_table_name_required'] = 'É necessário um nome de tabela para essa operação.';
+$lang['db_column_name_required'] = 'É necessário um nome de coluna para essa operação.';
+$lang['db_column_definition_required'] = 'É necessário uma definição de coluna para essa operação.';
+$lang['db_unable_to_set_charset'] = 'Incapaz de definir o set de caratéres da ligação ao cliente: %s';
+$lang['db_error_heading'] = 'Ocorreu um erro na base de dados';
diff --git a/src/application/language/portuguese/email_lang.php b/src/application/language/portuguese/email_lang.php
index e104db52..a61b6ed9 100644
--- a/src/application/language/portuguese/email_lang.php
+++ b/src/application/language/portuguese/email_lang.php
@@ -1,58 +1,30 @@
 <?php
 /**
- * CodeIgniter
+ * System messages translation for CodeIgniter(tm)
  *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright    Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright    Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT	MIT License
- * @link    https://codeigniter.com
- * @since    Version 1.0.0
- * @filesource
+ * @author	CodeIgniter community
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['email_must_be_array'] = 'The email validation method must be passed an array.';
-$lang['email_invalid_address'] = 'Invalid email address: %s';
-$lang['email_attachment_missing'] = 'Unable to locate the following email attachment: %s';
-$lang['email_attachment_unreadable'] = 'Unable to open this attachment: %s';
-$lang['email_no_from'] = 'Cannot send mail with no "From" header.';
-$lang['email_no_recipients'] = 'You must include recipients: To, Cc, or Bcc';
-$lang['email_send_failure_phpmail'] = 'Unable to send email using PHP mail(). Your server might not be configured to send mail using this method.';
-$lang['email_send_failure_sendmail'] = 'Unable to send email using PHP Sendmail. Your server might not be configured to send mail using this method.';
-$lang['email_send_failure_smtp'] = 'Unable to send email using PHP SMTP. Your server might not be configured to send mail using this method.';
-$lang['email_sent'] = 'Your message has been successfully sent using the following protocol: %s';
-$lang['email_no_socket'] = 'Unable to open a socket to Sendmail. Please check settings.';
-$lang['email_no_hostname'] = 'You did not specify a SMTP hostname.';
-$lang['email_smtp_error'] = 'The following SMTP error was encountered: %s';
-$lang['email_no_smtp_unpw'] = 'Error: You must assign a SMTP username and password.';
-$lang['email_failed_smtp_login'] = 'Failed to send AUTH LOGIN command. Error: %s';
-$lang['email_smtp_auth_un'] = 'Failed to authenticate username. Error: %s';
-$lang['email_smtp_auth_pw'] = 'Failed to authenticate password. Error: %s';
-$lang['email_smtp_data_failure'] = 'Unable to send data: %s';
-$lang['email_exit_status'] = 'Exit status code: %s';
+$lang['email_must_be_array'] = 'É necessário passar um array ao método de validação de email.';
+$lang['email_invalid_address'] = 'Endereço de email inválido: %s';
+$lang['email_attachment_missing'] = 'Incapaz de encontrar o seguinte anexo de email: %s';
+$lang['email_attachment_unreadable'] = 'Incapaz de abrir este anexo: %s';
+$lang['email_no_from'] = 'Não é possível enviar o email sem definir o cabeçalho "From".';
+$lang['email_no_recipients'] = 'Tem que definir os destinatários: To, Cc, ou Bcc';
+$lang['email_send_failure_phpmail'] = 'Incapaz de enviar o email através do PHP mail(). O seu servidor pode não estar configurado para enviar mails usando este método.';
+$lang['email_send_failure_sendmail'] = 'Incapaz de enviar o email através do PHP Sendmail. O seu servidor pode não estar configurado para enviar mails usando este método.';
+$lang['email_send_failure_smtp'] = 'Incapaz de enviar o email através do PHP SMTP. O seu servidor pode não estar configurado para enviar mails usando este método.';
+$lang['email_sent'] = 'A sua mensagem foi enviado com sucesso através do seguinte protocolo: %s';
+$lang['email_no_socket'] = 'Incapaz de abrir um socket para o Sendmail. Por favor, confira as definições.';
+$lang['email_no_hostname'] = 'Não especificou o hostname do SMTP.';
+$lang['email_smtp_error'] = 'Foi encontrado o seguinte erro SMTP: %s';
+$lang['email_no_smtp_unpw'] = 'Erro: Tem que definir um username e passowrd para o SMTP.';
+$lang['email_failed_smtp_login'] = 'Falha no envio do comando AUTH LOGIN. Erro: %s';
+$lang['email_smtp_auth_un'] = 'Falha na autenticação de username. Erro: %s';
+$lang['email_smtp_auth_pw'] = 'Falha na autenticação da password. Erro: %s';
+$lang['email_smtp_data_failure'] = 'Incapaz de enviar dados: %s';
+$lang['email_exit_status'] = 'Código do estado de saída: %s';
diff --git a/src/application/language/portuguese/migration_lang.php b/src/application/language/portuguese/migration_lang.php
index b5eaef41..5367e0cc 100644
--- a/src/application/language/portuguese/migration_lang.php
+++ b/src/application/language/portuguese/migration_lang.php
@@ -1,13 +1,19 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php
+/**
+ * System messages translation for CodeIgniter(tm)
+ *
+ * @author	CodeIgniter community
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
+ */
+defined('BASEPATH') OR exit('No direct script access allowed');
 
-$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.";
-
-
-/* End of file migration_lang.php */
-/* Location: ./system/language/portuguese/migration_lang.php */
+$lang['migration_none_found'] = 'Não foram encontradas migrações.';
+$lang['migration_not_found'] = 'Não foram encontradas migrações com a versão: %s.';
+$lang['migration_sequence_gap'] = 'Existe uma falha na sequência de versões das migrações junto à versão: %s.';
+$lang['migration_multiple_version'] = 'Existem várias migrações com o mesmo numero de versão: %s.';
+$lang['migration_class_doesnt_exist'] = 'Não foi possível encontrar a classe de migração "%s".';
+$lang['migration_missing_up_method'] = 'Falta o método "up" à classe de migração "%s"';
+$lang['migration_missing_down_method'] = 'Falta o método "down" à classe de migração "%s"';
+$lang['migration_invalid_filename'] = 'A migração "%s" tem um nome de ficheiro inválido.';
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/db_lang.php b/src/application/language/romanian/db_lang.php
index b9da89b1..a2ca4ac8 100644
--- a/src/application/language/romanian/db_lang.php
+++ b/src/application/language/romanian/db_lang.php
@@ -1,63 +1,36 @@
 <?php
 /**
- * CodeIgniter
+ * System messages translation for CodeIgniter(tm)
  *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright    Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright    Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT	MIT License
- * @link    https://codeigniter.com
- * @since    Version 1.0.0
- * @filesource
+ * @author	CodeIgniter community
+ * @author  Cristian Robert Chiribuc
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['db_invalid_connection_str'] = 'Unable to determine the database settings based on the connection string you submitted.';
-$lang['db_unable_to_connect'] = 'Unable to connect to your database server using the provided settings.';
-$lang['db_unable_to_select'] = 'Unable to select the specified database: %s';
-$lang['db_unable_to_create'] = 'Unable to create the specified database: %s';
-$lang['db_invalid_query'] = 'The query you submitted is not valid.';
-$lang['db_must_set_table'] = 'You must set the database table to be used with your query.';
-$lang['db_must_use_set'] = 'You must use the "set" method to update an entry.';
-$lang['db_must_use_index'] = 'You must specify an index to match on for batch updates.';
-$lang['db_batch_missing_index'] = 'One or more rows submitted for batch updating is missing the specified index.';
-$lang['db_must_use_where'] = 'Updates are not allowed unless they contain a "where" clause.';
-$lang['db_del_must_use_where'] = 'Deletes are not allowed unless they contain a "where" or "like" clause.';
-$lang['db_field_param_missing'] = 'To fetch fields requires the name of the table as a parameter.';
-$lang['db_unsupported_function'] = 'This feature is not available for the database you are using.';
-$lang['db_transaction_failure'] = 'Transaction failure: Rollback performed.';
-$lang['db_unable_to_drop'] = 'Unable to drop the specified database.';
-$lang['db_unsupported_feature'] = 'Unsupported feature of the database platform you are using.';
-$lang['db_unsupported_compression'] = 'The file compression format you chose is not supported by your server.';
-$lang['db_filepath_error'] = 'Unable to write data to the file path you have submitted.';
-$lang['db_invalid_cache_path'] = 'The cache path you submitted is not valid or writable.';
-$lang['db_table_name_required'] = 'A table name is required for that operation.';
-$lang['db_column_name_required'] = 'A column name is required for that operation.';
-$lang['db_column_definition_required'] = 'A column definition is required for that operation.';
-$lang['db_unable_to_set_charset'] = 'Unable to set client connection character set: %s';
-$lang['db_error_heading'] = 'A Database Error Occurred';
+$lang['db_invalid_connection_str'] = 'Datele conexiunii eronate. Nu s-au putut determina setările bazei de date.';
+$lang['db_unable_to_connect'] = 'Conexiunea la baza de date nu se poate efectua utilizând setările furnizate.';
+$lang['db_unable_to_select'] = 'Baza de date specificată nu poate fi selectată: %s';
+$lang['db_unable_to_create'] = 'Baza de date specificată nu poate fi creată: %s';
+$lang['db_invalid_query'] = 'Interogarea trimisă nu este validă.';
+$lang['db_must_set_table'] = 'Tabelul bazei de date trebuie setat pentru a putea fi efectuată interogarea.';
+$lang['db_must_use_set'] = 'Trebuie să folosiți metoda "set" pentru a actualiza o intrare.';
+$lang['db_must_use_index'] = 'Trebuie să specificați un index pentru a corespunde actualizărilor în lot.';
+$lang['db_batch_missing_index'] = 'Indexul specificat lipsește din unul sau mai multe rânduri trimise pentru actualizarea în lot.';
+$lang['db_must_use_where'] = 'Actualizările nu sunt permise decât dacă conțin o clausă de tip "where".';
+$lang['db_del_must_use_where'] = 'Ștergerile nu sunt permise decât dacă conțin o clausă de tip "where" sau "like".';
+$lang['db_field_param_missing'] = 'Pentru a prelua câmpuri este necesar numele tabelului ca parametru.';
+$lang['db_unsupported_function'] = 'Această opțiune nu este disponibilă pentru baza de date pe care o folosiți.';
+$lang['db_transaction_failure'] = 'Tranzacție eșuată: Revenirea a fost realizată.';
+$lang['db_unable_to_drop'] = 'Baza de date specificată nu a putut fi "aruncată".';
+$lang['db_unsupported_feature'] = 'Platforma bazei de date utilizată nu acceptă această caracteristică.';
+$lang['db_unsupported_compression'] = 'Formatul de compresie al fișierului ales nu este suportat de către server.';
+$lang['db_filepath_error'] = 'Nu s-au putut scrie date pe calea fișierului specificat.';
+$lang['db_invalid_cache_path'] = 'Calea specificată către cache nu este validă sau nu are permisiuni de scriere.';
+$lang['db_table_name_required'] = 'Pentru această operațiune este necesar un nume de tabel.';
+$lang['db_column_name_required'] = 'Pentru această operațiune este necesar un nume de coloană.';
+$lang['db_column_definition_required'] = 'Pentru această operație este necesară o definiție de coloană.';
+$lang['db_unable_to_set_charset'] = 'Unable to set client connection character set: %s'; //I must find a proper translation for this
+$lang['db_error_heading'] = 'A apărut o eroare la baza de date.';
diff --git a/src/application/language/romanian/email_lang.php b/src/application/language/romanian/email_lang.php
index e104db52..73a66711 100644
--- a/src/application/language/romanian/email_lang.php
+++ b/src/application/language/romanian/email_lang.php
@@ -1,58 +1,31 @@
 <?php
 /**
- * CodeIgniter
+ * System messages translation for CodeIgniter(tm)
  *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright    Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright    Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT	MIT License
- * @link    https://codeigniter.com
- * @since    Version 1.0.0
- * @filesource
+ * @author	CodeIgniter community
+ * @author  Cristian Robert Chiribuc
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['email_must_be_array'] = 'The email validation method must be passed an array.';
-$lang['email_invalid_address'] = 'Invalid email address: %s';
-$lang['email_attachment_missing'] = 'Unable to locate the following email attachment: %s';
-$lang['email_attachment_unreadable'] = 'Unable to open this attachment: %s';
-$lang['email_no_from'] = 'Cannot send mail with no "From" header.';
-$lang['email_no_recipients'] = 'You must include recipients: To, Cc, or Bcc';
-$lang['email_send_failure_phpmail'] = 'Unable to send email using PHP mail(). Your server might not be configured to send mail using this method.';
-$lang['email_send_failure_sendmail'] = 'Unable to send email using PHP Sendmail. Your server might not be configured to send mail using this method.';
-$lang['email_send_failure_smtp'] = 'Unable to send email using PHP SMTP. Your server might not be configured to send mail using this method.';
-$lang['email_sent'] = 'Your message has been successfully sent using the following protocol: %s';
-$lang['email_no_socket'] = 'Unable to open a socket to Sendmail. Please check settings.';
-$lang['email_no_hostname'] = 'You did not specify a SMTP hostname.';
-$lang['email_smtp_error'] = 'The following SMTP error was encountered: %s';
-$lang['email_no_smtp_unpw'] = 'Error: You must assign a SMTP username and password.';
-$lang['email_failed_smtp_login'] = 'Failed to send AUTH LOGIN command. Error: %s';
-$lang['email_smtp_auth_un'] = 'Failed to authenticate username. Error: %s';
-$lang['email_smtp_auth_pw'] = 'Failed to authenticate password. Error: %s';
-$lang['email_smtp_data_failure'] = 'Unable to send data: %s';
-$lang['email_exit_status'] = 'Exit status code: %s';
+$lang['email_must_be_array'] = 'Metoda de validare email trebuie să fie de tip array.';
+$lang['email_invalid_address'] = 'Adresa de email nu este validă: %s';
+$lang['email_attachment_missing'] = 'Nu s-a putut localiza următorul atașament de email: %s';
+$lang['email_attachment_unreadable'] = 'Atașamentul următor nu a putut fi deschis: %s';
+$lang['email_no_from'] = 'Nu se poate trimite email fără header-ul "De la".';
+$lang['email_no_recipients'] = 'Trebuie să includeți destinatarii: To, Cc, or Bcc';
+$lang['email_send_failure_phpmail'] = 'Nu s-a putut trimite email folosind PHP mail(). Este posibil ca server-ul dvs. să nu fie configurat pentru a trimite email-uri folosind această metodă.';
+$lang['email_send_failure_sendmail'] = 'Nu s-a putut trimite email folosind PHP Sendmail. Este posibil ca server-ul dvs. să nu fie configurat pentru a trimite email-uri folosind această metodă.';
+$lang['email_send_failure_smtp'] = 'Nu s-a putut trimite email folosind PHP SMTP. Este posibil ca server-ul dvs. să nu fie configurat pentru a trimite email-uri folosind această metodă.';
+$lang['email_sent'] = 'Mesajul dvs. a fost trimis cu succes folosind următorul protocol: %s';
+$lang['email_no_socket'] = 'Nu s-a putut deschide un socket pentru Sendmail. Verificați setările.';
+$lang['email_no_hostname'] = 'Nu ați specificat un hostname SMTP.';
+$lang['email_smtp_error'] = 'Următoarea eroare SMTP a fost întâlnită: %s';
+$lang['email_no_smtp_unpw'] = 'Eroare: Trebuie să atribuiți un nume de utilizator și parolă SMTP.';
+$lang['email_failed_smtp_login'] = 'Eroare la trimiterea comenzii AUTH LOGIN. Eroare: %s';
+$lang['email_smtp_auth_un'] = 'Autentificarea numelui de utilizator nu a putut fi efectuată. Eroare: %s';
+$lang['email_smtp_auth_pw'] = 'Autentificarea parolei nu a putut fi efectuată. Error: %s';
+$lang['email_smtp_data_failure'] = 'Datele nu pot fi trimise: %s';
+$lang['email_exit_status'] = 'Codul stării de ieșire: %s';
diff --git a/src/application/language/romanian/migration_lang.php b/src/application/language/romanian/migration_lang.php
index 740c4cc3..84c70043 100644
--- a/src/application/language/romanian/migration_lang.php
+++ b/src/application/language/romanian/migration_lang.php
@@ -1,13 +1,20 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php
+/**
+ * System messages translation for CodeIgniter(tm)
+ *
+ * @author	CodeIgniter community
+ * @author  Cristian Robert Chiribuc
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
+ */
+defined('BASEPATH') OR exit('No direct script access allowed');
 
-$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.";
-
-
-/* End of file migration_lang.php */
-/* Location: ./system/language/romanian/migration_lang.php */
+$lang['migration_none_found']		= 'Nu s-au găsit migrații.';
+$lang['migration_not_found']		= 'Nu s-au putut găsi migrații cu numărul: %s.';
+$lang['migration_sequence_gap']		= 'Există un decalaj în secvența de migrare aproape de versiunea nr.: %s.';
+$lang['migration_multiple_version']	= 'Există mai multe migrații cu aceleași versiune de număr: %s.';
+$lang['migration_class_doesnt_exist']	= 'Clasa migrației "%s" nu a fost găsită.';
+$lang['migration_missing_up_method']	= 'Clasei migrației "%s" îi lipsește o metodă de tip "up".';
+$lang['migration_missing_down_method']	= 'Clasei migrației "%s" îi lipsește o metodă de tip "down".';
+$lang['migration_invalid_filename']	= 'Migrația "%s" are un nume invalid..';
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/db_lang.php b/src/application/language/russian/db_lang.php
index b9da89b1..7fca3106 100644
--- a/src/application/language/russian/db_lang.php
+++ b/src/application/language/russian/db_lang.php
@@ -1,63 +1,35 @@
 <?php
 /**
- * CodeIgniter
+ * System messages translation for CodeIgniter(tm)
  *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright    Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright    Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT	MIT License
- * @link    https://codeigniter.com
- * @since    Version 1.0.0
- * @filesource
+ * @author	CodeIgniter community
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['db_invalid_connection_str'] = 'Unable to determine the database settings based on the connection string you submitted.';
-$lang['db_unable_to_connect'] = 'Unable to connect to your database server using the provided settings.';
-$lang['db_unable_to_select'] = 'Unable to select the specified database: %s';
-$lang['db_unable_to_create'] = 'Unable to create the specified database: %s';
-$lang['db_invalid_query'] = 'The query you submitted is not valid.';
-$lang['db_must_set_table'] = 'You must set the database table to be used with your query.';
-$lang['db_must_use_set'] = 'You must use the "set" method to update an entry.';
-$lang['db_must_use_index'] = 'You must specify an index to match on for batch updates.';
-$lang['db_batch_missing_index'] = 'One or more rows submitted for batch updating is missing the specified index.';
-$lang['db_must_use_where'] = 'Updates are not allowed unless they contain a "where" clause.';
-$lang['db_del_must_use_where'] = 'Deletes are not allowed unless they contain a "where" or "like" clause.';
-$lang['db_field_param_missing'] = 'To fetch fields requires the name of the table as a parameter.';
-$lang['db_unsupported_function'] = 'This feature is not available for the database you are using.';
-$lang['db_transaction_failure'] = 'Transaction failure: Rollback performed.';
-$lang['db_unable_to_drop'] = 'Unable to drop the specified database.';
-$lang['db_unsupported_feature'] = 'Unsupported feature of the database platform you are using.';
-$lang['db_unsupported_compression'] = 'The file compression format you chose is not supported by your server.';
-$lang['db_filepath_error'] = 'Unable to write data to the file path you have submitted.';
-$lang['db_invalid_cache_path'] = 'The cache path you submitted is not valid or writable.';
-$lang['db_table_name_required'] = 'A table name is required for that operation.';
-$lang['db_column_name_required'] = 'A column name is required for that operation.';
-$lang['db_column_definition_required'] = 'A column definition is required for that operation.';
-$lang['db_unable_to_set_charset'] = 'Unable to set client connection character set: %s';
-$lang['db_error_heading'] = 'A Database Error Occurred';
+$lang['db_invalid_connection_str'] = 'Невозможно определить параметры базы данных на основе строки подключения, которую вы предоставили.';
+$lang['db_unable_to_connect'] = 'Невозможно подключиться к серверу базы данных, используя предоставленные параметры.';
+$lang['db_unable_to_select'] = 'Невозможно выбрать указанную базу данных: %s';
+$lang['db_unable_to_create'] = 'Невозможно создать указанную базу данных: %s';
+$lang['db_invalid_query'] = 'Представленный вами запрос является недопустимым.';
+$lang['db_must_set_table'] = 'Необходимо указать таблицу базы данных, которая будет использована в вашем запросе.';
+$lang['db_must_use_set'] = 'Необходимо использовать метод "set" для обновления запись.';
+$lang['db_must_use_index'] = 'Необходимо указать индекс для пакетного обновления.';
+$lang['db_batch_missing_index'] = 'Одна или несколько строк представленных для пакетного обновления не содержит указанный индекс.';
+$lang['db_must_use_where'] = 'Обновления не допускаются, без указания условия через "where" оператор.';
+$lang['db_del_must_use_where'] = 'Удаления не допускаются, без указания условия через "where" или "like" параметр.';
+$lang['db_field_param_missing'] = 'Для выборки полей необходимо имя таблицы в качестве параметра.';
+$lang['db_unsupported_function'] = 'Эта функция не доступна для используемой базы данных.';
+$lang['db_transaction_failure'] = 'Транзакция не удалась: Осуществляется откат.';
+$lang['db_unable_to_drop'] = 'Невозможно удалить указанную базу данных.';
+$lang['db_unsupported_feature'] = 'Неподдерживаемая особенность платформы базы данных которую вы используете.';
+$lang['db_unsupported_compression'] = 'Формат сжатия файлов который вы выбрали не поддерживается вашим сервером.';
+$lang['db_filepath_error'] = 'Невозможно записать данные в файл, используя путь который вы указали.';
+$lang['db_invalid_cache_path'] = 'Путь до кеш файлов, указанный вами, некорректен или недоступен для записи.';
+$lang['db_table_name_required'] = 'Необходимо указать имя таблицы для этой операции.';
+$lang['db_column_name_required'] = 'Необходимо указать имя столбца для этой операции.';
+$lang['db_column_definition_required'] = 'Указание столбца обязательно для этой операции.';
+$lang['db_unable_to_set_charset'] = 'Невозможно установить кодировку соединения: %s';
+$lang['db_error_heading'] = 'Ошибка базы данных.';
diff --git a/src/application/language/russian/email_lang.php b/src/application/language/russian/email_lang.php
index e104db52..e084b8a7 100644
--- a/src/application/language/russian/email_lang.php
+++ b/src/application/language/russian/email_lang.php
@@ -1,58 +1,30 @@
 <?php
 /**
- * CodeIgniter
+ * System messages translation for CodeIgniter(tm)
  *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright    Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright    Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT	MIT License
- * @link    https://codeigniter.com
- * @since    Version 1.0.0
- * @filesource
+ * @author	CodeIgniter community
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['email_must_be_array'] = 'The email validation method must be passed an array.';
-$lang['email_invalid_address'] = 'Invalid email address: %s';
-$lang['email_attachment_missing'] = 'Unable to locate the following email attachment: %s';
-$lang['email_attachment_unreadable'] = 'Unable to open this attachment: %s';
-$lang['email_no_from'] = 'Cannot send mail with no "From" header.';
-$lang['email_no_recipients'] = 'You must include recipients: To, Cc, or Bcc';
-$lang['email_send_failure_phpmail'] = 'Unable to send email using PHP mail(). Your server might not be configured to send mail using this method.';
-$lang['email_send_failure_sendmail'] = 'Unable to send email using PHP Sendmail. Your server might not be configured to send mail using this method.';
-$lang['email_send_failure_smtp'] = 'Unable to send email using PHP SMTP. Your server might not be configured to send mail using this method.';
-$lang['email_sent'] = 'Your message has been successfully sent using the following protocol: %s';
-$lang['email_no_socket'] = 'Unable to open a socket to Sendmail. Please check settings.';
-$lang['email_no_hostname'] = 'You did not specify a SMTP hostname.';
-$lang['email_smtp_error'] = 'The following SMTP error was encountered: %s';
-$lang['email_no_smtp_unpw'] = 'Error: You must assign a SMTP username and password.';
-$lang['email_failed_smtp_login'] = 'Failed to send AUTH LOGIN command. Error: %s';
-$lang['email_smtp_auth_un'] = 'Failed to authenticate username. Error: %s';
-$lang['email_smtp_auth_pw'] = 'Failed to authenticate password. Error: %s';
-$lang['email_smtp_data_failure'] = 'Unable to send data: %s';
-$lang['email_exit_status'] = 'Exit status code: %s';
+$lang['email_must_be_array'] = 'В метод проверки адреса электронной почты должен быть передан массив.';
+$lang['email_invalid_address'] = 'Некорректный адрес электронной почты: %s';
+$lang['email_attachment_missing'] = 'Не удалось найти вложение: %s';
+$lang['email_attachment_unreadable'] = 'Невозможно открыть вложение: %s';
+$lang['email_no_from'] = 'Не удалось отправить письмо без указания заголовка "От"/"From".';
+$lang['email_no_recipients'] = 'Вы не указали получателей: Кому/To, Копии/Cc, или Скрытые копии/Bcc';
+$lang['email_send_failure_phpmail'] = 'Невозможно отправить электронную почту с помощью PHP mail(). Ваш сервер может быть не настроен для отправки почты с помощью этого метода.';
+$lang['email_send_failure_sendmail'] = 'Невозможно отправить электронную почту с помощью PHP Sendmail. Ваш сервер может быть не настроен для отправки почты с помощью этого метода.';
+$lang['email_send_failure_smtp'] = 'Невозможно отправить электронную почту с помощью PHP SMTP. Ваш сервер может быть не настроен для отправки почты с помощью этого метода.';
+$lang['email_sent'] = 'Ваше сообщение было успешно отправлено по следующему протоколу: %s';
+$lang['email_no_socket'] = 'Невозможно открыть сокет для Sendmail. Пожалуйста, проверьте настройки.';
+$lang['email_no_hostname'] = 'Вы не указали имя хоста SMTP.';
+$lang['email_smtp_error'] = 'Была обнаружена следующая ошибка SMTP: %s';
+$lang['email_no_smtp_unpw'] = 'Ошибка: Вы должны указать имя пользователя и пароль SMTP.';
+$lang['email_failed_smtp_login'] = 'Невозможно отправить команду AUTH LOGIN. Ошибка: %s';
+$lang['email_smtp_auth_un'] = 'Сбой при проверке имени пользователя. Ошибка: %s';
+$lang['email_smtp_auth_pw'] = 'Сбой при проверке пароля. Ошибка: %s';
+$lang['email_smtp_data_failure'] = 'Невозможно отправить данные: %s';
+$lang['email_exit_status'] = 'Код завершения: %s';
diff --git a/src/application/language/russian/migration_lang.php b/src/application/language/russian/migration_lang.php
index 0d684cc7..8f50fd58 100644
--- a/src/application/language/russian/migration_lang.php
+++ b/src/application/language/russian/migration_lang.php
@@ -1,13 +1,19 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php
+/**
+ * System messages translation for CodeIgniter(tm)
+ *
+ * @author	CodeIgniter community
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
+ */
+defined('BASEPATH') OR exit('No direct script access allowed');
 
-$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.";
-
-
-/* End of file migration_lang.php */
-/* Location: ./system/language/russian/migration_lang.php */
+$lang['migration_none_found'] = 'Не было найдено ни одной миграции.';
+$lang['migration_not_found'] = 'Не было найдено ни одной миграции с версией: %s.';
+$lang['migration_sequence_gap'] = 'Обнаружен разрыв в последовательности рядом с версией: %s.';
+$lang['migration_multiple_version'] = 'Имеется несколько миграций с одной версией: %s.';
+$lang['migration_class_doesnt_exist'] = 'Невозможно найти класс миграции "%s".';
+$lang['migration_missing_up_method'] = 'Класс миграции "%s" не содержит "up" метода.';
+$lang['migration_missing_down_method'] = 'Класс миграции "%s" не содержит "down" метода.';
+$lang['migration_invalid_filename'] = 'Миграция "%s" имеет недопустимое имя файла.';
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/db_lang.php b/src/application/language/slovak/db_lang.php
index b9da89b1..24fdf5e6 100644
--- a/src/application/language/slovak/db_lang.php
+++ b/src/application/language/slovak/db_lang.php
@@ -1,63 +1,36 @@
 <?php
 /**
- * CodeIgniter
+ * System messages translation for CodeIgniter(tm)
  *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright    Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright    Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT	MIT License
- * @link    https://codeigniter.com
- * @since    Version 1.0.0
- * @filesource
+ * @author    CodeIgniter community
+ * @author    Gabriel Potkány <gadelat+codeigniter@gmail.com>
+ * @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license   http://opensource.org/licenses/MIT MIT License
+ * @link      https://codeigniter.com
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['db_invalid_connection_str'] = 'Unable to determine the database settings based on the connection string you submitted.';
-$lang['db_unable_to_connect'] = 'Unable to connect to your database server using the provided settings.';
-$lang['db_unable_to_select'] = 'Unable to select the specified database: %s';
-$lang['db_unable_to_create'] = 'Unable to create the specified database: %s';
-$lang['db_invalid_query'] = 'The query you submitted is not valid.';
-$lang['db_must_set_table'] = 'You must set the database table to be used with your query.';
-$lang['db_must_use_set'] = 'You must use the "set" method to update an entry.';
-$lang['db_must_use_index'] = 'You must specify an index to match on for batch updates.';
-$lang['db_batch_missing_index'] = 'One or more rows submitted for batch updating is missing the specified index.';
-$lang['db_must_use_where'] = 'Updates are not allowed unless they contain a "where" clause.';
-$lang['db_del_must_use_where'] = 'Deletes are not allowed unless they contain a "where" or "like" clause.';
-$lang['db_field_param_missing'] = 'To fetch fields requires the name of the table as a parameter.';
-$lang['db_unsupported_function'] = 'This feature is not available for the database you are using.';
-$lang['db_transaction_failure'] = 'Transaction failure: Rollback performed.';
-$lang['db_unable_to_drop'] = 'Unable to drop the specified database.';
-$lang['db_unsupported_feature'] = 'Unsupported feature of the database platform you are using.';
-$lang['db_unsupported_compression'] = 'The file compression format you chose is not supported by your server.';
-$lang['db_filepath_error'] = 'Unable to write data to the file path you have submitted.';
-$lang['db_invalid_cache_path'] = 'The cache path you submitted is not valid or writable.';
-$lang['db_table_name_required'] = 'A table name is required for that operation.';
-$lang['db_column_name_required'] = 'A column name is required for that operation.';
-$lang['db_column_definition_required'] = 'A column definition is required for that operation.';
-$lang['db_unable_to_set_charset'] = 'Unable to set client connection character set: %s';
-$lang['db_error_heading'] = 'A Database Error Occurred';
+$lang['db_invalid_connection_str']     = 'Nebolo možné zistiť databázové nastavenie podľa vloženého reťazca';
+$lang['db_unable_to_connect']          = 'Nepodarilo sa pripojiť k databáze s daným nastavením';
+$lang['db_unable_to_select']           = 'Nepodarilo sa vybrať (select) databázu: %s';
+$lang['db_unable_to_create']           = 'Nepodarilo sa vytvoriť danú databázu: %s';
+$lang['db_invalid_query']              = 'Odoslaná požiadavka nie je platná.';
+$lang['db_must_set_table']             = 'Musíte určiť databázovú tabuľku, ktorej sa požiadavka týka.';
+$lang['db_must_use_set']               = 'Musíte nastaviť metódu "set" pre úpravu záznamu.';
+$lang['db_must_use_index']             = 'Je nutné určiť párový index pre dávkový update).';
+$lang['db_batch_missing_index']        = 'Pre jeden alebo viac daných riadkov určených k dávkovému updatu chýba špecifikovaný index.';
+$lang['db_must_use_where']             = 'Nie je možné upravovať záznamy bez podmienky "where".';
+$lang['db_del_must_use_where']         = 'Nie je možné mazať záznamy bez podmienky "where".';
+$lang['db_field_param_missing']        = 'Spracovanie polí vyžaduje ako parameter názov tabuľky.';
+$lang['db_unsupported_function']       = 'Táto funkcia nie je dostupná v tomto type databázy.';
+$lang['db_transaction_failure']        = 'Chyba transakcie: aplikovaný Rollback';
+$lang['db_unable_to_drop']             = 'Nie je možné odstrániť požadovanú databázu.';
+$lang['db_unsupported_feature']        = 'Táto vlastnosť nie je dostupná pri aktuálnej platforme.';
+$lang['db_unsupported_compression']    = 'Zvolená kompresia súborov nie je podporovaná serverom.';
+$lang['db_filepath_error']             = 'Nepodarilo sa zapísať dáta do zadanej cesty.';
+$lang['db_invalid_cache_path']         = 'Zadaná cesta pre kešovanie nie je platná alebo do nej nemožno zapisovať.';
+$lang['db_table_name_required']        = 'Táto operácia potrebuje názov tabuľky.';
+$lang['db_column_name_required']       = 'Táto operácia potrebuje názov stĺpca.';
+$lang['db_column_definition_required'] = 'Táto operácia potrebuje definíciu stĺpca.';
+$lang['db_unable_to_set_charset']      = 'Nie je možné nastaviť znakovú sadu pripojenia: %s';
+$lang['db_error_heading']              = 'Nastala chyba databázy';
\ No newline at end of file
diff --git a/src/application/language/slovak/email_lang.php b/src/application/language/slovak/email_lang.php
index e104db52..3f113e43 100644
--- a/src/application/language/slovak/email_lang.php
+++ b/src/application/language/slovak/email_lang.php
@@ -1,58 +1,31 @@
 <?php
 /**
- * CodeIgniter
+ * System messages translation for CodeIgniter(tm)
  *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright    Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright    Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT	MIT License
- * @link    https://codeigniter.com
- * @since    Version 1.0.0
- * @filesource
+ * @author    CodeIgniter community
+ * @author    Gabriel Potkány <gadelat+codeigniter@gmail.com>
+ * @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license   http://opensource.org/licenses/MIT MIT License
+ * @link      https://codeigniter.com
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['email_must_be_array'] = 'The email validation method must be passed an array.';
-$lang['email_invalid_address'] = 'Invalid email address: %s';
-$lang['email_attachment_missing'] = 'Unable to locate the following email attachment: %s';
-$lang['email_attachment_unreadable'] = 'Unable to open this attachment: %s';
-$lang['email_no_from'] = 'Cannot send mail with no "From" header.';
-$lang['email_no_recipients'] = 'You must include recipients: To, Cc, or Bcc';
-$lang['email_send_failure_phpmail'] = 'Unable to send email using PHP mail(). Your server might not be configured to send mail using this method.';
-$lang['email_send_failure_sendmail'] = 'Unable to send email using PHP Sendmail. Your server might not be configured to send mail using this method.';
-$lang['email_send_failure_smtp'] = 'Unable to send email using PHP SMTP. Your server might not be configured to send mail using this method.';
-$lang['email_sent'] = 'Your message has been successfully sent using the following protocol: %s';
-$lang['email_no_socket'] = 'Unable to open a socket to Sendmail. Please check settings.';
-$lang['email_no_hostname'] = 'You did not specify a SMTP hostname.';
-$lang['email_smtp_error'] = 'The following SMTP error was encountered: %s';
-$lang['email_no_smtp_unpw'] = 'Error: You must assign a SMTP username and password.';
-$lang['email_failed_smtp_login'] = 'Failed to send AUTH LOGIN command. Error: %s';
-$lang['email_smtp_auth_un'] = 'Failed to authenticate username. Error: %s';
-$lang['email_smtp_auth_pw'] = 'Failed to authenticate password. Error: %s';
-$lang['email_smtp_data_failure'] = 'Unable to send data: %s';
-$lang['email_exit_status'] = 'Exit status code: %s';
+$lang['email_must_be_array']         = 'Metóde na kontrolu e-mailu musí byť poslané pole.';
+$lang['email_invalid_address']       = 'Neplatná e-mailová adresa: %s';
+$lang['email_attachment_missing']    = 'Nie je možné nájsť prílohu e-mailu: %s';
+$lang['email_attachment_unreadable'] = 'Nepodarilo sa otvoriť prílohu: %s';
+$lang['email_no_from']               = 'Nie je možné odoslať e-mail bez odosielateľa.';
+$lang['email_no_recipients']         = 'Musíte uviesť príjemcu: Komu, Cc, alebo Bcc';
+$lang['email_send_failure_phpmail']  = 'Nie je možné poslať e-mail pomocou PHP funkcie mail(). Server nemusí byť nastavený pre posielanie e-mailov touto metódou.';
+$lang['email_send_failure_sendmail'] = 'Nie je možné poslať e-mail pomocou programu Sendmail. Server nemusí byť nastavený pre posielanie e-mailov touto metódou.';
+$lang['email_send_failure_smtp']     = 'Nie je možné poslať e-mail pomocou PHP funkcie pre SMTP. Server nemusí byť nastavený pre posielanie e-mailov touto metódou.';
+$lang['email_sent']                  = 'Správa bola úspešne odoslaná pomocou protokolu: %s';
+$lang['email_no_socket']             = 'Nie je možné otvoriť prístup k programu Sendmail. Skontrolujte nastavenia.';
+$lang['email_no_hostname']           = 'Nie je nastavené meno SMTP servera';
+$lang['email_smtp_error']            = 'Bola zaznamenaná chyba SMTP: %s';
+$lang['email_no_smtp_unpw']          = 'Chyba: Musíte nastaviť užívateľské meno a heslo pre SMTP.';
+$lang['email_failed_smtp_login']     = 'Zlyhalo odoslanie príkazu AUTH LOGIN. Chyba: %s';
+$lang['email_smtp_auth_un']          = 'Zlyhalo overenie užívateľského mena. Chyba: %s';
+$lang['email_smtp_auth_pw']          = 'Zlyhalo overenie hesla. Chyba: %s';
+$lang['email_smtp_data_failure']     = 'Nie je možné odoslať dáta: %s';
+$lang['email_exit_status']           = 'Stav pri ukončení: %s';
diff --git a/src/application/language/slovak/migration_lang.php b/src/application/language/slovak/migration_lang.php
index 887ec0ff..899619b5 100644
--- a/src/application/language/slovak/migration_lang.php
+++ b/src/application/language/slovak/migration_lang.php
@@ -1,13 +1,20 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php
+/**
+ * System messages translation for CodeIgniter(tm)
+ *
+ * @author    CodeIgniter community
+ * @author    Gabriel Potkány <gadelat+codeigniter@gmail.com>
+ * @copyright Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license   http://opensource.org/licenses/MIT MIT License
+ * @link      https://codeigniter.com
+ */
+defined('BASEPATH') OR exit('No direct script access allowed');
 
-$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.";
-
-
-/* End of file migration_lang.php */
-/* Location: ./system/language/slovak/migration_lang.php */
+$lang['migration_none_found']          = 'Žiadne migrácie neboli nájdené.';
+$lang['migration_not_found']           = 'Migrácia s číslom tejto verzie nebola nájdená: %s.';
+$lang['migration_sequence_gap']        = 'Chýbajúca migrácia v sekvencii blízko: %s.';
+$lang['migration_multiple_version']    = 'Existuje viacej migracií s rovnakým číslom verzie: %s.';
+$lang['migration_class_doesnt_exist']  = 'Trieda pre migráciu "%s" nebola nájdená.';
+$lang['migration_missing_up_method']   = 'V migračnej triede "%s" chýba "up" metoda.';
+$lang['migration_missing_down_method'] = 'V migračnej triede "%s" chýba "down" metoda.';
+$lang['migration_invalid_filename']    = 'Migrácia "%s" má chybné meno.';
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/db_lang.php b/src/application/language/spanish/db_lang.php
index b9da89b1..bcef282a 100644
--- a/src/application/language/spanish/db_lang.php
+++ b/src/application/language/spanish/db_lang.php
@@ -1,63 +1,36 @@
 <?php
 /**
- * CodeIgniter
+ * System messages translation for CodeIgniter(tm)
  *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright    Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright    Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT	MIT License
- * @link    https://codeigniter.com
- * @since    Version 1.0.0
- * @filesource
+ * @author	CodeIgniter community
+ * @author	Iban Eguia
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['db_invalid_connection_str'] = 'Unable to determine the database settings based on the connection string you submitted.';
-$lang['db_unable_to_connect'] = 'Unable to connect to your database server using the provided settings.';
-$lang['db_unable_to_select'] = 'Unable to select the specified database: %s';
-$lang['db_unable_to_create'] = 'Unable to create the specified database: %s';
-$lang['db_invalid_query'] = 'The query you submitted is not valid.';
-$lang['db_must_set_table'] = 'You must set the database table to be used with your query.';
-$lang['db_must_use_set'] = 'You must use the "set" method to update an entry.';
-$lang['db_must_use_index'] = 'You must specify an index to match on for batch updates.';
-$lang['db_batch_missing_index'] = 'One or more rows submitted for batch updating is missing the specified index.';
-$lang['db_must_use_where'] = 'Updates are not allowed unless they contain a "where" clause.';
-$lang['db_del_must_use_where'] = 'Deletes are not allowed unless they contain a "where" or "like" clause.';
-$lang['db_field_param_missing'] = 'To fetch fields requires the name of the table as a parameter.';
-$lang['db_unsupported_function'] = 'This feature is not available for the database you are using.';
-$lang['db_transaction_failure'] = 'Transaction failure: Rollback performed.';
-$lang['db_unable_to_drop'] = 'Unable to drop the specified database.';
-$lang['db_unsupported_feature'] = 'Unsupported feature of the database platform you are using.';
-$lang['db_unsupported_compression'] = 'The file compression format you chose is not supported by your server.';
-$lang['db_filepath_error'] = 'Unable to write data to the file path you have submitted.';
-$lang['db_invalid_cache_path'] = 'The cache path you submitted is not valid or writable.';
-$lang['db_table_name_required'] = 'A table name is required for that operation.';
-$lang['db_column_name_required'] = 'A column name is required for that operation.';
-$lang['db_column_definition_required'] = 'A column definition is required for that operation.';
-$lang['db_unable_to_set_charset'] = 'Unable to set client connection character set: %s';
-$lang['db_error_heading'] = 'A Database Error Occurred';
+$lang['db_invalid_connection_str'] = 'No ha sido posible determinar la configuración de la base de datos basada en la cadena de conexión introducida.';
+$lang['db_unable_to_connect'] = 'No ha sido posible conectar al servidor de la base de datos haciendo uso de la configuración proporcionada.';
+$lang['db_unable_to_select'] = 'No ha sido posible seleccionar la base de datos especificada: %s';
+$lang['db_unable_to_create'] = 'No ha sido posible crear la base de datos especificada: %s';
+$lang['db_invalid_query'] = 'La consulta introducida no es válida.';
+$lang['db_must_set_table'] = 'Debes fijar la tabla de la base de datos que será usada con tu consulta.';
+$lang['db_must_use_set'] = 'Debes usar el método "set" para actualizar una entrada.';
+$lang['db_must_use_index'] = 'Debes especificar un índice para emparejar las actualizaciones masivas.';
+$lang['db_batch_missing_index'] = 'A una o más filas introducidas para la actualización masiva le falta el índice especificado.';
+$lang['db_must_use_where'] = 'Las actualizaciones no están permitidas a no ser que contengan la cláusula "where".';
+$lang['db_del_must_use_where'] = 'Los borrados no están permitidos a no ser que contengan la cláusula "where" o "like".';
+$lang['db_field_param_missing'] = 'Para obtener campos se requiere el nombre de la tabla como parámetro.';
+$lang['db_unsupported_function'] = 'Esta característica no está disponible para la base de datos que estás usando.';
+$lang['db_transaction_failure'] = 'Fallo de transacción: Rollback realizado.';
+$lang['db_unable_to_drop'] = 'No ha sido posible borrar la base de datos especificada.';
+$lang['db_unsupported_feature'] = 'Característica no soportada de la plataforma de bases de datos que estás usando.';
+$lang['db_unsupported_compression'] = 'El formato de compresión elegido no está soportado por el servidor.';
+$lang['db_filepath_error'] = 'No ha sido posible escribir los datos en la ruta de archivo especificada.';
+$lang['db_invalid_cache_path'] = 'La ruta de la caché introducida no es válida o escribible.';
+$lang['db_table_name_required'] = 'Se requiere un nombre de tabla para esa operación.';
+$lang['db_column_name_required'] = 'Se requiere un nombre de columna para esa operación.';
+$lang['db_column_definition_required'] = 'Se requiere una definición de columna para esa operación.';
+$lang['db_unable_to_set_charset'] = 'No ha sido posible fijar en la conexión el conjunto de caracteres: %s';
+$lang['db_error_heading'] = 'Ha ocurrido un error con la base de datos';
diff --git a/src/application/language/spanish/email_lang.php b/src/application/language/spanish/email_lang.php
index e104db52..39e50af7 100644
--- a/src/application/language/spanish/email_lang.php
+++ b/src/application/language/spanish/email_lang.php
@@ -1,58 +1,31 @@
 <?php
 /**
- * CodeIgniter
+ * System messages translation for CodeIgniter(tm)
  *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright    Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright    Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT	MIT License
- * @link    https://codeigniter.com
- * @since    Version 1.0.0
- * @filesource
+ * @author	CodeIgniter community
+ * @author	Iban Eguia
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['email_must_be_array'] = 'The email validation method must be passed an array.';
-$lang['email_invalid_address'] = 'Invalid email address: %s';
-$lang['email_attachment_missing'] = 'Unable to locate the following email attachment: %s';
-$lang['email_attachment_unreadable'] = 'Unable to open this attachment: %s';
-$lang['email_no_from'] = 'Cannot send mail with no "From" header.';
-$lang['email_no_recipients'] = 'You must include recipients: To, Cc, or Bcc';
-$lang['email_send_failure_phpmail'] = 'Unable to send email using PHP mail(). Your server might not be configured to send mail using this method.';
-$lang['email_send_failure_sendmail'] = 'Unable to send email using PHP Sendmail. Your server might not be configured to send mail using this method.';
-$lang['email_send_failure_smtp'] = 'Unable to send email using PHP SMTP. Your server might not be configured to send mail using this method.';
-$lang['email_sent'] = 'Your message has been successfully sent using the following protocol: %s';
-$lang['email_no_socket'] = 'Unable to open a socket to Sendmail. Please check settings.';
-$lang['email_no_hostname'] = 'You did not specify a SMTP hostname.';
-$lang['email_smtp_error'] = 'The following SMTP error was encountered: %s';
-$lang['email_no_smtp_unpw'] = 'Error: You must assign a SMTP username and password.';
-$lang['email_failed_smtp_login'] = 'Failed to send AUTH LOGIN command. Error: %s';
-$lang['email_smtp_auth_un'] = 'Failed to authenticate username. Error: %s';
-$lang['email_smtp_auth_pw'] = 'Failed to authenticate password. Error: %s';
-$lang['email_smtp_data_failure'] = 'Unable to send data: %s';
-$lang['email_exit_status'] = 'Exit status code: %s';
+$lang['email_must_be_array'] = 'Debes pasar un array al método de validación de email.';
+$lang['email_invalid_address'] = 'Correo electrónico no válido: %s';
+$lang['email_attachment_missing'] = 'No ha sido posible encontrar este adjunto: %s';
+$lang['email_attachment_unreadable'] = 'No ha sido posible abrir este adjunto: %s';
+$lang['email_no_from'] = 'No se puede enviar un email sin la cabecera "From".';
+$lang['email_no_recipients'] = 'Debes incluir destinatarios: Para, Cc, o Cco';
+$lang['email_send_failure_phpmail'] = 'No ha sido posible enviar el correo usando PHP mail(). Tu servidor podría no estar configurado para enviar emails con este método.';
+$lang['email_send_failure_sendmail'] = 'No ha sido posible enviar el correo usando PHP Sendmail. Tu servidor podría no estar configurado para enviar emails con este método.';
+$lang['email_send_failure_smtp'] = 'No ha sido posible enviar el correo usando PHP SMTP. Tu servidor podría no estar configurado para enviar emails con este método.';
+$lang['email_sent'] = 'Tu mensaje ha sido enviado con éxito usando este protocolo: %s';
+$lang['email_no_socket'] = 'No ha sido posible abrir un socket a Sendmail. Por favor, comprueba la configuración.';
+$lang['email_no_hostname'] = 'No has especificado un servidor SMTP.';
+$lang['email_smtp_error'] = 'Se ha encontrado este error SMTP: %s';
+$lang['email_no_smtp_unpw'] = 'Error: Debes asignar un usuario y una contraseña SMTP.';
+$lang['email_failed_smtp_login'] = 'Fallo al enviar el comando AUTH LOGIN. Error: %s';
+$lang['email_smtp_auth_un'] = 'Fallo al autenticar el usuario. Error: %s';
+$lang['email_smtp_auth_pw'] = 'Fallo al autenticar la contraseña. Error: %s';
+$lang['email_smtp_data_failure'] = 'No ha sido posible enviar los datos: %s';
+$lang['email_exit_status'] = 'Código estado al salir: %s';
diff --git a/src/application/language/spanish/migration_lang.php b/src/application/language/spanish/migration_lang.php
index fd6bfcb0..a77dfc84 100644
--- a/src/application/language/spanish/migration_lang.php
+++ b/src/application/language/spanish/migration_lang.php
@@ -1,13 +1,20 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php
+/**
+ * System messages translation for CodeIgniter(tm)
+ *
+ * @author	CodeIgniter community
+ * @author	Iban Eguia
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
+ */
+defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['migration_none_found'] = "No se encontraron migraciones.";
-$lang['migration_not_found'] = "No se pudo encontrar esta migraci&oacute;n.";
-$lang['migration_multiple_version'] = "Estas son m&uacute;ltiples migraciones con el mismo n&uacute;mero de versi&oacute;n: %d.";
-$lang['migration_class_doesnt_exist'] = "No existe la migraci&oacute;n clase \"%s\".";
-$lang['migration_missing_up_method'] = "A la migraci&oacute;n clase \"%s\" le falta un m&eacute;todo de 'subida'.";
-$lang['migration_missing_down_method'] = "A la migraci&oacute;n clase \"%s\" le falta un m&eacute;todo de 'bajada'.";
-$lang['migration_invalid_filename'] = "La migraci&oacute;n \"%s\" tiene un archivo inv&aacute;lido.";
-
-
-/* End of file migration_lang.php */
-/* Location: ./system/language/spanish/migration_lang.php */
+$lang['migration_none_found']		= 'No se ha encontrado ninguna migración.';
+$lang['migration_not_found']		= 'No se ha encontrado ninguna migración con el número de versión: %s.';
+$lang['migration_sequence_gap']		= 'Hay un vacío en la migración, cerca del número de versión: %s.';
+$lang['migration_multiple_version']	= 'Hay múltiples migraciones con el mismo número de versión: %s.';
+$lang['migration_class_doesnt_exist']	= 'La clase de migración "%s" no ha podido ser encontrada.';
+$lang['migration_missing_up_method']	= 'A la clase de migración "%s" le falta el método "up".';
+$lang['migration_missing_down_method']	= 'A la clase de migración "%s" le falta el método "down".';
+$lang['migration_invalid_filename']	= 'La migración "%s" tiene un nombre de archivo no válido.';
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/db_lang.php b/src/application/language/turkish/db_lang.php
index b9da89b1..93e782b4 100644
--- a/src/application/language/turkish/db_lang.php
+++ b/src/application/language/turkish/db_lang.php
@@ -1,63 +1,35 @@
 <?php
 /**
- * CodeIgniter
+ * System messages translation for CodeIgniter(tm)
  *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright    Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright    Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT	MIT License
- * @link    https://codeigniter.com
- * @since    Version 1.0.0
- * @filesource
+ * @author	CodeIgniter community
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['db_invalid_connection_str'] = 'Unable to determine the database settings based on the connection string you submitted.';
-$lang['db_unable_to_connect'] = 'Unable to connect to your database server using the provided settings.';
-$lang['db_unable_to_select'] = 'Unable to select the specified database: %s';
-$lang['db_unable_to_create'] = 'Unable to create the specified database: %s';
-$lang['db_invalid_query'] = 'The query you submitted is not valid.';
-$lang['db_must_set_table'] = 'You must set the database table to be used with your query.';
-$lang['db_must_use_set'] = 'You must use the "set" method to update an entry.';
-$lang['db_must_use_index'] = 'You must specify an index to match on for batch updates.';
-$lang['db_batch_missing_index'] = 'One or more rows submitted for batch updating is missing the specified index.';
-$lang['db_must_use_where'] = 'Updates are not allowed unless they contain a "where" clause.';
-$lang['db_del_must_use_where'] = 'Deletes are not allowed unless they contain a "where" or "like" clause.';
-$lang['db_field_param_missing'] = 'To fetch fields requires the name of the table as a parameter.';
-$lang['db_unsupported_function'] = 'This feature is not available for the database you are using.';
-$lang['db_transaction_failure'] = 'Transaction failure: Rollback performed.';
-$lang['db_unable_to_drop'] = 'Unable to drop the specified database.';
-$lang['db_unsupported_feature'] = 'Unsupported feature of the database platform you are using.';
-$lang['db_unsupported_compression'] = 'The file compression format you chose is not supported by your server.';
-$lang['db_filepath_error'] = 'Unable to write data to the file path you have submitted.';
-$lang['db_invalid_cache_path'] = 'The cache path you submitted is not valid or writable.';
-$lang['db_table_name_required'] = 'A table name is required for that operation.';
-$lang['db_column_name_required'] = 'A column name is required for that operation.';
-$lang['db_column_definition_required'] = 'A column definition is required for that operation.';
-$lang['db_unable_to_set_charset'] = 'Unable to set client connection character set: %s';
-$lang['db_error_heading'] = 'A Database Error Occurred';
+$lang['db_invalid_connection_str']      = 'Verilen bağlantı dizisi bilgileriyle veri tabanı ayarları belirlenemiyor.';
+$lang['db_unable_to_connect']           = 'Verilen ayarlarla veri tabanına bağlantı sağlanamıyor.';
+$lang['db_unable_to_select']            = 'Belirtilen veri tabanı seçilemiyor: %s';
+$lang['db_unable_to_create']            = 'Belirtilen veri tabanı oluşturulamıyor: %s';
+$lang['db_invalid_query']               = 'Verilen sorgu geçersiz.';
+$lang['db_must_set_table']              = 'Sorguda kullanılacak tabloyu belirtmelisiniz.';
+$lang['db_must_use_set']                = 'Kaydı güncellemek için "set" metodu kullanmalısınız.';
+$lang['db_must_use_index']              = 'Toplu güncellemede eşleştirme için bir indeks belirtmelisiniz.';
+$lang['db_batch_missing_index']         = 'Toplu güncelleme için verilen bir veya birden fazla kaydın belirtilen indeksi eksik.';
+$lang['db_must_use_where']              = '"where" sözcüğü olmayan güncellemelere izin verilmez.';
+$lang['db_del_must_use_where']          = '"where" veya "like" sözcüğü olmayan silmelere izin verilmez.';
+$lang['db_field_param_missing']         = 'Alanların okunabilmesi için tablo adı parametre olarak verilmeli.';
+$lang['db_unsupported_function']        = 'Kullandığınız veri tabanında bu özellik bulunmuyor.';
+$lang['db_transaction_failure']         = 'İşlem hatası: Geri alma gerçekleştirildi.';
+$lang['db_unable_to_drop']              = 'Belirtilen veri tabanı silinemiyor.';
+$lang['db_unsupported_feature']         = 'Kullandığınız veri tabanı ortamında bu özellik desteklenmiyor.';
+$lang['db_unsupported_compression']     = 'Seçtiğiniz dosya sıkıştırma formatı sunucu tarafından desteklenmiyor.';
+$lang['db_filepath_error']              = 'Veriler belirtilen dosya yoluna yazılamıyor.';
+$lang['db_invalid_cache_path']          = 'Belirtilen önbellek yolu geçersiz veya yazılamıyor.';
+$lang['db_table_name_required']         = 'Bu işlem için bir tablo adı gerekli.';
+$lang['db_column_name_required']        = 'Bu işlem için bir sütun adı gerekli.';
+$lang['db_column_definition_required']  = 'Bu işlem için bir sütun tanımlaması gerekli';
+$lang['db_unable_to_set_charset']       = 'Kullanıcı bağlantı karakter seti ayarlanamıyor: %s';
+$lang['db_error_heading']               = 'Bir Veri Tabanı Hatası Oluştu';
diff --git a/src/application/language/turkish/email_lang.php b/src/application/language/turkish/email_lang.php
index e104db52..4ee206ea 100644
--- a/src/application/language/turkish/email_lang.php
+++ b/src/application/language/turkish/email_lang.php
@@ -1,58 +1,30 @@
 <?php
 /**
- * CodeIgniter
+ * System messages translation for CodeIgniter(tm)
  *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author    EllisLab Dev Team
- * @copyright    Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright    Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT	MIT License
- * @link    https://codeigniter.com
- * @since    Version 1.0.0
- * @filesource
+ * @author	CodeIgniter community
+ * @copyright	Copyright (c) 2014-2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['email_must_be_array'] = 'The email validation method must be passed an array.';
-$lang['email_invalid_address'] = 'Invalid email address: %s';
-$lang['email_attachment_missing'] = 'Unable to locate the following email attachment: %s';
-$lang['email_attachment_unreadable'] = 'Unable to open this attachment: %s';
-$lang['email_no_from'] = 'Cannot send mail with no "From" header.';
-$lang['email_no_recipients'] = 'You must include recipients: To, Cc, or Bcc';
-$lang['email_send_failure_phpmail'] = 'Unable to send email using PHP mail(). Your server might not be configured to send mail using this method.';
-$lang['email_send_failure_sendmail'] = 'Unable to send email using PHP Sendmail. Your server might not be configured to send mail using this method.';
-$lang['email_send_failure_smtp'] = 'Unable to send email using PHP SMTP. Your server might not be configured to send mail using this method.';
-$lang['email_sent'] = 'Your message has been successfully sent using the following protocol: %s';
-$lang['email_no_socket'] = 'Unable to open a socket to Sendmail. Please check settings.';
-$lang['email_no_hostname'] = 'You did not specify a SMTP hostname.';
-$lang['email_smtp_error'] = 'The following SMTP error was encountered: %s';
-$lang['email_no_smtp_unpw'] = 'Error: You must assign a SMTP username and password.';
-$lang['email_failed_smtp_login'] = 'Failed to send AUTH LOGIN command. Error: %s';
-$lang['email_smtp_auth_un'] = 'Failed to authenticate username. Error: %s';
-$lang['email_smtp_auth_pw'] = 'Failed to authenticate password. Error: %s';
-$lang['email_smtp_data_failure'] = 'Unable to send data: %s';
-$lang['email_exit_status'] = 'Exit status code: %s';
+$lang['email_must_be_array']            = 'Email doğrulama metoduna bir dizi verilmeli.';
+$lang['email_invalid_address']          = 'Geçersiz email adresi: %s';
+$lang['email_attachment_missing']       = 'Email eklentisi bulunamıyor: %s';
+$lang['email_attachment_unreadable']    = 'Email eklentisi açılamıyor: %s';
+$lang['email_no_from']                  = '"From" başlığı olmadan email gönderilemez.';
+$lang['email_no_recipients']            = 'Alıcıları yazmalısınız: To, Cc, or Bcc';
+$lang['email_send_failure_phpmail']     = 'PHP mail() fonksiyonu ile email gönderilemiyor. Sunucunuz bu metod ile email göndermeye ayarlanmamış olabilir.';
+$lang['email_send_failure_sendmail']    = 'PHP Sendmail ile email gönderilemiyor. Sunucunuz bu metod ile email göndermeye ayarlanmamış olabilir.';
+$lang['email_send_failure_smtp']        = 'PHP SMTP ile email gönderilemiyor. Sunucunuz bu metod ile email göndermeye ayarlanmamış olabilir.';
+$lang['email_sent']                     = 'Mesajınız %s protokolü kullanılarak başarıyla gönderildi.';
+$lang['email_no_socket']                = 'Sendmail soketi açılamıyor. Lütfen ayarlarınızı kontrol ediniz.';
+$lang['email_no_hostname']              = 'SMTP sunucu adı belirtmelisiniz.';
+$lang['email_smtp_error']               = 'SMTP hatası: %s';
+$lang['email_no_smtp_unpw']             = 'Hata: SMTP kullanıcı adı ve şifresi belirtilmeli.';
+$lang['email_failed_smtp_login']        = 'AUTH LOGIN komutu gönderilemedi. Hata: %s';
+$lang['email_smtp_auth_un']             = 'Kullanıcı adı geçersiz. Hata: %s';
+$lang['email_smtp_auth_pw']             = 'Şifre geçersiz. Hata: %s';
+$lang['email_smtp_data_failure']        = 'Veriler gönderilemedi: %s';
+$lang['email_exit_status']              = 'Çıkış durum kodu: %s';
diff --git a/src/application/language/turkish/migration_lang.php b/src/application/language/turkish/migration_lang.php
index 4189af4a..13019b15 100644
--- a/src/application/language/turkish/migration_lang.php
+++ b/src/application/language/turkish/migration_lang.php
@@ -1,13 +1,19 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php
+/**
+ * System messages translation for CodeIgniter(tm)
+ *
+ * @author	CodeIgniter community
+ * @copyright	Copyright (c) 2014 - 2016, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
+ */
+defined('BASEPATH') OR exit('No direct script access allowed');
 
-$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.";
-
-
-/* End of file migration_lang.php */
-/* Location: ./system/language/turkish/migration_lang.php */
+$lang['migration_none_found']           = 'Herhangi bir taşınma bulunamadı.';
+$lang['migration_not_found']            = 'Belirtilen sürüm numaralı taşınma bulunamadı: %s.';
+$lang['migration_sequence_gap']         = 'Şu sürüm numarasına yakın taşınma sıralamasında bir boşluk var: %s.';
+$lang['migration_multiple_version']     = 'Aynı sürüm numaralı birden çok taşınma var: %s.';
+$lang['migration_class_doesnt_exist']   = 'Taşınma sınıfı "%s" bulunamadı.';
+$lang['migration_missing_up_method']    = '"%s" taşınma sınıfında "up" metodu eksik.';
+$lang['migration_missing_down_method']  = '"%s" taşınma sınıfında "down" metodu eksik.';
+$lang['migration_invalid_filename']     = '"%s" taşınmasında geçersiz dosya adı.';
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';
diff --git a/src/application/views/backend/customers.php b/src/application/views/backend/customers.php
index 67a92728..a73be762 100755
--- a/src/application/views/backend/customers.php
+++ b/src/application/views/backend/customers.php
@@ -6,6 +6,7 @@
         csrfToken          : <?= json_encode($this->security->get_csrf_hash()) ?>,
         availableProviders : <?= json_encode($available_providers) ?>,
         availableServices  : <?= json_encode($available_services) ?>,
+        secretaryProviders : <?= json_encode($secretary_providers) ?>,
         dateFormat         : <?= json_encode($date_format) ?>,
         timeFormat         : <?= json_encode($time_format) ?>,
         baseUrl            : <?= json_encode($base_url) ?>,
diff --git a/src/assets/js/backend_calendar_appointments_modal.js b/src/assets/js/backend_calendar_appointments_modal.js
index d3021b7c..a1d18a4d 100755
--- a/src/assets/js/backend_calendar_appointments_modal.js
+++ b/src/assets/js/backend_calendar_appointments_modal.js
@@ -299,6 +299,14 @@ window.BackendCalendarAppointmentsModal = window.BackendCalendarAppointmentsModa
             // Update the providers select box.
             $.each(GlobalVariables.availableProviders, function (indexProvider, provider) {
                 $.each(provider.services, function (indexService, serviceId) {
+                    if (GlobalVariables.user.role_slug === Backend.DB_SLUG_PROVIDER && parseInt(provider.id) !== GlobalVariables.user.id) {
+                        return true; // continue
+                    }
+
+                    if (GlobalVariables.user.role_slug === Backend.DB_SLUG_SECRETARY && GlobalVariables.secretaryProviders.indexOf(provider.id) === -1) {
+                        return true; // continue
+                    }
+
                     // If the current provider is able to provide the selected service, add him to the listbox.
                     if (serviceId == sid) {
                         var optionHtml = '<option value="' + provider.id + '">'
diff --git a/src/assets/js/backend_customers_helper.js b/src/assets/js/backend_customers_helper.js
index 01941af8..de232155 100644
--- a/src/assets/js/backend_customers_helper.js
+++ b/src/assets/js/backend_customers_helper.js
@@ -317,6 +317,14 @@
 
         $('#customer-appointments').empty();
         $.each(customer.appointments, function (index, appointment) {
+            if (GlobalVariables.user.role_slug === Backend.DB_SLUG_PROVIDER && parseInt(appointment.id_users_provider) !== GlobalVariables.user.id) {
+                return true; // continue
+            }
+
+            if (GlobalVariables.user.role_slug === Backend.DB_SLUG_SECRETARY && GlobalVariables.secretaryProviders.indexOf(appointment.id_users_provider) === -1) {
+                return true; // continue
+            }
+
             var start = GeneralFunctions.formatDate(Date.parse(appointment.start_datetime), GlobalVariables.dateFormat, true);
             var end = GeneralFunctions.formatDate(Date.parse(appointment.end_datetime), GlobalVariables.dateFormat, true);
             var html =
diff --git a/src/assets/js/frontend_book.js b/src/assets/js/frontend_book.js
index 892f8a86..c3426e16 100644
--- a/src/assets/js/frontend_book.js
+++ b/src/assets/js/frontend_book.js
@@ -384,7 +384,7 @@ window.FrontendBook = window.FrontendBook || {};
             $('#delete-personal-information').on('click', function () {
                 var buttons = [
                     {
-                        text: 'Delete',
+                        text: EALang.delete,
                         click: function () {
                             FrontendBookApi.deletePersonalInformation(GlobalVariables.customerToken);
                         }