cleaned up conflicts

Cleaned up conflicts in Local flies. Moved parenthesis to local file as
well.
Fixes #5 Time format

Adds the option in settings for i18n format.
updated version
Initial commit for #4

Settings allow you to configure where the spent time report appears.
Need to bring customizations into floating report. It’s not using
localized language or custom columns.