DO NOT MERGE: Cherry-picked 5761e46f88aa2f216d8d22288435c497153931c7 from master...

Armor string format tokens with translation placeholders.

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 09dc66a..f340c95 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<resources>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- This is the name of the Download Manager application. -->
     <string name="app_label">Download Manager</string>
 
@@ -102,7 +102,7 @@
         downloads beyond the first two, i.e. "[title], [title] and [n] more".
         This is the " and [n] more" part, including the leading space, and it's
         used regardless of the number of additional downloads. -->
-    <string name="notification_filename_extras">" and %d more"</string>
+    <string name="notification_filename_extras">" and <xliff:g id="number" example="27">%d</xliff:g> more"</string>
 
     <!-- When a download completes, a notification is displayed, and this
         string is used to indicate that the download successfully completed.