Armor string format tokens with translation placeholders.

Change-Id: If5df4769880a03545894a77c578298370eeeb18e

diff --git a/res/values-keyshidden/strings.xml b/res/values-keyshidden/strings.xml
index b086fd0..bf01724 100644 (file)
--- a/res/values-keyshidden/strings.xml
+++ b/res/values-keyshidden/strings.xml
@@ -19,11 +19,11 @@
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- Prompt in dialog when creating a playlist and the keyboard is closed. -->
-    <string name="create_playlist_create_text_prompt">Open the keyboard to give your new Playlist a name, or select Save to name it \"%s\".</string>
+    <string name="create_playlist_create_text_prompt">Open the keyboard to give your new Playlist a name, or select Save to name it \"<xliff:g id="playlist" example="Favorite Songs">%s</xliff:g>\".</string>
 
     <!-- Prompt in dialog when renaming a playlist, and the entered name is the same as the old one. -->
     <string name="rename_playlist_same_prompt">Open the keyboard to give playlist \"<xliff:g id="playlist">%s</xliff:g>\" a new name.</string>
     <!-- Prompt in dialog when renaming a playlist, and the entered name is different from the old one. -->
-    <string name="rename_playlist_diff_prompt">Open the keyboard to give playlist \"<xliff:g id="playlist">%s</xliff:g>\" a new name, or select Save to name it \"%s\".</string>
+    <string name="rename_playlist_diff_prompt">Open the keyboard to give playlist \"<xliff:g id="playlist">%1$s</xliff:g>\" a new name, or select Save to name it \"<xliff:g id="name" example="Favorite Songs">%2$s</xliff:g>\".</string>
 </resources>
 

diff --git a/res/values/strings.xml b/res/values/strings.xml
index c51e37b..f5e509c 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -171,7 +171,7 @@
     <!-- Menu item -->
     <string name="ringtone_menu_short">Use as ringtone</string>
     <!-- Toast after setting a song as phone ringtone -->
-    <string name="ringtone_set">\"%s\" set as phone ringtone.</string>
+    <string name="ringtone_set">\"<xliff:g id="name" example="Alarm Bell">%s</xliff:g>\" set as phone ringtone.</string>
     <!-- Context menu item -->
     <string name="play_selection">Play</string>
     <!-- Context menu item -->
@@ -187,7 +187,7 @@
         <!-- message shown when one song was added -->
         <item quantity="one">1 song added to playlist.</item>
         <!-- message shown when zero or more than one song was added -->
-        <item quantity="other">%d songs added to playlist.</item>
+        <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> songs added to playlist.</item>
     </plurals>
     <!-- Toast after selecting an empty playlist -->
     <string name="emptyplaylist">Selected playlist is empty.</string>
@@ -255,7 +255,7 @@
     <string name="streamloadingtext">Connecting to <xliff:g id="host">%s</xliff:g></string>
 
     <!-- title of contextual music search menu -->
-    <string name="mediasearch">Search for %s using:</string>
+    <string name="mediasearch">Search for <xliff:g id="term" example="Beethoven">%s</xliff:g> using:</string>
 
     <!-- Shown in the title bar while the list of artists is being retrieved in the background -->
     <string name="working_artists">Artists\u2026</string>