Merge "Fixing bugs 6673815 and 6673190." into jb-ub-mail
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index fcc55e3..d403c2d 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -122,8 +122,7 @@
     <skip />
     <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
     <skip />
-    <!-- no translation found for saving (925514721138014677) -->
-    <skip />
+    <string name="saving" msgid="925514721138014677">"Stoor tans…"</string>
     <string name="choosertitle_sharevia" msgid="6142681649048665134">"Deel met"</string>
     <string name="contextmenu_openlink" msgid="2176176524824953775">"Maak oop in blaaier"</string>
     <string name="contextmenu_copy" msgid="4604170699444153037">"Kopieer"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 2fc7a92..6d08bfe 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -116,14 +116,10 @@
     <string name="saved" msgid="6977782468220926548">"ተቀምጧል፣"</string>
     <string name="download_failed" msgid="7860650496473302012">"ማውረድ አልተቻለም።"</string>
     <string name="attachments_header" msgid="6459475590011460229">"ተያያዦች"</string>
-    <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
-    <skip />
-    <!-- no translation found for menu_photo_share (2214772815165829079) -->
-    <skip />
-    <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
-    <skip />
-    <!-- no translation found for saving (925514721138014677) -->
-    <skip />
+    <string name="menu_photo_save_all" msgid="4295226099481995348">"ሁሉንም አስቀምጥ"</string>
+    <string name="menu_photo_share" msgid="2214772815165829079">"አጋራ"</string>
+    <string name="menu_photo_share_all" msgid="4577299400844129078">"ሁሉንም አጋራ"</string>
+    <string name="saving" msgid="925514721138014677">"በማስቀመጥ ላይ…"</string>
     <string name="choosertitle_sharevia" msgid="6142681649048665134">"በዚህ በኩል አጋራ -"</string>
     <string name="contextmenu_openlink" msgid="2176176524824953775">"በአሳሽ ውስጥ ክፈት"</string>
     <string name="contextmenu_copy" msgid="4604170699444153037">"ቅዳ"</string>
@@ -339,8 +335,6 @@
   </plurals>
     <string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"ፎቶ በማስገባት ላይ…"</string>
     <string name="cant_move_or_change_labels" msgid="7997792014816166601">"ምርጫው ብዙ መለያዎችን ስለያዘ ማንቀሳቀስ አይቻልም።"</string>
-    <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
-    <skip />
-    <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
-    <skip />
+    <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>"   <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index a969d65..d58ed7d 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -116,14 +116,10 @@
     <string name="saved" msgid="6977782468220926548">"تم الحفظ"</string>
     <string name="download_failed" msgid="7860650496473302012">"تعذر التنزيل."</string>
     <string name="attachments_header" msgid="6459475590011460229">"المرفقات"</string>
-    <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
-    <skip />
-    <!-- no translation found for menu_photo_share (2214772815165829079) -->
-    <skip />
-    <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
-    <skip />
-    <!-- no translation found for saving (925514721138014677) -->
-    <skip />
+    <string name="menu_photo_save_all" msgid="4295226099481995348">"حفظ الكل"</string>
+    <string name="menu_photo_share" msgid="2214772815165829079">"مشاركة"</string>
+    <string name="menu_photo_share_all" msgid="4577299400844129078">"مشاركة الكل"</string>
+    <string name="saving" msgid="925514721138014677">"جارٍ الحفظ..."</string>
     <string name="choosertitle_sharevia" msgid="6142681649048665134">"مشاركة عبر"</string>
     <string name="contextmenu_openlink" msgid="2176176524824953775">"فتح في المتصفح"</string>
     <string name="contextmenu_copy" msgid="4604170699444153037">"نسخ"</string>
@@ -339,8 +335,6 @@
   </plurals>
     <string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"جارٍ إدراج الصورة..."</string>
     <string name="cant_move_or_change_labels" msgid="7997792014816166601">"يتعذر النقل نظرًا لاحتواء التحديد على عدة حسابات."</string>
-    <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
-    <skip />
-    <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
-    <skip />
+    <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>"   <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 53f0170..df6fd0f 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -116,12 +116,9 @@
     <string name="saved" msgid="6977782468220926548">"Захавана,"</string>
     <string name="download_failed" msgid="7860650496473302012">"Не атрымалася спампаваць."</string>
     <string name="attachments_header" msgid="6459475590011460229">"Далучэнні"</string>
-    <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
-    <skip />
-    <!-- no translation found for menu_photo_share (2214772815165829079) -->
-    <skip />
-    <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
-    <skip />
+    <string name="menu_photo_save_all" msgid="4295226099481995348">"Захав. усё"</string>
+    <string name="menu_photo_share" msgid="2214772815165829079">"Адк. дост."</string>
+    <string name="menu_photo_share_all" msgid="4577299400844129078">"Падз. усё"</string>
     <!-- no translation found for saving (925514721138014677) -->
     <skip />
     <string name="choosertitle_sharevia" msgid="6142681649048665134">"Апублікаваць з дапамогай"</string>
@@ -339,8 +336,6 @@
   </plurals>
     <string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"Устаўка фота..."</string>
     <string name="cant_move_or_change_labels" msgid="7997792014816166601">"Немагчыма працягваць, таму што выбар змяшчае некалькі ўліковых запісаў."</string>
-    <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
-    <skip />
-    <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
-    <skip />
+    <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>"   <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 4ea8dbe..3db4f21 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -116,12 +116,9 @@
     <string name="saved" msgid="6977782468220926548">"Запазено,"</string>
     <string name="download_failed" msgid="7860650496473302012">"Не се изтегли."</string>
     <string name="attachments_header" msgid="6459475590011460229">"Прикачени файлове"</string>
-    <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
-    <skip />
-    <!-- no translation found for menu_photo_share (2214772815165829079) -->
-    <skip />
-    <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
-    <skip />
+    <string name="menu_photo_save_all" msgid="4295226099481995348">"Запазв. на всички"</string>
+    <string name="menu_photo_share" msgid="2214772815165829079">"Споделяне"</string>
+    <string name="menu_photo_share_all" msgid="4577299400844129078">"Спод. на всички"</string>
     <!-- no translation found for saving (925514721138014677) -->
     <skip />
     <string name="choosertitle_sharevia" msgid="6142681649048665134">"Споделяне чрез"</string>
@@ -339,8 +336,6 @@
   </plurals>
     <string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"Снимката се вмъква…"</string>
     <string name="cant_move_or_change_labels" msgid="7997792014816166601">"Не може да се премести, защото са избрани няколко профила."</string>
-    <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
-    <skip />
-    <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
-    <skip />
+    <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>"   <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 8e4b73d..39fc2c8 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -116,12 +116,9 @@
     <string name="saved" msgid="6977782468220926548">"Uloženo,"</string>
     <string name="download_failed" msgid="7860650496473302012">"Stažení se nezdařilo"</string>
     <string name="attachments_header" msgid="6459475590011460229">"Přílohy"</string>
-    <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
-    <skip />
-    <!-- no translation found for menu_photo_share (2214772815165829079) -->
-    <skip />
-    <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
-    <skip />
+    <string name="menu_photo_save_all" msgid="4295226099481995348">"Uložit vše"</string>
+    <string name="menu_photo_share" msgid="2214772815165829079">"Sdílet"</string>
+    <string name="menu_photo_share_all" msgid="4577299400844129078">"Sdílet vše"</string>
     <!-- no translation found for saving (925514721138014677) -->
     <skip />
     <string name="choosertitle_sharevia" msgid="6142681649048665134">"Sdílet pomocí"</string>
@@ -339,8 +336,6 @@
   </plurals>
     <string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"Vkládání fotky..."</string>
     <string name="cant_move_or_change_labels" msgid="7997792014816166601">"Přesun nelze uskutečnit, protože vybrané zprávy pocházejí z různých účtů."</string>
-    <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
-    <skip />
-    <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
-    <skip />
+    <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>"   <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 41f181b..593ae8a 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -116,14 +116,10 @@
     <string name="saved" msgid="6977782468220926548">"Gespeichert,"</string>
     <string name="download_failed" msgid="7860650496473302012">"Download nicht möglich"</string>
     <string name="attachments_header" msgid="6459475590011460229">"Anhänge"</string>
-    <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
-    <skip />
-    <!-- no translation found for menu_photo_share (2214772815165829079) -->
-    <skip />
-    <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
-    <skip />
-    <!-- no translation found for saving (925514721138014677) -->
-    <skip />
+    <string name="menu_photo_save_all" msgid="4295226099481995348">"Alle speichern"</string>
+    <string name="menu_photo_share" msgid="2214772815165829079">"Teilen"</string>
+    <string name="menu_photo_share_all" msgid="4577299400844129078">"Alle teilen"</string>
+    <string name="saving" msgid="925514721138014677">"Speichern…"</string>
     <string name="choosertitle_sharevia" msgid="6142681649048665134">"Teilen über"</string>
     <string name="contextmenu_openlink" msgid="2176176524824953775">"In Browser öffnen"</string>
     <string name="contextmenu_copy" msgid="4604170699444153037">"Kopieren"</string>
@@ -261,7 +257,7 @@
     <string name="hide_elided" msgid="8907305605854960737">"▼ Zitierten Text ausblenden"</string>
     <string name="message_invite_title" msgid="6757287288611722175">"Kalendereinladung"</string>
     <string name="message_invite_calendar_view" msgid="1898326841767645665">"Im Kalender ansehen"</string>
-    <string name="message_invite_label_attending" msgid="7378806613557157546">"Mit dabei?"</string>
+    <string name="message_invite_label_attending" msgid="7378806613557157546">"Teilnehmen?"</string>
     <string name="message_invite_accept" msgid="869753811259793266">"Ja"</string>
     <string name="message_invite_tentative" msgid="3898050756490962079">"Vielleicht"</string>
     <string name="message_invite_decline" msgid="4524135969656266758">"Nein"</string>
@@ -339,8 +335,6 @@
   </plurals>
     <string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"Foto wird eingefügt…"</string>
     <string name="cant_move_or_change_labels" msgid="7997792014816166601">"Verschieben nicht möglich, da mehrere Konten ausgewählt wurden."</string>
-    <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
-    <skip />
-    <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
-    <skip />
+    <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>"   <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index aafdc9b..0827512 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -116,12 +116,9 @@
     <string name="saved" msgid="6977782468220926548">"Αποθηκευμένα,"</string>
     <string name="download_failed" msgid="7860650496473302012">"Δεν έγινε λήψη."</string>
     <string name="attachments_header" msgid="6459475590011460229">"Συνημμένα"</string>
-    <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
-    <skip />
-    <!-- no translation found for menu_photo_share (2214772815165829079) -->
-    <skip />
-    <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
-    <skip />
+    <string name="menu_photo_save_all" msgid="4295226099481995348">"Αποθ. όλων"</string>
+    <string name="menu_photo_share" msgid="2214772815165829079">"Κοινή χρήση"</string>
+    <string name="menu_photo_share_all" msgid="4577299400844129078">"Κ.χρ. όλων"</string>
     <string name="saving" msgid="925514721138014677">"Αποθήκευση…"</string>
     <string name="choosertitle_sharevia" msgid="6142681649048665134">"Κοινή χρήση μέσω"</string>
     <string name="contextmenu_openlink" msgid="2176176524824953775">"Άνοιγμα στο πρόγραμμα περιήγησης"</string>
@@ -338,8 +335,6 @@
   </plurals>
     <string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"Εισαγωγή φωτογραφίας…"</string>
     <string name="cant_move_or_change_labels" msgid="7997792014816166601">"Δεν είναι δυνατή η μετακίνηση επειδή η επιλογή περιλαμβάνει πολλούς λογαριασμούς."</string>
-    <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
-    <skip />
-    <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
-    <skip />
+    <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>"   <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index c2a5d68..cf47eab 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -116,12 +116,9 @@
     <string name="saved" msgid="6977782468220926548">"Guardado"</string>
     <string name="download_failed" msgid="7860650496473302012">"Error al descargar"</string>
     <string name="attachments_header" msgid="6459475590011460229">"Archivos adjuntos"</string>
-    <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
-    <skip />
-    <!-- no translation found for menu_photo_share (2214772815165829079) -->
-    <skip />
-    <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
-    <skip />
+    <string name="menu_photo_save_all" msgid="4295226099481995348">"Guard todo"</string>
+    <string name="menu_photo_share" msgid="2214772815165829079">"Compartir"</string>
+    <string name="menu_photo_share_all" msgid="4577299400844129078">"Comp. todo"</string>
     <!-- no translation found for saving (925514721138014677) -->
     <skip />
     <string name="choosertitle_sharevia" msgid="6142681649048665134">"Compartir mediante"</string>
@@ -339,8 +336,6 @@
   </plurals>
     <string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"Insertando foto…"</string>
     <string name="cant_move_or_change_labels" msgid="7997792014816166601">"No se puede mover porque la selección contiene varias cuentas."</string>
-    <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
-    <skip />
-    <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
-    <skip />
+    <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>"   <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 168a12d..d8cdf2e 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -116,14 +116,10 @@
     <string name="saved" msgid="6977782468220926548">"Salvestatud"</string>
     <string name="download_failed" msgid="7860650496473302012">"Ei saanud laadida."</string>
     <string name="attachments_header" msgid="6459475590011460229">"Manused"</string>
-    <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
-    <skip />
-    <!-- no translation found for menu_photo_share (2214772815165829079) -->
-    <skip />
-    <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
-    <skip />
-    <!-- no translation found for saving (925514721138014677) -->
-    <skip />
+    <string name="menu_photo_save_all" msgid="4295226099481995348">"Salv. kõik"</string>
+    <string name="menu_photo_share" msgid="2214772815165829079">"Jaga"</string>
+    <string name="menu_photo_share_all" msgid="4577299400844129078">"Jaga kõike"</string>
+    <string name="saving" msgid="925514721138014677">"Salvestamine..."</string>
     <string name="choosertitle_sharevia" msgid="6142681649048665134">"Jagamine:"</string>
     <string name="contextmenu_openlink" msgid="2176176524824953775">"Ava brauseris"</string>
     <string name="contextmenu_copy" msgid="4604170699444153037">"Kopeeri"</string>
@@ -339,8 +335,6 @@
   </plurals>
     <string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"Foto sisestamine …"</string>
     <string name="cant_move_or_change_labels" msgid="7997792014816166601">"Ei saa teisaldada, kuna valik sisaldab mitut kontot."</string>
-    <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
-    <skip />
-    <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
-    <skip />
+    <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>"   <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 416ec0e..0465cba 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -119,8 +119,7 @@
     <string name="menu_photo_save_all" msgid="4295226099481995348">"Tallenna kaikki"</string>
     <string name="menu_photo_share" msgid="2214772815165829079">"Jaa"</string>
     <string name="menu_photo_share_all" msgid="4577299400844129078">"Jaa kaikki"</string>
-    <!-- no translation found for saving (925514721138014677) -->
-    <skip />
+    <string name="saving" msgid="925514721138014677">"Tallennetaan..."</string>
     <string name="choosertitle_sharevia" msgid="6142681649048665134">"Jaa sovelluksessa"</string>
     <string name="contextmenu_openlink" msgid="2176176524824953775">"Avaa selaimessa"</string>
     <string name="contextmenu_copy" msgid="4604170699444153037">"Kopioi"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 00f9ab8..28db0d8 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -116,12 +116,9 @@
     <string name="saved" msgid="6977782468220926548">"सहेजा गया,"</string>
     <string name="download_failed" msgid="7860650496473302012">"डाउनलोड नहीं कर सका."</string>
     <string name="attachments_header" msgid="6459475590011460229">"अनुलग्नक"</string>
-    <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
-    <skip />
-    <!-- no translation found for menu_photo_share (2214772815165829079) -->
-    <skip />
-    <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
-    <skip />
+    <string name="menu_photo_save_all" msgid="4295226099481995348">"सभी सहेजें"</string>
+    <string name="menu_photo_share" msgid="2214772815165829079">"साझा करें"</string>
+    <string name="menu_photo_share_all" msgid="4577299400844129078">"सभी साझा करें"</string>
     <!-- no translation found for saving (925514721138014677) -->
     <skip />
     <string name="choosertitle_sharevia" msgid="6142681649048665134">"इसके द्वारा साझा करें:"</string>
@@ -339,8 +336,6 @@
   </plurals>
     <string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"फ़ोटो सम्‍मिलित कर रहा है…"</string>
     <string name="cant_move_or_change_labels" msgid="7997792014816166601">"चयन में एकाधिक खाते होने के कारण नहीं ले जाया जा सकता."</string>
-    <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
-    <skip />
-    <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
-    <skip />
+    <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>"   <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index cda7a4f..9dfcff1 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -116,12 +116,9 @@
     <string name="saved" msgid="6977782468220926548">"Spremljeno,"</string>
     <string name="download_failed" msgid="7860650496473302012">"Nije preuzeto."</string>
     <string name="attachments_header" msgid="6459475590011460229">"Privici"</string>
-    <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
-    <skip />
-    <!-- no translation found for menu_photo_share (2214772815165829079) -->
-    <skip />
-    <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
-    <skip />
+    <string name="menu_photo_save_all" msgid="4295226099481995348">"Spremi sve"</string>
+    <string name="menu_photo_share" msgid="2214772815165829079">"Dijeli"</string>
+    <string name="menu_photo_share_all" msgid="4577299400844129078">"Dijeli sve"</string>
     <!-- no translation found for saving (925514721138014677) -->
     <skip />
     <string name="choosertitle_sharevia" msgid="6142681649048665134">"Dijeli putem"</string>
@@ -339,8 +336,6 @@
   </plurals>
     <string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"Umetanje fotografije…"</string>
     <string name="cant_move_or_change_labels" msgid="7997792014816166601">"Premještanje nije moguće jer odabir sadrži više računa."</string>
-    <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
-    <skip />
-    <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
-    <skip />
+    <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>"   <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index e638187..e2e5c17 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -116,12 +116,9 @@
     <string name="saved" msgid="6977782468220926548">"Mentve"</string>
     <string name="download_failed" msgid="7860650496473302012">"Letöltés sikertelen"</string>
     <string name="attachments_header" msgid="6459475590011460229">"Mellékletek"</string>
-    <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
-    <skip />
-    <!-- no translation found for menu_photo_share (2214772815165829079) -->
-    <skip />
-    <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
-    <skip />
+    <string name="menu_photo_save_all" msgid="4295226099481995348">"Összes mentése"</string>
+    <string name="menu_photo_share" msgid="2214772815165829079">"Megosztás"</string>
+    <string name="menu_photo_share_all" msgid="4577299400844129078">"Összes megosztása"</string>
     <!-- no translation found for saving (925514721138014677) -->
     <skip />
     <string name="choosertitle_sharevia" msgid="6142681649048665134">"Megosztás a következőn:"</string>
@@ -339,8 +336,6 @@
   </plurals>
     <string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"Fotó beszúrása…"</string>
     <string name="cant_move_or_change_labels" msgid="7997792014816166601">"Nem lehet áthelyezni, mert a kijelölés több fiókból származik."</string>
-    <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
-    <skip />
-    <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
-    <skip />
+    <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>"   <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 5a3fad4..a14be14 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -116,14 +116,10 @@
     <string name="saved" msgid="6977782468220926548">"Telah disimpan,"</string>
     <string name="download_failed" msgid="7860650496473302012">"Tidak dapat mengunduh."</string>
     <string name="attachments_header" msgid="6459475590011460229">"Lampiran"</string>
-    <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
-    <skip />
-    <!-- no translation found for menu_photo_share (2214772815165829079) -->
-    <skip />
-    <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
-    <skip />
-    <!-- no translation found for saving (925514721138014677) -->
-    <skip />
+    <string name="menu_photo_save_all" msgid="4295226099481995348">"Smpn semua"</string>
+    <string name="menu_photo_share" msgid="2214772815165829079">"Bagikan"</string>
+    <string name="menu_photo_share_all" msgid="4577299400844129078">"Bagi semua"</string>
+    <string name="saving" msgid="925514721138014677">"Menyimpan..."</string>
     <string name="choosertitle_sharevia" msgid="6142681649048665134">"Berbagi melalui"</string>
     <string name="contextmenu_openlink" msgid="2176176524824953775">"Buka di Browser"</string>
     <string name="contextmenu_copy" msgid="4604170699444153037">"Salin"</string>
@@ -339,8 +335,6 @@
   </plurals>
     <string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"Menyisipkan foto…"</string>
     <string name="cant_move_or_change_labels" msgid="7997792014816166601">"Tidak dapat memindah karena pilihan berisi beberapa akun."</string>
-    <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
-    <skip />
-    <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
-    <skip />
+    <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>"   <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 382f62d..84b7134 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -116,14 +116,10 @@
     <string name="saved" msgid="6977782468220926548">"נשמר,"</string>
     <string name="download_failed" msgid="7860650496473302012">"לא ניתן היה להוריד."</string>
     <string name="attachments_header" msgid="6459475590011460229">"קבצים מצורפים"</string>
-    <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
-    <skip />
-    <!-- no translation found for menu_photo_share (2214772815165829079) -->
-    <skip />
-    <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
-    <skip />
-    <!-- no translation found for saving (925514721138014677) -->
-    <skip />
+    <string name="menu_photo_save_all" msgid="4295226099481995348">"שמור הכל"</string>
+    <string name="menu_photo_share" msgid="2214772815165829079">"שתף"</string>
+    <string name="menu_photo_share_all" msgid="4577299400844129078">"שתף הכל"</string>
+    <string name="saving" msgid="925514721138014677">"שומר…"</string>
     <string name="choosertitle_sharevia" msgid="6142681649048665134">"שתף באמצעות"</string>
     <string name="contextmenu_openlink" msgid="2176176524824953775">"פתח בדפדפן"</string>
     <string name="contextmenu_copy" msgid="4604170699444153037">"העתק"</string>
@@ -339,8 +335,6 @@
   </plurals>
     <string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"מכניס תמונה…"</string>
     <string name="cant_move_or_change_labels" msgid="7997792014816166601">"לא ניתן לבצע העברה מכיוון שהבחירה כוללת מספר חשבונות."</string>
-    <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
-    <skip />
-    <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
-    <skip />
+    <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>"   <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 88149ed..72051fa 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -116,12 +116,9 @@
     <string name="saved" msgid="6977782468220926548">"저장됨"</string>
     <string name="download_failed" msgid="7860650496473302012">"다운로드하지 못했습니다."</string>
     <string name="attachments_header" msgid="6459475590011460229">"첨부파일"</string>
-    <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
-    <skip />
-    <!-- no translation found for menu_photo_share (2214772815165829079) -->
-    <skip />
-    <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
-    <skip />
+    <string name="menu_photo_save_all" msgid="4295226099481995348">"모두 저장"</string>
+    <string name="menu_photo_share" msgid="2214772815165829079">"공유"</string>
+    <string name="menu_photo_share_all" msgid="4577299400844129078">"모두 공유"</string>
     <!-- no translation found for saving (925514721138014677) -->
     <skip />
     <string name="choosertitle_sharevia" msgid="6142681649048665134">"공유 방법"</string>
@@ -339,8 +336,6 @@
   </plurals>
     <string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"사진 추가 중…"</string>
     <string name="cant_move_or_change_labels" msgid="7997792014816166601">"선택하신 메일에 여러 계정이 포함되어 있어 이동할 수 없습니다."</string>
-    <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
-    <skip />
-    <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
-    <skip />
+    <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>"   <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index be78c07..d851850 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -116,14 +116,10 @@
     <string name="saved" msgid="6977782468220926548">"Išsaugota"</string>
     <string name="download_failed" msgid="7860650496473302012">"Nepavyko atsisiųsti."</string>
     <string name="attachments_header" msgid="6459475590011460229">"Priedai"</string>
-    <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
-    <skip />
-    <!-- no translation found for menu_photo_share (2214772815165829079) -->
-    <skip />
-    <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
-    <skip />
-    <!-- no translation found for saving (925514721138014677) -->
-    <skip />
+    <string name="menu_photo_save_all" msgid="4295226099481995348">"Išs. viską"</string>
+    <string name="menu_photo_share" msgid="2214772815165829079">"Bendrinti"</string>
+    <string name="menu_photo_share_all" msgid="4577299400844129078">"Ben. viską"</string>
+    <string name="saving" msgid="925514721138014677">"Išsaugoma…"</string>
     <string name="choosertitle_sharevia" msgid="6142681649048665134">"Bendrinti per"</string>
     <string name="contextmenu_openlink" msgid="2176176524824953775">"Atidaryti naršyklėje"</string>
     <string name="contextmenu_copy" msgid="4604170699444153037">"Kopijuoti"</string>
@@ -339,8 +335,6 @@
   </plurals>
     <string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"Įterpiama nuotrauka…"</string>
     <string name="cant_move_or_change_labels" msgid="7997792014816166601">"Negalima perkelti, nes pasirinktos kelios paskyros."</string>
-    <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
-    <skip />
-    <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
-    <skip />
+    <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>"   <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 386cd97..512ef91 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -116,14 +116,10 @@
     <string name="saved" msgid="6977782468220926548">"Saglabāts"</string>
     <string name="download_failed" msgid="7860650496473302012">"Nevarēja lejupielād."</string>
     <string name="attachments_header" msgid="6459475590011460229">"Pielikumi"</string>
-    <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
-    <skip />
-    <!-- no translation found for menu_photo_share (2214772815165829079) -->
-    <skip />
-    <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
-    <skip />
-    <!-- no translation found for saving (925514721138014677) -->
-    <skip />
+    <string name="menu_photo_save_all" msgid="4295226099481995348">"Sagl. visu"</string>
+    <string name="menu_photo_share" msgid="2214772815165829079">"Koplietot"</string>
+    <string name="menu_photo_share_all" msgid="4577299400844129078">"Kopl. visu"</string>
+    <string name="saving" msgid="925514721138014677">"Notiek saglabāšana…"</string>
     <string name="choosertitle_sharevia" msgid="6142681649048665134">"Kopīgošanas veids"</string>
     <string name="contextmenu_openlink" msgid="2176176524824953775">"Atvērt pārlūkprogrammā"</string>
     <string name="contextmenu_copy" msgid="4604170699444153037">"Kopēt"</string>
@@ -339,8 +335,6 @@
   </plurals>
     <string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"Notiek fotoattēla ievietošana…"</string>
     <string name="cant_move_or_change_labels" msgid="7997792014816166601">"Nevar pārvietot, jo ir atlasīti ziņojumi no vairākiem kontiem."</string>
-    <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
-    <skip />
-    <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
-    <skip />
+    <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>"   <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 31b49e1..f1d17d1 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -115,14 +115,10 @@
     <string name="please_wait" msgid="8797634225088247121">"Sila tunggu..."</string>
     <string name="saved" msgid="6977782468220926548">"Disimpan,"</string>
     <string name="download_failed" msgid="7860650496473302012">"Tidak dapat memuat turun."</string>
-    <!-- no translation found for attachments_header (6459475590011460229) -->
-    <skip />
-    <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
-    <skip />
-    <!-- no translation found for menu_photo_share (2214772815165829079) -->
-    <skip />
-    <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
-    <skip />
+    <string name="attachments_header" msgid="6459475590011460229">"Lampiran"</string>
+    <string name="menu_photo_save_all" msgid="4295226099481995348">"Simpan semua"</string>
+    <string name="menu_photo_share" msgid="2214772815165829079">"Kongsi"</string>
+    <string name="menu_photo_share_all" msgid="4577299400844129078">"Kongsi semua"</string>
     <!-- no translation found for saving (925514721138014677) -->
     <skip />
     <string name="choosertitle_sharevia" msgid="6142681649048665134">"Kongsi melalui"</string>
@@ -340,8 +336,6 @@
   </plurals>
     <string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"Menyisipkan foto..."</string>
     <string name="cant_move_or_change_labels" msgid="7997792014816166601">"Tidak boleh dialihkan kerana pilihan mengandungi akaun berbilang."</string>
-    <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
-    <skip />
-    <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
-    <skip />
+    <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>"   <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index f317d7c..415e523 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -119,8 +119,7 @@
     <string name="menu_photo_save_all" msgid="4295226099481995348">"Lagre alle"</string>
     <string name="menu_photo_share" msgid="2214772815165829079">"Del"</string>
     <string name="menu_photo_share_all" msgid="4577299400844129078">"Del alle"</string>
-    <!-- no translation found for saving (925514721138014677) -->
-    <skip />
+    <string name="saving" msgid="925514721138014677">"Lagrer ..."</string>
     <string name="choosertitle_sharevia" msgid="6142681649048665134">"Del på"</string>
     <string name="contextmenu_openlink" msgid="2176176524824953775">"Åpne i nettleser"</string>
     <string name="contextmenu_copy" msgid="4604170699444153037">"Kopiér"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 1ff29c4..358b00c 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -116,12 +116,9 @@
     <string name="saved" msgid="6977782468220926548">"Opgeslagen."</string>
     <string name="download_failed" msgid="7860650496473302012">"Kan niet downloaden."</string>
     <string name="attachments_header" msgid="6459475590011460229">"Bijlagen"</string>
-    <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
-    <skip />
-    <!-- no translation found for menu_photo_share (2214772815165829079) -->
-    <skip />
-    <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
-    <skip />
+    <string name="menu_photo_save_all" msgid="4295226099481995348">"Alles opslaan"</string>
+    <string name="menu_photo_share" msgid="2214772815165829079">"Delen"</string>
+    <string name="menu_photo_share_all" msgid="4577299400844129078">"Alles delen"</string>
     <!-- no translation found for saving (925514721138014677) -->
     <skip />
     <string name="choosertitle_sharevia" msgid="6142681649048665134">"Delen via"</string>
@@ -339,8 +336,6 @@
   </plurals>
     <string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"Foto invoegen…"</string>
     <string name="cant_move_or_change_labels" msgid="7997792014816166601">"Verplaatsen is niet mogelijk. Selectie bevat meerdere accounts."</string>
-    <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
-    <skip />
-    <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
-    <skip />
+    <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>"   <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index faf99d1..6e56f33 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -119,8 +119,7 @@
     <string name="menu_photo_save_all" msgid="4295226099481995348">"Zapisz"</string>
     <string name="menu_photo_share" msgid="2214772815165829079">"Udostępnij"</string>
     <string name="menu_photo_share_all" msgid="4577299400844129078">"Udostępnij"</string>
-    <!-- no translation found for saving (925514721138014677) -->
-    <skip />
+    <string name="saving" msgid="925514721138014677">"Zapisuję…"</string>
     <string name="choosertitle_sharevia" msgid="6142681649048665134">"Udostępnij przez"</string>
     <string name="contextmenu_openlink" msgid="2176176524824953775">"Otwórz w przeglądarce"</string>
     <string name="contextmenu_copy" msgid="4604170699444153037">"Kopiuj"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 05437d9..b2cd1c5 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -116,14 +116,10 @@
     <string name="saved" msgid="6977782468220926548">"Guardado,"</string>
     <string name="download_failed" msgid="7860650496473302012">"Impossível transf."</string>
     <string name="attachments_header" msgid="6459475590011460229">"Anexos"</string>
-    <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
-    <skip />
-    <!-- no translation found for menu_photo_share (2214772815165829079) -->
-    <skip />
-    <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
-    <skip />
-    <!-- no translation found for saving (925514721138014677) -->
-    <skip />
+    <string name="menu_photo_save_all" msgid="4295226099481995348">"Guardar tudo"</string>
+    <string name="menu_photo_share" msgid="2214772815165829079">"Partilhar"</string>
+    <string name="menu_photo_share_all" msgid="4577299400844129078">"Part. tod."</string>
+    <string name="saving" msgid="925514721138014677">"A guardar..."</string>
     <string name="choosertitle_sharevia" msgid="6142681649048665134">"Partilhar através do"</string>
     <string name="contextmenu_openlink" msgid="2176176524824953775">"Abrir no Navegador"</string>
     <string name="contextmenu_copy" msgid="4604170699444153037">"Copiar"</string>
@@ -339,8 +335,6 @@
   </plurals>
     <string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"A introduzir fotografia…"</string>
     <string name="cant_move_or_change_labels" msgid="7997792014816166601">"Não é possível mover porque a seleção contém várias contas."</string>
-    <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
-    <skip />
-    <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
-    <skip />
+    <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>"   <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 6b6645f..9068e10 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -116,14 +116,10 @@
     <string name="saved" msgid="6977782468220926548">"Salvo"</string>
     <string name="download_failed" msgid="7860650496473302012">"Falha no download"</string>
     <string name="attachments_header" msgid="6459475590011460229">"Anexos"</string>
-    <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
-    <skip />
-    <!-- no translation found for menu_photo_share (2214772815165829079) -->
-    <skip />
-    <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
-    <skip />
-    <!-- no translation found for saving (925514721138014677) -->
-    <skip />
+    <string name="menu_photo_save_all" msgid="4295226099481995348">"Salvar td."</string>
+    <string name="menu_photo_share" msgid="2214772815165829079">"Compart."</string>
+    <string name="menu_photo_share_all" msgid="4577299400844129078">"Comp. td."</string>
+    <string name="saving" msgid="925514721138014677">"Salvando…"</string>
     <string name="choosertitle_sharevia" msgid="6142681649048665134">"Compartilhar via"</string>
     <string name="contextmenu_openlink" msgid="2176176524824953775">"Abrir no navegador"</string>
     <string name="contextmenu_copy" msgid="4604170699444153037">"Copiar"</string>
@@ -339,8 +335,6 @@
   </plurals>
     <string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"Inserindo foto..."</string>
     <string name="cant_move_or_change_labels" msgid="7997792014816166601">"Não é possível mover porque a seleção contém várias contas."</string>
-    <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
-    <skip />
-    <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
-    <skip />
+    <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>" <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 750e3a7..3ebe7ee 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -116,12 +116,9 @@
     <string name="saved" msgid="6977782468220926548">"Сохранено"</string>
     <string name="download_failed" msgid="7860650496473302012">"Файл не загружен."</string>
     <string name="attachments_header" msgid="6459475590011460229">"Прикрепленные файлы"</string>
-    <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
-    <skip />
-    <!-- no translation found for menu_photo_share (2214772815165829079) -->
-    <skip />
-    <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
-    <skip />
+    <string name="menu_photo_save_all" msgid="4295226099481995348">"Сохранить все"</string>
+    <string name="menu_photo_share" msgid="2214772815165829079">"Поделиться"</string>
+    <string name="menu_photo_share_all" msgid="4577299400844129078">"Поделиться всеми"</string>
     <!-- no translation found for saving (925514721138014677) -->
     <skip />
     <string name="choosertitle_sharevia" msgid="6142681649048665134">"Способ отправки"</string>
@@ -339,8 +336,6 @@
   </plurals>
     <string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"Добавление фотографии…"</string>
     <string name="cant_move_or_change_labels" msgid="7997792014816166601">"Не удалось переместить сообщения, так как они находятся в разных аккаунтах."</string>
-    <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
-    <skip />
-    <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
-    <skip />
+    <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>": <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 81f7485..438403b 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -116,12 +116,9 @@
     <string name="saved" msgid="6977782468220926548">"Uložené,"</string>
     <string name="download_failed" msgid="7860650496473302012">"Nepodarilo sa prevziať."</string>
     <string name="attachments_header" msgid="6459475590011460229">"Prílohy"</string>
-    <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
-    <skip />
-    <!-- no translation found for menu_photo_share (2214772815165829079) -->
-    <skip />
-    <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
-    <skip />
+    <string name="menu_photo_save_all" msgid="4295226099481995348">"Uložiť všetky"</string>
+    <string name="menu_photo_share" msgid="2214772815165829079">"Zdieľať"</string>
+    <string name="menu_photo_share_all" msgid="4577299400844129078">"Zdieľať všetky"</string>
     <!-- no translation found for saving (925514721138014677) -->
     <skip />
     <string name="choosertitle_sharevia" msgid="6142681649048665134">"Zdieľať prostredníctvom"</string>
@@ -339,8 +336,6 @@
   </plurals>
     <string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"Prebieha vkladanie fotografie..."</string>
     <string name="cant_move_or_change_labels" msgid="7997792014816166601">"Presun nie je možné uskutočniť, pretože vybraté správy pochádzajú z rôznych účtov."</string>
-    <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
-    <skip />
-    <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
-    <skip />
+    <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>"   <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 2cc5c02..ef5d45f 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -116,12 +116,9 @@
     <string name="saved" msgid="6977782468220926548">"Shranjeno,"</string>
     <string name="download_failed" msgid="7860650496473302012">"Prenos ni uspel."</string>
     <string name="attachments_header" msgid="6459475590011460229">"Priloge"</string>
-    <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
-    <skip />
-    <!-- no translation found for menu_photo_share (2214772815165829079) -->
-    <skip />
-    <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
-    <skip />
+    <string name="menu_photo_save_all" msgid="4295226099481995348">"Shrani vse"</string>
+    <string name="menu_photo_share" msgid="2214772815165829079">"Deli z drugimi"</string>
+    <string name="menu_photo_share_all" msgid="4577299400844129078">"Deli vse z drugimi"</string>
     <!-- no translation found for saving (925514721138014677) -->
     <skip />
     <string name="choosertitle_sharevia" msgid="6142681649048665134">"Deli z drugimi prek"</string>
@@ -339,8 +336,6 @@
   </plurals>
     <string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"Vstavljanje fotografije ..."</string>
     <string name="cant_move_or_change_labels" msgid="7997792014816166601">"Sporočil ni mogoče premakniti, ker izbor vsebuje več računov."</string>
-    <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
-    <skip />
-    <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
-    <skip />
+    <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>"   <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index fb8361e..e1bd483 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -116,12 +116,9 @@
     <string name="saved" msgid="6977782468220926548">"Сачувано,"</string>
     <string name="download_failed" msgid="7860650496473302012">"Није могуће преузимање."</string>
     <string name="attachments_header" msgid="6459475590011460229">"Прилози"</string>
-    <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
-    <skip />
-    <!-- no translation found for menu_photo_share (2214772815165829079) -->
-    <skip />
-    <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
-    <skip />
+    <string name="menu_photo_save_all" msgid="4295226099481995348">"Сачувaj све"</string>
+    <string name="menu_photo_share" msgid="2214772815165829079">"Дели"</string>
+    <string name="menu_photo_share_all" msgid="4577299400844129078">"Дели све"</string>
     <!-- no translation found for saving (925514721138014677) -->
     <skip />
     <string name="choosertitle_sharevia" msgid="6142681649048665134">"Дељење преко"</string>
@@ -339,8 +336,6 @@
   </plurals>
     <string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"Уметање слике..."</string>
     <string name="cant_move_or_change_labels" msgid="7997792014816166601">"Премештање није могуће зато што избор обухвата више налога."</string>
-    <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
-    <skip />
-    <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
-    <skip />
+    <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>"   <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index e9c3e90..54d30f7 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -122,8 +122,7 @@
     <skip />
     <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
     <skip />
-    <!-- no translation found for saving (925514721138014677) -->
-    <skip />
+    <string name="saving" msgid="925514721138014677">"Inahifadhi..."</string>
     <string name="choosertitle_sharevia" msgid="6142681649048665134">"Shiriki kupitia"</string>
     <string name="contextmenu_openlink" msgid="2176176524824953775">"Fungua katika Kivinjari"</string>
     <string name="contextmenu_copy" msgid="4604170699444153037">"Nakili"</string>
@@ -316,8 +315,8 @@
     <string name="photo_network_error" msgid="6545183306958652345">"Picha haipatikani hivi sasa."</string>
     <string name="loading_photo" msgid="6784297653634402137">"Inapakia…"</string>
     <string name="post_operation_pending" msgid="1312168212880219407">"Inatuma..."</string>
-    <string name="download_photo_retry" msgid="1894223549069749239">"Taswira hii ni kubwa mno kupakuliwa, je, ungependa kujaribu tena katika msongo mdogo?"</string>
-    <string name="download_photo_error" msgid="7511376299526085797">"Picha haingeweza kuhifadhiwa kwenye kifaa."</string>
+    <string name="download_photo_retry" msgid="1894223549069749239">"Picha hii ni kubwa mno haiwezi kupakuliwa, je, ungependa kujaribu tena katika msongo mdogo?"</string>
+    <string name="download_photo_error" msgid="7511376299526085797">"Picha haikuweza kuhifadhiwa kwenye kifaa."</string>
     <string name="yes" msgid="7474216525286833848">"Ndiyo"</string>
     <string name="no" msgid="427548507197604096">"Hapana"</string>
     <string name="camera_photo_error" msgid="653424229752191252">"Haiwezi kupata picha."</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index e018802..3698b2c 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -116,12 +116,9 @@
     <string name="saved" msgid="6977782468220926548">"Na-save,"</string>
     <string name="download_failed" msgid="7860650496473302012">"Hindi ma-download."</string>
     <string name="attachments_header" msgid="6459475590011460229">"Mga Attachment"</string>
-    <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
-    <skip />
-    <!-- no translation found for menu_photo_share (2214772815165829079) -->
-    <skip />
-    <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
-    <skip />
+    <string name="menu_photo_save_all" msgid="4295226099481995348">"I-sve lhat"</string>
+    <string name="menu_photo_share" msgid="2214772815165829079">"Ibahagi"</string>
+    <string name="menu_photo_share_all" msgid="4577299400844129078">"Ibhgi lhat"</string>
     <!-- no translation found for saving (925514721138014677) -->
     <skip />
     <string name="choosertitle_sharevia" msgid="6142681649048665134">"Ibahagi sa pamamagitan ng"</string>
@@ -339,8 +336,6 @@
   </plurals>
     <string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"Ipinapasok ang larawan..."</string>
     <string name="cant_move_or_change_labels" msgid="7997792014816166601">"Hindi mailipat dahil naglalaman ng maraming account ang pinili."</string>
-    <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
-    <skip />
-    <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
-    <skip />
+    <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>"   <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 191b475..4998f2c 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -116,12 +116,9 @@
     <string name="saved" msgid="6977782468220926548">"Kaydedildi,"</string>
     <string name="download_failed" msgid="7860650496473302012">"İndirilemedi."</string>
     <string name="attachments_header" msgid="6459475590011460229">"Ekler"</string>
-    <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
-    <skip />
-    <!-- no translation found for menu_photo_share (2214772815165829079) -->
-    <skip />
-    <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
-    <skip />
+    <string name="menu_photo_save_all" msgid="4295226099481995348">"Tümünü kaydet"</string>
+    <string name="menu_photo_share" msgid="2214772815165829079">"Paylaş"</string>
+    <string name="menu_photo_share_all" msgid="4577299400844129078">"Tümünü paylaş"</string>
     <!-- no translation found for saving (925514721138014677) -->
     <skip />
     <string name="choosertitle_sharevia" msgid="6142681649048665134">"Şunu kullanarak paylaş:"</string>
@@ -339,8 +336,6 @@
   </plurals>
     <string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"Fotoğraf ekleniyor..."</string>
     <string name="cant_move_or_change_labels" msgid="7997792014816166601">"Seçim birden fazla hesap içerdiğinden taşınamıyor."</string>
-    <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
-    <skip />
-    <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
-    <skip />
+    <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>"   <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index bd5ae2c..14de713 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -119,8 +119,7 @@
     <string name="menu_photo_save_all" msgid="4295226099481995348">"Зберег.всі"</string>
     <string name="menu_photo_share" msgid="2214772815165829079">"Надіслати"</string>
     <string name="menu_photo_share_all" msgid="4577299400844129078">"Надісл.всі"</string>
-    <!-- no translation found for saving (925514721138014677) -->
-    <skip />
+    <string name="saving" msgid="925514721138014677">"Збереження…"</string>
     <string name="choosertitle_sharevia" msgid="6142681649048665134">"Надіслати через"</string>
     <string name="contextmenu_openlink" msgid="2176176524824953775">"Відкрити у веб-переглядачі"</string>
     <string name="contextmenu_copy" msgid="4604170699444153037">"Копіювати"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 02ef8b1..9cd2105 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -75,7 +75,7 @@
     <string name="menu_account_settings" msgid="8230989362863431918">"Cài đặt tài khoản"</string>
     <string name="menu_settings" msgid="6007027046949837282">"Cài đặt"</string>
     <string name="menu_search" msgid="5297197523031943248">"Tìm kiếm"</string>
-    <string name="more" msgid="1238344647379009858">"Khác"</string>
+    <string name="more" msgid="1238344647379009858">"Thêm"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> trong tổng số <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="newer" msgid="1007166236908596854">"Mới hơn"</string>
     <string name="older" msgid="6651690916337202936">"Cũ hơn"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index cd7d4e3..23b8bcb 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -116,12 +116,9 @@
     <string name="saved" msgid="6977782468220926548">"已保存,"</string>
     <string name="download_failed" msgid="7860650496473302012">"无法下载。"</string>
     <string name="attachments_header" msgid="6459475590011460229">"附件"</string>
-    <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
-    <skip />
-    <!-- no translation found for menu_photo_share (2214772815165829079) -->
-    <skip />
-    <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
-    <skip />
+    <string name="menu_photo_save_all" msgid="4295226099481995348">"全部保存"</string>
+    <string name="menu_photo_share" msgid="2214772815165829079">"分享"</string>
+    <string name="menu_photo_share_all" msgid="4577299400844129078">"全部分享"</string>
     <!-- no translation found for saving (925514721138014677) -->
     <skip />
     <string name="choosertitle_sharevia" msgid="6142681649048665134">"分享方式:"</string>
@@ -339,8 +336,6 @@
   </plurals>
     <string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"正在插入照片…"</string>
     <string name="cant_move_or_change_labels" msgid="7997792014816166601">"所选内容分属多个帐户,因此无法进行移动。"</string>
-    <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
-    <skip />
-    <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
-    <skip />
+    <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>"   <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 5a4fbfd..81a5129 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -116,12 +116,9 @@
     <string name="saved" msgid="6977782468220926548">"已儲存,"</string>
     <string name="download_failed" msgid="7860650496473302012">"無法下載。"</string>
     <string name="attachments_header" msgid="6459475590011460229">"附件"</string>
-    <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
-    <skip />
-    <!-- no translation found for menu_photo_share (2214772815165829079) -->
-    <skip />
-    <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
-    <skip />
+    <string name="menu_photo_save_all" msgid="4295226099481995348">"全部儲存"</string>
+    <string name="menu_photo_share" msgid="2214772815165829079">"分享"</string>
+    <string name="menu_photo_share_all" msgid="4577299400844129078">"全部分享"</string>
     <!-- no translation found for saving (925514721138014677) -->
     <skip />
     <string name="choosertitle_sharevia" msgid="6142681649048665134">"分享方式"</string>
@@ -339,8 +336,6 @@
   </plurals>
     <string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"正在插入相片..."</string>
     <string name="cant_move_or_change_labels" msgid="7997792014816166601">"您已選取多個帳戶,因此無法移動。"</string>
-    <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
-    <skip />
-    <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
-    <skip />
+    <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>" - <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 2332538..7ecab83 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -116,14 +116,10 @@
     <string name="saved" msgid="6977782468220926548">"Kulondoloziwe,"</string>
     <string name="download_failed" msgid="7860650496473302012">"Ayikwazanga ukulanda."</string>
     <string name="attachments_header" msgid="6459475590011460229">"Okunamathiselwe"</string>
-    <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
-    <skip />
-    <!-- no translation found for menu_photo_share (2214772815165829079) -->
-    <skip />
-    <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
-    <skip />
-    <!-- no translation found for saving (925514721138014677) -->
-    <skip />
+    <string name="menu_photo_save_all" msgid="4295226099481995348">"Londoloza konke"</string>
+    <string name="menu_photo_share" msgid="2214772815165829079">"Abelana"</string>
+    <string name="menu_photo_share_all" msgid="4577299400844129078">"Abelana konke"</string>
+    <string name="saving" msgid="925514721138014677">"Iyalondoloza..."</string>
     <string name="choosertitle_sharevia" msgid="6142681649048665134">"Abelana nge"</string>
     <string name="contextmenu_openlink" msgid="2176176524824953775">"Vula kwisiphequluli"</string>
     <string name="contextmenu_copy" msgid="4604170699444153037">"Kopisha"</string>
@@ -339,8 +335,6 @@
   </plurals>
     <string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"Ifaka isithombe…"</string>
     <string name="cant_move_or_change_labels" msgid="7997792014816166601">"Ayikwazi ukugudluza ngoba ukukhetha kuqukethe ama-akhawunti amaningi."</string>
-    <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
-    <skip />
-    <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
-    <skip />
+    <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>"   <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
 </resources>