Updated missing translations (refs #3748)
Corrected conflicting gettext msgids between modules (refs #3748)
Merge pull request #46 from eguaj/1.0-A3748

Updated missing translations (closes #3748)