Syncing with upstream

This will sync this branch with upstream.

I clicked everywhere, using all locales, and found no missing translation errors.

I've seen that a guy in the upstream merged another i18n branch.

I don't mean to flame, but IMHO it's kinda messy, it lacks the scoped structure. I think scopes are important, specially when you bring in localized extensions.

I'd like to see this one being merged instead. Do you plan to submit a PR?

Thank you,

Cheers.