diff options
| author | Raman Tenneti <rtenneti@google.com> | 2019-07-08 17:36:05 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-08 17:36:05 -0700 |
| commit | 09a9ca6446948eeac8600e4e3465de78604baaee (patch) | |
| tree | dd8b33161744bf4947a4cb9a4b0b50e36e8efe1f | |
| parent | df4bd6ba6f44ce8016c64c9f7e1d364ba39d8193 (diff) | |
| parent | f9fe78cbb172474a8d94a3a29bb9c32a4d8340d7 (diff) | |
| download | UnifiedEmail-09a9ca6446948eeac8600e4e3465de78604baaee.tar.gz | |
Merge "AOSP/UnifiedEmail - Fix improperly formatted resource strings in UnifiedEmail."
am: f9fe78cbb1
Change-Id: Id042ed9b1300a756ce1181b37840c2db857991d8
| -rw-r--r-- | res/values/strings.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 608acdbfb..951f1070c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -70,7 +70,7 @@ <!-- Compose screen, Prefix to forwarded message subject. Do not translate. --> <string name="forward_subject_label" translatable="false">Fwd:</string> <!-- Compose screen, displayed at the top of a message being replied to. Please preserve the HTML entities (surrounded by & and ;). The two %s strings will be replaced by 1) the date 2) the person who wrote the email being responded to. [CHAR LIMIT=1000]--> - <string name="reply_attribution">On <xliff:g id="date">%s</xliff:g>, <xliff:g id="person">%s</xliff:g> wrote:</string> + <string name="reply_attribution">On <xliff:g id="date">%1$s</xliff:g>, <xliff:g id="person">%2$s</xliff:g> wrote:</string> <!-- Compose screen, displayed at the top of a message being forwarded. Please preserve the HTML entities (surrounded by & and ;). [CHAR LIMIT=1000] --> <string name="forward_attribution">---------- Forwarded message ----------<br>From: <xliff:g id="from">%1$s</xliff:g><br>Date: <xliff:g id="date">%2$s</xliff:g><br>Subject: <xliff:g id="subject">%3$s</xliff:g><br>To: <xliff:g id="to">%4$s</xliff:g><br></string> <!-- Compose screen, displayed at the top of a message being forwarded. [CHAR LIMIT=100]--> @@ -789,7 +789,7 @@ <string name="veiled_summary_unknown_person"/> <!-- Notification ticker text for per-label notification [CHAR LIMIT=30]--> - <string name="label_notification_ticker">"<xliff:g id="label">%s</xliff:g>: <xliff:g id="notification">%s</xliff:g>"</string> + <string name="label_notification_ticker">"<xliff:g id="label">%1$s</xliff:g>: <xliff:g id="notification">%2$s</xliff:g>"</string> <!-- Notification message to the user upon new messages for a conversation. [CHAR LIMIT=120] --> <plurals name="new_messages"> |