Update strings.xml
Update German translation.
Make the label on the "mark read" action on Jelly Bean notifications less confusing
Merge pull request #290 from rk4an/master

Update French translation
Fix typo in German translation.
Merge pull request #293 from justdave/notification_mark_read

Make the label on the "mark read" action on Jelly Bean notifications less confusing
Remove explicit left-alignment so EditText works with RTL languages
Fix settings file versioning
Better cope with messages having identical message IDs
Avoid NullPointerException
Avoid another NPE
Don't show ALL unread messages for "notification opens unread messages"
Hide "condensed layout" setting instead of disabling it
Always enable "pull to refresh" when "check mail" action is shown
Fix copyOrMove() so it works for single messages in Unified Inbox
Exclude folders Trash, Spam, and Outbox from "All messages"
Use very light grey instead of white for message text in dark theme
Use a dark startup animation
Merge branch 'master' into issue362

Conflicts:
	src/com/fsck/k9/activity/Accounts.java