Translated Conditions :)
Merge branch 'dev' of git@github.com:LePhil/Bibliotheca.git into dev

Conflicts:
	src/views/messages.properties
	src/views/messages_de_CH.properties

	
	Sorry für den MonsterMerge :(