conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merged 1.5.2 into trz/master with conflicts resolved	steckbrief	2015-08-11	1	-9/+38
\|\
\| *	made 'check image on http host' message more generic. fixed #1281	Daniel Gultsch	2015-07-16	1	-5/+8
\| \|
\| *	pulled new translations from transifex	Daniel Gultsch	2015-06-23	1	-3/+15
\| \|
\| *	pulled translations from transifex	Daniel Gultsch	2015-04-26	1	-0/+10
\| \|
\| *	added missing translations from transifex	Daniel Gultsch	2015-04-21	1	-1/+0
\| \|
\| *	pulled translations from transifex	iNPUTmice	2015-04-01	1	-0/+5
\| \|
* \|	added settings for accepting and downloading files	lookshe	2015-04-12	1	-1/+1
\|/ \| \| \|	fix in Settings, initialize with same values like in preferences.xml
*	pulled new translations from transifex	iNPUTmice	2015-02-27	1	-0/+5
\|
*	pulled translations from transifex	iNPUTmice	2015-02-01	1	-0/+420