switched to mtm
Merge pull request #303 from kruks23/development

Update Spanish Translations
some cleanup
Merge branch 'development' of github.com:siacs/Conversations into development
updated mtm
typos
Merge pull request #307 from Erkan-Yilmaz/development

typos
more disco. fixed chat markers with jappix
Merge branch 'development' of github.com:siacs/Conversations into development
fixed bug with otr session being initilized over and over again
answer correctly if both markers and receipts are requested
presonalized read up to this point message
removed outdated translations from languge files
removed outdated tls error
removed more legacy tls error handling stuff
added jelmer to the list of translators
Added translations

Added translations per issue #309 - Missing Translations
Update strings.xml
Merge branch 'development' of https://github.com/rostovtsev/Conversations into rostovtsev-development

Conflicts:
	res/values-ru/strings.xml
Merge branch 'rostovtsev-development' into development