Some tweaks to the original merge
 - Fixed some oddities with storage locations
 - Improved the logic of the sorting and type-selecting bars
 - Fixed typos
fixed string for folder import
fixed payees to be more consistent
pull from upstream
updated strings to match 1.14
fixing a mixup without any fuss
Merge pull request #65 from thor/master

Updated strings in accordance with request