Calculator: Remove unused string

Also readd cm_extra to get rid of compiler warnings.
Why was this even removed...?

Change-Id: Ied76a576b6c0aae64115084973a2346031388f2d
Automatic translation import

Change-Id: If5f2150881411900a878253782b4657232c33ec5
Drop remnants of broken local locales

Turns out there was still a dependency on a local string which was
messing with other broken locales. Drop it and try to rely exclusively
on the system-provided separators.

Change-Id: I9eb09560efe4e46aca35c97498bfbfee9fa41757
TODO: Dedupe code.