Separate time string into two unique strings

In certain languages, "Until Tue, 9AM" and "Unil 3pm" are formatted
differently, so separate them into two unique strings for better translation.

Test: manual
Fixes: 165796742
Change-Id: Ib7c44714191acca427bcee0a4d88e1cb50a90afc
3 files changed