5816 Commits

Author	SHA1	Message	Date
James Cole	6191362fe0	Merge pull request #3420 from sephrat/fix#3409 ... Display account names only once when displaying split transactions	2020-06-02 17:59:52 +02:00
Florian Dupret	6d8fd79922	Fix #3409 - Split transactions show source/destination accounts several times	2020-06-01 17:51:07 +02:00
James Cole	0227879a69	Merge pull request #3417 from sephrat/pluralization ... Fix typo from #3413	2020-06-01 11:41:49 +02:00
Florian Dupret	e4d2b121c1	Merge branch 'pluralization' of https://github.com/sephrat/firefly-iii into pluralization	2020-06-01 08:25:27 +02:00
Florian Dupret	f8941ab507	Fix string displayed twice	2020-06-01 08:15:19 +02:00
James Cole	f3ac8a5888	Add newlines and remove some unused translations.	2020-05-30 07:33:06 +02:00
James Cole	64ac3927ec	Pluralization.	2020-05-29 21:00:10 +02:00
James Cole	7535ca9a26	Merge branch 'develop' into pluralization	2020-05-29 20:55:31 +02:00
James Cole	03670e2dfe	New translations.	2020-05-29 19:53:49 +02:00
Florian Dupret	be797f5353	pluralization wave 2	2020-05-29 19:07:51 +02:00
Florian Dupret	da38df6e4b	pluralization wave 1	2020-05-29 18:00:29 +02:00
James Cole	523ea78166	Error strings.	2020-05-29 07:55:59 +02:00
James Cole	351272cc27	Merge pull request #3408 from sephrat/issue/3407 ... Fix #3407	2020-05-29 06:44:34 +02:00
James Cole	a293827739	Reformat translations.	2020-05-29 06:43:42 +02:00
James Cole	dea9e21382	Merge branch 'develop' into error_pages_translation	2020-05-29 06:41:47 +02:00
James Cole	d31bb1f9b6	Regenerated JSON files for all languages. #3404	2020-05-29 06:39:48 +02:00
James Cole	b64979e45a	New strings in all languages for #3404	2020-05-29 06:39:24 +02:00
James Cole	3dd3d2cabb	Clean up strings #3404	2020-05-29 06:34:39 +02:00
James Cole	94e7c3527f	Refactor strings #3404	2020-05-29 06:30:42 +02:00
James Cole	1a71d22146	Add strings to i18n #3404	2020-05-29 06:28:34 +02:00
James Cole	fdc3b80f1f	Refactor strings #3404	2020-05-29 06:28:24 +02:00
James Cole	b978de78e4	Refactor strings #3404	2020-05-29 06:22:13 +02:00
James Cole	8b6bd296e1	Refactor string identifiers #3404	2020-05-29 06:19:56 +02:00
James Cole	e0e16489a1	Merge branch 'develop' into js_translations	2020-05-29 06:18:22 +02:00
James Cole	49b1a6d844	Alignment	2020-05-29 06:12:24 +02:00
James Cole	3c1361e377	Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop	2020-05-29 06:09:27 +02:00
James Cole	0c8229d689	Some language strings.	2020-05-29 06:07:03 +02:00
Florian Dupret	aebf45697f	fix #3407	2020-05-28 19:08:34 +02:00
Florian Dupret	d319a21b01	Make error pages translatable	2020-05-27 17:42:19 +02:00
Florian Dupret	f8963179c3	Make new profile settings translatable	2020-05-27 16:17:24 +02:00
James Cole	d3cd657501	Merge pull request #3395 from sephrat/master ... Make email notifications translatable (#3387)	2020-05-27 14:00:49 +00:00
Florian Dupret	6c6bb2cd1e	Email translations cleanup	2020-05-27 09:34:52 +02:00
Florian Dupret	1771b3964e	Email view cleanup: confirm account is obsolete	2020-05-26 18:50:48 +02:00
Florian Dupret	351c0ee2d7	Email notifications are now translatable	2020-05-26 12:01:39 +02:00
James Cole	1c9c380c8c	Expand debug	2020-05-26 06:28:42 +02:00
James Cole	24455bf980	Fix #3133	2020-05-26 06:28:02 +02:00
Florian Dupret	37b35661be	most email notifications translatable	2020-05-25 19:24:21 +02:00
Florian Dupret	b54bb20617	Make admin test email translatable	2020-05-25 13:13:33 +02:00
James Cole	61733f6553	Forgot to remove debug variable.	2020-05-24 11:47:44 +02:00
James Cole	ae7b81bf86	Merge pull request #3390 from sephrat/master ... Fix typos and minor text inconsistency	2020-05-24 09:19:02 +00:00
Florian Dupret	2c9ac0982a	Fix minor typos	2020-05-24 09:59:34 +02:00
Florian Dupret	2df390065b	Minor fix: fix rule action/trigger labels consistency	2020-05-24 09:53:54 +02:00
James Cole	806ad918f0	Include original collection time.	2020-05-22 20:24:56 +02:00
James Cole	a73247ec8c	Some last minute translations.	2020-05-22 17:53:09 +02:00
James Cole	e98d43dd65	New meta files for 5.2.6	2020-05-22 14:15:57 +02:00
James Cole	dbd68cedc9	Code for #3309	2020-05-22 13:52:33 +02:00
James Cole	782ecca6a9	Warning if people disabled update checking. Every 4 weeks.	2020-05-20 06:40:18 +02:00
James Cole	e6338705a7	Fix #3376	2020-05-19 19:37:12 +02:00
James Cole	09226e6f12	New translations.	2020-05-19 13:29:47 +02:00
James Cole	1ba7d65582	Warning if demo user.	2020-05-18 21:21:34 +02:00