Delete conflicted copy created by dropbox, update localization and fix a few crashes