Updated .pot and .po/.mo Files
Merge branch 'upstream-master'