conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	no trim of messages or password	lookshe	2015-04-11	1	-0/+1
\| \| \| \|	check password with only spaces separately
*	Configurable LED color (Attention: Expert setting because currently only ↵	steckbrief	2015-03-31	1	-0/+2
\| \| \| \|	text input)
*	Merge tag '1.2.0' into trz/master	steckbrief	2015-03-30	1	-42/+56
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/main/java/eu/siacs/conversations/parser/AbstractParser.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/res/values-de/strings.xml src/main/res/xml/preferences.xml
\| *	pulled translations	iNPUTmice	2015-03-22	1	-0/+4
\| \|
\| *	pulled new translations from transifex	iNPUTmice	2015-03-16	1	-0/+5
\| \|
\| *	pulled new translations from transifex	iNPUTmice	2015-02-27	1	-22/+22
\| \|
\| *	pulled new translations from transifex	iNPUTmice	2015-02-23	1	-21/+25
\| \|
\| *	pulled translations from transifex	iNPUTmice	2015-02-16	1	-1/+2
\| \|
* \|	Merge master-origin	steckbrief	2015-02-20	1	-50/+87
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/java/eu/siacs/conversations/utils/UIHelper.java src/main/res/values-de/strings.xml
\| *	pulled translations from transifex	iNPUTmice	2015-02-01	1	-0/+1
\| \|
\| *	Removes some unused strings (the legacy SSL stuff)	Sam Whited	2015-02-01	1	-2/+0
\| \|
\| *	Remove title_activity_conversations and use app_name instead	kruks23	2015-01-30	1	-1/+0
\| \|
\| *	updated translations	iNPUTmice	2015-01-25	1	-0/+15
\| \|
\| *	Remove legacy SSL support	Sam Whited	2015-01-19	1	-1/+0
\| \|
\| *	fetched translations from transifex	iNPUTmice	2015-01-19	1	-402/+406
\| \|
\| *	Correct the download file string on notifications	Sam Whited	2015-01-17	1	-1/+0
\| \| \| \| \| \| \| \|	Fixes #896
\| *	allow for very basic muc configuration	Daniel Gultsch	2015-01-08	1	-1/+9
\| \|
\| *	fixed german translation	Daniel Gultsch	2015-01-08	1	-2/+2
\| \|
\| *	Updated German translations for more muc options	Christian S.	2015-01-07	1	-9/+12
\| \|
\| *	Updated German translations...	Christian S	2015-01-07	1	-4/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	...I'm not sure if "Weitere Einstellungen" is the right translation for "advanced mode". Has anybody a better translation? I've changed the translations. Updated German translations... Updated German translations...
\| *	corrected German spellings	Christian Schneppe	2015-01-05	1	-16/+16
\| \| \| \| \| \|	and shorten some strings
\| *	corrected German 'private_message_to'	kriztan	2015-01-04	1	-1/+1
\| \|
* \|	Setting added for parsing emoticons or not	Tristan Zur	2015-01-11	1	-0/+2
\|/
*	Added and modified German translations	kriztan	2015-01-03	1	-5/+11
\|
*	Added German translations	kriztan	2015-01-02	1	-0/+7
\|
*	Make `app_name' string untranslatable	Sam Whited	2014-12-29	1	-1/+0
\| \| \| \| \| \|	Remove untranslatable about message Escape single quote in NL translation
*	Update german translations	kriztan	2014-12-27	1	-0/+4
\|
*	Update german translations	kriztan	2014-12-25	1	-0/+20
\|
*	Update german translations	kriztan	2014-12-18	1	-0/+8
\|
*	Update/improve German translations	Holger Weiß	2014-12-02	1	-2/+4
\|
*	Update german translations	kriztan	2014-11-26	1	-1/+1
\| \| \|	modified translations a bit
*	Update german translations	kriztan	2014-11-23	1	-0/+2
\|
*	Update german translations	kriztan	2014-11-20	1	-16/+20
\|
*	Update german translations	kriztan	2014-11-19	1	-0/+41
\|
*	Spelling fix in German translation	Sam Whited	2014-11-14	1	-1/+1
\|
*	Update German language	kriztan	2014-11-12	1	-24/+0
\| \| \|	deleted 'pref_about_message'
*	Update German language	kriztan	2014-11-12	1	-5/+34
\|
*	Merge branch 'gradle' into development	Sam Whited	2014-10-30	1	-7/+23
\| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib
*	Make conversations the root project	Sam Whited	2014-10-22	1	-0/+269