diff --git a/application/language/catalan/db_lang.php b/application/language/catalan/db_lang.php
new file mode 100644
index 00000000..b9da89b1
--- /dev/null
+++ b/application/language/catalan/db_lang.php
@@ -0,0 +1,63 @@
+<?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['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';
diff --git a/application/language/catalan/email_lang.php b/application/language/catalan/email_lang.php
new file mode 100644
index 00000000..e104db52
--- /dev/null
+++ b/application/language/catalan/email_lang.php
@@ -0,0 +1,58 @@
+<?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';
diff --git a/application/language/catalan/index.html b/application/language/catalan/index.html
new file mode 100644
index 00000000..423d9d58
--- /dev/null
+++ b/application/language/catalan/index.html
@@ -0,0 +1,10 @@
+<html>
+<head>
+    <title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
diff --git a/application/language/catalan/migration_lang.php b/application/language/catalan/migration_lang.php
new file mode 100644
index 00000000..62ce1526
--- /dev/null
+++ b/application/language/catalan/migration_lang.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * System messages translation for CodeIgniter(tm)
+ *
+ * @author	CodeIgniter community
+ * @author	
+ * @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 s\'ha trobat cap migració.';
+$lang['migration_not_found']		= 'No s\'ha trobat cap migració amb el númeo de versió: %s.';
+$lang['migration_sequence_gap']		= 'Hi ha un buit a la migració, prop del número de versió: %s.';
+$lang['migration_multiple_version']	= 'Hi ha múltiples migracions amb el mateix número de versió: %s.';
+$lang['migration_class_doesnt_exist']	= 'La classe de migració "%s" no s\'ha trobat.';
+$lang['migration_missing_up_method']	= 'A la classe de migració "%s", li falta el mètode "up".';
+$lang['migration_missing_down_method']	= 'A la classe de migració "%s" li falta el mètode "down".';
+$lang['migration_invalid_filename']	= 'La migració "%s" té un nom de fitxer no vàlid.';
diff --git a/application/language/catalan/translations_lang.php b/application/language/catalan/translations_lang.php
index 2565525c..1ff7d4b7 100644
--- a/application/language/catalan/translations_lang.php
+++ b/application/language/catalan/translations_lang.php
@@ -16,10 +16,13 @@ $lang['first_name'] = 'Nom';
 $lang['last_name'] = 'Cognoms';
 $lang['email'] = 'Correu electrònic';
 $lang['phone_number'] = 'Número de telèfon';
+$lang['phone'] = 'Telèfon';
 $lang['address'] = 'Adreça';
 $lang['city'] = 'Ciutat';
 $lang['zip_code'] = 'Codi postal';
 $lang['notes'] = 'Notes';
+$lang['language'] = 'Idioma';
+$lang['no_language'] = 'Sense idioma';
 $lang['fields_are_required'] = 'Els camps amb un * són obligatoris.';
 $lang['appointment_confirmation'] = 'Confirmació de la cita';
 $lang['confirm'] = 'Confirma';
@@ -47,7 +50,7 @@ $lang['name'] = 'Nom';
 $lang['phone'] = 'Telèfon';
 $lang['address'] = 'Adreça';
 $lang['appointment_link_title'] = 'Enllaç a la cita';
-$lang['success'] = 'Success.';
+$lang['success'] = 'Correcte.';
 $lang['appointment_added_to_google_calendar'] = 'La vostra cita s\'ha afegit al vostre compte de Google Calendar.';
 $lang['view_appointment_in_google_calendar'] = 'Cliqueu aquí per veure la vostra cita al Google Calendar.';
 $lang['appointment_added_to_your_plan'] = 'S\'ha afegit una nova cita a la vostra planificació.';
@@ -83,7 +86,7 @@ $lang['manage_services_hint'] = 'Gestiona els serveis disponibles i les categori
 $lang['manage_users_hint'] = 'Gestiona els usuaris gestors (administradors, proveïdors, secretaris).';
 $lang['settings_hint'] = 'Configura les opcions del sistema i dels usuaris.';
 $lang['log_out_hint'] = 'Surt del sistema.';
-$lang['unavailable_periods_hint'] = 'Durant els periodes no disponibles el proveïdor no acceptarà noves cites.';
+$lang['unavailable_periods_hint'] = 'Durant els períodes no disponibles el proveïdor no acceptarà noves cites.';
 $lang['new_appointment_hint'] = 'Crea una nova cita i emmagatzema-la a la base de dades.';
 $lang['reload_appointments_hint'] = 'Recarrega el calendari de cites.';
 $lang['trigger_google_sync_hint'] = 'Dispara el procés de sincronització amb el Google Calendar.';
@@ -104,8 +107,8 @@ $lang['delete_appointment_title'] = 'Elimina la cita';
 $lang['write_appointment_removal_reason'] = 'Escribiu el motiu pel qual elimineu la cita:';
 $lang['appointment_saved'] = 'La cita s\'ha desat correctament.';
 $lang['new_unavailable_title'] = 'Nou període de no disponibilitat';
-$lang['edit_unavailable_title'] = 'Edita el periode de no disponibilitat';
-$lang['unavailable_saved'] = 'El periode de no disponibilitat s\'ha desat correctament.';
+$lang['edit_unavailable_title'] = 'Edita el període de no disponibilitat';
+$lang['unavailable_saved'] = 'El període de no disponibilitat s\'ha desat correctament.';
 $lang['start_date_before_end_error'] = 'La data d\'inici és posterior de la de fi.';
 $lang['invalid_email'] = 'L\'adreça de correu electrònic no és vàlida.';
 $lang['customers'] = 'Clients';
@@ -121,7 +124,8 @@ $lang['categories'] = 'Categories';
 $lang['admins'] = 'Admins';
 $lang['providers'] = 'Proveïdors';
 $lang['secretaries'] = 'Secretaris';
-$lang['mobile_number'] = 'Mòbil';
+$lang['mobile_number'] = 'Número de telefon mòbil';
+$lang['mobile'] = 'Mòbil';
 $lang['state'] = 'Província';
 $lang['username'] = 'Usuari';
 $lang['password'] = 'Contrasenya';
@@ -151,7 +155,7 @@ $lang['friday'] = 'Divendres';
 $lang['saturday'] = 'Dissabte';
 $lang['sunday'] = 'Diumenge';
 $lang['breaks'] = 'Descansos';
-$lang['add_breaks_during_each_day'] = 'Afegeix els descansos per a cada dia. Durant els descansos, el proveïdor no acceptarà cites.';
+$lang['add_breaks_during_each_day'] = 'Afegeix pauses. Durant les pauses, el proveïdor no acceptarà cites.';
 $lang['day'] = 'Dia';
 $lang['days'] = 'Dies';
 $lang['actions'] = 'Accions';
@@ -168,8 +172,8 @@ $lang['general'] = 'General';
 $lang['business_logic'] = 'Lògica de negoci';
 $lang['current_user'] = 'Usuari actual';
 $lang['about_app'] = 'Quant a Easy!Appointments';
-$lang['edit_working_plan_hint'] = 'Marqueu a sota els dies i les hores que la vostra organització acceptarà cites. Podreu ajustar les cites a les hores no laborables, però els clients no podran reservar cites en aquest periodes. Aquesta planificació de treball serà utilitzada per defecte per cada nou proveïdor, però podreu canviar cadascuna de les planificacions dels proveïdors de forma separada. Després d\'això, podeu afegir els periodes de descans.';
-$lang['edit_breaks_hint'] = 'Afegiu descansos per a cada dia. Aquests descansos s\'aplicaran a tots els nous proveïdors.';
+$lang['edit_working_plan_hint'] = 'Marqueu a sota els dies i les hores que la vostra organització acceptarà cites. Podreu ajustar les cites a les hores no laborables, però els clients no podran reservar cites en aquest períodes. Aquesta planificació de treball serà utilitzada per defecte per cada nou proveïdor, però podreu canviar cadascuna de les planificacions dels proveïdors de forma separada. Finalment, podeu afegir els períodes de pausa.';
+$lang['edit_breaks_hint'] = 'Afegiu pauses per a cadascun dels dies. Aquestes pauses s\'aplicaran a tots els nous proveïdors.';
 $lang['book_advance_timeout'] = 'Temps límit de reserva';
 $lang['book_advance_timeout_hint'] = 'Defineix el temps límit (en minuts) a partir del qual els clients no poden reservar una hora o modificar una cita.';
 $lang['timeout_minutes'] = 'Temps límit de reserva (minuts)';
@@ -237,7 +241,7 @@ $lang['general_settings'] = 'Configuracions generals';
 $lang['personal_information'] = 'Informació personal';
 $lang['system_login'] = 'Entrada al sistema';
 $lang['user_settings_are_invalid'] = 'Les configuració d\'usuari no User settings are invalid! Please review your settings and try again.';
-$lang['add_break'] = 'Afegeix un descans';
+$lang['add_break'] = 'Afegeix una pausa';
 $lang['january'] = 'Gener';
 $lang['february'] = 'Febrer';
 $lang['march'] = 'Març';
@@ -276,6 +280,8 @@ $lang['date_format'] = 'Format de data';
 $lang['date_format_hint'] = 'Canvia el format de visualització de la data (D - Dia, M - Mes, Y - Any).';
 $lang['time_format'] = 'Format d\'hora';
 $lang['time_format_hint'] = 'Canvia el format de visualització de l\'hora (H - Hores, M - Minuts).';
+$lang['first_weekday'] = 'Primer dia de la setmana';
+$lang['first_weekday_hint'] = 'Estableix el primer dia de la setmana als calendaris.';
 $lang['google_analytics_code_hint'] = 'Afegiu el vostre ID de Google Analytics per afegir-lo a la pàgina de reserves.';
 $lang['availabilities_type'] = 'Tipus de disponibilitats';
 $lang['flexible'] = 'Flexible';
@@ -289,36 +295,36 @@ $lang['cookie_notice_content'] = 'Contingut de l\'avís de cookies';
 $lang['terms_and_conditions'] = 'Termes i condicions';
 $lang['display_terms_and_conditions'] = 'Mostra els termes i condicions';
 $lang['terms_and_conditions_content'] = 'Contingut dels termes i condicions';
-$lang['privacy_policy'] = 'Política de privacitat';
-$lang['display_privacy_policy'] = 'Mostra la política de privacitat';
-$lang['privacy_policy_content'] = 'Contingut de la política de privacitat';
+$lang['privacy_policy'] = 'Política de privadesa';
+$lang['display_privacy_policy'] = 'Mostra la política de privadesa';
+$lang['privacy_policy_content'] = 'Contingut de la política de privadesa';
 $lang['website_using_cookies_to_ensure_best_experience'] = 'Aquest lloc web usa cookies per assegurar-se que obteniu la millor experiència navegant pel nostre web.';
 $lang['read_and_agree_to_terms_and_conditions'] = 'He llegit i estic d\'acord amb els {$link}Termes i condicions{/$link}.';
-$lang['read_and_agree_to_privacy_policy'] = 'He llegit i estic d\'acord amb la {$link}Política de privacitat{/$link}.';
+$lang['read_and_agree_to_privacy_policy'] = 'He llegit i estic d\'acord amb la {$link}Política de privadesa{/$link}.';
 $lang['delete_personal_information_hint'] = 'Elimineu les vostres dades del sistema (i les cites associades).';
 $lang['delete_personal_information'] = 'Eliminació de dades personals';
 $lang['delete_personal_information_prompt'] = 'Esteu segur que voleu eliminar la vostra informació personal? Aquesta acció no es pot desfer.';
-$lang['location'] = 'Location';
-$lang['working_plan_exception'] = 'Working Plan Exception';
-$lang['working_plan_exceptions'] = 'Working Plan Exceptions';
-$lang['working_plan_exceptions_hint'] = 'Add a working plan exception day, outside the working plan.';
-$lang['new_working_plan_exception_title'] = 'New Working Plan Exception';
-$lang['working_plan_exception_saved'] = 'Working plan exception saved successfully.';
-$lang['working_plan_exception_deleted'] = 'Working plan exception deleted successfully.';
-$lang['add_working_plan_exceptions_during_each_day'] = 'Add working plan exceptions, outside the working plan.';
-$lang['add_working_plan_exception'] = 'Add Working Plan Exception';
-$lang['require_phone_number'] = 'Require phone number';
-$lang['require_phone_number_hint'] = 'When enabled, customers and users will need to enter the customer\'s phone number when booking an appointment';
-$lang['check_spam_folder'] = 'Please check your spam folder if the email does not arrive within a few minutes.';
-$lang['api_token_hint'] = 'Set a secret token in order to enable the token based authentication of the Easy!Appointments API.';
-$lang['timezone'] = 'Timezone';
-$lang['overwrite_existing_working_plans'] = 'This will overwrite the existing provider working plans, are you sure that you want to continue?';
-$lang['working_plans_got_updated'] = 'All the working plans got updated.';
-$lang['apply_to_all_providers'] = 'Apply To All Providers';
-$lang['display_any_provider'] = 'Display Any Provider Option';
-$lang['display_any_provider_hint'] = 'The booking page will get an additional option that allows customers to book without specifying a provider.';
-$lang['load_more'] = 'Load More';
-$lang['list'] = 'List';
-$lang['default'] = 'Default';
-$lang['table'] = 'Table';
-$lang['date'] = 'Date';
+$lang['location'] = 'Ubicació';
+$lang['working_plan_exception'] = 'Excepció del pla de treball';
+$lang['working_plan_exceptions'] = 'Excepcions del pla de treball';
+$lang['working_plan_exceptions_hint'] = 'Afegeix un dia d\'excepció del pla de treball, fora del pla de treball.';
+$lang['new_working_plan_exception_title'] = 'Nova excepció al pla de treball';
+$lang['working_plan_exception_saved'] = 'L\'excepció del pla de treball s\'ha desat correctament.';
+$lang['working_plan_exception_deleted'] = 'L\'excepció del pla de treball s\'ha suprimit correctament.';
+$lang['add_working_plan_exceptions_during_each_day'] = 'Afegeix excepcions al pla de treball, fora del pla de treball.';
+$lang['add_working_plan_exception'] = 'Afegeix una excepció al pla de treball';
+$lang['require_phone_number'] = 'Requereix el número de telèfon';
+$lang['require_phone_number_hint'] = 'Quan està activat, els clients i els usuaris hauran d\'introduir el número de telèfon al reservar una cita';
+$lang['check_spam_folder'] = 'Comproveu la vostra carpeta de correu brossa si el correu no arriba en uns minuts.';
+$lang['api_token_hint'] = 'Establiu un token secret per permetre l\'autenticació basada en tokens de l\'API d\'Easy!Appointments.';
+$lang['timezone'] = 'Zona horària';
+$lang['overwrite_existing_working_plans'] = 'Això sobreescriurà els plans de treball existents del proveïdor, esteu segur que voleu continuar?';
+$lang['working_plans_got_updated'] = 'S\'han actualitzat tots els plans de treball.';
+$lang['apply_to_all_providers'] = 'Aplica-ho a tots els proveïdors';
+$lang['display_any_provider'] = 'Mostra l\'opció de Qualsevol proveïdor';
+$lang['display_any_provider_hint'] = 'La pàgina de reserva mostrarà una opció addicional que permet als clients reservar sense especificar un proveïdor.';
+$lang['load_more'] = 'Carrega\'n més';
+$lang['list'] = 'Llista';
+$lang['default'] = 'Per defecte';
+$lang['table'] = 'Taula';
+$lang['date'] = 'Data';