153 commits

Author	SHA1	Message	Date
Alex Tselegidis	93e7a2d994	Added missing translation strings.	2020-03-11 10:00:44 +01:00
Alex Tselegidis	0f17a7a689	Added the new check_spam_folder translation key to all translation files.	2020-03-10 21:40:33 +01:00
Alex Tselegidis	bf0f5ec2e7	Merge pull request #708 from DiGitHubCap/check-spam-folder ... Add note to check spam folder after booking an appointment	2020-03-10 21:38:31 +01:00
wolfygit	eb3ab4800d	Spanish Translation ... Translate the las sentences	2020-03-10 21:26:43 +01:00
Alex Tselegidis	058089134b	Merge branch 'make_phone_number_optional' of https://github.com/sandbergja/easyappointments into sandbergja-make_phone_number_optional ... # Conflicts: # src/application/controllers/Appointments.php # src/application/controllers/Backend.php # src/application/language/arabic/translations_lang.php # src/application/language/bulgarian/translations_lang.php # src/application/language/chinese/translations_lang.php # src/application/language/danish/translations_lang.php # src/application/language/dutch/translations_lang.php # src/application/language/english/translations_lang.php # src/application/language/finnish/translations_lang.php # src/application/language/french/translations_lang.php # src/application/language/german/translations_lang.php # src/application/language/greek/translations_lang.php # src/application/language/hindi/translations_lang.php # src/application/language/hungarian/translations_lang.php # src/application/language/italian/translations_lang.php # src/application/language/japanese/translations_lang.php # src/application/language/luxembourgish/translations_lang.php # src/application/language/polish/translations_lang.php # src/application/language/portuguese-br/translations_lang.php # src/application/language/portuguese/translations_lang.php # src/application/language/romanian/translations_lang.php # src/application/language/russian/translations_lang.php # src/application/language/slovak/translations_lang.php # src/application/language/spanish/translations_lang.php # src/application/language/turkish/translations_lang.php # src/assets/sql/data.sql	2020-03-10 21:11:33 +01:00
Alex Tselegidis	2eeead90a3	Merge branch 'sduck-dk_lang_updates' into develop ... # Conflicts: # src/application/language/danish/translations_lang.php	2020-03-10 21:00:44 +01:00
Alex Tselegidis	923d7bd4c4	Merge branch 'ftaurino-patch-1' into develop ... # Conflicts: # src/application/language/italian/translations_lang.php	2020-03-10 20:57:00 +01:00
Alex Tselegidis	209f9dff4e	Merge branch 'guifelix-patch-1' into develop ... # Conflicts: # src/application/language/portuguese-br/translations_lang.php	2020-03-10 20:50:44 +01:00
Alex Tselegidis	6ae4835015	Merge branch 'altomarketing-patch-1' into develop ... # Conflicts: # src/application/language/spanish/translations_lang.php	2020-03-10 20:48:40 +01:00
Alex Tselegidis	902485e2d3	Merge branch 'oxteam-oxteam-translation-cleanup-2' into develop	2020-03-10 20:35:31 +01:00
Alex Tselegidis	dd44f8e132	Merge branch 'oxteam-dev-first_week_day' of https://github.com/oxteam/easyappointments into oxteam-oxteam-dev-first_week_day ... # Conflicts: # src/application/language/portuguese-br/translations_lang.php # src/assets/js/backend_calendar_default_view.js # src/assets/js/backend_users_providers.js # src/assets/js/general_functions.js # src/assets/js/working_plan.js	2020-03-10 20:32:53 +01:00
Alex Tselegidis	7d04052697	Merge branch 'extra-working-days' of https://github.com/Caine85/easyappointments into Caine85-extra-working-days ... # Conflicts: # src/application/config/migration.php # src/application/language/arabic/translations_lang.php # src/application/language/bulgarian/translations_lang.php # src/application/language/chinese/translations_lang.php # src/application/language/danish/translations_lang.php # src/application/language/dutch/translations_lang.php # src/application/language/english/translations_lang.php # src/application/language/finnish/translations_lang.php # src/application/language/french/translations_lang.php # src/application/language/german/translations_lang.php # src/application/language/greek/translations_lang.php # src/application/language/hindi/translations_lang.php # src/application/language/hungarian/translations_lang.php # src/application/language/italian/translations_lang.php # src/application/language/japanese/translations_lang.php # src/application/language/luxembourgish/translations_lang.php # src/application/language/polish/translations_lang.php # src/application/language/portuguese-br/translations_lang.php # src/application/language/portuguese/translations_lang.php # src/application/language/romanian/translations_lang.php # src/application/language/russian/translations_lang.php # src/application/language/slovak/translations_lang.php # src/application/language/spanish/translations_lang.php # src/application/language/turkish/translations_lang.php # src/assets/js/general_functions.js # src/assets/js/working_plan.js # src/assets/sql/data.sql	2020-03-10 20:09:31 +01:00
Alex Tselegidis	4ed023618d	Merge branch 'cuchi-update-pt-br' into develop ... # Conflicts: # src/application/language/portuguese-br/translations_lang.php	2020-03-09 22:05:49 +01:00
Kaustubh Kulkarni	89b114f2eb	added marathi language support	2020-03-09 22:03:12 +01:00
Alex Tselegidis	21ab3428a5	Merge pull request #556 from PetrTodorov/develop ... Add Czech language translation	2020-03-09 21:52:37 +01:00
DiGitHubCap	c69714ad90	Add note check spam folder after booking an appointment	2020-02-18 20:12:12 -05:00
Jane Sandberg	271269d059	Added setting to require phone number for customers, closes #655	2019-10-17 20:37:02 -07:00
oxteam	45db34cb52	Merge branch 'develop' into oxteam-dev-first_week_day	2019-07-30 14:38:59 +02:00
Steffan Mølbæk Andersen	4b8ea251bc	Another DK lang fix	2019-07-01 10:06:01 +02:00
Steffan Mølbæk Andersen	1826123ac2	More DK translation fixes	2019-06-27 14:06:09 +02:00
Steffan Mølbæk Andersen	cd33631ce1	Fixed several bad danish translations	2019-06-26 12:56:42 +02:00
alext	84afca8b26	Integrated location field in the backend section.	2019-06-08 16:43:21 +02:00
Francesco M. Taurino	e17a42087f	Updated italian translation	2019-02-06 12:33:59 +01:00
Guilherme Maciel	ee3a4c81a5	Update translations_lang.php ... Updating Brazilian Portuguese version. Still not finished	2019-01-05 01:42:07 -02:00
Altomarketing.com	3f63833e64	Update translations_lang.php	2019-01-04 21:09:52 -03:00
PetrTodorov	83f14044d9	Add Czech language translation	2018-10-19 22:14:17 +02:00
Paulo Henrique Cuchi	b3659c46d6	Update pt-br translation	2018-08-20 06:27:11 -03:00
oxteam	ad5f9f1266	Merge branch 'develop' into oxteam-dev-first_week_day	2018-07-31 10:17:06 +02:00
oxteam	76f53b8418	Translation file cleanup. ... Remove duplicate of the 'address' language key. Remove the 'phone' language key as the 'phone_number' already exists for the same purpose. Minor typo fixes in English and French translation files.	2018-07-18 15:05:29 +02:00
Alex Tselegidis	3fd0c2834b	Merge pull request #523 from oxteam/oxteam-feat_gpdr_translate ... Updated GDPR related french translations (oxteam).	2018-07-13 08:10:49 +02:00
oxteam	3c605c139c	Import system translations from official CI depot https://github.com/bcit-ci/codeigniter3-translations ... Only files already existing in EA! were imported. CI's portuguese-brazilian folder was used for EA!'s portuguese-br. CI's simplified-chinese folder was used for EA!'s chinese folder. No supported translations exists for Finish and Luxembourgish. The migration_lang files for these languages are still in English but one translation key is missing compared to the EA! English original file. For consistency purpose, the Finish and Luxembourgish migration_lang files have been overwritten by the EA! English original file.	2018-07-13 01:13:25 +02:00
oxteam	041a1c2078	Clean-up of translations_lang.php files using the English one as a reference. ... All files have their tags now ordered like in the English one, duplicate tags are removed and the Arabic file has the "about_ea*" tags changed to "about_app*" like in other languages. In additon for the French language, improved some translations (mainly consistency in usage of infinitive verb forms).	2018-07-12 22:11:09 +02:00
oxteam	7b20616559	French translation for GPDR labels.	2018-07-12 14:48:58 +02:00
alext	49cbd2da16	Merge branch 'oxteam-oxteam-patch-fr_trans-1'	2018-07-11 09:45:52 +02:00
alext	e1f30b85dd	Merge branch 'oxteam-patch-fr_trans-1' of https://github.com/oxteam/easyappointments into oxteam-oxteam-patch-fr_trans-1	2018-07-11 09:45:33 +02:00
oxteam	e9de0e5581	Add missing French translation (company_link_hint)	2018-07-11 09:42:37 +02:00
Roberto Barlocci	6ae4c2b04f	typo	2018-07-10 14:49:09 +02:00
oxteam	734be96126	Add new system-wide setting that enable users to choose the first day of the week. (#471) ... The setting change the display of weeks shown in backend and booking page calendars. Work plans and break lists in the 'settings' page are still displayed starting on Sunday.	2018-06-29 00:42:52 +02:00
alext	ba33755032	Added new translation strings to language files (#480).	2018-06-24 19:24:17 +02:00
alext	0d91792d36	Customers will now be able to remove all their data from the system (#480).	2018-06-24 19:08:45 +02:00
alext	60f48e24ee	Integrated new legal content settings in the booking page (#480).	2018-06-24 16:58:03 +02:00
alext	54076bd244	Integrated legal contents in backend settings page (#480).	2018-06-24 15:46:58 +02:00
oxteam	c0a33d1116	French translation improved.	2018-06-03 18:56:12 +02:00
oxteam	3d27d05b58	Update French translation	2018-05-27 17:38:34 +02:00
Andrea	e7c1415526	Update italian translation file	2018-04-12 16:55:45 +02:00
Andrea	9c7ae5dfdc	Extra working days outside default working plan ... Add function to add extra working days outside the default working plan.	2018-04-12 15:03:46 +02:00
Aurélien	31639bb1db	Update translations_lang.php ... About issue #455	2018-04-04 18:03:23 +02:00
alext	917d7fa6bb	Added translations for the time format setting.	2018-03-06 22:47:57 +01:00
Andrea	d971f4f097	Added time format selection	2018-03-06 12:20:47 +01:00
alext	49c856054c	Corrections in the spanish translation.	2018-02-27 10:12:55 +01:00