Sync with fixes sent upstream.
Both Cities and Regions need to be translated. Also make sure that we sort them properly, and use symbolic names for COLUMNS in the region liststore. https://bugzilla.gnome.org/show_bug.cgi?id=630264