Adding sublocality_name_type and locality_name_type handling.

Involves new strings for translations, plus the logic to return those
strings. Implemented in Java and C++.

Tested: unit-tests in C++. Unit-tests in Java don't exist for the main
UI class, but I tested it built.
Delete trailing whitespace.
Resolved conflicts; accepted upstream.