summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaman Tenneti <rtenneti@google.com>2019-07-08 11:44:53 -0700
committerRaman Tenneti <rtenneti@google.com>2019-07-08 19:15:05 +0000
commit00b98a7ed1a92425c9ed5d65fb6dac18e984dda8 (patch)
treedd8b33161744bf4947a4cb9a4b0b50e36e8efe1f
parent7ffdac40ac88f18f7633e74065c1fa37f21bf484 (diff)
downloadUnifiedEmail-00b98a7ed1a92425c9ed5d65fb6dac18e984dda8.tar.gz
AOSP/UnifiedEmail - Fix improperly formatted resource strings in UnifiedEmail.
TODO: Need to run translation to fix across all languages. Bug: 135616422 Test: manual - Did a "make -j40" and verified that there are no warnings in strings.xml. Change-Id: I953357d0b3222818e673ea88f8ec77ac16264c02
-rw-r--r--res/values/strings.xml4
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 ----------&lt;br&gt;From: <xliff:g id="from">%1$s</xliff:g>&lt;br&gt;Date: <xliff:g id="date">%2$s</xliff:g>&lt;br&gt;Subject: <xliff:g id="subject">%3$s</xliff:g>&lt;br&gt;To: <xliff:g id="to">%4$s</xliff:g>&lt;br&gt;</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">