Remove unused resources, remove lint warnings
Merge commit 'cc154a6675dd15ca784407d2c58f8668b839fb1a' into develop
Update strings again and remove some lint warnings
Remove lint static handler warning
Fix lint warnings against locale