diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index c261192..901bd27 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Voeg kontak by"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Onderwerp"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Onderwerp: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Laai tans kontakkaart"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Kon nie kontakkaart laai nie"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Bekyk kontakkaart"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index acf0929..bea9e6f 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"እውቅያ ያክሉ"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"ርዕሰ ጉዳይ"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"ርዕሰ ጉዳይ፦ "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"የእውቂያ ካርድ በመጫን ላይ"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"የእውቂያ ካርድን መጫን አልተቻለም"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"የእውቂያ ካርድ ይመልከቱ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index ff3d6d0..1a0f4b9 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -455,7 +455,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"إضافة جهة اتصال"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"الموضوع"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"الموضوع: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"جارٍ تحميل بطاقة جهة الاتصال"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"تعذر تحميل بطاقة جهة الاتصال"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"عرض بطاقة جهة الاتصال"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 573c5b6..56b4274 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Kontakt əlavə edin"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Mövzu"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Mövzu: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Kontakt kartı yüklənir"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Kontakt kartını yükləmək alınmadı"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Kontakt kartına baxın"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index eec9654..c1b8401 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Добавяне на контакт"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Тема"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Тема: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"„<xliff:g id="SUBJECT_LABEL">%s</xliff:g>“ – „<xliff:g id="MESSAGETEXT">%s</xliff:g>“"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"„<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g>“ – „<xliff:g id="MESSAGETEXT">%2$s</xliff:g>“"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Визитната картичка се зарежда"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Визитната картичка не можа да се зареди"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Преглед на визитната картичка"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 2967568..96af70b 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"পরিচিতি জুড়ুন"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"বিষয়"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"বিষয়: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"পরিচিতি কার্ড লোড হচ্ছে"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"পরিচিতি কার্ড লোড করা যায়নি"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"পরিচিতি কার্ড দেখুন"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index b49f4fe..9f09908 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Afegeix el contacte"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Assumpte"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Assumpte: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"S\'està carregant la targeta de contacte"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"No s\'ha pogut carregar la targeta de contacte"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Mostra la targeta de contactes"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 6e17d38..7e58112 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -407,7 +407,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Přidat kontakt"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Předmět"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Předmět: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Načítání kontaktní karty"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Kartu kontaktu nelze načíst."</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Zobrazit kontaktní kartu"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index b7c93ad..6d441da 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Tilføj kontakt"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Emne"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Emne: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Kontaktkortet indlæses"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Kontaktkortet kunne ikke indlæses"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Se visitkortet"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 9fd8736..4537b8b 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Kontakt hinzufügen"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Betreff"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Betreff: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Kontaktkarte wird geladen."</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Kontaktkarte kann nicht geladen werden."</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Kontaktkarte ansehen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index fa66ff0..d74a84b 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Προσθήκη επαφής"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Θέμα"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Θέμα: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Φόρτωση κάρτας επαφής"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Δεν ήταν δυνατή η φόρτωση της κάρτας επαφής"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Προβολή κάρτας επαφής"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 0d6a778..3a642fb 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Add Contact"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Subject"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Subject: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Loading contact card"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Couldn\'t load contact card"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"View contact card"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 0d6a778..3a642fb 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Add Contact"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Subject"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Subject: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Loading contact card"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Couldn\'t load contact card"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"View contact card"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 0d6a778..3a642fb 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Add Contact"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Subject"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Subject: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Loading contact card"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Couldn\'t load contact card"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"View contact card"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 48e87d7..f474514 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Agregar contacto"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Asunto"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Asunto: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Cargando tarjeta de contacto"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"No se pudo cargar la tarjeta de contacto."</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Ver tarjeta de contacto"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index dd0896f..98e0a1d 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Añadir contacto"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Asunto"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Asunto: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Cargando tarjeta de contacto"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"No se ha podido cargar la tarjeta de contacto"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Ver tarjeta de contacto"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 00ece2d..e222a3e 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Kontaktisiku lisamine"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Teema"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Teema: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Kontakti kaardi laadimine"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Kontaktkaarti ei õnnestunud laadida"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Kontakti kaardi kuvamine"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 31124d4..1703681 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Gehitu kontaktua"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Gaia"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Gaia: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Kontaktu-txartela kargatzen"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Ezin izan da kargatu kontaktu-txartela"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Ikusi kontaktu-txartela"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 90ba60f..a1bf9d8 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"افزودن مخاطب"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"موضوع"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"موضوع: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"در حال بارگیری کارت مخاطب"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"کارت مخاطب بارگیری نشد"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"مشاهده کارت مخاطب"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 6d1cef2..a07825b 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Lisää yhteystieto"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Aihe"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Aihe: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Ladataan yhteystietokorttia"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Yhteystietokorttia ei voitu ladata:"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Näytä yhteystietokortti"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 36c1bda..a626832 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Ajouter un contact"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Objet"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Objet : "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g> <xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g> <xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Chargement de la fiche de contact"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Impossible de charger la fiche de contact"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Afficher la fiche de contact"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 1eba10e..b9f22af 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Ajouter un contact"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Objet"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Objet : "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Chargement de la fiche de contact en cours…"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Impossible de charger la fiche de contact."</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Afficher la fiche de contact"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index deac219..8a626c2 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Engadir contacto"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Asunto"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Asunto: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Cargando tarxeta de contacto"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Non se puido cargar a tarxeta de contacto"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Ver tarxeta de contacto"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 7701578..8d2adaf 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"સંપર્ક ઉમેરો"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"વિષય"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"વિષય: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"સંપર્ક કાર્ડ લોડ કરી રહ્યું છે"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"સંપર્ક કાર્ડ લોડ કરી શકાયું નથી"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"સંપર્ક કાર્ડ જુઓ"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 24bb5cc..7e7a780 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"संपर्क जोड़ें"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"विषय"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"विषय: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"संपर्क कार्ड लोड हो रहा है"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"संपर्क कार्ड लोड नहीं किया जा सका"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"संपर्क कार्ड देखें"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 46fb4ed..b8bb490 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -383,7 +383,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Dodavanje kontakta"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Predmet"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Predmet: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Učitavanje kartice kontakta"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Kartica kontakta nije učitana"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Prikaz kartice kontakta"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index b3e41a0..9203514 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Névjegy hozzáadása"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Tárgy"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Tárgy: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Névjegykártya betöltése"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Nem lehetett betölteni a névjegykártyát"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Névjegykártya megtekintése"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 6653c81..4dd99b0 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Ավելացնել կոնտակտ"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Թեմա"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Թեմա՝ "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Կոնտակտի քարտը բեռնվում է"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Հնարավոր չէ բեռնել կոնտակտի քարտը"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Դիտել կոնտակտի քարտը"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index a1854fe..3b65bb2 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Tambahkan Kontak"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Subjek"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Subjek: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Memuat kartu kontak"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Tidak dapat memuat kartu kontak"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Lihat kartu kontak"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 65a38fc..f02a11c 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Bæta tengilið við"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Efni"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Efni: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Hleður tengiliðaspjald"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Ekki var hægt að hlaða tengiliðaspjald"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Skoða tengiliðaspjald"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index f064dd5..f041793 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Aggiungi contatto"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Oggetto"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Oggetto: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Caricamento scheda contatto in corso"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Impossibile caricare la scheda del contatto"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Visualizza scheda contatto"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index db1f666..3f80e3c 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -407,7 +407,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"הוסף איש קשר"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"נושא"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"נושא: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"טוען את כרטיס איש הקשר"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"לא ניתן לטעון כרטיס איש קשר"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"הצג את כרטיס איש הקשר"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index f6aa883..a3a513e 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"連絡先を追加"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"件名"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"件名: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"連絡先カードを読み込んでいます"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"連絡先カードを読み込めませんでした"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"連絡先カードを表示"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index ba53db1..8a2cd5e 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"კონტაქტის დამატება"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"თემა"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"თემა: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"იტვირთება კონტაქტის ბარათი"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"საკონტაქტო ბარათი ვერ იტვირთება"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"კონტაქტის ბარათის ნახვა"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index c5feda2..386e8ef 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Контакт қосу"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Тақырып"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Тақырып: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Контакт карточкасы жүктелуде"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Контакт картасын жүктеу мүмкін болмады"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Контакт карточкасын көру"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index debd44e..fba58e2 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"បន្ថែម​ទំនាក់ទំនង"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"ប្រធានបទ"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"ប្រធានបទ៖ "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"ផ្ទុក​កាត​ទំនាក់ទំនង"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"មិន​អាច​ផ្ទុក​កាត​ទំនាក់ទំនង"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"មើល​កាត​ទំនាក់ទំនង"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 8406558..b484009 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"ಸಂಪರ್ಕ ಸೇರಿಸು"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"ವಿಷಯ"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"ವಿಷಯ: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"ಸಂಪರ್ಕ ಕಾರ್ಡ್‌ ಲೋಡ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"ಸಂಪರ್ಕ ಕಾರ್ಡ್ ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"ಸಂಪರ್ಕ ಕಾರ್ಡ್ ವೀಕ್ಷಿಸಿ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 5b9f8c6..1faec2a 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"연락처 추가"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"제목"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"제목: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"연락처 카드 로드 중"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"연락처 카드를 로드할 수 없습니다."</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"연락처 카드 보기"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 029f3e1..96b6d86 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Байланыш кошуу"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Тема"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Темасы: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Байланыш картасы жүктөлүүдө"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Байланыштын картасы жүктөлгөн жок"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Байланыш картасын карап көрүү"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 89643ca..4911499 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"ເພີ່ມ​​ໃສ່​ລາ​ຍ​ຊື່​ຜູ່​ຕິດ​ຕໍ່"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"ຫົວຂໍ້"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"ຫົວຂໍ້: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"​ກຳ​ລັງ​ໂຫລດ​ບັດ​ລາຍ​ຊື່​ຜ​ູ່​ຕິດ​ຕໍ່"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"​ບໍ່​ສາ​ມາດ​ໂຫລດ​ບັດ​ລາຍ​ຊື່​ຜູ່​ຕິດ​ຕໍ່ໄດ້"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"​ເບິ່ງ​ບັດ​ລາຍ​ຊື່​ຜູ່​ຕິດ​ຕໍ່"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index e2a0231..0430221 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -407,7 +407,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Pridėti kontaktą"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Tema"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Tema: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Įkeliama kontakto kortelė"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Nepavyko įkelti kontakto kortelės"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Peržiūrėti kontakto kortelę"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 2501f9a..f598c77 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -383,7 +383,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Pievienot kontaktpersonu"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Temats"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Temats: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Notiek kontaktpersonas kartītes ielāde…"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Nevarēja ielādēt kontaktpersonas kartīti."</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Skatiet kontaktpersonas kartīti"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index c0b045b..16f60c9 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Додај контакт"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Предмет"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Предмет: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Се вчитува картичката за контакт"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Картичката за контакт не можеше да се вчита"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Прикажи картичка за контакти"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 315eb30..b292525 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"കോൺടാക്‌റ്റ് ചേർക്കുക"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"വിഷയം"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"വിഷയം: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"കോൺടാക്‌റ്റ് കാർഡ് ലോഡുചെയ്യുന്നു"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"കോൺടാക്‌റ്റ് കാർഡ് ലോഡുചെയ്യാനായില്ല"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"കോൺടാക്റ്റ് കാർഡ് കാണുക"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 6219e39..f3edd91 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Харилцагч нэмэх"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Гарчиг"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Гарчиг: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Харилцагчийн картыг ачаалж байна"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Харилцагчийн картыг дуудаж чадсангүй"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Харилцагчийн картыг харах"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 007ed5e..ff585ba 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"संपर्क जोडा"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"विषय"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"विषय: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"संपर्क कार्ड लोड करीत आहे"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"संपर्क कार्ड लोड करू शकलो नाही"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"संपर्क कार्ड पहा"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index f29ad13..3094e1d 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Tambah Kenalan"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Subjek"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Subjek: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Memuatkan kad kenalan"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Tidak dapat memuatkan kad kenalan"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Lihat kad kenalan"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 220f0c3..26df42e 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"အဆက်အသွယ် ထည့်ရန်"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"ဘာသာရပ်"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"အကြောင်းအရာ: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"အဆက်အသွယ် ကဒ်ကို တင်ပေးနေ"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"နာမည်ကဒ် မရယူနိုင်ပါ"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"အဆက်အသွယ် ကဒ်ကို ကြည့်ရန်"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 963723b..ca04e94 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Legg til kontakten"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Emne"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Emne: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Laster inn kontaktkortet"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Kunne ikke laste kontaktkort"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Se kontaktkortet"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index eefaf15..b269345 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -361,7 +361,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"सम्पर्क थप्नुहोस्"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"विषय"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"विषय: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"सम्पर्क कार्ड लोड गर्दै"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"सम्पर्क कार्ड लोड गर्न सकिएन"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"सम्पर्क कार्ड हेर्नुहोस्"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index b472948..8312dcc 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Contact toevoegen"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Onderwerp"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Onderwerp: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Contactkaart laden"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Kan visitekaartje niet laden"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Contactkaart weergeven"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 048853b..3ccc046 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"ਸੰਪਰਕ ਜੋੜੋ"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"ਵਿਸ਼ਾ"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"ਵਿਸ਼ਾ: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"ਸੰਪਰਕ ਕਾਰਡ ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"ਸੰਪਰਕ ਕਾਰਡ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"ਸੰਪਰਕ ਕਾਰਡ ਦੇਖੋ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 8247e63..1f21955 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -407,7 +407,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Dodaj kontakt"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Temat"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Temat: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Ładowanie wizytówki"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Nie można załadować wizytówki"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Wyświetl wizytówkę"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 2a2cc02..5c64052 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Adicionar contacto"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Assunto"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Assunto: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"A carregar o cartão de contacto"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Não foi possível carregar o cartão de contacto"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Ver cartão de contacto"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 3e50f41..bd60502 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Adicionar contato"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Assunto"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Assunto: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Carregando cartão de visita"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Falha ao carregar o cartão de visita"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Ver cartão de visita"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index a1e2a4d..2f9c5a7 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -383,7 +383,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Adăugați o persoană"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Subiect"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Subiect: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Se încarcă cartea de vizită"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Cartea de vizită nu a putut fi încărcată"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Vedeți cartea de vizită"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 4a21b08..132f8c4 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -407,7 +407,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Добавить"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Тема"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Тема: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Загрузка карточки контакта…"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Не удалось загрузить карточку контакта"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Посмотреть карточку контакта"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index a02f5e0..80c7cd7 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"සම්බන්ධතාවය එකතු කරන්න"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"මාතෘකාව"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"මාතෘකාව "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"සම්බන්ධතා කාඩ් පත් පුර්ණ කරමින්"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"සම්බන්ධතා කාඩ්පත පුර්ණය කළ නොහැක"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"සම්බන්ධ්තා කාඩ්පත පෙන්වන්න"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 4ea3845..1056a95 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -407,7 +407,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Pridať kontakt"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Predmet"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Predmet: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Načítava sa vizitka"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Nepodarilo sa načítať vizitku"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Zobraziť vizitku"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index f506f87..6c85318 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -407,7 +407,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Dodaj stik"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Zadeva"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Zadeva: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Nalaganje osebne vizitke"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Vizitke ni bilo mogoče naložiti"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Ogled osebne vizitke"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 1caa72d..f7b858c 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Shto kontakt"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Subjekti"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Subjekti: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Po ngarkon kartën e kontaktit"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Nuk arriti të ngarkonte kartën e kontakteve"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Shiko kartën e kontaktit"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index a965dd1..a1262a0 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -383,7 +383,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Додај контакт"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Наслов"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Наслов: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Учитава се картица контакта"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Учитавање картице контакта није успело"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Погледајте картицу контакта"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 6f0fd89..01d5820 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Lägg till kontakt"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Ämne"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Ämne: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Läser in visitkort"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Det gick inte att läsa in kontaktkortet"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Visa visitkort"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index eee4ca6..87b12ae 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Ongeza Anwani"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Kichwa"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Kichwa: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Inapakia kadi ya anwani"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Haikuweza kupakia kadi ya anwani"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Angalia kadi ya anwani"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index df46f2f..327e454 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"தொடர்பைச் சேர்"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"தலைப்பு"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"தலைப்பு: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"தொடர்பு கார்டை ஏற்றுகிறது"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"தொடர்பு கார்டை ஏற்ற முடியவில்லை"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"தொடர்பு கார்டைக் காட்டு"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 5c4713d..f2dabb2 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"పరిచయాన్ని జోడించు"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"విషయం"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"విషయం: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"పరిచయ కార్డ్‌ను లోడ్ చేస్తోంది"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"పరిచయ కార్డ్‌ను లోడ్ చేయడం సాధ్యపడలేదు"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"పరిచయ కార్డ్‌ను వీక్షించండి"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 708d45f..3768ca8 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"เพิ่มรายชื่อติดต่อ"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"เรื่อง"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"เรื่อง: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"กำลังโหลดบัตรติดต่อ"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"ไม่สามารถโหลดการ์ดรายชื่อติดต่อได้"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"ดูบัตรติดต่อ"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 720e285..091949f 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Magdagdag ng Contact"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Subject"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Subject: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Nilo-load ang contact card"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Hindi mai-load ang contact card"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Tingnan ang contact card"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 6772d7f..7d7fefb 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Kişi Ekle"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Konu"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Konu: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Kişi kartı yükleniyor"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Kişi kartı yüklenemedi"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Kişi kartını görüntüle"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 1bd4582..1fa8a2e 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -407,7 +407,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Додати контакт"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Тема"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Тема: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g>. <xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g>. <xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Завантаження картки контакта"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Не вдалося завантажити картку контакта"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Переглянути картку контакта"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 25a81ce..68217ca 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"رابطہ شامل کریں"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"موضوع"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"موضوع: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"‎<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>‎"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"‎<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>‎"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"رابطہ کارڈ لوڈ کر رہا ہے"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"رابطہ کارڈ کو لوڈ نہیں کیا جا سکا"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"رابطہ کارڈ دیکھیں"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index c4a3caf..4d84ca1 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Kontakt qo‘shish"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Mavzu"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Mavzu: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Kontaktlar kartasi yuklanmoqda"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Kontaktlar kartasini yuklab bo‘lmadi"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Kontaktlar kartasini ko‘rish"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 14974db..4923847 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Thêm liên hệ"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Chủ đề"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Chủ đề: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Đang tải thẻ liên hệ"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Không thể tải danh thiếp"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Xem thẻ liên hệ"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index edff309..77dbfae 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"添加到通讯录"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"主题"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"主题： "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"正在加载名片"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"无法加载名片"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"查看名片"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 1cc9f7d..a5c690f 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"新增聯絡人"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"主旨"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"主旨： "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g>：<xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g>：<xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"正在載入聯絡人卡片"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"無法載入聯絡人資訊卡"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"查看聯絡人卡片"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index ed129c8..c911ea7 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"新增聯絡人"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"主旨"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"主旨： "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g>：<xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g>：<xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"正在載入聯絡人卡片"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"無法載入聯絡人卡片"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"查看聯絡人卡片"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 9b3ce11..0221bcd 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -359,7 +359,7 @@
     <string name="add_contact_confirmation" msgid="1479380805406328264">"Engeza oxhumana naye"</string>
     <string name="compose_message_view_subject_hint_text" msgid="6076616675845705660">"Isihloko"</string>
     <string name="conversation_message_view_subject_text" msgid="5634274498769555505">"Isihloko: "</string>
-    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%s</xliff:g><xliff:g id="MESSAGETEXT">%s</xliff:g>"</string>
+    <string name="notification_subject" msgid="5229975483160300625">"<xliff:g id="SUBJECT_LABEL">%1$s</xliff:g><xliff:g id="MESSAGETEXT">%2$s</xliff:g>"</string>
     <string name="loading_vcard" msgid="3961520941271265083">"Ilayisha ikhadi loxhumana naye"</string>
     <string name="failed_loading_vcard" msgid="7711070643740368402">"Ayikwazi ukulayisha ikhadi loxhumana naye"</string>
     <string name="vcard_tap_hint" msgid="4940284329175200952">"Buka ikhadi lokuxhumana"</string>