Merge remote-tracking branch 'upstream/master' into chinese
Decay update translation, measure part 1

retranslated the decay as well as the measurement
Minor fix measure.po
Merge branch 'chinese' into chinese-integration