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.