Merge pull request #3777 from smoe/weblate_changes_merged

Weblate changes merged into new branch to manually resolve conflict.

Had to manually address a conflict in es.po which was only the time stamp of the .po file creation.

Author: smoe