Add positional substitution for strings

Chinese, Czech, Japanese, Korean, Polish, Russian, and Turkish have different
word order for some strings which necessitate positional substitution.

Change-Id: I2655d6cc445287ee05e616bedb5467aba595ac03
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 8290ada..2ae3644 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -274,7 +274,7 @@
     <string name="message_queued" msgid="8869479754825264671">"Momentálně nelze zprávu odeslat. Zpráva bude odeslána, jakmile bude služba dostupná."</string>
     <string name="no_subject" msgid="4168963736134552285">"(Předmět neuveden)"</string>
     <string name="unknown_sender" msgid="4929330613278853635">"Neznámý odesílatel"</string>
-    <string name="dl_failure_notification" msgid="2457080452886498701">"Stažení zprávy <xliff:g id="SUBJECT">%s</xliff:g> od uživatele <xliff:g id="FROM">%s</xliff:g> se nezdařilo."</string>
+    <string name="dl_failure_notification" msgid="2457080452886498701">"Stažení zprávy <xliff:g id="SUBJECT">%1$s</xliff:g> od uživatele <xliff:g id="FROM">%2$s</xliff:g> se nezdařilo."</string>
     <string name="dl_expired_notification" msgid="950390029992535809">"Platnost této zprávy vypršela a zpráva bude smazána."</string>
     <string name="rate_limit_surpassed" msgid="1347801608211628177">"Potvrdit"</string>
     <string name="confirm_rate_limit" msgid="234228299751243067">"Odesílá se velký počet zpráv MMS. Je to v pořádku?"</string>
@@ -319,7 +319,7 @@
     <item quantity="one" msgid="675571420878010439">"Počet výsledků pro výraz „%s“: <xliff:g id="NUMBER">%s</xliff:g>"</item>
     <item quantity="other" msgid="3778201725913692491">"Počet výsledků pro výraz %s: <xliff:g id="NUMBER">%s</xliff:g>"</item>
   </plurals>
-    <string name="search_history" msgid="4127805495662693154">"Počet výsledků pro výraz <xliff:g id="SEARCH">%s</xliff:g>: <xliff:g id="COUNT">%s</xliff:g>"</string>
+    <string name="search_history" msgid="4127805495662693154">"Počet výsledků pro výraz <xliff:g id="SEARCH">%2$s</xliff:g>: <xliff:g id="COUNT">%1$s</xliff:g>"</string>
     <string name="confirm_clear_search_title" msgid="8510295993632032904">"Vymazat"</string>
     <string name="confirm_clear_search_text" msgid="8731877031837077478">"Historie vyhledávání bude vymazána"</string>
     <string name="pref_mms_clear_search_history_title" msgid="6159758850628148164">"Vymazat historii vyhledávání"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index b2a9ae4..13c96dd 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -274,7 +274,7 @@
     <string name="message_queued" msgid="8869479754825264671">"Din besked kunne ikke sendes i øjeblikket. Den sendes, når tjenesten bliver tilgængelig."</string>
     <string name="no_subject" msgid="4168963736134552285">"(Intet emne)"</string>
     <string name="unknown_sender" msgid="4929330613278853635">"Ukendt afsender"</string>
-    <string name="dl_failure_notification" msgid="2457080452886498701">"Download af beskeden <xliff:g id="SUBJECT">%s</xliff:g> fra <xliff:g id="FROM">%s</xliff:g> mislykkedes."</string>
+    <string name="dl_failure_notification" msgid="2457080452886498701">"Download af beskeden <xliff:g id="SUBJECT">%1$s</xliff:g> fra <xliff:g id="FROM">%2$s</xliff:g> mislykkedes."</string>
     <string name="dl_expired_notification" msgid="950390029992535809">"Denne besked er forældet og slettes."</string>
     <string name="rate_limit_surpassed" msgid="1347801608211628177">"Bekræft"</string>
     <string name="confirm_rate_limit" msgid="234228299751243067">"Der sendes et stort antal multimediebeskeder. Er det OK?"</string>
@@ -319,7 +319,7 @@
     <item quantity="one" msgid="675571420878010439">"<xliff:g id="NUMBER">%s</xliff:g> resultat for \"%s\""</item>
     <item quantity="other" msgid="3778201725913692491">"<xliff:g id="NUMBER">%s</xliff:g> resultater for \"%s\""</item>
   </plurals>
-    <string name="search_history" msgid="4127805495662693154">"<xliff:g id="COUNT">%s</xliff:g> resultater for \"<xliff:g id="SEARCH">%s</xliff:g>\""</string>
+    <string name="search_history" msgid="4127805495662693154">"<xliff:g id="COUNT">%1$s</xliff:g> resultater for \"<xliff:g id="SEARCH">%2$s</xliff:g>\""</string>
     <string name="confirm_clear_search_title" msgid="8510295993632032904">"Ryd"</string>
     <string name="confirm_clear_search_text" msgid="8731877031837077478">"Søgeoversigten ryddes."</string>
     <string name="pref_mms_clear_search_history_title" msgid="6159758850628148164">"Ryd søgeoversigt"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index fe10682..43c49c3 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -274,7 +274,7 @@
     <string name="message_queued" msgid="8869479754825264671">"Senden der Nachricht derzeit nicht möglich. Sie wird gesendet, sobald der Service verfügbar ist."</string>
     <string name="no_subject" msgid="4168963736134552285">"(Kein Betreff)"</string>
     <string name="unknown_sender" msgid="4929330613278853635">"Unbekannter Sender"</string>
-    <string name="dl_failure_notification" msgid="2457080452886498701">"Nachricht <xliff:g id="SUBJECT">%s</xliff:g> von <xliff:g id="FROM">%s</xliff:g> konnte nicht heruntergeladen werden."</string>
+    <string name="dl_failure_notification" msgid="2457080452886498701">"Nachricht <xliff:g id="SUBJECT">%1$s</xliff:g> von <xliff:g id="FROM">%2$s</xliff:g> konnte nicht heruntergeladen werden."</string>
     <string name="dl_expired_notification" msgid="950390029992535809">"Diese Nachricht ist abgelaufen und wird gelöscht."</string>
     <string name="rate_limit_surpassed" msgid="1347801608211628177">"Bestätigen"</string>
     <string name="confirm_rate_limit" msgid="234228299751243067">"Es werden mehrere Multimedia-Nachrichten gesendet. Möchten Sie fortfahren?"</string>
@@ -319,7 +319,7 @@
     <item quantity="one" msgid="675571420878010439">"<xliff:g id="NUMBER">%s</xliff:g> Ergebnis für \"%s\""</item>
     <item quantity="other" msgid="3778201725913692491">"<xliff:g id="NUMBER">%s</xliff:g> Ergebnisse für \"%s\""</item>
   </plurals>
-    <string name="search_history" msgid="4127805495662693154">"<xliff:g id="COUNT">%s</xliff:g> Ergebnisse für \"<xliff:g id="SEARCH">%s</xliff:g>\""</string>
+    <string name="search_history" msgid="4127805495662693154">"<xliff:g id="COUNT">%1$s</xliff:g> Ergebnisse für \"<xliff:g id="SEARCH">%2$s</xliff:g>\""</string>
     <string name="confirm_clear_search_title" msgid="8510295993632032904">"Löschen"</string>
     <string name="confirm_clear_search_text" msgid="8731877031837077478">"Der Suchverlauf wird gelöscht."</string>
     <string name="pref_mms_clear_search_history_title" msgid="6159758850628148164">"Suchverlauf löschen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index e352e33..7a11ec8 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -274,7 +274,7 @@
     <string name="message_queued" msgid="8869479754825264671">"Δεν είναι δυνατή η αποστολή του μηνύματός σας αυτήν τη στιγμή. Η αποστολή θα πραγματοποιηθεί όταν η υπηρεσία θα είναι διαθέσιμη."</string>
     <string name="no_subject" msgid="4168963736134552285">"(Χωρίς θέμα)"</string>
     <string name="unknown_sender" msgid="4929330613278853635">"Άγνωστος αποστολέας"</string>
-    <string name="dl_failure_notification" msgid="2457080452886498701">"Η λήψη του μηνύματος <xliff:g id="SUBJECT">%s</xliff:g> από <xliff:g id="FROM">%s</xliff:g> απέτυχε."</string>
+    <string name="dl_failure_notification" msgid="2457080452886498701">"Η λήψη του μηνύματος <xliff:g id="SUBJECT">%1$s</xliff:g> από <xliff:g id="FROM">%2$s</xliff:g> απέτυχε."</string>
     <string name="dl_expired_notification" msgid="950390029992535809">"Αυτό το μήνυμα έχει λήξει και θα διαγραφεί."</string>
     <string name="rate_limit_surpassed" msgid="1347801608211628177">"Επιβεβαίωση"</string>
     <string name="confirm_rate_limit" msgid="234228299751243067">"Γίνεται αποστολή μεγάλου αριθμού μηνυμάτων πολυμέσων. OK;"</string>
@@ -319,7 +319,7 @@
     <item quantity="one" msgid="675571420878010439">"<xliff:g id="NUMBER">%s</xliff:g> αποτέλεσμα για \"%s\""</item>
     <item quantity="other" msgid="3778201725913692491">"<xliff:g id="NUMBER">%s</xliff:g> αποτελέσματα για \"%s\""</item>
   </plurals>
-    <string name="search_history" msgid="4127805495662693154">"<xliff:g id="COUNT">%s</xliff:g> αποτελέσματα για \"<xliff:g id="SEARCH">%s</xliff:g>\""</string>
+    <string name="search_history" msgid="4127805495662693154">"<xliff:g id="COUNT">%1$s</xliff:g> αποτελέσματα για \"<xliff:g id="SEARCH">%2$s</xliff:g>\""</string>
     <string name="confirm_clear_search_title" msgid="8510295993632032904">"Εκκαθάριση"</string>
     <string name="confirm_clear_search_text" msgid="8731877031837077478">"Το ιστορικό αναζήτησης θα εκκαθαριστεί."</string>
     <string name="pref_mms_clear_search_history_title" msgid="6159758850628148164">"Εκκαθάριση ιστορικού αναζήτησης"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 2f4685c..c966719 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -274,7 +274,7 @@
     <string name="message_queued" msgid="8869479754825264671">"En este momento, no es posible enviar tu mensaje. Se enviará cuando el servicio esté disponible."</string>
     <string name="no_subject" msgid="4168963736134552285">"(Sin asunto)"</string>
     <string name="unknown_sender" msgid="4929330613278853635">"Emisor desconocido"</string>
-    <string name="dl_failure_notification" msgid="2457080452886498701">"La descarga sobre <xliff:g id="SUBJECT">%s</xliff:g> del mensaje desde  <xliff:g id="FROM">%s</xliff:g> no se ha realizado correctamente."</string>
+    <string name="dl_failure_notification" msgid="2457080452886498701">"La descarga sobre <xliff:g id="SUBJECT">%1$s</xliff:g> del mensaje desde  <xliff:g id="FROM">%2$s</xliff:g> no se ha realizado correctamente."</string>
     <string name="dl_expired_notification" msgid="950390029992535809">"Este mensaje ha vencido y será eliminado."</string>
     <string name="rate_limit_surpassed" msgid="1347801608211628177">"Confirmar"</string>
     <string name="confirm_rate_limit" msgid="234228299751243067">"Se está enviando una gran cantidad de mensajes multimedia. ¿Es correcto?"</string>
@@ -319,7 +319,7 @@
     <item quantity="one" msgid="675571420878010439">"<xliff:g id="NUMBER">%s</xliff:g> resultado para \"%s\""</item>
     <item quantity="other" msgid="3778201725913692491">"<xliff:g id="NUMBER">%s</xliff:g> resultados para \"%s\""</item>
   </plurals>
-    <string name="search_history" msgid="4127805495662693154">"<xliff:g id="COUNT">%s</xliff:g> resultados para \"<xliff:g id="SEARCH">%s</xliff:g>\""</string>
+    <string name="search_history" msgid="4127805495662693154">"<xliff:g id="COUNT">%1$s</xliff:g> resultados para \"<xliff:g id="SEARCH">%2$s</xliff:g>\""</string>
     <string name="confirm_clear_search_title" msgid="8510295993632032904">"Borrar"</string>
     <string name="confirm_clear_search_text" msgid="8731877031837077478">"Se borrará el historial de búsquedas."</string>
     <string name="pref_mms_clear_search_history_title" msgid="6159758850628148164">"Borrar historial de búsqueda"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index ccfac76..09c8ded 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -274,7 +274,7 @@
     <string name="message_queued" msgid="8869479754825264671">"El mensaje no se puede enviar en este momento; se enviará cuando el servicio esté disponible."</string>
     <string name="no_subject" msgid="4168963736134552285">"(Sin asunto)"</string>
     <string name="unknown_sender" msgid="4929330613278853635">"Destinatario desconocido"</string>
-    <string name="dl_failure_notification" msgid="2457080452886498701">"El mensaje <xliff:g id="SUBJECT">%s</xliff:g> de <xliff:g id="FROM">%s</xliff:g> no se ha podido descargar correctamente."</string>
+    <string name="dl_failure_notification" msgid="2457080452886498701">"El mensaje <xliff:g id="SUBJECT">%1$s</xliff:g> de <xliff:g id="FROM">%2$s</xliff:g> no se ha podido descargar correctamente."</string>
     <string name="dl_expired_notification" msgid="950390029992535809">"Este mensaje ha caducado y se eliminará."</string>
     <string name="rate_limit_surpassed" msgid="1347801608211628177">"Confirmar"</string>
     <string name="confirm_rate_limit" msgid="234228299751243067">"Se va a enviar un gran número de mensajes multimedia, ¿estás seguro de que quieres enviarlos?"</string>
@@ -319,7 +319,7 @@
     <item quantity="one" msgid="675571420878010439">"<xliff:g id="NUMBER">%s</xliff:g> resultados de \"%s\""</item>
     <item quantity="other" msgid="3778201725913692491">"<xliff:g id="NUMBER">%s</xliff:g> resultados de \"%s\""</item>
   </plurals>
-    <string name="search_history" msgid="4127805495662693154">"<xliff:g id="COUNT">%s</xliff:g> resultados de \"<xliff:g id="SEARCH">%s</xliff:g>\""</string>
+    <string name="search_history" msgid="4127805495662693154">"<xliff:g id="COUNT">%1$s</xliff:g> resultados de \"<xliff:g id="SEARCH">%2$s</xliff:g>\""</string>
     <string name="confirm_clear_search_title" msgid="8510295993632032904">"Borrar"</string>
     <string name="confirm_clear_search_text" msgid="8731877031837077478">"El historial de búsquedas se borrará."</string>
     <string name="pref_mms_clear_search_history_title" msgid="6159758850628148164">"Borrar historial de búsqueda"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 010e876..41fe449 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -274,7 +274,7 @@
     <string name="message_queued" msgid="8869479754825264671">"Votre message ne peut pas être envoyé pour l\'instant. Il sera transmis lorsque le service sera à nouveau disponible."</string>
     <string name="no_subject" msgid="4168963736134552285">"(Aucun objet)"</string>
     <string name="unknown_sender" msgid="4929330613278853635">"Expéditeur inconnu"</string>
-    <string name="dl_failure_notification" msgid="2457080452886498701">"Le téléchargement du message <xliff:g id="SUBJECT">%s</xliff:g> de <xliff:g id="FROM">%s</xliff:g> a échoué."</string>
+    <string name="dl_failure_notification" msgid="2457080452886498701">"Le téléchargement du message <xliff:g id="SUBJECT">%1$s</xliff:g> de <xliff:g id="FROM">%2$s</xliff:g> a échoué."</string>
     <string name="dl_expired_notification" msgid="950390029992535809">"Ce message est arrivé à expiration et sera supprimé."</string>
     <string name="rate_limit_surpassed" msgid="1347801608211628177">"Confirmer"</string>
     <string name="confirm_rate_limit" msgid="234228299751243067">"Un grand nombre de messages multimédias est en cours d\'envoi. Voulez-vous continuer ?"</string>
@@ -319,7 +319,7 @@
     <item quantity="one" msgid="675571420878010439">"<xliff:g id="NUMBER">%s</xliff:g> résultat pour \"%s\""</item>
     <item quantity="other" msgid="3778201725913692491">"<xliff:g id="NUMBER">%s</xliff:g> résultats pour \"%s\""</item>
   </plurals>
-    <string name="search_history" msgid="4127805495662693154">"<xliff:g id="COUNT">%s</xliff:g> résultats pour \"<xliff:g id="SEARCH">%s</xliff:g>\""</string>
+    <string name="search_history" msgid="4127805495662693154">"<xliff:g id="COUNT">%1$s</xliff:g> résultats pour \"<xliff:g id="SEARCH">%2$s</xliff:g>\""</string>
     <string name="confirm_clear_search_title" msgid="8510295993632032904">"Effacer"</string>
     <string name="confirm_clear_search_text" msgid="8731877031837077478">"L\'historique des recherches sera effacé."</string>
     <string name="pref_mms_clear_search_history_title" msgid="6159758850628148164">"Effacer l\'historique des recherches"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 3756031..7b67ed4 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -274,7 +274,7 @@
     <string name="message_queued" msgid="8869479754825264671">"Al momento è impossibile inviare il messaggio. Il messaggio verrà inviato non appena il servizio diventa disponibile."</string>
     <string name="no_subject" msgid="4168963736134552285">"(Nessun oggetto)"</string>
     <string name="unknown_sender" msgid="4929330613278853635">"Mittente sconosciuto"</string>
-    <string name="dl_failure_notification" msgid="2457080452886498701">"Download del messaggio <xliff:g id="SUBJECT">%s</xliff:g> di <xliff:g id="FROM">%s</xliff:g> non riuscito."</string>
+    <string name="dl_failure_notification" msgid="2457080452886498701">"Download del messaggio <xliff:g id="SUBJECT">%1$s</xliff:g> di <xliff:g id="FROM">%2$s</xliff:g> non riuscito."</string>
     <string name="dl_expired_notification" msgid="950390029992535809">"Questo messaggio è scaduto e verrà eliminato."</string>
     <string name="rate_limit_surpassed" msgid="1347801608211628177">"Conferma"</string>
     <string name="confirm_rate_limit" msgid="234228299751243067">"Stai per inviare numerosi MMS. Confermi?"</string>
@@ -319,7 +319,7 @@
     <item quantity="one" msgid="675571420878010439">"<xliff:g id="NUMBER">%s</xliff:g> risultato per \"%s\""</item>
     <item quantity="other" msgid="3778201725913692491">"<xliff:g id="NUMBER">%s</xliff:g> risultati per \"%s\""</item>
   </plurals>
-    <string name="search_history" msgid="4127805495662693154">"<xliff:g id="COUNT">%s</xliff:g> risultati per \"<xliff:g id="SEARCH">%s</xliff:g>\""</string>
+    <string name="search_history" msgid="4127805495662693154">"<xliff:g id="COUNT">%1$s</xliff:g> risultati per \"<xliff:g id="SEARCH">%2$s</xliff:g>\""</string>
     <string name="confirm_clear_search_title" msgid="8510295993632032904">"Cancella"</string>
     <string name="confirm_clear_search_text" msgid="8731877031837077478">"La cronologia delle ricerche verrà cancellata."</string>
     <string name="pref_mms_clear_search_history_title" msgid="6159758850628148164">"Cancella cronologia ricerche"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 97cbd9a..32d8447 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -274,7 +274,7 @@
     <string name="message_queued" msgid="8869479754825264671">"現在メッセージを送信できません。サービスが利用できる状態になり次第送信されます。"</string>
     <string name="no_subject" msgid="4168963736134552285">"(件名なし)"</string>
     <string name="unknown_sender" msgid="4929330613278853635">"送信者不明"</string>
-    <string name="dl_failure_notification" msgid="2457080452886498701">"<xliff:g id="FROM">%s</xliff:g>さんからのメッセージ「<xliff:g id="SUBJECT">%s</xliff:g>」をダウンロードできませんでした。"</string>
+    <string name="dl_failure_notification" msgid="2457080452886498701">"<xliff:g id="FROM">%2$s</xliff:g>さんからのメッセージ「<xliff:g id="SUBJECT">%1$s</xliff:g>」をダウンロードできませんでした。"</string>
     <string name="dl_expired_notification" msgid="950390029992535809">"このメッセージは期限が切れているため削除されます。"</string>
     <string name="rate_limit_surpassed" msgid="1347801608211628177">"確認"</string>
     <string name="confirm_rate_limit" msgid="234228299751243067">"大量のマルチメディアメッセージを送信してもよろしいですか?"</string>
@@ -316,10 +316,10 @@
     <string name="search_setting_description" msgid="4104004595086437572">"メッセージ内のテキスト"</string>
     <string name="search_empty" msgid="645052646985297065">"該当なし"</string>
   <plurals name="search_results_title">
-    <item quantity="one" msgid="675571420878010439">"「%s」の検索結果<xliff:g id="NUMBER">%s</xliff:g>件"</item>
-    <item quantity="other" msgid="3778201725913692491">"「%s」の検索結果<xliff:g id="NUMBER">%s</xliff:g>件"</item>
+    <item quantity="one" msgid="675571420878010439">"「%2$s」の検索結果<xliff:g id="NUMBER">%1$s</xliff:g>件"</item>
+    <item quantity="other" msgid="3778201725913692491">"「%2$s」の検索結果<xliff:g id="NUMBER">%1$s</xliff:g>件"</item>
   </plurals>
-    <string name="search_history" msgid="4127805495662693154">"「<xliff:g id="SEARCH">%s</xliff:g>」の検索結果<xliff:g id="COUNT">%s</xliff:g>件"</string>
+    <string name="search_history" msgid="4127805495662693154">"「<xliff:g id="SEARCH">%2$s</xliff:g>」の検索結果<xliff:g id="COUNT">%1$s</xliff:g>件"</string>
     <string name="confirm_clear_search_title" msgid="8510295993632032904">"クリア"</string>
     <string name="confirm_clear_search_text" msgid="8731877031837077478">"検索履歴を消去します。"</string>
     <string name="pref_mms_clear_search_history_title" msgid="6159758850628148164">"検索履歴を消去"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 0b57fbe..736233e 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -274,7 +274,7 @@
     <string name="message_queued" msgid="8869479754825264671">"메시지를 보낼 수 없습니다. 서비스가 복구되면 전송됩니다."</string>
     <string name="no_subject" msgid="4168963736134552285">"(제목 없음)"</string>
     <string name="unknown_sender" msgid="4929330613278853635">"알 수 없는 발신자"</string>
-    <string name="dl_failure_notification" msgid="2457080452886498701">"<xliff:g id="FROM">%s</xliff:g>에서 <xliff:g id="SUBJECT">%s</xliff:g> 메시지를 다운로드하지 못했습니다."</string>
+    <string name="dl_failure_notification" msgid="2457080452886498701">"<xliff:g id="FROM">%2$s</xliff:g>에서 <xliff:g id="SUBJECT">%1$s</xliff:g> 메시지를 다운로드하지 못했습니다."</string>
     <string name="dl_expired_notification" msgid="950390029992535809">"메시지가 만료되었으므로 삭제됩니다."</string>
     <string name="rate_limit_surpassed" msgid="1347801608211628177">"확인"</string>
     <string name="confirm_rate_limit" msgid="234228299751243067">"여러 개의 멀티미디어 메시지를 전송 중입니다. 계속하시겠습니까?"</string>
@@ -316,10 +316,10 @@
     <string name="search_setting_description" msgid="4104004595086437572">"메시지의 문자"</string>
     <string name="search_empty" msgid="645052646985297065">"검색결과 없음"</string>
   <plurals name="search_results_title">
-    <item quantity="one" msgid="675571420878010439">"\'%s\'에 대한 결과 <xliff:g id="NUMBER">%s</xliff:g>개"</item>
-    <item quantity="other" msgid="3778201725913692491">"\'%s\'에 대한 결과 <xliff:g id="NUMBER">%s</xliff:g>개"</item>
+    <item quantity="one" msgid="675571420878010439">"\'%2$s\'에 대한 결과 <xliff:g id="NUMBER">%1$s</xliff:g>개"</item>
+    <item quantity="other" msgid="3778201725913692491">"\'%2$s\'에 대한 결과 <xliff:g id="NUMBER">%1$s</xliff:g>개"</item>
   </plurals>
-    <string name="search_history" msgid="4127805495662693154">"\'<xliff:g id="SEARCH">%s</xliff:g>\'에 대한 검색결과 <xliff:g id="COUNT">%s</xliff:g>개"</string>
+    <string name="search_history" msgid="4127805495662693154">"\'<xliff:g id="SEARCH">%2$s</xliff:g>\'에 대한 검색결과 <xliff:g id="COUNT">%1$s</xliff:g>개"</string>
     <string name="confirm_clear_search_title" msgid="8510295993632032904">"지우기"</string>
     <string name="confirm_clear_search_text" msgid="8731877031837077478">"검색기록이 지워집니다."</string>
     <string name="pref_mms_clear_search_history_title" msgid="6159758850628148164">"검색기록 지우기"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 86204f7..fa8b271 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -274,7 +274,7 @@
     <string name="message_queued" msgid="8869479754825264671">"Kunne ikke sende meldingen nå. Den vil bli sendt når tjenesten blir tilgjengelig."</string>
     <string name="no_subject" msgid="4168963736134552285">"(Mangler emne)"</string>
     <string name="unknown_sender" msgid="4929330613278853635">"Ukjent sender"</string>
-    <string name="dl_failure_notification" msgid="2457080452886498701">"Kunne ikke laste ned meldingen <xliff:g id="SUBJECT">%s</xliff:g> fra <xliff:g id="FROM">%s</xliff:g>."</string>
+    <string name="dl_failure_notification" msgid="2457080452886498701">"Kunne ikke laste ned meldingen <xliff:g id="SUBJECT">%1$s</xliff:g> fra <xliff:g id="FROM">%2$s</xliff:g>."</string>
     <string name="dl_expired_notification" msgid="950390029992535809">"Denne meldingen er utløpt, og vil bli slettet."</string>
     <string name="rate_limit_surpassed" msgid="1347801608211628177">"Bekreft"</string>
     <string name="confirm_rate_limit" msgid="234228299751243067">"Et stort antall multimediemeldinger blir sendt. Er dette OK?"</string>
@@ -319,7 +319,7 @@
     <item quantity="one" msgid="675571420878010439">"<xliff:g id="NUMBER">%s</xliff:g> resultater for «%s»"</item>
     <item quantity="other" msgid="3778201725913692491">"<xliff:g id="NUMBER">%s</xliff:g> resultater for «%s»"</item>
   </plurals>
-    <string name="search_history" msgid="4127805495662693154">"<xliff:g id="COUNT">%s</xliff:g> resultater for «<xliff:g id="SEARCH">%s</xliff:g>»"</string>
+    <string name="search_history" msgid="4127805495662693154">"<xliff:g id="COUNT">%1$s</xliff:g> resultater for «<xliff:g id="SEARCH">%2$s</xliff:g>»"</string>
     <string name="confirm_clear_search_title" msgid="8510295993632032904">"Tøm"</string>
     <string name="confirm_clear_search_text" msgid="8731877031837077478">"Søkeloggen slettes."</string>
     <string name="pref_mms_clear_search_history_title" msgid="6159758850628148164">"Tøm søkeloggen"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 1fde7f5..82fa6e5 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -274,7 +274,7 @@
     <string name="message_queued" msgid="8869479754825264671">"Uw bericht kan momenteel niet worden verzonden. Het wordt verzonden als de service beschikbaar komt."</string>
     <string name="no_subject" msgid="4168963736134552285">"(Geen onderwerp)"</string>
     <string name="unknown_sender" msgid="4929330613278853635">"Onbekende afzender"</string>
-    <string name="dl_failure_notification" msgid="2457080452886498701">"Downloaden van bericht <xliff:g id="SUBJECT">%s</xliff:g> van <xliff:g id="FROM">%s</xliff:g> is mislukt."</string>
+    <string name="dl_failure_notification" msgid="2457080452886498701">"Downloaden van bericht <xliff:g id="SUBJECT">%1$s</xliff:g> van <xliff:g id="FROM">%2$s</xliff:g> is mislukt."</string>
     <string name="dl_expired_notification" msgid="950390029992535809">"Dit bericht is verlopen en wordt verwijderd."</string>
     <string name="rate_limit_surpassed" msgid="1347801608211628177">"Bevestigen"</string>
     <string name="confirm_rate_limit" msgid="234228299751243067">"Er wordt een groot aantal multimediaberichten verzonden. Is dat OK?"</string>
@@ -319,7 +319,7 @@
     <item quantity="one" msgid="675571420878010439">"<xliff:g id="NUMBER">%s</xliff:g> resultaten voor \'%s\'"</item>
     <item quantity="other" msgid="3778201725913692491">"<xliff:g id="NUMBER">%s</xliff:g> resultaten voor \'%s\'"</item>
   </plurals>
-    <string name="search_history" msgid="4127805495662693154">"<xliff:g id="COUNT">%s</xliff:g> resultaten voor \'<xliff:g id="SEARCH">%s</xliff:g>\'"</string>
+    <string name="search_history" msgid="4127805495662693154">"<xliff:g id="COUNT">%1$s</xliff:g> resultaten voor \'<xliff:g id="SEARCH">%2$s</xliff:g>\'"</string>
     <string name="confirm_clear_search_title" msgid="8510295993632032904">"Wissen"</string>
     <string name="confirm_clear_search_text" msgid="8731877031837077478">"De zoekgeschiedenis wordt gewist."</string>
     <string name="pref_mms_clear_search_history_title" msgid="6159758850628148164">"Zoekgeschiedenis wissen"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index fa254a6..9688897 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -274,7 +274,7 @@
     <string name="message_queued" msgid="8869479754825264671">"Nie można w tej chwili wysłać wiadomości. Zostanie ona wysłana, gdy usługa będzie dostępna."</string>
     <string name="no_subject" msgid="4168963736134552285">"(Brak tematu)"</string>
     <string name="unknown_sender" msgid="4929330613278853635">"Nieznany nadawca"</string>
-    <string name="dl_failure_notification" msgid="2457080452886498701">"Pobieranie wiadomości <xliff:g id="SUBJECT">%s</xliff:g> od <xliff:g id="FROM">%s</xliff:g> zakończyło się niepowodzeniem."</string>
+    <string name="dl_failure_notification" msgid="2457080452886498701">"Pobieranie wiadomości <xliff:g id="SUBJECT">%1$s</xliff:g> od <xliff:g id="FROM">%2$s</xliff:g> zakończyło się niepowodzeniem."</string>
     <string name="dl_expired_notification" msgid="950390029992535809">"Ta wiadomość wygasła i zostanie usunięta."</string>
     <string name="rate_limit_surpassed" msgid="1347801608211628177">"Potwierdź"</string>
     <string name="confirm_rate_limit" msgid="234228299751243067">"Wysyłanych jest wiele wiadomości multimedialnych. Czy to jest OK?"</string>
@@ -316,10 +316,10 @@
     <string name="search_setting_description" msgid="4104004595086437572">"Tekst w wiadomościach"</string>
     <string name="search_empty" msgid="645052646985297065">"Brak wyników"</string>
   <plurals name="search_results_title">
-    <item quantity="one" msgid="675571420878010439">"Liczba wyników dla zapytania „%s”: <xliff:g id="NUMBER">%s</xliff:g>"</item>
-    <item quantity="other" msgid="3778201725913692491">"Liczba wyników dla zapytania „%s”: <xliff:g id="NUMBER">%s</xliff:g>"</item>
+    <item quantity="one" msgid="675571420878010439">"Liczba wyników dla zapytania „%2$s”: <xliff:g id="NUMBER">%1$s</xliff:g>"</item>
+    <item quantity="other" msgid="3778201725913692491">"Liczba wyników dla zapytania „%2$s”: <xliff:g id="NUMBER">%1$s</xliff:g>"</item>
   </plurals>
-    <string name="search_history" msgid="4127805495662693154">"Liczba wyników dla zapytania „<xliff:g id="SEARCH">%s</xliff:g>”: <xliff:g id="COUNT">%s</xliff:g>"</string>
+    <string name="search_history" msgid="4127805495662693154">"Liczba wyników dla zapytania „<xliff:g id="SEARCH">%2$s</xliff:g>”: <xliff:g id="COUNT">%1$s</xliff:g>"</string>
     <string name="confirm_clear_search_title" msgid="8510295993632032904">"Wyczyść"</string>
     <string name="confirm_clear_search_text" msgid="8731877031837077478">"Historia wyszukiwania zostanie wyczyszczona."</string>
     <string name="pref_mms_clear_search_history_title" msgid="6159758850628148164">"Wyczyść historię wyszukiwania"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index af6de12..5ff7ac5 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -274,7 +274,7 @@
     <string name="message_queued" msgid="8869479754825264671">"De momento não é possível enviar a mensagem. Esta será enviada quando o serviço estiver disponível."</string>
     <string name="no_subject" msgid="4168963736134552285">"(Sem assunto)"</string>
     <string name="unknown_sender" msgid="4929330613278853635">"Remetente desconhecido"</string>
-    <string name="dl_failure_notification" msgid="2457080452886498701">"Falha·ao·transferir·a·mensagem <xliff:g id="SUBJECT">%s</xliff:g> de <xliff:g id="FROM">%s</xliff:g>."</string>
+    <string name="dl_failure_notification" msgid="2457080452886498701">"Falha·ao·transferir·a·mensagem <xliff:g id="SUBJECT">%1$s</xliff:g> de <xliff:g id="FROM">%2$s</xliff:g>."</string>
     <string name="dl_expired_notification" msgid="950390029992535809">"Esta mensagem expirou e vai ser eliminada."</string>
     <string name="rate_limit_surpassed" msgid="1347801608211628177">"Confirmar"</string>
     <string name="confirm_rate_limit" msgid="234228299751243067">"Está a ser enviado um grande número de mensagens multimédia. Está de acordo?"</string>
@@ -319,7 +319,7 @@
     <item quantity="one" msgid="675571420878010439">"<xliff:g id="NUMBER">%s</xliff:g> resultado para \"%s\""</item>
     <item quantity="other" msgid="3778201725913692491">"<xliff:g id="NUMBER">%s</xliff:g> resultados para \"%s\""</item>
   </plurals>
-    <string name="search_history" msgid="4127805495662693154">"<xliff:g id="COUNT">%s</xliff:g> resultados para \"<xliff:g id="SEARCH">%s</xliff:g>\""</string>
+    <string name="search_history" msgid="4127805495662693154">"<xliff:g id="COUNT">%1$s</xliff:g> resultados para \"<xliff:g id="SEARCH">%2$s</xliff:g>\""</string>
     <string name="confirm_clear_search_title" msgid="8510295993632032904">"Limpar"</string>
     <string name="confirm_clear_search_text" msgid="8731877031837077478">"O histórico de pesquisas será limpo."</string>
     <string name="pref_mms_clear_search_history_title" msgid="6159758850628148164">"Limpar histórico de pesquisas"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index b309c1f..497a5f2 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -274,7 +274,7 @@
     <string name="message_queued" msgid="8869479754825264671">"No momento, não é possível enviar a sua mensagem. Ela será enviada quando o serviço ficar disponível."</string>
     <string name="no_subject" msgid="4168963736134552285">"(Sem título)"</string>
     <string name="unknown_sender" msgid="4929330613278853635">"Remetente desconhecido"</string>
-    <string name="dl_failure_notification" msgid="2457080452886498701">"O download da mensagem <xliff:g id="SUBJECT">%s</xliff:g> de <xliff:g id="FROM">%s</xliff:g> falhou."</string>
+    <string name="dl_failure_notification" msgid="2457080452886498701">"O download da mensagem <xliff:g id="SUBJECT">%1$s</xliff:g> de <xliff:g id="FROM">%2$s</xliff:g> falhou."</string>
     <string name="dl_expired_notification" msgid="950390029992535809">"Esta mensagem expirou e será excluída."</string>
     <string name="rate_limit_surpassed" msgid="1347801608211628177">"Confirmar"</string>
     <string name="confirm_rate_limit" msgid="234228299751243067">"Muitas mensagens multimídia estão sendo enviadas. Isso está certo?"</string>
@@ -319,7 +319,7 @@
     <item quantity="one" msgid="675571420878010439">"<xliff:g id="NUMBER">%s</xliff:g> resultado para \"%s\""</item>
     <item quantity="other" msgid="3778201725913692491">"<xliff:g id="NUMBER">%s</xliff:g> resultados para \"%s\""</item>
   </plurals>
-    <string name="search_history" msgid="4127805495662693154">"<xliff:g id="COUNT">%s</xliff:g> resultados para \"<xliff:g id="SEARCH">%s</xliff:g>\""</string>
+    <string name="search_history" msgid="4127805495662693154">"<xliff:g id="COUNT">%1$s</xliff:g> resultados para \"<xliff:g id="SEARCH">%2$s</xliff:g>\""</string>
     <string name="confirm_clear_search_title" msgid="8510295993632032904">"Limpar"</string>
     <string name="confirm_clear_search_text" msgid="8731877031837077478">"O histórico de pesquisa será limpo."</string>
     <string name="pref_mms_clear_search_history_title" msgid="6159758850628148164">"Limpar histórico de pesquisa"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 9d65787..cf6536d 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -275,7 +275,7 @@
     <string name="message_queued" msgid="8869479754825264671">"В настоящий момент отправить сообщение невозможно. Сообщение будет отправлено, когда появится доступ к службе."</string>
     <string name="no_subject" msgid="4168963736134552285">"(Без темы)"</string>
     <string name="unknown_sender" msgid="4929330613278853635">"Неизвестный отправитель"</string>
-    <string name="dl_failure_notification" msgid="2457080452886498701">"Загрузка сообщения <xliff:g id="SUBJECT">%s</xliff:g> от пользователя <xliff:g id="FROM">%s</xliff:g> не удалась."</string>
+    <string name="dl_failure_notification" msgid="2457080452886498701">"Загрузка сообщения <xliff:g id="SUBJECT">%1$s</xliff:g> от пользователя <xliff:g id="FROM">%2$s</xliff:g> не удалась."</string>
     <string name="dl_expired_notification" msgid="950390029992535809">"Это сообщение устарело и будет удалено."</string>
     <string name="rate_limit_surpassed" msgid="1347801608211628177">"Подтвердить"</string>
     <string name="confirm_rate_limit" msgid="234228299751243067">"Отправляется большое количество MMS. Продолжить?"</string>
@@ -317,10 +317,10 @@
     <string name="search_setting_description" msgid="4104004595086437572">"Текст в сообщениях"</string>
     <string name="search_empty" msgid="645052646985297065">"Соответствий нет"</string>
   <plurals name="search_results_title">
-    <item quantity="one" msgid="675571420878010439">"Результатов по запросу \"%s\": <xliff:g id="NUMBER">%s</xliff:g>"</item>
-    <item quantity="other" msgid="3778201725913692491">"Результатов по запросу \"%s\": <xliff:g id="NUMBER">%s</xliff:g>"</item>
+    <item quantity="one" msgid="675571420878010439">"Результатов по запросу \"%2$s\": <xliff:g id="NUMBER">%1$s</xliff:g>"</item>
+    <item quantity="other" msgid="3778201725913692491">"Результатов по запросу \"%2$s\": <xliff:g id="NUMBER">%1$s</xliff:g>"</item>
   </plurals>
-    <string name="search_history" msgid="4127805495662693154">"Результатов для \"<xliff:g id="SEARCH">%s</xliff:g>\": <xliff:g id="COUNT">%s</xliff:g>"</string>
+    <string name="search_history" msgid="4127805495662693154">"Результатов для \"<xliff:g id="SEARCH">%2$s</xliff:g>\": <xliff:g id="COUNT">%1$s</xliff:g>"</string>
     <string name="confirm_clear_search_title" msgid="8510295993632032904">"Очистить"</string>
     <string name="confirm_clear_search_text" msgid="8731877031837077478">"История поиска будет удалена."</string>
     <string name="pref_mms_clear_search_history_title" msgid="6159758850628148164">"Очистить историю поиска"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index f983946..5ca8718 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -274,7 +274,7 @@
     <string name="message_queued" msgid="8869479754825264671">"Det går inte att skicka meddelandet just nu. Det skickas så snart tjänsten blir tillgänglig."</string>
     <string name="no_subject" msgid="4168963736134552285">"(Inget ämne)"</string>
     <string name="unknown_sender" msgid="4929330613278853635">"Okänd avsändare"</string>
-    <string name="dl_failure_notification" msgid="2457080452886498701">"Det gick inte att hämta meddelandet <xliff:g id="SUBJECT">%s</xliff:g> från <xliff:g id="FROM">%s</xliff:g>."</string>
+    <string name="dl_failure_notification" msgid="2457080452886498701">"Det gick inte att hämta meddelandet <xliff:g id="SUBJECT">%1$s</xliff:g> från <xliff:g id="FROM">%2$s</xliff:g>."</string>
     <string name="dl_expired_notification" msgid="950390029992535809">"Meddelandet har upphört att gälla och kommer att tas bort."</string>
     <string name="rate_limit_surpassed" msgid="1347801608211628177">"Bekräfta"</string>
     <string name="confirm_rate_limit" msgid="234228299751243067">"Du håller på att skicka ett stort antal MMS. Vill du fortsätta?"</string>
@@ -319,7 +319,7 @@
     <item quantity="one" msgid="675571420878010439">"<xliff:g id="NUMBER">%s</xliff:g> resultat för \"%s\""</item>
     <item quantity="other" msgid="3778201725913692491">"<xliff:g id="NUMBER">%s</xliff:g> resultat för \"%s\""</item>
   </plurals>
-    <string name="search_history" msgid="4127805495662693154">"<xliff:g id="COUNT">%s</xliff:g> resultat för \"<xliff:g id="SEARCH">%s</xliff:g>\""</string>
+    <string name="search_history" msgid="4127805495662693154">"<xliff:g id="COUNT">%1$s</xliff:g> resultat för \"<xliff:g id="SEARCH">%2$s</xliff:g>\""</string>
     <string name="confirm_clear_search_title" msgid="8510295993632032904">"Ta bort"</string>
     <string name="confirm_clear_search_text" msgid="8731877031837077478">"Sökhistoriken tas bort."</string>
     <string name="pref_mms_clear_search_history_title" msgid="6159758850628148164">"Rensa sökhistorik"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index fc86ef1..222dc79 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -274,7 +274,7 @@
     <string name="message_queued" msgid="8869479754825264671">"Şu an için iletiniz gönderilemiyor. Hizmet kullanılabilir olduğunda gönderilecektir."</string>
     <string name="no_subject" msgid="4168963736134552285">"(Konu yok)"</string>
     <string name="unknown_sender" msgid="4929330613278853635">"Bilinmeyen gönderen"</string>
-    <string name="dl_failure_notification" msgid="2457080452886498701">"<xliff:g id="FROM">%s</xliff:g> adlı gönderenden gelen <xliff:g id="SUBJECT">%s</xliff:g> konulu ileti indirilemedi."</string>
+    <string name="dl_failure_notification" msgid="2457080452886498701">"<xliff:g id="FROM">%2$s</xliff:g> adlı gönderenden gelen <xliff:g id="SUBJECT">%1$s</xliff:g> konulu ileti indirilemedi."</string>
     <string name="dl_expired_notification" msgid="950390029992535809">"Bu iletinin geçerliliği sona ermiştir ve silinecektir."</string>
     <string name="rate_limit_surpassed" msgid="1347801608211628177">"Doğrula"</string>
     <string name="confirm_rate_limit" msgid="234228299751243067">"Çok sayıda multimedya iletisi gönderiliyor. Onaylıyor musunuz?"</string>
@@ -316,10 +316,10 @@
     <string name="search_setting_description" msgid="4104004595086437572">"Mesajlarınızdaki metin"</string>
     <string name="search_empty" msgid="645052646985297065">"Eşleşme yok"</string>
   <plurals name="search_results_title">
-    <item quantity="one" msgid="675571420878010439">"\"%s\" için <xliff:g id="NUMBER">%s</xliff:g> sonuç"</item>
-    <item quantity="other" msgid="3778201725913692491">"\"%s\" için <xliff:g id="NUMBER">%s</xliff:g> sonuç"</item>
+    <item quantity="one" msgid="675571420878010439">"\"%2$s\" için <xliff:g id="NUMBER">%1$s</xliff:g> sonuç"</item>
+    <item quantity="other" msgid="3778201725913692491">"\"%2$s\" için <xliff:g id="NUMBER">%1$s</xliff:g> sonuç"</item>
   </plurals>
-    <string name="search_history" msgid="4127805495662693154">"\"<xliff:g id="SEARCH">%s</xliff:g>\" için <xliff:g id="COUNT">%s</xliff:g> sonuç"</string>
+    <string name="search_history" msgid="4127805495662693154">"\"<xliff:g id="SEARCH">%2$s</xliff:g>\" için <xliff:g id="COUNT">%1$s</xliff:g> sonuç"</string>
     <string name="confirm_clear_search_title" msgid="8510295993632032904">"Temizle"</string>
     <string name="confirm_clear_search_text" msgid="8731877031837077478">"Arama geçmişi temizlenecek."</string>
     <string name="pref_mms_clear_search_history_title" msgid="6159758850628148164">"Arama geçmişini temizle"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 5d1731d..d00f388 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -274,7 +274,7 @@
     <string name="message_queued" msgid="8869479754825264671">"当前无法发送信息,将在服务恢复后发送。"</string>
     <string name="no_subject" msgid="4168963736134552285">"(无主题)"</string>
     <string name="unknown_sender" msgid="4929330613278853635">"未知发送者"</string>
-    <string name="dl_failure_notification" msgid="2457080452886498701">"下载来自<xliff:g id="FROM">%s</xliff:g>的<xliff:g id="SUBJECT">%s</xliff:g>信息失败。"</string>
+    <string name="dl_failure_notification" msgid="2457080452886498701">"下载来自<xliff:g id="FROM">%2$s</xliff:g>的<xliff:g id="SUBJECT">%1$s</xliff:g>信息失败。"</string>
     <string name="dl_expired_notification" msgid="950390029992535809">"此短信已过期,将被删除。"</string>
     <string name="rate_limit_surpassed" msgid="1347801608211628177">"确认"</string>
     <string name="confirm_rate_limit" msgid="234228299751243067">"即将发送多条彩信。确定要这样做吗?"</string>
@@ -319,7 +319,7 @@
     <item quantity="one" msgid="675571420878010439">"<xliff:g id="NUMBER">%s</xliff:g> 项符合“%s”的搜索结果"</item>
     <item quantity="other" msgid="3778201725913692491">"<xliff:g id="NUMBER">%s</xliff:g> 项符合“%s”的搜索结果"</item>
   </plurals>
-    <string name="search_history" msgid="4127805495662693154">"<xliff:g id="COUNT">%s</xliff:g> 项符合“<xliff:g id="SEARCH">%s</xliff:g>”的搜索结果"</string>
+    <string name="search_history" msgid="4127805495662693154">"<xliff:g id="COUNT">%1$s</xliff:g> 项符合“<xliff:g id="SEARCH">%2$s</xliff:g>”的搜索结果"</string>
     <string name="confirm_clear_search_title" msgid="8510295993632032904">"清除"</string>
     <string name="confirm_clear_search_text" msgid="8731877031837077478">"搜索历史记录将被清除。"</string>
     <string name="pref_mms_clear_search_history_title" msgid="6159758850628148164">"清除搜索历史记录"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index e3441ca..b3f6029 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -274,7 +274,7 @@
     <string name="message_queued" msgid="8869479754825264671">"目前無法傳送簡訊。服務恢復後會自動傳送。"</string>
     <string name="no_subject" msgid="4168963736134552285">"(沒有主旨)"</string>
     <string name="unknown_sender" msgid="4929330613278853635">"未知的寄件者"</string>
-    <string name="dl_failure_notification" msgid="2457080452886498701">"無法從 <xliff:g id="FROM">%s</xliff:g> 下載訊息「<xliff:g id="SUBJECT">%s</xliff:g>」。"</string>
+    <string name="dl_failure_notification" msgid="2457080452886498701">"無法從 <xliff:g id="FROM">%2$s</xliff:g> 下載訊息「<xliff:g id="SUBJECT">%1$s</xliff:g>」。"</string>
     <string name="dl_expired_notification" msgid="950390029992535809">"訊息已過期,系統將予以刪除。"</string>
     <string name="rate_limit_surpassed" msgid="1347801608211628177">"確認"</string>
     <string name="confirm_rate_limit" msgid="234228299751243067">"即將傳送大量多媒體簡訊。確定傳送?"</string>
@@ -319,7 +319,7 @@
     <item quantity="one" msgid="675571420878010439">"<xliff:g id="NUMBER">%s</xliff:g> 項符合「%s」的結果"</item>
     <item quantity="other" msgid="3778201725913692491">"<xliff:g id="NUMBER">%s</xliff:g> 項符合「%s」的結果"</item>
   </plurals>
-    <string name="search_history" msgid="4127805495662693154">"<xliff:g id="COUNT">%s</xliff:g> 個符合「<xliff:g id="SEARCH">%s</xliff:g>」的搜尋結果"</string>
+    <string name="search_history" msgid="4127805495662693154">"<xliff:g id="COUNT">%1$s</xliff:g> 個符合「<xliff:g id="SEARCH">%2$s</xliff:g>」的搜尋結果"</string>
     <string name="confirm_clear_search_title" msgid="8510295993632032904">"清除"</string>
     <string name="confirm_clear_search_text" msgid="8731877031837077478">"系統即將清除搜尋記錄。"</string>
     <string name="pref_mms_clear_search_history_title" msgid="6159758850628148164">"清除搜尋記錄"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 56b8cb3..ec2b4f5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -600,7 +600,7 @@
     <string name="unknown_sender">Unknown sender</string>
     <!-- When an error occurs downloading a new message, display this message.
          An example: Download of message Wanna get pizza from dorkman was unsuccessful. -->
-    <string name="dl_failure_notification">Download of message <xliff:g id="subject">%s</xliff:g> from <xliff:g id="from">%s</xliff:g> was unsuccessful.</string>
+    <string name="dl_failure_notification">Download of message <xliff:g id="subject">%1$s</xliff:g> from <xliff:g id="from">%2$s</xliff:g> was unsuccessful.</string>
 
     <!-- While downloading a message, if that message has expired, display this message. -->
     <string name="dl_expired_notification">This message has expired and will be deleted.</string>
@@ -710,13 +710,13 @@
     <!--  Search results title -->
     <plurals name="search_results_title">
         <!-- Case of 1 result. -->
-        <item quantity="one"><xliff:g id="number" example="1">%s</xliff:g> result for \"%s\"</item>
+        <item quantity="one"><xliff:g id="number" example="1">%1$s</xliff:g> result for \"<xliff:g id="search" example="???">%2$s</xliff:g>\"</item>
         <!-- Case of 0 or 2 or more results. -->
-        <item quantity="other"><xliff:g id="number" example="15">%s</xliff:g> results for \"%s\"</item>
+        <item quantity="other"><xliff:g id="number" example="15">%1$s</xliff:g> results for \"<xliff:g id="search" example="???">%2$s</xliff:g>\"</item>
     </plurals>
 
     <!--- String saved in history searches. -->
-    <string name="search_history"><xliff:g id="count">%s</xliff:g> results for \"<xliff:g id="search">%s</xliff:g>\"</string>
+    <string name="search_history"><xliff:g id="count">%1$s</xliff:g> results for \"<xliff:g id="search">%2$s</xliff:g>\"</string>
 
     <!-- Button title in Messaging preferences. -->
     <string name="confirm_clear_search_title">Clear</string>