Make it compile
Merge pull request #2768 from fluffyfreak/no-or

Make it compile again
auto-commit: translation updates
separate widget border width from inner padding