Fix rubocop, I18n, cleanup rebase
This commit is contained in:

committed by
Sebastian Serth

parent
2dff81a510
commit
5cc180d0e9