Manual merge for translations by @puentesarrin in #61.