Merge "Merging list dividers into bg assets and updating other gmail assets" into jb-ub-mail

commit: 93c6399658f8f4c9f9d50af57b077cf435732d36 [log] [tgz]
author: Peter Ng <petergng@google.com> Tue Aug 21 15:38:04 2012 -0700
committer: Android (Google) Code Review <android-gerrit@google.com> Tue Aug 21 15:38:05 2012 -0700
tree: 05eca89daf158ce20682460230400cde235e8284
parent: 3dc68949fc08678194cce8aae5d75bff58191eec [diff]
parent: 7dc120e3712727d8cba3b40694aeb4a446678826 [diff]
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index dc02f46..c335ab2 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml

@@ -300,14 +300,7 @@
     <string name="cancel" msgid="8762981157252199115">"Kanselleer"</string>
     <string name="close" msgid="419945428844076406">"Maak toe"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Geen vouers is vir hierdie rekening opgestel nie."</string>
-  <string-array name="sync_status">
-    <item msgid="2446076619901049026">"Sukses"</item>
-    <item msgid="7109065688039971961">"Geen verbinding nie."</item>
-    <item msgid="8437496123716232060">"Kon nie aanmeld nie."</item>
-    <item msgid="1651266301325684887">"Sekuriteitsfout"</item>
-    <item msgid="1461520171154288533">"Kon nie sinkroniseer nie."</item>
-    <item msgid="8749857841162829469">"Fout"</item>
-  </string-array>
+    <!-- no translation found for sync_status:5 (4779810016424303449) -->
     <string name="tap_to_configure" msgid="1181356242354390930">"Raak om op te stel"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"Om gesprekke te sien, sinkroniseer hierdie vouer."</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sinkroniseer vouer"</string>

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 201e0cd..571212a 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml

@@ -148,8 +148,7 @@
     <item quantity="one" msgid="3657821200245019288">"ውይይት አንቀሳቅስ"</item>
     <item quantity="other" msgid="1685896770174368261">"<xliff:g id="ID_1">%1$d</xliff:g> ውይይቶች አንቀሳቅስ"</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> <xliff:g id="DATE">%3$s</xliff:g> ላይ <xliff:g id="SUBJECT">%2$s</xliff:g>ን ልኳል"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -300,14 +299,7 @@
     <string name="cancel" msgid="8762981157252199115">"ሰርዝ"</string>
     <string name="close" msgid="419945428844076406">"ዝጋ"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"ለዚህ መለያ ምንም ስያሜዎች አልተዘጋጁም።"</string>
-  <string-array name="sync_status">
-    <item msgid="2446076619901049026">"ተሳክቷል"</item>
-    <item msgid="7109065688039971961">"ግንኙነት የለም።"</item>
-    <item msgid="8437496123716232060">"በመለያ መግባት አልተቻለም።"</item>
-    <item msgid="1651266301325684887">"የደህንነት ስህተት።"</item>
-    <item msgid="1461520171154288533">"ማመሳሰል አልተቻለም።"</item>
-    <item msgid="8749857841162829469">"ስህተት"</item>
-  </string-array>
+    <!-- no translation found for sync_status:5 (4779810016424303449) -->
     <string name="tap_to_configure" msgid="1181356242354390930">"ለማዋቀር ንካ"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"ውይይቶችን ለማየት ይህንን እቃፊ አመሳስል።"</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"አቃፊ አመሳስል"</string>

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 2f0ec80..bc418e8 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml

@@ -299,14 +299,7 @@
     <string name="cancel" msgid="8762981157252199115">"إلغاء"</string>
     <string name="close" msgid="419945428844076406">"إغلاق"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"لم يتم تعيين أية مجلدات لهذا الحساب."</string>
-  <string-array name="sync_status">
-    <item msgid="2446076619901049026">"تم بنجاح"</item>
-    <item msgid="7109065688039971961">"لا يتوفر اتصال."</item>
-    <item msgid="8437496123716232060">"تعذر تسجيل الدخول."</item>
-    <item msgid="1651266301325684887">"خطأ أمنى."</item>
-    <item msgid="1461520171154288533">"تعذرت المزامنة"</item>
-    <item msgid="8749857841162829469">"خطأ"</item>
-  </string-array>
+    <!-- no translation found for sync_status:5 (4779810016424303449) -->
     <string name="tap_to_configure" msgid="1181356242354390930">"المس للإعداد"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"لعرض المحادثات، عليك مزامنة هذا المجلد."</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"مزامنة المجلد"</string>

diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index fa894bb..9a22dff 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml

@@ -26,10 +26,8 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Далучыць файл"</string>
-    <!-- no translation found for add_photo_attachment (8548176514426323119) -->
-    <skip />
-    <!-- no translation found for add_video_attachment (4284457799113546464) -->
-    <skip />
+    <string name="add_photo_attachment" msgid="8548176514426323119">"Далучыць фота"</string>
+    <string name="add_video_attachment" msgid="4284457799113546464">"Далучыць відэа"</string>
     <string name="save_draft" msgid="5555744208032445632">"Захаваць чарнавік"</string>
     <string name="discard" msgid="1714960202994370243">"Скасаваць"</string>
     <string name="compose" msgid="1473559896062432878">"Напісаць"</string>
@@ -150,8 +148,7 @@
     <item quantity="one" msgid="3657821200245019288">"Перамясціць размову"</item>
     <item quantity="other" msgid="1685896770174368261">"Перамяшчэнне размоў: <xliff:g id="ID_1">%1$d</xliff:g>"</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"Адпраўнiк <xliff:g id="SENDER">%1$s</xliff:g> адправіў <xliff:g id="SUBJECT">%2$s</xliff:g> <xliff:g id="DATE">%3$s</xliff:g>"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -205,8 +202,10 @@
     <item quantity="one" msgid="7361303622131552596">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; пазначана як не спам."</item>
     <item quantity="other" msgid="2250720080221922267">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; пазначана як не спам."</item>
   </plurals>
-    <!-- no translation found for conversation_not_important:one (788387259924027833) -->
-    <!-- no translation found for conversation_not_important:other (6662213740575340397) -->
+  <plurals name="conversation_not_important">
+    <item quantity="one" msgid="788387259924027833">"Пазначаны як няважныя: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="other" msgid="6662213740575340397">"Пазначаны як няважныя: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+  </plurals>
   <plurals name="conversation_phished">
     <item quantity="one" msgid="5386916574432049235">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; пазначана як фiшынг."</item>
     <item quantity="other" msgid="3678624994662639442">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; пазначана як фiшынг."</item>
@@ -284,8 +283,7 @@
     <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt;"</string>
     <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt; праз <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Паведамленне захавана як чарнавік."</string>
-    <!-- no translation found for sending_message (2822171587017313151) -->
-    <skip />
+    <string name="sending_message" msgid="2822171587017313151">"Адпраўка паведамленняў у \"Адпраўленыя\""</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Адрас <xliff:g id="WRONGEMAIL">%s</xliff:g> несапраўдны."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Паказаць цытуемы тэкст"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Схаваць цытуемы тэкст"</string>
@@ -301,14 +299,7 @@
     <string name="cancel" msgid="8762981157252199115">"Адмена"</string>
     <string name="close" msgid="419945428844076406">"Закрыць"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Для гэтага ўліковага запісу не былі ўсталяваны цэтлікі."</string>
-  <string-array name="sync_status">
-    <item msgid="2446076619901049026">"Паспяхова"</item>
-    <item msgid="7109065688039971961">"Няма злучэння."</item>
-    <item msgid="8437496123716232060">"Не атрымалася ўвайсці."</item>
-    <item msgid="1651266301325684887">"Памылка бяспекi."</item>
-    <item msgid="1461520171154288533">"Не атрымалася сінхранізаваць."</item>
-    <item msgid="8749857841162829469">"Памылка"</item>
-  </string-array>
+    <!-- no translation found for sync_status:5 (4779810016424303449) -->
     <string name="tap_to_configure" msgid="1181356242354390930">"Націсніце, каб наладзіць"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"Сінхр. гэту тэчку, каб прагл. разм."</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Сінхранізацыя тэчкi"</string>

diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index a01bd65..e8f5ab5 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml

@@ -26,10 +26,8 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Прикачване на файл"</string>
-    <!-- no translation found for add_photo_attachment (8548176514426323119) -->
-    <skip />
-    <!-- no translation found for add_video_attachment (4284457799113546464) -->
-    <skip />
+    <string name="add_photo_attachment" msgid="8548176514426323119">"Прикачване на снимка"</string>
+    <string name="add_video_attachment" msgid="4284457799113546464">"Прикачване на клип"</string>
     <string name="save_draft" msgid="5555744208032445632">"Запазване на черновата"</string>
     <string name="discard" msgid="1714960202994370243">"Отхвърляне"</string>
     <string name="compose" msgid="1473559896062432878">"Ново съобщение"</string>
@@ -205,8 +203,10 @@
     <item quantity="one" msgid="7361303622131552596">"Подадохте сигнал „Не е спам“ за &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
     <item quantity="other" msgid="2250720080221922267">"Подадохте сигнал „Не е спам“ за &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
   </plurals>
-    <!-- no translation found for conversation_not_important:one (788387259924027833) -->
-    <!-- no translation found for conversation_not_important:other (6662213740575340397) -->
+  <plurals name="conversation_not_important">
+    <item quantity="one" msgid="788387259924027833">"Означихте &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&amp; като маловажна."</item>
+    <item quantity="other" msgid="6662213740575340397">"Означихте &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&amp; като маловажни."</item>
+  </plurals>
   <plurals name="conversation_phished">
     <item quantity="one" msgid="5386916574432049235">"Подадохте сигнал за фишинг за &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
     <item quantity="other" msgid="3678624994662639442">"Подадохте сигнал за фишинг за &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
@@ -284,8 +284,7 @@
     <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt;"</string>
     <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt; чрез <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Съобщението е запазено като чернова."</string>
-    <!-- no translation found for sending_message (2822171587017313151) -->
-    <skip />
+    <string name="sending_message" msgid="2822171587017313151">"Съобщението се изпраща към „Изх. поща“…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Адресът <xliff:g id="WRONGEMAIL">%s</xliff:g> е невалиден."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Показване на цитирания текст"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Скриване на цитирания текст"</string>
@@ -301,14 +300,7 @@
     <string name="cancel" msgid="8762981157252199115">"Отказ"</string>
     <string name="close" msgid="419945428844076406">"Затваряне"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"В този профил не са зададени папки."</string>
-  <string-array name="sync_status">
-    <item msgid="2446076619901049026">"Успех"</item>
-    <item msgid="7109065688039971961">"Няма връзка."</item>
-    <item msgid="8437496123716232060">"Не можахте да влезете."</item>
-    <item msgid="1651266301325684887">"Грешка в сигурността."</item>
-    <item msgid="1461520171154288533">"Не можа да се синхронизира."</item>
-    <item msgid="8749857841162829469">"Грешка"</item>
-  </string-array>
+    <!-- no translation found for sync_status:5 (4779810016424303449) -->
     <string name="tap_to_configure" msgid="1181356242354390930">"Докоснете, за да настроите"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"За да видите кореспонденциите, синхронизирайте тази папка."</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Синхронизиране на папката"</string>

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index de9a611..520437d 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml

@@ -26,10 +26,8 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Adjunta un fitxer"</string>
-    <!-- no translation found for add_photo_attachment (8548176514426323119) -->
-    <skip />
-    <!-- no translation found for add_video_attachment (4284457799113546464) -->
-    <skip />
+    <string name="add_photo_attachment" msgid="8548176514426323119">"Adjunta una imatge"</string>
+    <string name="add_video_attachment" msgid="4284457799113546464">"Adjunta un vídeo"</string>
     <string name="save_draft" msgid="5555744208032445632">"Desa l\'esborrany"</string>
     <string name="discard" msgid="1714960202994370243">"Descarta"</string>
     <string name="compose" msgid="1473559896062432878">"Redacta"</string>
@@ -150,8 +148,7 @@
     <item quantity="one" msgid="3657821200245019288">"Mou la conversa"</item>
     <item quantity="other" msgid="1685896770174368261">"Mou <xliff:g id="ID_1">%1$d</xliff:g> converses"</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> ha enviat <xliff:g id="SUBJECT">%2$s</xliff:g> el dia <xliff:g id="DATE">%3$s</xliff:g>"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -205,8 +202,10 @@
     <item quantity="one" msgid="7361303622131552596">"S\'ha informat que &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; converses no són activitat brossa."</item>
     <item quantity="other" msgid="2250720080221922267">"S\'ha informat que &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; converses no són activitat brossa."</item>
   </plurals>
-    <!-- no translation found for conversation_not_important:one (788387259924027833) -->
-    <!-- no translation found for conversation_not_important:other (6662213740575340397) -->
+  <plurals name="conversation_not_important">
+    <item quantity="one" msgid="788387259924027833">"Se n\'ha marcat &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; com a no important."</item>
+    <item quantity="other" msgid="6662213740575340397">"Se n\'han marcat &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; com a no importants."</item>
+  </plurals>
   <plurals name="conversation_phished">
     <item quantity="one" msgid="5386916574432049235">"S\'ha informat que &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; converses són pesca."</item>
     <item quantity="other" msgid="3678624994662639442">"S\'ha informat que &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; converses són pesca."</item>
@@ -284,8 +283,7 @@
     <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt;"</string>
     <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt; a través de <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Missatge desat com a esborrany."</string>
-    <!-- no translation found for sending_message (2822171587017313151) -->
-    <skip />
+    <string name="sending_message" msgid="2822171587017313151">"S\'està enviant el missatge a la bústia de sortida…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"L\'adreça <xliff:g id="WRONGEMAIL">%s</xliff:g> no és vàlida."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Mostra el text citat"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Amaga el text citat"</string>
@@ -307,7 +305,7 @@
     <item msgid="8437496123716232060">"No s\'ha pogut iniciar la sessió."</item>
     <item msgid="1651266301325684887">"Error de seguretat."</item>
     <item msgid="1461520171154288533">"No s\'ha pogut sincronitzar."</item>
-    <item msgid="8749857841162829469">"Error"</item>
+    <item msgid="4779810016424303449">"Error intern"</item>
   </string-array>
     <string name="tap_to_configure" msgid="1181356242354390930">"Toca per configurar"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"Sincron. la carpeta per veure conv."</string>

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 7ddc8e8..0fce1cd 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml

@@ -299,14 +299,7 @@
     <string name="cancel" msgid="8762981157252199115">"Zrušit"</string>
     <string name="close" msgid="419945428844076406">"Zavřít"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Pro tento účet nebyly nastaveny žádné složky."</string>
-  <string-array name="sync_status">
-    <item msgid="2446076619901049026">"Podařilo se"</item>
-    <item msgid="7109065688039971961">"Žádné připojení."</item>
-    <item msgid="8437496123716232060">"Přihlášení se nezdařilo."</item>
-    <item msgid="1651266301325684887">"Chyba zabezpečení."</item>
-    <item msgid="1461520171154288533">"Chyba synchronizace."</item>
-    <item msgid="8749857841162829469">"Chyba"</item>
-  </string-array>
+    <!-- no translation found for sync_status:5 (4779810016424303449) -->
     <string name="tap_to_configure" msgid="1181356242354390930">"Nastavte dotykem"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"Chcete-li zobrazit konverzace, synchronizujte tuto složku."</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Synchronizovat složku"</string>

diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 5dc9abb..22f789a 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml

@@ -148,8 +148,7 @@
     <item quantity="one" msgid="3657821200245019288">"Flyt samtale"</item>
     <item quantity="other" msgid="1685896770174368261">"Flyt <xliff:g id="ID_1">%1$d</xliff:g> samtaler"</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> sendte <xliff:g id="SUBJECT">%2$s</xliff:g> den <xliff:g id="DATE">%3$s</xliff:g>"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -300,14 +299,7 @@
     <string name="cancel" msgid="8762981157252199115">"Annuller"</string>
     <string name="close" msgid="419945428844076406">"Luk"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Der er ikke angivet nogen etiketter for denne konto."</string>
-  <string-array name="sync_status">
-    <item msgid="2446076619901049026">"Gennemført"</item>
-    <item msgid="7109065688039971961">"Ingen forbindelse."</item>
-    <item msgid="8437496123716232060">"Det var ikke muligt at logge ind."</item>
-    <item msgid="1651266301325684887">"Sikkerhedsfejl."</item>
-    <item msgid="1461520171154288533">"Det var ikke muligt at synkronisere."</item>
-    <item msgid="8749857841162829469">"Fejl"</item>
-  </string-array>
+    <!-- no translation found for sync_status:5 (4779810016424303449) -->
     <string name="tap_to_configure" msgid="1181356242354390930">"Tryk for at konfigurere"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"Synkroniser denne mappe for at se samtaler."</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Synkroniser mappe"</string>

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 594449e..0a614ad 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml

@@ -148,8 +148,7 @@
     <item quantity="one" msgid="3657821200245019288">"Konversation verschieben"</item>
     <item quantity="other" msgid="1685896770174368261">"<xliff:g id="ID_1">%1$d</xliff:g> Konversationen verschieben"</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> hat <xliff:g id="SUBJECT">%2$s</xliff:g> am <xliff:g id="DATE">%3$s</xliff:g> gesendet."</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -306,7 +305,7 @@
     <item msgid="8437496123716232060">"Anmeldung nicht möglich"</item>
     <item msgid="1651266301325684887">"Sicherheitsfehler"</item>
     <item msgid="1461520171154288533">"Synchronisierung nicht möglich"</item>
-    <item msgid="8749857841162829469">"Fehler"</item>
+    <item msgid="4779810016424303449">"Interner Fehler"</item>
   </string-array>
     <string name="tap_to_configure" msgid="1181356242354390930">"Zum Einrichten tippen"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"Ordner synchronisieren, um Konversationen einzublenden"</string>

diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index bb3426b..76db46c 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml

@@ -148,8 +148,7 @@
     <item quantity="one" msgid="3657821200245019288">"Μετακίνηση συνομιλίας"</item>
     <item quantity="other" msgid="1685896770174368261">"Μετακίνηση <xliff:g id="ID_1">%1$d</xliff:g> συνομιλιών"</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"Ο χρήστης <xliff:g id="SENDER">%1$s</xliff:g> έστειλε <xliff:g id="SUBJECT">%2$s</xliff:g> στις <xliff:g id="DATE">%3$s</xliff:g>"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -306,7 +305,7 @@
     <item msgid="8437496123716232060">"Δεν ήταν δυνατή η σύνδεση."</item>
     <item msgid="1651266301325684887">"Σφάλμα ασφαλείας."</item>
     <item msgid="1461520171154288533">"Δεν ήταν δυνατός ο συγχρονισμός."</item>
-    <item msgid="8749857841162829469">"Σφάλμα"</item>
+    <item msgid="4779810016424303449">"Εσωτερικό σφάλμα"</item>
   </string-array>
     <string name="tap_to_configure" msgid="1181356242354390930">"Αγγίξτε για ρύθμιση"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"Συγχρ. τον φάκελο για προβ. συνομ."</string>

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index e6e3a8d..324ac51 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml

@@ -148,8 +148,7 @@
     <item quantity="one" msgid="3657821200245019288">"Move conversation"</item>
     <item quantity="other" msgid="1685896770174368261">"Move <xliff:g id="ID_1">%1$d</xliff:g> conversations"</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> sent <xliff:g id="SUBJECT">%2$s</xliff:g> on <xliff:g id="DATE">%3$s</xliff:g>"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -306,7 +305,7 @@
     <item msgid="8437496123716232060">"Couldn\'t sign in."</item>
     <item msgid="1651266301325684887">"Security error."</item>
     <item msgid="1461520171154288533">"Couldn\'t sync."</item>
-    <item msgid="8749857841162829469">"Error"</item>
+    <item msgid="4779810016424303449">"Internal Error"</item>
   </string-array>
     <string name="tap_to_configure" msgid="1181356242354390930">"Touch to set up"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"To view conversations, sync this folder."</string>

diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 02d083f..b3f0fbd 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml

@@ -148,8 +148,7 @@
     <item quantity="one" msgid="3657821200245019288">"Mover conversación"</item>
     <item quantity="other" msgid="1685896770174368261">"Mover <xliff:g id="ID_1">%1$d</xliff:g> conversaciones"</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> envió <xliff:g id="SUBJECT">%2$s</xliff:g> el <xliff:g id="DATE">%3$s</xliff:g>."</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -300,14 +299,7 @@
     <string name="cancel" msgid="8762981157252199115">"Cancelar"</string>
     <string name="close" msgid="419945428844076406">"Cerrar"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"No se definieron carpetas para esta cuenta."</string>
-  <string-array name="sync_status">
-    <item msgid="2446076619901049026">"La acción se realizó correctamente."</item>
-    <item msgid="7109065688039971961">"Sin conexión"</item>
-    <item msgid="8437496123716232060">"No se pudo acceder."</item>
-    <item msgid="1651266301325684887">"Error de seguridad"</item>
-    <item msgid="1461520171154288533">"No se pudo establecer la sincronización."</item>
-    <item msgid="8749857841162829469">"Error"</item>
-  </string-array>
+    <!-- no translation found for sync_status:5 (4779810016424303449) -->
     <string name="tap_to_configure" msgid="1181356242354390930">"Toca para configurarlo"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"Para ver conversaciones, sincroniza esta carpeta."</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sincronizar carpeta"</string>

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index ff1dc9b..3f5ef96 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml

@@ -148,8 +148,7 @@
     <item quantity="one" msgid="3657821200245019288">"Mover una conversación"</item>
     <item quantity="other" msgid="1685896770174368261">"Mover <xliff:g id="ID_1">%1$d</xliff:g> conversaciones"</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> envió <xliff:g id="SUBJECT">%2$s</xliff:g> el <xliff:g id="DATE">%3$s</xliff:g>."</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> - <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -306,7 +305,7 @@
     <item msgid="8437496123716232060">"Error al iniciar sesión"</item>
     <item msgid="1651266301325684887">"Error de seguridad"</item>
     <item msgid="1461520171154288533">"Error al sincronizar"</item>
-    <item msgid="8749857841162829469">"Error"</item>
+    <item msgid="4779810016424303449">"Error interno"</item>
   </string-array>
     <string name="tap_to_configure" msgid="1181356242354390930">"Tocar para configurar"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"Para ver conversaciones, sincroniza esta carpeta."</string>

diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 03a6e93..f7d845a 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml

@@ -26,10 +26,8 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Manusta fail"</string>
-    <!-- no translation found for add_photo_attachment (8548176514426323119) -->
-    <skip />
-    <!-- no translation found for add_video_attachment (4284457799113546464) -->
-    <skip />
+    <string name="add_photo_attachment" msgid="8548176514426323119">"Manusta pilt"</string>
+    <string name="add_video_attachment" msgid="4284457799113546464">"Manusta video"</string>
     <string name="save_draft" msgid="5555744208032445632">"Salvesta mustand"</string>
     <string name="discard" msgid="1714960202994370243">"Loobu"</string>
     <string name="compose" msgid="1473559896062432878">"Koosta"</string>
@@ -150,8 +148,7 @@
     <item quantity="one" msgid="3657821200245019288">"Meilivestluse teisaldamine"</item>
     <item quantity="other" msgid="1685896770174368261">"Teisalda <xliff:g id="ID_1">%1$d</xliff:g> meilivestlust"</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> saatis sõnumi <xliff:g id="SUBJECT">%2$s</xliff:g> kuupäeval <xliff:g id="DATE">%3$s</xliff:g>"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>] <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g>  –  <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -205,8 +202,10 @@
     <item quantity="one" msgid="7361303622131552596">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; vestlus märgiti mitte-rämpspostiks."</item>
     <item quantity="other" msgid="2250720080221922267">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; vestlust märgiti mitte-rämpspostiks."</item>
   </plurals>
-    <!-- no translation found for conversation_not_important:one (788387259924027833) -->
-    <!-- no translation found for conversation_not_important:other (6662213740575340397) -->
+  <plurals name="conversation_not_important">
+    <item quantity="one" msgid="788387259924027833">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; üksus märgiti ebaoluliseks."</item>
+    <item quantity="other" msgid="6662213740575340397">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; üksust märgiti ebaoluliseks."</item>
+  </plurals>
   <plurals name="conversation_phished">
     <item quantity="one" msgid="5386916574432049235">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; vestlus märgiti andmepüügiga seotuks."</item>
     <item quantity="other" msgid="3678624994662639442">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; vestlust märgiti andmepüügiga seotuks."</item>
@@ -284,8 +283,7 @@
     <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt;"</string>
     <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt;: <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Sõnum salvestati mustandina."</string>
-    <!-- no translation found for sending_message (2822171587017313151) -->
-    <skip />
+    <string name="sending_message" msgid="2822171587017313151">"Sõnumi väljundkausta saatmine …"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Aadress <xliff:g id="WRONGEMAIL">%s</xliff:g> on kehtetu."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Kuva osundatud tekst"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Peida osundatud tekst"</string>
@@ -301,14 +299,7 @@
     <string name="cancel" msgid="8762981157252199115">"Tühista"</string>
     <string name="close" msgid="419945428844076406">"Sule"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Sellele kontole pole määratud ühtegi kausta."</string>
-  <string-array name="sync_status">
-    <item msgid="2446076619901049026">"Õnnestus"</item>
-    <item msgid="7109065688039971961">"Ühendus puudub."</item>
-    <item msgid="8437496123716232060">"Sisselogimine ebaõnnestus."</item>
-    <item msgid="1651266301325684887">"Turvalisuse viga."</item>
-    <item msgid="1461520171154288533">"Ei saanud sünkroonida."</item>
-    <item msgid="8749857841162829469">"Viga"</item>
-  </string-array>
+    <!-- no translation found for sync_status:5 (4779810016424303449) -->
     <string name="tap_to_configure" msgid="1181356242354390930">"Puudutage seadistamiseks"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"Meilivestl. vaatamis. sünkr. kaust."</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sünkrooni kaust"</string>

diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 9034218..176d100 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml

@@ -299,14 +299,7 @@
     <string name="cancel" msgid="8762981157252199115">"لغو"</string>
     <string name="close" msgid="419945428844076406">"بستن"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"پوشه‌ای برای این حساب تنظیم نشده است."</string>
-  <string-array name="sync_status">
-    <item msgid="2446076619901049026">"موفقیت‌آمیز"</item>
-    <item msgid="7109065688039971961">"اتصال برقرار نیست."</item>
-    <item msgid="8437496123716232060">"ورود به برنامه انجام نشد."</item>
-    <item msgid="1651266301325684887">"خطای امنیتی."</item>
-    <item msgid="1461520171154288533">"همگام‌سازی انجام نشد."</item>
-    <item msgid="8749857841162829469">"خطا"</item>
-  </string-array>
+    <!-- no translation found for sync_status:5 (4779810016424303449) -->
     <string name="tap_to_configure" msgid="1181356242354390930">"برای راه‌اندازی لمس کنید"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"برای مشاهده مکالمات، این پوشه همگام شود."</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"همگام‌سازی پوشه"</string>

diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 67bf92d..1117b29 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml

@@ -26,10 +26,8 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Liitä tiedosto"</string>
-    <!-- no translation found for add_photo_attachment (8548176514426323119) -->
-    <skip />
-    <!-- no translation found for add_video_attachment (4284457799113546464) -->
-    <skip />
+    <string name="add_photo_attachment" msgid="8548176514426323119">"Liitä kuva"</string>
+    <string name="add_video_attachment" msgid="4284457799113546464">"Liitä video"</string>
     <string name="save_draft" msgid="5555744208032445632">"Tallenna luonnos"</string>
     <string name="discard" msgid="1714960202994370243">"Hylkää"</string>
     <string name="compose" msgid="1473559896062432878">"Viestin kirj."</string>
@@ -150,8 +148,7 @@
     <item quantity="one" msgid="3657821200245019288">"Siirrä keskustelu"</item>
     <item quantity="other" msgid="1685896770174368261">"Siirrä <xliff:g id="ID_1">%1$d</xliff:g> keskustelua"</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> lähetti viestin <xliff:g id="SUBJECT">%2$s</xliff:g> <xliff:g id="DATE">%3$s</xliff:g>"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g>–<xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -205,8 +202,10 @@
     <item quantity="one" msgid="7361303622131552596">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; merkitty muuksi kuin roskapostiksi."</item>
     <item quantity="other" msgid="2250720080221922267">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; merkitty muuksi kuin roskapostiksi."</item>
   </plurals>
-    <!-- no translation found for conversation_not_important:one (788387259924027833) -->
-    <!-- no translation found for conversation_not_important:other (6662213740575340397) -->
+  <plurals name="conversation_not_important">
+    <item quantity="one" msgid="788387259924027833">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; merkitty ei-tärkeäksi."</item>
+    <item quantity="other" msgid="6662213740575340397">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; merkitty ei-tärkeäksi."</item>
+  </plurals>
   <plurals name="conversation_phished">
     <item quantity="one" msgid="5386916574432049235">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; merkitty tietojenkalasteluksi."</item>
     <item quantity="other" msgid="3678624994662639442">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; merkitty tietojenkalasteluksi."</item>
@@ -284,8 +283,7 @@
     <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt;"</string>
     <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt; toimialueelta <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Viesti tallennettu luonnokseksi."</string>
-    <!-- no translation found for sending_message (2822171587017313151) -->
-    <skip />
+    <string name="sending_message" msgid="2822171587017313151">"Lähetetään viestiä lähetettyihin..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Osoite <xliff:g id="WRONGEMAIL">%s</xliff:g> ei kelpaa."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Näytä lainattu teksti"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Piilota lainattu teksti"</string>
@@ -307,7 +305,7 @@
     <item msgid="8437496123716232060">"Kirjautuminen ei onnistu."</item>
     <item msgid="1651266301325684887">"Suojausvirhe."</item>
     <item msgid="1461520171154288533">"Synkronointi epäonnistui."</item>
-    <item msgid="8749857841162829469">"Virhe"</item>
+    <item msgid="4779810016424303449">"Sisäinen virhe"</item>
   </string-array>
     <string name="tap_to_configure" msgid="1181356242354390930">"Kosketa ja määritä asetukset"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"Synkronoi tämä kansio, jos haluat tarkastella keskusteluja."</string>

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 8cb6411..01ad380 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml

@@ -148,8 +148,7 @@
     <item quantity="one" msgid="3657821200245019288">"Déplacer la conversation"</item>
     <item quantity="other" msgid="1685896770174368261">"Déplacer <xliff:g id="ID_1">%1$d</xliff:g> conversations"</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> a envoyé le message \"<xliff:g id="SUBJECT">%2$s</xliff:g>\" le <xliff:g id="DATE">%3$s</xliff:g>."</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -300,14 +299,7 @@
     <string name="cancel" msgid="8762981157252199115">"Annuler"</string>
     <string name="close" msgid="419945428844076406">"Fermer"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Aucun dossier n\'a été défini pour ce compte."</string>
-  <string-array name="sync_status">
-    <item msgid="2446076619901049026">"Opération réussie."</item>
-    <item msgid="7109065688039971961">"Aucune connexion"</item>
-    <item msgid="8437496123716232060">"Connexion impossible."</item>
-    <item msgid="1651266301325684887">"Erreur de sécurité."</item>
-    <item msgid="1461520171154288533">"Synchronisation impossible."</item>
-    <item msgid="8749857841162829469">"Erreur"</item>
-  </string-array>
+    <!-- no translation found for sync_status:5 (4779810016424303449) -->
     <string name="tap_to_configure" msgid="1181356242354390930">"Appuyez pour configurer."</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"Pour afficher les conversations, synchronisez ce dossier."</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Synchroniser le dossier"</string>

diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 0b80302..9f75d48 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml

@@ -26,10 +26,8 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"फ़ाइल अनुलग्‍न करें"</string>
-    <!-- no translation found for add_photo_attachment (8548176514426323119) -->
-    <skip />
-    <!-- no translation found for add_video_attachment (4284457799113546464) -->
-    <skip />
+    <string name="add_photo_attachment" msgid="8548176514426323119">"चित्र अनुलग्न करें"</string>
+    <string name="add_video_attachment" msgid="4284457799113546464">"वीडियो अनुलग्न करें"</string>
     <string name="save_draft" msgid="5555744208032445632">"ड्राफ़्ट सहेजें"</string>
     <string name="discard" msgid="1714960202994370243">"छोड़ें"</string>
     <string name="compose" msgid="1473559896062432878">"लिखें"</string>
@@ -150,8 +148,7 @@
     <item quantity="one" msgid="3657821200245019288">"बातचीत ले जाएं"</item>
     <item quantity="other" msgid="1685896770174368261">"<xliff:g id="ID_1">%1$d</xliff:g> बातचीत ले जाएं"</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> ने <xliff:g id="DATE">%3$s</xliff:g> को <xliff:g id="SUBJECT">%2$s</xliff:g> भेजा"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -205,8 +202,10 @@
     <item quantity="one" msgid="7361303622131552596">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; को स्पैम नहीं के रूप में रिपोर्ट किया गया."</item>
     <item quantity="other" msgid="2250720080221922267">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; को स्पैम नहीं के रूप में रिपोर्ट किया गया."</item>
   </plurals>
-    <!-- no translation found for conversation_not_important:one (788387259924027833) -->
-    <!-- no translation found for conversation_not_important:other (6662213740575340397) -->
+  <plurals name="conversation_not_important">
+    <item quantity="one" msgid="788387259924027833">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; को महत्‍वपूर्ण नहीं के रूप में चि‍ह्नि‍त कि‍या गया."</item>
+    <item quantity="other" msgid="6662213740575340397">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; को महत्‍वपूर्ण नहीं के रूप में चि‍ह्नि‍त कि‍या गया."</item>
+  </plurals>
   <plurals name="conversation_phished">
     <item quantity="one" msgid="5386916574432049235">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; को फ़िशिंग के रूप में रिपोर्ट किया गया."</item>
     <item quantity="other" msgid="3678624994662639442">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; को फ़िशिंग के रूप में रिपोर्ट किया गया."</item>
@@ -280,12 +279,11 @@
     <string name="bcc_heading" msgid="5528824453033598299">"Bcc:"</string>
     <string name="show_images" msgid="1875700481186331432">"चित्र दिखाएं"</string>
     <string name="always_show_images" msgid="5966408990164581801">"इस प्रेषक के चित्र हमेशा दिखाएं"</string>
-    <string name="always_show_images_toast" msgid="6218061921546973716">"इस प्रेषक के चित्रों को स्वचालित रूप से दिखाया जाएगा."</string>
+    <string name="always_show_images_toast" msgid="6218061921546973716">"इस प्रेषक के चित्रों को अपने आप दिखाया जाएगा."</string>
     <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt;"</string>
     <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt; <xliff:g id="VIA_DOMAIN">%3$s</xliff:g> के माध्यम से"</string>
     <string name="message_saved" msgid="7073947895562277576">"संदेश ड्राफ़्ट के रूप में सहेजा गया."</string>
-    <!-- no translation found for sending_message (2822171587017313151) -->
-    <skip />
+    <string name="sending_message" msgid="2822171587017313151">"आउटबॉक्स पर संदेश भेज रहा है…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"<xliff:g id="WRONGEMAIL">%s</xliff:g> पता अमान्‍य है."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ उद्धृत पाठ दिखाएं"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ उद्धृत पाठ छिपाएं"</string>
@@ -301,14 +299,7 @@
     <string name="cancel" msgid="8762981157252199115">"रद्द करें"</string>
     <string name="close" msgid="419945428844076406">"बंद करें"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"इस खाते के लिए कोई फ़ोल्‍डर सेट नहीं किया गया है."</string>
-  <string-array name="sync_status">
-    <item msgid="2446076619901049026">"सफल"</item>
-    <item msgid="7109065688039971961">"कोई कनेक्शन नहीं."</item>
-    <item msgid="8437496123716232060">"साइन इन नहीं किया जा सका."</item>
-    <item msgid="1651266301325684887">"सुरक्षा त्रुटि."</item>
-    <item msgid="1461520171154288533">"समन्‍वयित नहीं किया जा सका."</item>
-    <item msgid="8749857841162829469">"त्रुटि"</item>
-  </string-array>
+    <!-- no translation found for sync_status:5 (4779810016424303449) -->
     <string name="tap_to_configure" msgid="1181356242354390930">"सेट करने के लिए स्पर्श करें"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"बातचीत देखने हेतु, फ़ोल्डर समन्वयित करें."</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"फ़ोल्डर समन्वयित करें"</string>
@@ -336,7 +327,7 @@
     <string name="wait_for_sync_title" msgid="2767841242539238015">"समन्‍वयन की प्रतीक्षा कर रहा है"</string>
     <string name="wait_for_sync_body" msgid="7718316938173643688">"आपका ईमेल शीघ्र ही दिखाई देगा."</string>
     <string name="not_synced_title" msgid="794279749170198599">"खाता समन्वयित नहीं है"</string>
-    <string name="wait_for_manual_sync_body" msgid="2003192935254244968">"यह खाता स्वचालित रूप से समन्वयित करने के लिए सेट नहीं है. "\n"एक बार मेल समन्‍वयित करने के लिए, "<b>"अभी समन्वयित करें"</b>" स्‍पर्श करें, या इस खाते को मेल स्वचालित रूप से समन्‍वयित करने के लिए सेट करने हेतु "<b>"समन्वयन सेटिंग बदलें"</b>" स्‍पर्श करें."</string>
+    <string name="wait_for_manual_sync_body" msgid="2003192935254244968">"यह खाता अपने आप समन्वयित करने के लिए सेट नहीं है. "\n"एक बार मेल समन्‍वयित करने के लिए, "<b>"अभी समन्वयित करें"</b>" स्‍पर्श करें, या इस खाते को मेल अपने आप समन्‍वयित करने के लिए सेट करने हेतु "<b>"समन्वयन सेटिंग बदलें"</b>" स्‍पर्श करें."</string>
     <string name="manual_sync" msgid="6743983544685622800">"अभी समन्वयित करें"</string>
     <string name="change_sync_settings" msgid="5514293926214426577">"समन्वयन सेटिंग बदलें"</string>
     <string name="photo_load_failed" msgid="8811324070219403896">"चित्र लोड नहीं की जा सकी"</string>

diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 2aff237..6f9950d 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml

@@ -148,8 +148,7 @@
     <item quantity="one" msgid="3657821200245019288">"Premjesti razgovor"</item>
     <item quantity="other" msgid="1685896770174368261">"Premjesti sljedeći broj razgovora: <xliff:g id="ID_1">%1$d</xliff:g>"</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"Pošiljatelj: <xliff:g id="SENDER">%1$s</xliff:g>, predmet: <xliff:g id="SUBJECT">%2$s</xliff:g>, datum: <xliff:g id="DATE">%3$s</xliff:g>"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -300,14 +299,7 @@
     <string name="cancel" msgid="8762981157252199115">"Odustani"</string>
     <string name="close" msgid="419945428844076406">"Zatvori"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Za ovaj račun nisu postavljene mape."</string>
-  <string-array name="sync_status">
-    <item msgid="2446076619901049026">"Uspjeh"</item>
-    <item msgid="7109065688039971961">"Nema veze."</item>
-    <item msgid="8437496123716232060">"Prijava nije bila moguća."</item>
-    <item msgid="1651266301325684887">"Sigurnosna pogreška."</item>
-    <item msgid="1461520171154288533">"Sinkronizacija nije bila moguća."</item>
-    <item msgid="8749857841162829469">"Pogreška"</item>
-  </string-array>
+    <!-- no translation found for sync_status:5 (4779810016424303449) -->
     <string name="tap_to_configure" msgid="1181356242354390930">"Dodirnite za postavljanje"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"Za prikaz razgovora sinkronizirajte ovu mapu."</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sinkronizacija mape"</string>

diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index c3295ac..89d72fe 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml

@@ -148,8 +148,7 @@
     <item quantity="one" msgid="3657821200245019288">"Beszélgetés áthelyezése"</item>
     <item quantity="other" msgid="1685896770174368261">"<xliff:g id="ID_1">%1$d</xliff:g> beszélgetés áthelyezése"</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> küldte a következőt: <xliff:g id="SUBJECT">%2$s</xliff:g> | ekkor: <xliff:g id="DATE">%3$s</xliff:g>"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> -- <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -300,14 +299,7 @@
     <string name="cancel" msgid="8762981157252199115">"Mégse"</string>
     <string name="close" msgid="419945428844076406">"Bezárás"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Nincs beállítva mappa ehhez a fiókhoz."</string>
-  <string-array name="sync_status">
-    <item msgid="2446076619901049026">"Sikerült"</item>
-    <item msgid="7109065688039971961">"Nincs kapcsolat."</item>
-    <item msgid="8437496123716232060">"A bejelentkezés sikertelen."</item>
-    <item msgid="1651266301325684887">"Biztonsági hiba"</item>
-    <item msgid="1461520171154288533">"A szinkronizálás sikertelen."</item>
-    <item msgid="8749857841162829469">"Hiba"</item>
-  </string-array>
+    <!-- no translation found for sync_status:5 (4779810016424303449) -->
     <string name="tap_to_configure" msgid="1181356242354390930">"Érintse meg a beállításhoz"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"Beszélgetésekhez szinkr. a mappát."</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Mappa szinkronizálása"</string>

diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index eb90285..d9d0bf8 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml

@@ -26,10 +26,8 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Lampirkan file"</string>
-    <!-- no translation found for add_photo_attachment (8548176514426323119) -->
-    <skip />
-    <!-- no translation found for add_video_attachment (4284457799113546464) -->
-    <skip />
+    <string name="add_photo_attachment" msgid="8548176514426323119">"Lampirkan Gambar"</string>
+    <string name="add_video_attachment" msgid="4284457799113546464">"Lampirkan Video"</string>
     <string name="save_draft" msgid="5555744208032445632">"Simpan draf"</string>
     <string name="discard" msgid="1714960202994370243">"Buang"</string>
     <string name="compose" msgid="1473559896062432878">"Tulis"</string>
@@ -150,8 +148,7 @@
     <item quantity="one" msgid="3657821200245019288">"Pindahkan percakapan"</item>
     <item quantity="other" msgid="1685896770174368261">"Pindahkan <xliff:g id="ID_1">%1$d</xliff:g> percakapan"</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> mengirim <xliff:g id="SUBJECT">%2$s</xliff:g> pada <xliff:g id="DATE">%3$s</xliff:g>"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -205,8 +202,10 @@
     <item quantity="one" msgid="7361303622131552596">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dilaporkan sebagai bukan spam."</item>
     <item quantity="other" msgid="2250720080221922267">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dilaporkan sebagai bukan spam."</item>
   </plurals>
-    <!-- no translation found for conversation_not_important:one (788387259924027833) -->
-    <!-- no translation found for conversation_not_important:other (6662213740575340397) -->
+  <plurals name="conversation_not_important">
+    <item quantity="one" msgid="788387259924027833">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ditandai sebagai tidak penting."</item>
+    <item quantity="other" msgid="6662213740575340397">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ditandai sebagai tidak penting."</item>
+  </plurals>
   <plurals name="conversation_phished">
     <item quantity="one" msgid="5386916574432049235">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dilaporkan sebagai phising."</item>
     <item quantity="other" msgid="3678624994662639442">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dilaporkan sebagai phising."</item>
@@ -284,8 +283,7 @@
     <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt;"</string>
     <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt; via <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Pesan disimpan sebagai draf."</string>
-    <!-- no translation found for sending_message (2822171587017313151) -->
-    <skip />
+    <string name="sending_message" msgid="2822171587017313151">"Mengirim pesan ke kotak keluar…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Alamat <xliff:g id="WRONGEMAIL">%s</xliff:g> tidak valid."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Tampilkan kutipan teks"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Sembunyikan kutipan teks"</string>
@@ -301,14 +299,7 @@
     <string name="cancel" msgid="8762981157252199115">"Batal"</string>
     <string name="close" msgid="419945428844076406">"Tutup"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Tidak ada folder yang disetel untuk akun ini."</string>
-  <string-array name="sync_status">
-    <item msgid="2446076619901049026">"Berhasil"</item>
-    <item msgid="7109065688039971961">"Tidak ada sambungan."</item>
-    <item msgid="8437496123716232060">"Tidak dapat masuk."</item>
-    <item msgid="1651266301325684887">"Kesalahan keamanan."</item>
-    <item msgid="1461520171154288533">"Tidak dapat menyinkronkan."</item>
-    <item msgid="8749857841162829469">"Kesalahan"</item>
-  </string-array>
+    <!-- no translation found for sync_status:5 (4779810016424303449) -->
     <string name="tap_to_configure" msgid="1181356242354390930">"Sentuh untuk menyiapkan"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"Untuk melihat percakapan, sinkronkan folder ini."</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sinkronkan Folder"</string>

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 481d515..bb48a8b 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml

@@ -148,8 +148,7 @@
     <item quantity="one" msgid="3657821200245019288">"Sposta conversazione"</item>
     <item quantity="other" msgid="1685896770174368261">"Sposta <xliff:g id="ID_1">%1$d</xliff:g> conversazioni"</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> ha inviato <xliff:g id="SUBJECT">%2$s</xliff:g> il giorno <xliff:g id="DATE">%3$s</xliff:g>"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> - <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -306,7 +305,7 @@
     <item msgid="8437496123716232060">"Accesso non riuscito."</item>
     <item msgid="1651266301325684887">"Errore di protezione."</item>
     <item msgid="1461520171154288533">"Sincronizzazione non riuscita."</item>
-    <item msgid="8749857841162829469">"Errore"</item>
+    <item msgid="4779810016424303449">"Errore interno"</item>
   </string-array>
     <string name="tap_to_configure" msgid="1181356242354390930">"Tocca per configurare"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"Per vedere conversazioni, sincronizza cartella."</string>

diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index b3814b9..c7f2169 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml

@@ -305,7 +305,7 @@
     <item msgid="8437496123716232060">"הכניסה נכשלה."</item>
     <item msgid="1651266301325684887">"שגיאת אבטחה."</item>
     <item msgid="1461520171154288533">"הסנכרון נכשל."</item>
-    <item msgid="8749857841162829469">"שגיאה"</item>
+    <item msgid="4779810016424303449">"שגיאה פנימית"</item>
   </string-array>
     <string name="tap_to_configure" msgid="1181356242354390930">"גע כדי להגדיר"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"כדי להציג שיחות, סנכרן תיקיה זו."</string>

diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index cb855cc..268c3b0 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml

@@ -26,10 +26,8 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"ファイルを添付"</string>
-    <!-- no translation found for add_photo_attachment (8548176514426323119) -->
-    <skip />
-    <!-- no translation found for add_video_attachment (4284457799113546464) -->
-    <skip />
+    <string name="add_photo_attachment" msgid="8548176514426323119">"画像を添付"</string>
+    <string name="add_video_attachment" msgid="4284457799113546464">"動画を添付"</string>
     <string name="save_draft" msgid="5555744208032445632">"下書きを保存"</string>
     <string name="discard" msgid="1714960202994370243">"破棄"</string>
     <string name="compose" msgid="1473559896062432878">"作成"</string>
@@ -150,8 +148,7 @@
     <item quantity="one" msgid="3657821200245019288">"1件のスレッドを移動"</item>
     <item quantity="other" msgid="1685896770174368261">"<xliff:g id="ID_1">%1$d</xliff:g>件のスレッドを移動"</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g>が<xliff:g id="DATE">%3$s</xliff:g>に<xliff:g id="SUBJECT">%2$s</xliff:g>を送信"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -205,8 +202,10 @@
     <item quantity="one" msgid="7361303622131552596">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;件を迷惑メールではないメールとして報告しました。"</item>
     <item quantity="other" msgid="2250720080221922267">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;件を迷惑メールではないメールとして報告しました。"</item>
   </plurals>
-    <!-- no translation found for conversation_not_important:one (788387259924027833) -->
-    <!-- no translation found for conversation_not_important:other (6662213740575340397) -->
+  <plurals name="conversation_not_important">
+    <item quantity="one" msgid="788387259924027833">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;件の重要マークを外しました。"</item>
+    <item quantity="other" msgid="6662213740575340397">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;件の重要マークを外しました。"</item>
+  </plurals>
   <plurals name="conversation_phished">
     <item quantity="one" msgid="5386916574432049235">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;件をフィッシングとして報告しました。"</item>
     <item quantity="other" msgid="3678624994662639442">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;件をフィッシングとして報告しました。"</item>
@@ -284,8 +283,7 @@
     <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt;"</string>
     <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="VIA_DOMAIN">%3$s</xliff:g>経由の<xliff:g id="NAME">%1$s</xliff:g>&lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt;"</string>
     <string name="message_saved" msgid="7073947895562277576">"メッセージを下書きとして保存しました。"</string>
-    <!-- no translation found for sending_message (2822171587017313151) -->
-    <skip />
+    <string name="sending_message" msgid="2822171587017313151">"送信トレイにメッセージを送信しています…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"アドレス<xliff:g id="WRONGEMAIL">%s</xliff:g>は無効です。"</string>
     <string name="show_elided" msgid="5255917904110437886">"▶元のメッセージを表示"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼元のメッセージを隠す"</string>
@@ -301,14 +299,7 @@
     <string name="cancel" msgid="8762981157252199115">"キャンセル"</string>
     <string name="close" msgid="419945428844076406">"閉じる"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"このアカウントに設定されているフォルダはありません。"</string>
-  <string-array name="sync_status">
-    <item msgid="2446076619901049026">"完了"</item>
-    <item msgid="7109065688039971961">"接続できません。"</item>
-    <item msgid="8437496123716232060">"ログインできませんでした。"</item>
-    <item msgid="1651266301325684887">"セキュリティエラー"</item>
-    <item msgid="1461520171154288533">"同期できませんでした。"</item>
-    <item msgid="8749857841162829469">"エラー"</item>
-  </string-array>
+    <!-- no translation found for sync_status:5 (4779810016424303449) -->
     <string name="tap_to_configure" msgid="1181356242354390930">"タップしてセットアップ"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"スレッドを表示するには、このフォルダを同期します。"</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"フォルダを同期"</string>

diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 86891b4..da38d4d 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml

@@ -26,10 +26,8 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"파일 첨부"</string>
-    <!-- no translation found for add_photo_attachment (8548176514426323119) -->
-    <skip />
-    <!-- no translation found for add_video_attachment (4284457799113546464) -->
-    <skip />
+    <string name="add_photo_attachment" msgid="8548176514426323119">"사진 첨부"</string>
+    <string name="add_video_attachment" msgid="4284457799113546464">"동영상 첨부"</string>
     <string name="save_draft" msgid="5555744208032445632">"임시보관함에 저장"</string>
     <string name="discard" msgid="1714960202994370243">"삭제"</string>
     <string name="compose" msgid="1473559896062432878">"편지쓰기"</string>
@@ -150,8 +148,7 @@
     <item quantity="one" msgid="3657821200245019288">"대화 이동"</item>
     <item quantity="other" msgid="1685896770174368261">"대화 <xliff:g id="ID_1">%1$d</xliff:g>개 이동"</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g>님이 <xliff:g id="SUBJECT">%2$s</xliff:g>을(를) <xliff:g id="DATE">%3$s</xliff:g>에 보냈습니다."</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -205,8 +202,10 @@
     <item quantity="one" msgid="7361303622131552596">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;개가 스팸이 아님을 신고"</item>
     <item quantity="other" msgid="2250720080221922267">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;개가 스팸이 아님을 신고"</item>
   </plurals>
-    <!-- no translation found for conversation_not_important:one (788387259924027833) -->
-    <!-- no translation found for conversation_not_important:other (6662213740575340397) -->
+  <plurals name="conversation_not_important">
+    <item quantity="one" msgid="788387259924027833">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;개를 중요하지 않음으로 표시했습니다."</item>
+    <item quantity="other" msgid="6662213740575340397">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;개를 중요하지 않음으로 표시했습니다."</item>
+  </plurals>
   <plurals name="conversation_phished">
     <item quantity="one" msgid="5386916574432049235">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;개를 피싱 메일로 신고"</item>
     <item quantity="other" msgid="3678624994662639442">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;개를 피싱 메일로 신고"</item>
@@ -284,8 +283,7 @@
     <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt;"</string>
     <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt;(<xliff:g id="VIA_DOMAIN">%3$s</xliff:g> 경유)"</string>
     <string name="message_saved" msgid="7073947895562277576">"메일이 임시보관함에 저장되었습니다."</string>
-    <!-- no translation found for sending_message (2822171587017313151) -->
-    <skip />
+    <string name="sending_message" msgid="2822171587017313151">"보낼편지함에 메일 전송 중…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"주소(<xliff:g id="WRONGEMAIL">%s</xliff:g>)가 잘못되었습니다."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ 받은메일 표시"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ 받은메일 숨기기"</string>
@@ -301,14 +299,7 @@
     <string name="cancel" msgid="8762981157252199115">"취소"</string>
     <string name="close" msgid="419945428844076406">"닫기"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"이 계정에 대한 폴더를 설정하지 않았습니다."</string>
-  <string-array name="sync_status">
-    <item msgid="2446076619901049026">"완료"</item>
-    <item msgid="7109065688039971961">"연결되지 않았습니다."</item>
-    <item msgid="8437496123716232060">"로그인하지 못했습니다."</item>
-    <item msgid="1651266301325684887">"보안 오류입니다."</item>
-    <item msgid="1461520171154288533">"동기화하지 못했습니다."</item>
-    <item msgid="8749857841162829469">"오류"</item>
-  </string-array>
+    <!-- no translation found for sync_status:5 (4779810016424303449) -->
     <string name="tap_to_configure" msgid="1181356242354390930">"설정하려면 터치하세요."</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"대화를 보려면 폴더를 동기화하세요."</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"폴더 동기화"</string>

diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 4eb630e..d5e7df4 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml

@@ -26,10 +26,8 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Pridėti failą"</string>
-    <!-- no translation found for add_photo_attachment (8548176514426323119) -->
-    <skip />
-    <!-- no translation found for add_video_attachment (4284457799113546464) -->
-    <skip />
+    <string name="add_photo_attachment" msgid="8548176514426323119">"Pridėti paveikslėlį"</string>
+    <string name="add_video_attachment" msgid="4284457799113546464">"Pridėti vaizdo įrašą"</string>
     <string name="save_draft" msgid="5555744208032445632">"Išsaugoti juodraštį"</string>
     <string name="discard" msgid="1714960202994370243">"Atmesti"</string>
     <string name="compose" msgid="1473559896062432878">"Sukurti"</string>
@@ -150,8 +148,7 @@
     <item quantity="one" msgid="3657821200245019288">"Perkelti pokalbį"</item>
     <item quantity="other" msgid="1685896770174368261">"Perkelti <xliff:g id="ID_1">%1$d</xliff:g> pokalbius (-ių)"</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> išsiuntė <xliff:g id="SUBJECT">%2$s</xliff:g> <xliff:g id="DATE">%3$s</xliff:g>"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g>–<xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -205,8 +202,10 @@
     <item quantity="one" msgid="7361303622131552596">"Apie &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; pokalb. pranešta kaip apie šlamštą."</item>
     <item quantity="other" msgid="2250720080221922267">"Apie &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; pokalb. pranešta kaip apie šlamštą."</item>
   </plurals>
-    <!-- no translation found for conversation_not_important:one (788387259924027833) -->
-    <!-- no translation found for conversation_not_important:other (6662213740575340397) -->
+  <plurals name="conversation_not_important">
+    <item quantity="one" msgid="788387259924027833">"Pažymėta kaip nesvarbūs: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="other" msgid="6662213740575340397">"Pažymėta kaip nesvarbūs: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+  </plurals>
   <plurals name="conversation_phished">
     <item quantity="one" msgid="5386916574432049235">"Apie &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; pokalb. pranešta kaip apie sukčiavimą."</item>
     <item quantity="other" msgid="3678624994662639442">"Apie &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; pokalb. pranešta kaip apie sukčiavimą."</item>
@@ -284,8 +283,7 @@
     <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt;"</string>
     <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt; per <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Pranešimas išsaugotas kaip juodraštis."</string>
-    <!-- no translation found for sending_message (2822171587017313151) -->
-    <skip />
+    <string name="sending_message" msgid="2822171587017313151">"Pranešimas siunčiamas į išsiųstuosius…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Adresas <xliff:g id="WRONGEMAIL">%s</xliff:g> yra neteisingas."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Rodyti citatą"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Slėpti citatą"</string>
@@ -301,14 +299,7 @@
     <string name="cancel" msgid="8762981157252199115">"Atšaukti"</string>
     <string name="close" msgid="419945428844076406">"Uždaryti"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Šiai paskyrai nenustatyti jokie aplankai."</string>
-  <string-array name="sync_status">
-    <item msgid="2446076619901049026">"Sėkmingai"</item>
-    <item msgid="7109065688039971961">"Nėra ryšio."</item>
-    <item msgid="8437496123716232060">"Nepavyko prisijungti."</item>
-    <item msgid="1651266301325684887">"Saugos klaida."</item>
-    <item msgid="1461520171154288533">"Nepavyko sinchronizuoti."</item>
-    <item msgid="8749857841162829469">"Klaida"</item>
-  </string-array>
+    <!-- no translation found for sync_status:5 (4779810016424303449) -->
     <string name="tap_to_configure" msgid="1181356242354390930">"Jei norite nustatyti, palieskite"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"Jei norite perž. pok., sinchr. apl."</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sinchronizuoti aplanką"</string>

diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 651b843..4f46169 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml

@@ -26,10 +26,8 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Pievienot failu"</string>
-    <!-- no translation found for add_photo_attachment (8548176514426323119) -->
-    <skip />
-    <!-- no translation found for add_video_attachment (4284457799113546464) -->
-    <skip />
+    <string name="add_photo_attachment" msgid="8548176514426323119">"Pievienot attēlu"</string>
+    <string name="add_video_attachment" msgid="4284457799113546464">"Pievienot videoklipu"</string>
     <string name="save_draft" msgid="5555744208032445632">"Saglabāt melnrakstu"</string>
     <string name="discard" msgid="1714960202994370243">"Atmest"</string>
     <string name="compose" msgid="1473559896062432878">"Rakstīt"</string>
@@ -150,8 +148,7 @@
     <item quantity="one" msgid="3657821200245019288">"Pārvietot sarunu"</item>
     <item quantity="other" msgid="1685896770174368261">"Pārvietot <xliff:g id="ID_1">%1$d</xliff:g> sarunu(-as)"</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> nosūtīja: <xliff:g id="SUBJECT">%2$s</xliff:g> (šādā datumā: <xliff:g id="DATE">%3$s</xliff:g>)"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -205,8 +202,10 @@
     <item quantity="one" msgid="7361303622131552596">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; saruna atzīmēta kā “nav mēstule”."</item>
     <item quantity="other" msgid="2250720080221922267">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; saruna(-as) atzīmēta(-as) kā “nav mēstule”."</item>
   </plurals>
-    <!-- no translation found for conversation_not_important:one (788387259924027833) -->
-    <!-- no translation found for conversation_not_important:other (6662213740575340397) -->
+  <plurals name="conversation_not_important">
+    <item quantity="one" msgid="788387259924027833">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; saruna atzīmēta kā nesvarīga."</item>
+    <item quantity="other" msgid="6662213740575340397">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; saruna(-as) atzīmēta(-as) kā nesvarīga(-as)."</item>
+  </plurals>
   <plurals name="conversation_phished">
     <item quantity="one" msgid="5386916574432049235">"Par &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; sarunu ziņots kā par pikšķerēšanu."</item>
     <item quantity="other" msgid="3678624994662639442">"Par &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; sarunu(-ām) ziņots kā par pikšķerēšanu."</item>
@@ -284,8 +283,7 @@
     <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt;"</string>
     <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt; caur <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Ziņojums ir saglabāts kā melnraksts."</string>
-    <!-- no translation found for sending_message (2822171587017313151) -->
-    <skip />
+    <string name="sending_message" msgid="2822171587017313151">"Notiek ziņojuma sūtīšana uz izsūtni…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Adrese <xliff:g id="WRONGEMAIL">%s</xliff:g> nav derīga."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Rādīt citēto tekstu"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Paslēpt citēto tekstu"</string>
@@ -301,14 +299,7 @@
     <string name="cancel" msgid="8762981157252199115">"Atcelt"</string>
     <string name="close" msgid="419945428844076406">"Aizvērt"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Šajā kontā nav izveidota neviena mape."</string>
-  <string-array name="sync_status">
-    <item msgid="2446076619901049026">"Izpildīta veiksmīgi"</item>
-    <item msgid="7109065688039971961">"Nav savienojuma."</item>
-    <item msgid="8437496123716232060">"Neizdevās pierakstīties."</item>
-    <item msgid="1651266301325684887">"Drošības kļūda."</item>
-    <item msgid="1461520171154288533">"Neizdevās sinhronizēt."</item>
-    <item msgid="8749857841162829469">"Kļūda"</item>
-  </string-array>
+    <!-- no translation found for sync_status:5 (4779810016424303449) -->
     <string name="tap_to_configure" msgid="1181356242354390930">"Pieskarieties, lai iestatītu"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"Lai skat. sarunas, sinhr. šo mapi."</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sinhronizēt mapi"</string>

diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index c515c94..47cd961 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml

@@ -26,10 +26,8 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Lampirkan fail"</string>
-    <!-- no translation found for add_photo_attachment (8548176514426323119) -->
-    <skip />
-    <!-- no translation found for add_video_attachment (4284457799113546464) -->
-    <skip />
+    <string name="add_photo_attachment" msgid="8548176514426323119">"Lampirkan Gambar"</string>
+    <string name="add_video_attachment" msgid="4284457799113546464">"Lampirkan Video"</string>
     <string name="save_draft" msgid="5555744208032445632">"Simpan draf"</string>
     <string name="discard" msgid="1714960202994370243">"Buang"</string>
     <string name="compose" msgid="1473559896062432878">"Karang"</string>
@@ -204,8 +202,10 @@
     <item quantity="one" msgid="7361303622131552596">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dilaporkan sebagai bukan spam."</item>
     <item quantity="other" msgid="2250720080221922267">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dilaporkan sebagai bukan spam."</item>
   </plurals>
-    <!-- no translation found for conversation_not_important:one (788387259924027833) -->
-    <!-- no translation found for conversation_not_important:other (6662213740575340397) -->
+  <plurals name="conversation_not_important">
+    <item quantity="one" msgid="788387259924027833">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ditandakan tidak penting."</item>
+    <item quantity="other" msgid="6662213740575340397">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ditandakan tidak penting."</item>
+  </plurals>
   <plurals name="conversation_phished">
     <item quantity="one" msgid="5386916574432049235">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dilaporkan sebagai pancingan data."</item>
     <item quantity="other" msgid="3678624994662639442">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dilaporkan sebagai pancingan data."</item>
@@ -283,8 +283,7 @@
     <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt;"</string>
     <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt; melalui <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Mesej disimpan sebagai draf."</string>
-    <!-- no translation found for sending_message (2822171587017313151) -->
-    <skip />
+    <string name="sending_message" msgid="2822171587017313151">"Menghantar mesej kepada peti keluar..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Alamat <xliff:g id="WRONGEMAIL">%s</xliff:g> tidak sah."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Tunjukkan teks yang dipetik"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Sembunyikan teks yang dipetik"</string>
@@ -300,14 +299,7 @@
     <string name="cancel" msgid="8762981157252199115">"Batal"</string>
     <string name="close" msgid="419945428844076406">"Tutup"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Tiada folder ditetapkan untuk akaun ini."</string>
-  <string-array name="sync_status">
-    <item msgid="2446076619901049026">"Berjaya"</item>
-    <item msgid="7109065688039971961">"Tiada sambungan."</item>
-    <item msgid="8437496123716232060">"Tidak dapat melog masuk."</item>
-    <item msgid="1651266301325684887">"Ralat keselamatan."</item>
-    <item msgid="1461520171154288533">"Tidak dapat menyegerakkan."</item>
-    <item msgid="8749857841162829469">"Ralat"</item>
-  </string-array>
+    <!-- no translation found for sync_status:5 (4779810016424303449) -->
     <string name="tap_to_configure" msgid="1181356242354390930">"Sentuh untuk menyediakan"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"Untuk melihat perbualan, segerakkan folder ini."</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Segerak Folder"</string>

diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 1e9755a..94d2290 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml

@@ -148,8 +148,7 @@
     <item quantity="one" msgid="3657821200245019288">"Flytt samtale"</item>
     <item quantity="other" msgid="1685896770174368261">"Flytt <xliff:g id="ID_1">%1$d</xliff:g> samtaler"</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> sendte <xliff:g id="SUBJECT">%2$s</xliff:g> <xliff:g id="DATE">%3$s</xliff:g>"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -300,14 +299,7 @@
     <string name="cancel" msgid="8762981157252199115">"Avbryt"</string>
     <string name="close" msgid="419945428844076406">"Lukk"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Ingen mapper er angitt for denne kontoen."</string>
-  <string-array name="sync_status">
-    <item msgid="2446076619901049026">"Fullført"</item>
-    <item msgid="7109065688039971961">"Ingen tilkobling."</item>
-    <item msgid="8437496123716232060">"Påloggingen mislyktes."</item>
-    <item msgid="1651266301325684887">"Sikkerhetsfeil."</item>
-    <item msgid="1461520171154288533">"Synkroniseringen mislyktes."</item>
-    <item msgid="8749857841162829469">"Feil"</item>
-  </string-array>
+    <!-- no translation found for sync_status:5 (4779810016424303449) -->
     <string name="tap_to_configure" msgid="1181356242354390930">"Trykk for å konfigurere"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"Synkroniser denne mappen for å se samtaler."</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Synkroniser mappen"</string>

diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 07ea222..5e56ba8 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml

@@ -148,8 +148,7 @@
     <item quantity="one" msgid="3657821200245019288">"Conversatie verplaatsen"</item>
     <item quantity="other" msgid="1685896770174368261">"<xliff:g id="ID_1">%1$d</xliff:g> conversaties verplaatsen"</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> heeft <xliff:g id="SUBJECT">%2$s</xliff:g> verzonden op <xliff:g id="DATE">%3$s</xliff:g>"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -306,7 +305,7 @@
     <item msgid="8437496123716232060">"Kan niet aanmelden."</item>
     <item msgid="1651266301325684887">"Beveiligingsfout."</item>
     <item msgid="1461520171154288533">"Kan niet synchroniseren."</item>
-    <item msgid="8749857841162829469">"Fout"</item>
+    <item msgid="4779810016424303449">"Interne fout"</item>
   </string-array>
     <string name="tap_to_configure" msgid="1181356242354390930">"Raak aan om in te stellen"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"Synchroniseer deze map om conversaties weer te geven."</string>

diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 17a61a3..6188da5 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml

@@ -26,10 +26,8 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Załącz plik"</string>
-    <!-- no translation found for add_photo_attachment (8548176514426323119) -->
-    <skip />
-    <!-- no translation found for add_video_attachment (4284457799113546464) -->
-    <skip />
+    <string name="add_photo_attachment" msgid="8548176514426323119">"Dołącz zdjęcie"</string>
+    <string name="add_video_attachment" msgid="4284457799113546464">"Dołącz film"</string>
     <string name="save_draft" msgid="5555744208032445632">"Zapisz wersję roboczą"</string>
     <string name="discard" msgid="1714960202994370243">"Odrzuć"</string>
     <string name="compose" msgid="1473559896062432878">"Utwórz"</string>
@@ -148,8 +146,7 @@
     <item quantity="one" msgid="3657821200245019288">"Przenieś wątek"</item>
     <item quantity="other" msgid="1685896770174368261">"Przenieś <xliff:g id="ID_1">%1$d</xliff:g> wątki(ów)"</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> wysłał(a) <xliff:g id="SUBJECT">%2$s</xliff:g> <xliff:g id="DATE">%3$s</xliff:g>"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -203,8 +200,10 @@
     <item quantity="one" msgid="7361303622131552596">"Zgłoszone jako nie spam: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
     <item quantity="other" msgid="2250720080221922267">"Zgłoszone jako nie spam: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
   </plurals>
-    <!-- no translation found for conversation_not_important:one (788387259924027833) -->
-    <!-- no translation found for conversation_not_important:other (6662213740575340397) -->
+  <plurals name="conversation_not_important">
+    <item quantity="one" msgid="788387259924027833">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; oznaczono jako mało ważny."</item>
+    <item quantity="other" msgid="6662213740575340397">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; oznaczono jako mało ważny."</item>
+  </plurals>
   <plurals name="conversation_phished">
     <item quantity="one" msgid="5386916574432049235">"Zgłoszone jako wyłudzanie informacji: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
     <item quantity="other" msgid="3678624994662639442">"Zgłoszone jako wyłudzanie informacji: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
@@ -282,8 +281,7 @@
     <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt;"</string>
     <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt; przez <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Wiadomość została zapisana jako wersja robocza."</string>
-    <!-- no translation found for sending_message (2822171587017313151) -->
-    <skip />
+    <string name="sending_message" msgid="2822171587017313151">"Wysyłam wiadomość do skrzynki nadawczej…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Adres <xliff:g id="WRONGEMAIL">%s</xliff:g> jest nieprawidłowy."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Pokaż cytowany tekst"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Ukryj cytowany tekst"</string>
@@ -299,14 +297,7 @@
     <string name="cancel" msgid="8762981157252199115">"Anuluj"</string>
     <string name="close" msgid="419945428844076406">"Zamknij"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Dla tego konta nie ustawiono żadnych folderów."</string>
-  <string-array name="sync_status">
-    <item msgid="2446076619901049026">"Udało się"</item>
-    <item msgid="7109065688039971961">"Brak połączenia."</item>
-    <item msgid="8437496123716232060">"Nie można się zalogować."</item>
-    <item msgid="1651266301325684887">"Błąd zabezpieczeń."</item>
-    <item msgid="1461520171154288533">"Błąd synchronizacji."</item>
-    <item msgid="8749857841162829469">"Błąd"</item>
-  </string-array>
+    <!-- no translation found for sync_status:5 (4779810016424303449) -->
     <string name="tap_to_configure" msgid="1181356242354390930">"Kliknij, by skonfigurować"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"Aby wyświetlić rozmowy, zsynchronizuj ten folder."</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Synchronizuj folder"</string>

diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 3fd8f6b..09d047f 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml

@@ -148,8 +148,7 @@
     <item quantity="one" msgid="3657821200245019288">"Mover conversa"</item>
     <item quantity="other" msgid="1685896770174368261">"Mover <xliff:g id="ID_1">%1$d</xliff:g> conversas"</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> enviou <xliff:g id="SUBJECT">%2$s</xliff:g> em <xliff:g id="DATE">%3$s</xliff:g>"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -300,14 +299,7 @@
     <string name="cancel" msgid="8762981157252199115">"Cancelar"</string>
     <string name="close" msgid="419945428844076406">"Fechar"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Não foram definidas pastas para esta conta."</string>
-  <string-array name="sync_status">
-    <item msgid="2446076619901049026">"Êxito"</item>
-    <item msgid="7109065688039971961">"Sem ligação."</item>
-    <item msgid="8437496123716232060">"Não foi possível iniciar sessão."</item>
-    <item msgid="1651266301325684887">"Erro de segurança"</item>
-    <item msgid="1461520171154288533">"Não foi possível sincronizar."</item>
-    <item msgid="8749857841162829469">"Erro"</item>
-  </string-array>
+    <!-- no translation found for sync_status:5 (4779810016424303449) -->
     <string name="tap_to_configure" msgid="1181356242354390930">"Toque para configurar"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"Para ver as conversas, sincronize esta pasta."</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sincronizar Pasta"</string>

diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 0deefe4..429ceca 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml

@@ -26,10 +26,8 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Anexar arquivo"</string>
-    <!-- no translation found for add_photo_attachment (8548176514426323119) -->
-    <skip />
-    <!-- no translation found for add_video_attachment (4284457799113546464) -->
-    <skip />
+    <string name="add_photo_attachment" msgid="8548176514426323119">"Anexar imagem"</string>
+    <string name="add_video_attachment" msgid="4284457799113546464">"Anexar vídeo"</string>
     <string name="save_draft" msgid="5555744208032445632">"Salvar rascunho"</string>
     <string name="discard" msgid="1714960202994370243">"Descartar"</string>
     <string name="compose" msgid="1473559896062432878">"Escrever"</string>
@@ -150,8 +148,7 @@
     <item quantity="one" msgid="3657821200245019288">"Mover conversa"</item>
     <item quantity="other" msgid="1685896770174368261">"Mover <xliff:g id="ID_1">%1$d</xliff:g> conversas"</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> enviou <xliff:g id="SUBJECT">%2$s</xliff:g> em <xliff:g id="DATE">%3$s</xliff:g>"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -205,8 +202,10 @@
     <item quantity="one" msgid="7361303622131552596">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; marcada como não sendo spam."</item>
     <item quantity="other" msgid="2250720080221922267">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; marcadas como não sendo spam."</item>
   </plurals>
-    <!-- no translation found for conversation_not_important:one (788387259924027833) -->
-    <!-- no translation found for conversation_not_important:other (6662213740575340397) -->
+  <plurals name="conversation_not_important">
+    <item quantity="one" msgid="788387259924027833">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; marcada como não importante."</item>
+    <item quantity="other" msgid="6662213740575340397">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; marcadas como não importantes."</item>
+  </plurals>
   <plurals name="conversation_phished">
     <item quantity="one" msgid="5386916574432049235">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; denunciada como phishing."</item>
     <item quantity="other" msgid="3678624994662639442">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; denunciadas como phishing."</item>
@@ -284,8 +283,7 @@
     <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt;"</string>
     <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt; por <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Mensagem salva como rascunho."</string>
-    <!-- no translation found for sending_message (2822171587017313151) -->
-    <skip />
+    <string name="sending_message" msgid="2822171587017313151">"Enviando a mensagem para a caixa de saída..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"O endereço <xliff:g id="WRONGEMAIL">%s</xliff:g> é inválido."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Exibir texto das mensagens anteriores"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Ocultar texto das mensagens anteriores"</string>
@@ -301,14 +299,7 @@
     <string name="cancel" msgid="8762981157252199115">"Cancelar"</string>
     <string name="close" msgid="419945428844076406">"Fechar"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Nenhuma pasta foi definida para esta conta."</string>
-  <string-array name="sync_status">
-    <item msgid="2446076619901049026">"Êxito"</item>
-    <item msgid="7109065688039971961">"Sem conexão."</item>
-    <item msgid="8437496123716232060">"Falha ao fazer login."</item>
-    <item msgid="1651266301325684887">"Erro de segurança."</item>
-    <item msgid="1461520171154288533">"Não foi possível sincronizar."</item>
-    <item msgid="8749857841162829469">"Erro"</item>
-  </string-array>
+    <!-- no translation found for sync_status:5 (4779810016424303449) -->
     <string name="tap_to_configure" msgid="1181356242354390930">"Toque para configurar"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"Para ver as conversações, sincronize esta pasta."</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sincronizar pasta"</string>

diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index d22ac70..3d2c97c 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml

@@ -434,7 +434,7 @@
     <!-- no translation found for sync_status:2 (8437496123716232060) -->
     <!-- no translation found for sync_status:3 (1651266301325684887) -->
     <!-- no translation found for sync_status:4 (1461520171154288533) -->
-    <!-- no translation found for sync_status:5 (8749857841162829469) -->
+    <!-- no translation found for sync_status:5 (4779810016424303449) -->
     <!-- no translation found for tap_to_configure (1181356242354390930) -->
     <skip />
     <!-- no translation found for non_synced_folder_description (6059194125558004080) -->

diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 5c8ed34..82cd916 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml

@@ -26,10 +26,8 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Ataşaţi un fişier"</string>
-    <!-- no translation found for add_photo_attachment (8548176514426323119) -->
-    <skip />
-    <!-- no translation found for add_video_attachment (4284457799113546464) -->
-    <skip />
+    <string name="add_photo_attachment" msgid="8548176514426323119">"Ataşaţi o fotografie"</string>
+    <string name="add_video_attachment" msgid="4284457799113546464">"Ataşaţi un videoclip"</string>
     <string name="save_draft" msgid="5555744208032445632">"Salvaţi mesajul nefinal."</string>
     <string name="discard" msgid="1714960202994370243">"Renunţaţi"</string>
     <string name="compose" msgid="1473559896062432878">"Scrieţi"</string>
@@ -150,8 +148,7 @@
     <item quantity="one" msgid="3657821200245019288">"Mutaţi conversaţia"</item>
     <item quantity="other" msgid="1685896770174368261">"Mutaţi <xliff:g id="ID_1">%1$d</xliff:g> (de) conversaţii"</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> a trimis <xliff:g id="SUBJECT">%2$s</xliff:g> pe <xliff:g id="DATE">%3$s</xliff:g>"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>] <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -205,8 +202,10 @@
     <item quantity="one" msgid="7361303622131552596">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; a fost raportată că nu este spam."</item>
     <item quantity="other" msgid="2250720080221922267">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; au fost raportate că nu sunt spam."</item>
   </plurals>
-    <!-- no translation found for conversation_not_important:one (788387259924027833) -->
-    <!-- no translation found for conversation_not_important:other (6662213740575340397) -->
+  <plurals name="conversation_not_important">
+    <item quantity="one" msgid="788387259924027833">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; a fost marcată ca neimportantă."</item>
+    <item quantity="other" msgid="6662213740575340397">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; au fost marcate ca neimportante."</item>
+  </plurals>
   <plurals name="conversation_phished">
     <item quantity="one" msgid="5386916574432049235">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; a fost raportată ca phishing."</item>
     <item quantity="other" msgid="3678624994662639442">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; au fost raportate ca phishing."</item>
@@ -284,8 +283,7 @@
     <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt;"</string>
     <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt; prin <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Mesaj salvat ca mesaj nefinalizat."</string>
-    <!-- no translation found for sending_message (2822171587017313151) -->
-    <skip />
+    <string name="sending_message" msgid="2822171587017313151">"Se trimite mesajul în Mesaje de trimis…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Adresa <xliff:g id="WRONGEMAIL">%s</xliff:g> este nevalidă."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Afişaţi textul citat"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Ascundeţi textul citat"</string>
@@ -301,14 +299,7 @@
     <string name="cancel" msgid="8762981157252199115">"Anulaţi"</string>
     <string name="close" msgid="419945428844076406">"Închideţi"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Pentru acest cont nu a fost setat niciun dosar."</string>
-  <string-array name="sync_status">
-    <item msgid="2446076619901049026">"Finalizat"</item>
-    <item msgid="7109065688039971961">"Nicio conexiune."</item>
-    <item msgid="8437496123716232060">"Conectarea a eşuat."</item>
-    <item msgid="1651266301325684887">"Eroare de securitate."</item>
-    <item msgid="1461520171154288533">"Sincronizarea a eşuat."</item>
-    <item msgid="8749857841162829469">"Eroare"</item>
-  </string-array>
+    <!-- no translation found for sync_status:5 (4779810016424303449) -->
     <string name="tap_to_configure" msgid="1181356242354390930">"Atingeţi pentru a configura"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"Pentru a afişa conversaţiile, sincronizaţi acest dosar."</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sincronizaţi dosarul"</string>

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 4a93aa6..7bb6de7 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml

@@ -26,10 +26,8 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Прикрепить файл"</string>
-    <!-- no translation found for add_photo_attachment (8548176514426323119) -->
-    <skip />
-    <!-- no translation found for add_video_attachment (4284457799113546464) -->
-    <skip />
+    <string name="add_photo_attachment" msgid="8548176514426323119">"Прикрепить фото"</string>
+    <string name="add_video_attachment" msgid="4284457799113546464">"Прикрепить видео"</string>
     <string name="save_draft" msgid="5555744208032445632">"Сохранить черновик"</string>
     <string name="discard" msgid="1714960202994370243">"Закрыть"</string>
     <string name="compose" msgid="1473559896062432878">"Написать"</string>
@@ -150,8 +148,7 @@
     <item quantity="one" msgid="3657821200245019288">"Переместить цепочку"</item>
     <item quantity="other" msgid="1685896770174368261">"Переместить цепочки (<xliff:g id="ID_1">%1$d</xliff:g>)"</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"Отправитель: <xliff:g id="SENDER">%1$s</xliff:g>; тема: <xliff:g id="SUBJECT">%2$s</xliff:g>; дата: <xliff:g id="DATE">%3$s</xliff:g>"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -205,8 +202,10 @@
     <item quantity="one" msgid="7361303622131552596">"Цепочек, помеченных как спам: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
     <item quantity="other" msgid="2250720080221922267">"Цепочек, помеченных как нужные: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
   </plurals>
-    <!-- no translation found for conversation_not_important:one (788387259924027833) -->
-    <!-- no translation found for conversation_not_important:other (6662213740575340397) -->
+  <plurals name="conversation_not_important">
+    <item quantity="one" msgid="788387259924027833">"Цепочек, помеченных как неважные: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="other" msgid="6662213740575340397">"Цепочек, помеченных как неважные: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+  </plurals>
   <plurals name="conversation_phished">
     <item quantity="one" msgid="5386916574432049235">"Цепочек, помеченных как фишинг: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
     <item quantity="other" msgid="3678624994662639442">"Цепочек, помеченных как фишинг: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
@@ -284,8 +283,7 @@
     <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt;"</string>
     <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt; из домена <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Черновик сообщения сохранен."</string>
-    <!-- no translation found for sending_message (2822171587017313151) -->
-    <skip />
+    <string name="sending_message" msgid="2822171587017313151">"Отправка сообщения в исходящие…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Недействительный адрес: <xliff:g id="WRONGEMAIL">%s</xliff:g>."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Показать цитируемый текст"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Скрыть цитируемый текст"</string>
@@ -301,14 +299,7 @@
     <string name="cancel" msgid="8762981157252199115">"Отмена"</string>
     <string name="close" msgid="419945428844076406">"Закрыть"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"В этом аккаунте нет папок."</string>
-  <string-array name="sync_status">
-    <item msgid="2446076619901049026">"Без ошибок"</item>
-    <item msgid="7109065688039971961">"Нет соединения"</item>
-    <item msgid="8437496123716232060">"Не удалось войти"</item>
-    <item msgid="1651266301325684887">"Ошибка системы безопасности"</item>
-    <item msgid="1461520171154288533">"Ошибка синхронизации"</item>
-    <item msgid="8749857841162829469">"Ошибка"</item>
-  </string-array>
+    <!-- no translation found for sync_status:5 (4779810016424303449) -->
     <string name="tap_to_configure" msgid="1181356242354390930">"Нажмите для настройки"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"Для просмотра цепочек писем синхронизируйте эту папку."</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Синхронизировать папку"</string>

diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 596af08..48c03c6 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml

@@ -148,8 +148,7 @@
     <item quantity="one" msgid="3657821200245019288">"Presunúť konverzáciu"</item>
     <item quantity="other" msgid="1685896770174368261">"Presunúť konverzácie (počet: <xliff:g id="ID_1">%1$d</xliff:g>)"</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"Používateľ <xliff:g id="SENDER">%1$s</xliff:g> dňa <xliff:g id="DATE">%3$s</xliff:g> poslal správu <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -300,14 +299,7 @@
     <string name="cancel" msgid="8762981157252199115">"Zrušiť"</string>
     <string name="close" msgid="419945428844076406">"Zavrieť"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Pre tento účet neboli nastavené žiadne priečinky."</string>
-  <string-array name="sync_status">
-    <item msgid="2446076619901049026">"Úspech"</item>
-    <item msgid="7109065688039971961">"Žiadne pripojenie."</item>
-    <item msgid="8437496123716232060">"Nepodarilo sa prihlásiť."</item>
-    <item msgid="1651266301325684887">"Chyba zabezpečenia."</item>
-    <item msgid="1461520171154288533">"Nepodarilo sa synchronizovať."</item>
-    <item msgid="8749857841162829469">"Chyba"</item>
-  </string-array>
+    <!-- no translation found for sync_status:5 (4779810016424303449) -->
     <string name="tap_to_configure" msgid="1181356242354390930">"Klepnutím nastavte"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"Zobr. konverz., synchr. priečinok."</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Synchronizovať priečinok"</string>

diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index d5de7c7..45408ed 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml

@@ -26,10 +26,8 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Priloži datoteko"</string>
-    <!-- no translation found for add_photo_attachment (8548176514426323119) -->
-    <skip />
-    <!-- no translation found for add_video_attachment (4284457799113546464) -->
-    <skip />
+    <string name="add_photo_attachment" msgid="8548176514426323119">"Priložite sliko"</string>
+    <string name="add_video_attachment" msgid="4284457799113546464">"Priložite videoposnetek"</string>
     <string name="save_draft" msgid="5555744208032445632">"Shrani osnutek"</string>
     <string name="discard" msgid="1714960202994370243">"Zavrzi"</string>
     <string name="compose" msgid="1473559896062432878">"Novo"</string>
@@ -150,8 +148,7 @@
     <item quantity="one" msgid="3657821200245019288">"Premakni pogovor"</item>
     <item quantity="other" msgid="1685896770174368261">"Premakni toliko pogovorov: <xliff:g id="ID_1">%1$d</xliff:g>."</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"Oseba <xliff:g id="SENDER">%1$s</xliff:g> je poslala <xliff:g id="SUBJECT">%2$s</xliff:g> dne <xliff:g id="DATE">%3$s</xliff:g>"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -205,8 +202,10 @@
     <item quantity="one" msgid="7361303622131552596">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; pogovor je bil prijavljen kot neželen."</item>
     <item quantity="other" msgid="2250720080221922267">"Št. pogovorov, prijavljenih kot neželenih: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
   </plurals>
-    <!-- no translation found for conversation_not_important:one (788387259924027833) -->
-    <!-- no translation found for conversation_not_important:other (6662213740575340397) -->
+  <plurals name="conversation_not_important">
+    <item quantity="one" msgid="788387259924027833">"Označeno kot nepomembno: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="other" msgid="6662213740575340397">"Označeno kot pomembno: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+  </plurals>
   <plurals name="conversation_phished">
     <item quantity="one" msgid="5386916574432049235">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; pogovor je bil prijavljen kot lažno predstavljanje."</item>
     <item quantity="other" msgid="3678624994662639442">"Št. pogovorov, prijavljenih kot lažno predstavljanje: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
@@ -284,8 +283,7 @@
     <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt;"</string>
     <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt; prek <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Sporočilo shranjeno kot osnutek."</string>
-    <!-- no translation found for sending_message (2822171587017313151) -->
-    <skip />
+    <string name="sending_message" msgid="2822171587017313151">"Pošiljanje sporočil v mapo Odpošlji ..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Naslov <xliff:g id="WRONGEMAIL">%s</xliff:g> je neveljaven."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Pokaži citirano besedilo"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Skrij citirano besedilo"</string>
@@ -307,7 +305,7 @@
     <item msgid="8437496123716232060">"Prijava ni mogoča."</item>
     <item msgid="1651266301325684887">"Varnostna napaka."</item>
     <item msgid="1461520171154288533">"Sinhroniziranje ni mogoče."</item>
-    <item msgid="8749857841162829469">"Napaka"</item>
+    <item msgid="4779810016424303449">"Notranja napaka"</item>
   </string-array>
     <string name="tap_to_configure" msgid="1181356242354390930">"Dotaknite se za nastavitev"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"Če si želite ogledati pogovore, sinhronizirajte to mapo."</string>

diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index daa986e..dba7e64 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml

@@ -148,8 +148,7 @@
     <item quantity="one" msgid="3657821200245019288">"Премести преписку"</item>
     <item quantity="other" msgid="1685896770174368261">"Премести преписке (<xliff:g id="ID_1">%1$d</xliff:g>)"</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> је послао/ла <xliff:g id="SUBJECT">%2$s</xliff:g> <xliff:g id="DATE">%3$s</xliff:g>"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>] <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -300,14 +299,7 @@
     <string name="cancel" msgid="8762981157252199115">"Откажи"</string>
     <string name="close" msgid="419945428844076406">"Затвори"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Нису подешени директоријуми за овај налог."</string>
-  <string-array name="sync_status">
-    <item msgid="2446076619901049026">"Успешно"</item>
-    <item msgid="7109065688039971961">"Веза није успостављена."</item>
-    <item msgid="8437496123716232060">"Пријављивање није могуће."</item>
-    <item msgid="1651266301325684887">"Безбедносна грешка."</item>
-    <item msgid="1461520171154288533">"Синхронизација није могућа."</item>
-    <item msgid="8749857841162829469">"Грешка"</item>
-  </string-array>
+    <!-- no translation found for sync_status:5 (4779810016424303449) -->
     <string name="tap_to_configure" msgid="1181356242354390930">"Додирните да бисте подесили"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"Да бисте прегледали преписке, синхронизујте директоријум."</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Синхронизуј директоријум"</string>

diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 2c7d849..24a0d64 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml

@@ -148,8 +148,7 @@
     <item quantity="one" msgid="3657821200245019288">"Flytta konversation"</item>
     <item quantity="other" msgid="1685896770174368261">"Flytta <xliff:g id="ID_1">%1$d</xliff:g> konversationer"</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> skickade <xliff:g id="SUBJECT">%2$s</xliff:g> den <xliff:g id="DATE">%3$s</xliff:g>"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -306,7 +305,7 @@
     <item msgid="8437496123716232060">"Det gick inte att logga in"</item>
     <item msgid="1651266301325684887">"Säkerhetsfel."</item>
     <item msgid="1461520171154288533">"Det gick inte att synkronisera."</item>
-    <item msgid="8749857841162829469">"Fel"</item>
+    <item msgid="4779810016424303449">"Internt fel"</item>
   </string-array>
     <string name="tap_to_configure" msgid="1181356242354390930">"Tryck om du vill konfigurera"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"Synka för att visa konversationer."</string>

diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index c0e1a21..852d4d7 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml

@@ -148,8 +148,7 @@
     <item quantity="one" msgid="3657821200245019288">"Hamisha mazungumzo"</item>
     <item quantity="other" msgid="1685896770174368261">"Hamisha mazungumzo <xliff:g id="ID_1">%1$d</xliff:g>"</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> ilitumwa <xliff:g id="SUBJECT">%2$s</xliff:g> mnamo <xliff:g id="DATE">%3$s</xliff:g>"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> - <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -306,7 +305,7 @@
     <item msgid="8437496123716232060">"Haikuweza kuingia"</item>
     <item msgid="1651266301325684887">"Hitilafu ya usalama."</item>
     <item msgid="1461520171154288533">"Haikuweza kulandanisha."</item>
-    <item msgid="8749857841162829469">"Hitilafu"</item>
+    <item msgid="4779810016424303449">"Hitilafu ya Ndani"</item>
   </string-array>
     <string name="tap_to_configure" msgid="1181356242354390930">"Gusa ili kusanidi"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"Ili kuona mazungumzo, landanisha folda hii."</string>

diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 831a38d..e072578 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml

@@ -26,10 +26,8 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"แนบไฟล์"</string>
-    <!-- no translation found for add_photo_attachment (8548176514426323119) -->
-    <skip />
-    <!-- no translation found for add_video_attachment (4284457799113546464) -->
-    <skip />
+    <string name="add_photo_attachment" msgid="8548176514426323119">"แนบรูปภาพ"</string>
+    <string name="add_video_attachment" msgid="4284457799113546464">"แนบวิดีโอ"</string>
     <string name="save_draft" msgid="5555744208032445632">"บันทึกร่างจดหมาย"</string>
     <string name="discard" msgid="1714960202994370243">"ยกเลิก"</string>
     <string name="compose" msgid="1473559896062432878">"เขียน"</string>
@@ -150,8 +148,7 @@
     <item quantity="one" msgid="3657821200245019288">"ย้ายการสนทนา"</item>
     <item quantity="other" msgid="1685896770174368261">"ย้ายการสนทนา <xliff:g id="ID_1">%1$d</xliff:g> รายการ"</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> ส่ง <xliff:g id="SUBJECT">%2$s</xliff:g> เมื่อวันที่ <xliff:g id="DATE">%3$s</xliff:g>"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -205,8 +202,10 @@
     <item quantity="one" msgid="7361303622131552596">"ได้รับการรายงานว่าไม่ใช่สแปม &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; รายการ"</item>
     <item quantity="other" msgid="2250720080221922267">"ได้รับการรายงานว่าไม่ใช่สแปม &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; รายการ"</item>
   </plurals>
-    <!-- no translation found for conversation_not_important:one (788387259924027833) -->
-    <!-- no translation found for conversation_not_important:other (6662213740575340397) -->
+  <plurals name="conversation_not_important">
+    <item quantity="one" msgid="788387259924027833">"ทำเครื่องหมายว่าไม่สำคัญ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; รายการ"</item>
+    <item quantity="other" msgid="6662213740575340397">"ทำเครื่องหมายว่าไม่สำคัญ &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; รายการ"</item>
+  </plurals>
   <plurals name="conversation_phished">
     <item quantity="one" msgid="5386916574432049235">"ได้รับการรายงานว่าเป็นฟิชชิง &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; รายการ"</item>
     <item quantity="other" msgid="3678624994662639442">"ได้รับการรายงานว่าเป็นฟิชชิง &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; รายการ"</item>
@@ -284,8 +283,7 @@
     <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt;"</string>
     <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt; ผ่าน <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"บันทึกข้อความเป็นร่างจดหมาย"</string>
-    <!-- no translation found for sending_message (2822171587017313151) -->
-    <skip />
+    <string name="sending_message" msgid="2822171587017313151">"กำลังส่งข้อความไปที่กล่องจดหมายออก…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"ที่อยู่ <xliff:g id="WRONGEMAIL">%s</xliff:g> ไม่ถูกต้อง"</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ แสดงข้อความที่ยกมา"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ ซ่อนข้อความที่ยกมา"</string>
@@ -301,14 +299,7 @@
     <string name="cancel" msgid="8762981157252199115">"ยกเลิก"</string>
     <string name="close" msgid="419945428844076406">"ปิด"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"ไม่ได้กำหนดโฟลเดอร์ใดไว้สำหรับบัญชีนี้"</string>
-  <string-array name="sync_status">
-    <item msgid="2446076619901049026">"สำเร็จ"</item>
-    <item msgid="7109065688039971961">"ไม่มีการเชื่อมต่อ"</item>
-    <item msgid="8437496123716232060">"ไม่สามารถลงชื่อเข้าใช้"</item>
-    <item msgid="1651266301325684887">"ข้อผิดพลาดเกี่ยวกับความปลอดภัย"</item>
-    <item msgid="1461520171154288533">"ไม่สามารถซิงค์"</item>
-    <item msgid="8749857841162829469">"ข้อผิดพลาด"</item>
-  </string-array>
+    <!-- no translation found for sync_status:5 (4779810016424303449) -->
     <string name="tap_to_configure" msgid="1181356242354390930">"แตะเพื่อตั้งค่า"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"ในการดูการสนทนา ให้ซิงค์โฟลเดอร์นี้"</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"ซิงค์โฟลเดอร์"</string>

diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index bf7bbad..71a7c1d 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml

@@ -26,10 +26,8 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Mag-attach ng file"</string>
-    <!-- no translation found for add_photo_attachment (8548176514426323119) -->
-    <skip />
-    <!-- no translation found for add_video_attachment (4284457799113546464) -->
-    <skip />
+    <string name="add_photo_attachment" msgid="8548176514426323119">"Mag-attach Larawan"</string>
+    <string name="add_video_attachment" msgid="4284457799113546464">"Mag-attach ng Video"</string>
     <string name="save_draft" msgid="5555744208032445632">"I-save ang draft"</string>
     <string name="discard" msgid="1714960202994370243">"Itapon"</string>
     <string name="compose" msgid="1473559896062432878">"Bumuo"</string>
@@ -150,8 +148,7 @@
     <item quantity="one" msgid="3657821200245019288">"Ilipat ang pag-uusap"</item>
     <item quantity="other" msgid="1685896770174368261">"Ilipat ang <xliff:g id="ID_1">%1$d</xliff:g> (na) pag-uusap"</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"Ipinadala ni <xliff:g id="SENDER">%1$s</xliff:g> ang <xliff:g id="SUBJECT">%2$s</xliff:g> noong <xliff:g id="DATE">%3$s</xliff:g>"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -205,8 +202,10 @@
     <item quantity="one" msgid="7361303622131552596">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ang iniulat bilang hindi spam."</item>
     <item quantity="other" msgid="2250720080221922267">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ang iniulat bilang hindi spam."</item>
   </plurals>
-    <!-- no translation found for conversation_not_important:one (788387259924027833) -->
-    <!-- no translation found for conversation_not_important:other (6662213740575340397) -->
+  <plurals name="conversation_not_important">
+    <item quantity="one" msgid="788387259924027833">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ang minarkahang hindi mahalaga."</item>
+    <item quantity="other" msgid="6662213740575340397">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ang minarkahang hindi mahalaga."</item>
+  </plurals>
   <plurals name="conversation_phished">
     <item quantity="one" msgid="5386916574432049235">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ang iniulat bilang phishing."</item>
     <item quantity="other" msgid="3678624994662639442">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ang iniulat bilang phishing."</item>
@@ -284,8 +283,7 @@
     <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt;"</string>
     <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt; gmit <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Na-save ang mensahe bilang draft."</string>
-    <!-- no translation found for sending_message (2822171587017313151) -->
-    <skip />
+    <string name="sending_message" msgid="2822171587017313151">"Ipinapadala ang mensahe sa outbox…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Ang address na <xliff:g id="WRONGEMAIL">%s</xliff:g> ay di-wasto."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Ipakita ang kasamang teksto"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Itago ang kasamang teksto"</string>
@@ -301,14 +299,7 @@
     <string name="cancel" msgid="8762981157252199115">"Kanselahin"</string>
     <string name="close" msgid="419945428844076406">"Isara"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Walang mga folder na naitakda para sa account na ito."</string>
-  <string-array name="sync_status">
-    <item msgid="2446076619901049026">"Tagumpay"</item>
-    <item msgid="7109065688039971961">"Walang koneksyon."</item>
-    <item msgid="8437496123716232060">"Hindi makapag-sign in."</item>
-    <item msgid="1651266301325684887">"Error sa seguridad."</item>
-    <item msgid="1461520171154288533">"Hindi makapag-sync."</item>
-    <item msgid="8749857841162829469">"Error"</item>
-  </string-array>
+    <!-- no translation found for sync_status:5 (4779810016424303449) -->
     <string name="tap_to_configure" msgid="1181356242354390930">"Pindutin upang i-set up"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"Para tingin pag-uusap, sync folder."</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"I-sync ang Folder"</string>

diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index b3c0d6b..6b3c107 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml

@@ -148,8 +148,7 @@
     <item quantity="one" msgid="3657821200245019288">"İleti dizisini taşı"</item>
     <item quantity="other" msgid="1685896770174368261">"<xliff:g id="ID_1">%1$d</xliff:g> ileti dizisini taşı"</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g>, <xliff:g id="SUBJECT">%2$s</xliff:g> konulu iletiyi <xliff:g id="DATE">%3$s</xliff:g> tarihinde gönderdi"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -300,14 +299,7 @@
     <string name="cancel" msgid="8762981157252199115">"İptal"</string>
     <string name="close" msgid="419945428844076406">"Kapat"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Bu hesap için hiçbir klasör ayarlanmamış."</string>
-  <string-array name="sync_status">
-    <item msgid="2446076619901049026">"Başarılı"</item>
-    <item msgid="7109065688039971961">"Bağlantı yok."</item>
-    <item msgid="8437496123716232060">"Oturum açılamadı."</item>
-    <item msgid="1651266301325684887">"Güvenlik hatası."</item>
-    <item msgid="1461520171154288533">"Senkronize edilemedi."</item>
-    <item msgid="8749857841162829469">"Hata"</item>
-  </string-array>
+    <!-- no translation found for sync_status:5 (4779810016424303449) -->
     <string name="tap_to_configure" msgid="1181356242354390930">"Kurulum için dokunun"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"İleti dizilerini görüntülemek için bu klasörü senk edin."</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Klasörü Senkronize Et"</string>

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index f47a967..354bde3 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml

@@ -26,10 +26,8 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Вкласти файл"</string>
-    <!-- no translation found for add_photo_attachment (8548176514426323119) -->
-    <skip />
-    <!-- no translation found for add_video_attachment (4284457799113546464) -->
-    <skip />
+    <string name="add_photo_attachment" msgid="8548176514426323119">"Вкласти фото"</string>
+    <string name="add_video_attachment" msgid="4284457799113546464">"Вкласти відео"</string>
     <string name="save_draft" msgid="5555744208032445632">"Зберегти як чернетку"</string>
     <string name="discard" msgid="1714960202994370243">"Закрити"</string>
     <string name="compose" msgid="1473559896062432878">"Написати"</string>
@@ -150,8 +148,7 @@
     <item quantity="one" msgid="3657821200245019288">"Перемістити бесіду"</item>
     <item quantity="other" msgid="1685896770174368261">"Перемістити бесід: <xliff:g id="ID_1">%1$d</xliff:g>"</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>, надіслано: <xliff:g id="DATE">%3$s</xliff:g>"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -205,8 +202,10 @@
     <item quantity="one" msgid="7361303622131552596">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; позначено як не спам."</item>
     <item quantity="other" msgid="2250720080221922267">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; позначено як не спам."</item>
   </plurals>
-    <!-- no translation found for conversation_not_important:one (788387259924027833) -->
-    <!-- no translation found for conversation_not_important:other (6662213740575340397) -->
+  <plurals name="conversation_not_important">
+    <item quantity="one" msgid="788387259924027833">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; позначено як неважливу."</item>
+    <item quantity="other" msgid="6662213740575340397">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; позначено як неважливі."</item>
+  </plurals>
   <plurals name="conversation_phished">
     <item quantity="one" msgid="5386916574432049235">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; позначено як фішинг."</item>
     <item quantity="other" msgid="3678624994662639442">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; позначено як фішинг."</item>
@@ -284,8 +283,7 @@
     <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt;"</string>
     <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt; через <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Повідомлення збережено як чернетку."</string>
-    <!-- no translation found for sending_message (2822171587017313151) -->
-    <skip />
+    <string name="sending_message" msgid="2822171587017313151">"Повідомлення надсилається в папку \"Вихідні\"…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Адреса <xliff:g id="WRONGEMAIL">%s</xliff:g> не дійсна."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Показати цитований текст"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Сховати цитований текст"</string>
@@ -307,7 +305,7 @@
     <item msgid="8437496123716232060">"Не вдалося ввійти."</item>
     <item msgid="1651266301325684887">"Помилка безпеки."</item>
     <item msgid="1461520171154288533">"Не вдалося синхронізувати."</item>
-    <item msgid="8749857841162829469">"Помилка"</item>
+    <item msgid="4779810016424303449">"Внутрішня помилка"</item>
   </string-array>
     <string name="tap_to_configure" msgid="1181356242354390930">"Торкніться, щоб налаштувати"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"Щоб переглядати бесіди, синхронізуйте цю папку."</string>

diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index d064575..7d5d829 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml

@@ -26,10 +26,8 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Đính kèm tệp"</string>
-    <!-- no translation found for add_photo_attachment (8548176514426323119) -->
-    <skip />
-    <!-- no translation found for add_video_attachment (4284457799113546464) -->
-    <skip />
+    <string name="add_photo_attachment" msgid="8548176514426323119">"Đính kèm ảnh"</string>
+    <string name="add_video_attachment" msgid="4284457799113546464">"Đính kèm video"</string>
     <string name="save_draft" msgid="5555744208032445632">"Lưu bản nháp"</string>
     <string name="discard" msgid="1714960202994370243">"Hủy"</string>
     <string name="compose" msgid="1473559896062432878">"Soạn thư"</string>
@@ -150,8 +148,7 @@
     <item quantity="one" msgid="3657821200245019288">"Di chuyển cuộc hội thoại"</item>
     <item quantity="other" msgid="1685896770174368261">"Di chuyển <xliff:g id="ID_1">%1$d</xliff:g> cuộc hội thoại"</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> đã gửi <xliff:g id="SUBJECT">%2$s</xliff:g> vào <xliff:g id="DATE">%3$s</xliff:g>"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -205,8 +202,10 @@
     <item quantity="one" msgid="7361303622131552596">"Đã báo cáo &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; không phải spam."</item>
     <item quantity="other" msgid="2250720080221922267">"Đã báo cáo &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; không phải spam."</item>
   </plurals>
-    <!-- no translation found for conversation_not_important:one (788387259924027833) -->
-    <!-- no translation found for conversation_not_important:other (6662213740575340397) -->
+  <plurals name="conversation_not_important">
+    <item quantity="one" msgid="788387259924027833">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; được đánh dấu là không quan trọng."</item>
+    <item quantity="other" msgid="6662213740575340397">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; được đánh dấu là không quan trọng."</item>
+  </plurals>
   <plurals name="conversation_phished">
     <item quantity="one" msgid="5386916574432049235">"Đã báo cáo &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; là lừa đảo."</item>
     <item quantity="other" msgid="3678624994662639442">"Đã báo cáo &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; là lừa đảo."</item>
@@ -284,8 +283,7 @@
     <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt;"</string>
     <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt; qua <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Tin nhắn đã được lưu dưới dạng tin nháp."</string>
-    <!-- no translation found for sending_message (2822171587017313151) -->
-    <skip />
+    <string name="sending_message" msgid="2822171587017313151">"Đang gửi thư tới hộp thư đi…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Địa chỉ <xliff:g id="WRONGEMAIL">%s</xliff:g> không hợp lệ."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Hiển thị văn bản được trích dẫn"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Ẩn văn bản được trích dẫn"</string>
@@ -301,14 +299,7 @@
     <string name="cancel" msgid="8762981157252199115">"Hủy"</string>
     <string name="close" msgid="419945428844076406">"Đóng"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Không có thư mục nào được đặt cho tài khoản này."</string>
-  <string-array name="sync_status">
-    <item msgid="2446076619901049026">"Thành công"</item>
-    <item msgid="7109065688039971961">"Không có kết nối."</item>
-    <item msgid="8437496123716232060">"Không thể đăng nhập."</item>
-    <item msgid="1651266301325684887">"Lỗi bảo mật."</item>
-    <item msgid="1461520171154288533">"Không thể đồng bộ hóa."</item>
-    <item msgid="8749857841162829469">"Lỗi"</item>
-  </string-array>
+    <!-- no translation found for sync_status:5 (4779810016424303449) -->
     <string name="tap_to_configure" msgid="1181356242354390930">"Chạm để thiết lập"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"Để xem các cuộc hội thoại, hãy đồng bộ hóa thư mục này."</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Đồng bộ hóa thư mục"</string>

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index ade2449..339c2e0 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml

@@ -26,10 +26,8 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"添加附件"</string>
-    <!-- no translation found for add_photo_attachment (8548176514426323119) -->
-    <skip />
-    <!-- no translation found for add_video_attachment (4284457799113546464) -->
-    <skip />
+    <string name="add_photo_attachment" msgid="8548176514426323119">"附加图片"</string>
+    <string name="add_video_attachment" msgid="4284457799113546464">"附加视频"</string>
     <string name="save_draft" msgid="5555744208032445632">"保存草稿"</string>
     <string name="discard" msgid="1714960202994370243">"舍弃"</string>
     <string name="compose" msgid="1473559896062432878">"写邮件"</string>
@@ -150,8 +148,7 @@
     <item quantity="one" msgid="3657821200245019288">"移动会话"</item>
     <item quantity="other" msgid="1685896770174368261">"移动 <xliff:g id="ID_1">%1$d</xliff:g> 个会话"</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g>于<xliff:g id="DATE">%3$s</xliff:g>发送了“<xliff:g id="SUBJECT">%2$s</xliff:g>”"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>] <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> - <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -205,8 +202,10 @@
     <item quantity="one" msgid="7361303622131552596">"已将 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 个会话举报为非垃圾邮件。"</item>
     <item quantity="other" msgid="2250720080221922267">"已将 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 个会话举报为非垃圾邮件。"</item>
   </plurals>
-    <!-- no translation found for conversation_not_important:one (788387259924027833) -->
-    <!-- no translation found for conversation_not_important:other (6662213740575340397) -->
+  <plurals name="conversation_not_important">
+    <item quantity="one" msgid="788387259924027833">"已将 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 个会话标记为不重要。"</item>
+    <item quantity="other" msgid="6662213740575340397">"已将 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 个会话标记为不重要。"</item>
+  </plurals>
   <plurals name="conversation_phished">
     <item quantity="one" msgid="5386916574432049235">"已将 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 个会话举报为网上诱骗。"</item>
     <item quantity="other" msgid="3678624994662639442">"已将 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 个会话举报为网上诱骗。"</item>
@@ -284,8 +283,7 @@
     <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt;"</string>
     <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt; 来自 <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"邮件已另存为草稿。"</string>
-    <!-- no translation found for sending_message (2822171587017313151) -->
-    <skip />
+    <string name="sending_message" msgid="2822171587017313151">"正在将邮件发送到发件箱…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"地址 <xliff:g id="WRONGEMAIL">%s</xliff:g> 无效。"</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ 显示引用文字"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ 隐藏引用文字"</string>
@@ -301,14 +299,7 @@
     <string name="cancel" msgid="8762981157252199115">"取消"</string>
     <string name="close" msgid="419945428844076406">"关闭"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"此帐户尚未设置文件夹。"</string>
-  <string-array name="sync_status">
-    <item msgid="2446076619901049026">"成功"</item>
-    <item msgid="7109065688039971961">"无网络连接。"</item>
-    <item msgid="8437496123716232060">"无法登录。"</item>
-    <item msgid="1651266301325684887">"安全错误。"</item>
-    <item msgid="1461520171154288533">"无法同步。"</item>
-    <item msgid="8749857841162829469">"错误"</item>
-  </string-array>
+    <!-- no translation found for sync_status:5 (4779810016424303449) -->
     <string name="tap_to_configure" msgid="1181356242354390930">"触摸可进行设置"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"要查看会话，请同步此文件夹。"</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"同步文件夹"</string>

diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 1609e71..14776c3 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml

@@ -26,10 +26,8 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"附加檔案"</string>
-    <!-- no translation found for add_photo_attachment (8548176514426323119) -->
-    <skip />
-    <!-- no translation found for add_video_attachment (4284457799113546464) -->
-    <skip />
+    <string name="add_photo_attachment" msgid="8548176514426323119">"附加圖片"</string>
+    <string name="add_video_attachment" msgid="4284457799113546464">"附加影片"</string>
     <string name="save_draft" msgid="5555744208032445632">"儲存草稿"</string>
     <string name="discard" msgid="1714960202994370243">"捨棄"</string>
     <string name="compose" msgid="1473559896062432878">"撰寫"</string>
@@ -150,8 +148,7 @@
     <item quantity="one" msgid="3657821200245019288">"移動會話群組"</item>
     <item quantity="other" msgid="1685896770174368261">"移動 <xliff:g id="ID_1">%1$d</xliff:g> 個會話群組"</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> 在 <xliff:g id="DATE">%3$s</xliff:g>傳送了主旨為「<xliff:g id="SUBJECT">%2$s</xliff:g>」的郵件"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -205,8 +202,10 @@
     <item quantity="one" msgid="7361303622131552596">"已將 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個會話群組回報為非垃圾郵件。"</item>
     <item quantity="other" msgid="2250720080221922267">"已將 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個會話群組回報為非垃圾郵件。"</item>
   </plurals>
-    <!-- no translation found for conversation_not_important:one (788387259924027833) -->
-    <!-- no translation found for conversation_not_important:other (6662213740575340397) -->
+  <plurals name="conversation_not_important">
+    <item quantity="one" msgid="788387259924027833">"已將 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個會話群組標示為不重要。"</item>
+    <item quantity="other" msgid="6662213740575340397">"已將 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個會話群組標示為不重要。"</item>
+  </plurals>
   <plurals name="conversation_phished">
     <item quantity="one" msgid="5386916574432049235">"已將 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個會話群組回報為詐騙郵件。"</item>
     <item quantity="other" msgid="3678624994662639442">"已將 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 個會話群組回報為詐騙郵件。"</item>
@@ -284,8 +283,7 @@
     <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt;"</string>
     <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g>，&lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt;，來源網域：<xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"已儲存郵件草稿。"</string>
-    <!-- no translation found for sending_message (2822171587017313151) -->
-    <skip />
+    <string name="sending_message" msgid="2822171587017313151">"正在將郵件傳送到寄件匣…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"地址 <xliff:g id="WRONGEMAIL">%s</xliff:g> 無效。"</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ 顯示引用文字"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ 隱藏引用文字"</string>
@@ -301,14 +299,7 @@
     <string name="cancel" msgid="8762981157252199115">"取消"</string>
     <string name="close" msgid="419945428844076406">"關閉"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"尚未設定這個帳戶的資料夾。"</string>
-  <string-array name="sync_status">
-    <item msgid="2446076619901049026">"成功"</item>
-    <item msgid="7109065688039971961">"沒有網路連線。"</item>
-    <item msgid="8437496123716232060">"無法登入。"</item>
-    <item msgid="1651266301325684887">"安全性錯誤。"</item>
-    <item msgid="1461520171154288533">"無法同步處理。"</item>
-    <item msgid="8749857841162829469">"錯誤"</item>
-  </string-array>
+    <!-- no translation found for sync_status:5 (4779810016424303449) -->
     <string name="tap_to_configure" msgid="1181356242354390930">"輕觸即可設定"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"如要查看會話群組，請同步處理這個資料夾。"</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"同步處理資料夾"</string>

diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index adb26e5..c52de58 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml

@@ -26,7 +26,7 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Namathisela ifayela"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"Namthisela isithombe"</string>
+    <string name="add_photo_attachment" msgid="8548176514426323119">"Namathisela isithombe"</string>
     <string name="add_video_attachment" msgid="4284457799113546464">"Namathisela ividiyo"</string>
     <string name="save_draft" msgid="5555744208032445632">"Londoloza okusazolungiswa"</string>
     <string name="discard" msgid="1714960202994370243">"Lahla"</string>
@@ -148,8 +148,7 @@
     <item quantity="one" msgid="3657821200245019288">"Hambisa ingxoxo"</item>
     <item quantity="other" msgid="1685896770174368261">"Hambisa izingxoxo <xliff:g id="ID_1">%1$d</xliff:g>"</item>
   </plurals>
-    <!-- no translation found for content_description (175899621885107464) -->
-    <skip />
+    <string name="content_description" msgid="175899621885107464">"U-<xliff:g id="SENDER">%1$s</xliff:g> uthumele i-<xliff:g id="SUBJECT">%2$s</xliff:g> ngomhla ka-<xliff:g id="DATE">%3$s</xliff:g>"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -300,14 +299,7 @@
     <string name="cancel" msgid="8762981157252199115">"Khansela"</string>
     <string name="close" msgid="419945428844076406">"Vala"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Awekho amafolda ahlelelwe le akhawunti."</string>
-  <string-array name="sync_status">
-    <item msgid="2446076619901049026">"Impumelelo"</item>
-    <item msgid="7109065688039971961">"Akukho ukuxhumana."</item>
-    <item msgid="8437496123716232060">"Ayikwazanga ukungena ngemvume."</item>
-    <item msgid="1651266301325684887">"Iphutha lokuphepha."</item>
-    <item msgid="1461520171154288533">"Ayikwazanga ukuvumelanisa."</item>
-    <item msgid="8749857841162829469">"Iphutha"</item>
-  </string-array>
+    <!-- no translation found for sync_status:5 (4779810016424303449) -->
     <string name="tap_to_configure" msgid="1181356242354390930">"Thinta ukuze ulungisele ukusebenza"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"Ukuze ubuke izingxoxo, vumelanisa le folda."</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Vumelanisa ifolda"</string>

diff --git a/src/com/android/mail/browse/ConversationContainer.java b/src/com/android/mail/browse/ConversationContainer.java
index 5e0aed5..5fa3b0b 100644
--- a/src/com/android/mail/browse/ConversationContainer.java
+++ b/src/com/android/mail/browse/ConversationContainer.java

@@ -268,6 +268,7 @@
 
     private void onDataSetChanged() {
         clearOverlays();
+        positionOverlays(0, mOffsetY);
     }
 
     private void forwardFakeMotionEvent(MotionEvent original, int newAction) {

diff --git a/src/com/android/mail/browse/ConversationItemView.java b/src/com/android/mail/browse/ConversationItemView.java
index 4a7cc0d..3aab551 100644
--- a/src/com/android/mail/browse/ConversationItemView.java
+++ b/src/com/android/mail/browse/ConversationItemView.java

@@ -585,8 +585,11 @@
         } else {
             mHeader.styledSendersString.removeSpan(mActivatedTextSpan);
         }
-        mHeader.sendersDisplayLayout = new StaticLayout(mHeader.styledSendersString, sPaint,
-                mSendersWidth, Alignment.ALIGN_NORMAL, 1, 0, true);
+        int length = (int) sPaint.measureText(mHeader.styledSendersString.toString());
+        mHeader.sendersDisplayLayout = new StaticLayout(mHeader.styledSendersString, 0,
+                mHeader.styledSendersString.length(), sPaint,
+                length,
+                Alignment.ALIGN_NORMAL, 1, 0, true, TextUtils.TruncateAt.END, length);
     }
 
     private CharacterStyle getActivatedTextSpan() {
@@ -764,9 +767,8 @@
         SpannableStringBuilder builder = new SpannableStringBuilder();
         float totalWidth = 0;
         boolean ellipsize = false;
-        SpannableString ellipsizedText;
         float width;
-        SpannableStringBuilder messageInfoString = mHeader.messageInfoString;
+        SpannableStringBuilder messageInfoString =  mHeader.messageInfoString;
         if (messageInfoString.length() > 0) {
             CharacterStyle[] spans = messageInfoString.getSpans(0, messageInfoString.length(),
                     CharacterStyle.class);
@@ -779,7 +781,8 @@
             float messageInfoWidth = sPaint.measureText(messageInfoString.toString());
             totalWidth += messageInfoWidth;
         }
-        SpannableString prevSender = null;
+       SpannableString prevSender = null;
+       SpannableString ellipsizedText;
         for (SpannableString sender : mHeader.styledSenders) {
             // There may be null sender strings if there were dupes we had to remove.
             if (sender == null) {
@@ -807,13 +810,16 @@
             } else {
                 prevSender = sender;
             }
+            if (spans.length > 0) {
+                spans[0].updateDrawState(sPaint);
+            }
             // Measure the width of the current sender and make sure we have space
             width = (int) sPaint.measureText(sender.toString());
             if (width + totalWidth > mSendersWidth) {
                 // The text is too long, new line won't help. We have to
                 // ellipsize text.
                 ellipsize = true;
-                width = mSendersWidth - totalWidth - getEllipsisWidth(); // ellipsis width?
+                width = mSendersWidth - totalWidth; // ellipsis width?
                 ellipsizedText = copyStyles(spans,
                         TextUtils.ellipsize(sender, sPaint, width, TruncateAt.END));
                 width = (int) sPaint.measureText(ellipsizedText.toString());
@@ -838,10 +844,6 @@
         return (int)totalWidth;
     }
 
-    private float getEllipsisWidth() {
-        return sPaint.measureText(sEllipsis);
-    }
-
     private SpannableString copyStyles(CharacterStyle[] spans, CharSequence newText) {
         SpannableString s = new SpannableString(newText);
         if (spans != null && spans.length > 0) {
@@ -966,6 +968,8 @@
             int sendersColor = getFontColor(isUnread ? sSendersTextColorUnread
                     : sSendersTextColorRead);
             sPaint.setColor(sendersColor);
+        } else {
+            sPaint.setTextSize(mCoordinates.sendersFontSize);
         }
         canvas.save();
         canvas.translate(mCoordinates.sendersX,

diff --git a/src/com/android/mail/browse/ConversationViewAdapter.java b/src/com/android/mail/browse/ConversationViewAdapter.java
index b5c1756..44d9e6f 100644
--- a/src/com/android/mail/browse/ConversationViewAdapter.java
+++ b/src/com/android/mail/browse/ConversationViewAdapter.java

@@ -56,7 +56,7 @@
 
     private Context mContext;
     private final FormattedDateBuilder mDateBuilder;
-    private final Account mAccount;
+    private final ConversationAccountController mAccountController;
     private final LoaderManager mLoaderManager;
     private final MessageHeaderViewCallbacks mMessageCallbacks;
     private final ContactInfoSource mContactInfoSource;
@@ -64,7 +64,6 @@
     private OnClickListener mSuperCollapsedListener;
     private Map<String, Address> mAddressCache;
     private final LayoutInflater mInflater;
-    private boolean mDefaultReplyAll;
 
     private final List<ConversationOverlayItem> mItems;
 
@@ -74,6 +73,10 @@
     public static final int VIEW_TYPE_SUPER_COLLAPSED_BLOCK = 3;
     public static final int VIEW_TYPE_COUNT = 4;
 
+    public interface ConversationAccountController {
+        Account getAccount();
+    }
+
     public class ConversationHeaderItem extends ConversationOverlayItem {
         public final Conversation mConversation;
 
@@ -90,10 +93,10 @@
         public View createView(Context context, LayoutInflater inflater, ViewGroup parent) {
             final ConversationViewHeader headerView = (ConversationViewHeader) inflater.inflate(
                     R.layout.conversation_view_header, parent, false);
-            headerView.setCallbacks(mConversationCallbacks);
+            headerView.setCallbacks(mConversationCallbacks, mAccountController);
 
             headerView.setSubject(mConversation.subject, false /* notify */);
-            if (mAccount.supportsCapability(
+            if (mAccountController.getAccount().supportsCapability(
                     UIProvider.AccountCapabilities.MULTIPLE_FOLDERS_PER_CONV)) {
                 headerView.setFolders(mConversation, false /* notify */);
             }
@@ -141,7 +144,7 @@
         public View createView(Context context, LayoutInflater inflater, ViewGroup parent) {
             final MessageHeaderView v = (MessageHeaderView) inflater.inflate(
                     R.layout.conversation_message_header, parent, false);
-            v.initialize(mDateBuilder, mAccount, mAddressCache);
+            v.initialize(mDateBuilder, mAccountController, mAddressCache);
             v.setCallbacks(mMessageCallbacks);
             v.setContactInfoSource(mContactInfoSource);
             return v;
@@ -150,7 +153,7 @@
         @Override
         public void bindView(View v, boolean measureOnly) {
             final MessageHeaderView header = (MessageHeaderView) v;
-            header.bind(this, mDefaultReplyAll, measureOnly);
+            header.bind(this, measureOnly);
         }
 
         @Override
@@ -274,7 +277,9 @@
         }
     }
 
-    public ConversationViewAdapter(Context context, Account account, LoaderManager loaderManager,
+    public ConversationViewAdapter(Context context,
+            ConversationAccountController accountController,
+            LoaderManager loaderManager,
             MessageHeaderViewCallbacks messageCallbacks,
             ContactInfoSource contactInfoSource,
             ConversationViewHeaderCallbacks convCallbacks,
@@ -282,7 +287,7 @@
             FormattedDateBuilder dateBuilder) {
         mContext = context;
         mDateBuilder = dateBuilder;
-        mAccount = account;
+        mAccountController = accountController;
         mLoaderManager = loaderManager;
         mMessageCallbacks = messageCallbacks;
         mContactInfoSource = contactInfoSource;
@@ -294,10 +299,6 @@
         mItems = Lists.newArrayList();
     }
 
-    public void setDefaultReplyAll(boolean defaultReplyAll) {
-        mDefaultReplyAll = defaultReplyAll;
-    }
-
     @Override
     public int getCount() {
         return mItems.size();

diff --git a/src/com/android/mail/browse/ConversationViewHeader.java b/src/com/android/mail/browse/ConversationViewHeader.java
index fb7fbc9..d6c60b3 100644
--- a/src/com/android/mail/browse/ConversationViewHeader.java
+++ b/src/com/android/mail/browse/ConversationViewHeader.java

@@ -31,6 +31,7 @@
 import android.widget.TextView;
 
 import com.android.mail.R;
+import com.android.mail.browse.ConversationViewAdapter.ConversationAccountController;
 import com.android.mail.browse.FolderSpan.FolderSpanDimensions;
 import com.android.mail.providers.Conversation;
 import com.android.mail.providers.Folder;
@@ -67,16 +68,12 @@
          * @return the remainder of text that didn't fit
          */
         String getSubjectRemainder(String subject);
-        /**
-         * Returns the {@link Settings} object associated with the current account.
-         * @return
-         */
-        Settings getSettings();
     }
 
     private TextView mSubjectView;
     private FolderSpanTextView mFoldersView;
     private ConversationViewHeaderCallbacks mCallbacks;
+    private ConversationAccountController mAccountController;
     private ConversationFolderDisplayer mFolderDisplayer;
 
     private boolean mSizeChanged;
@@ -123,8 +120,10 @@
         return child.getMeasuredWidth() + p.leftMargin + p.rightMargin;
     }
 
-    public void setCallbacks(ConversationViewHeaderCallbacks callbacks) {
+    public void setCallbacks(ConversationViewHeaderCallbacks callbacks,
+            ConversationAccountController accountController) {
         mCallbacks = callbacks;
+        mAccountController = accountController;
     }
 
     public void setSubject(final String subject, boolean notify) {
@@ -145,7 +144,7 @@
 
     public void setFolders(Conversation conv, boolean notify) {
         SpannableStringBuilder sb = new SpannableStringBuilder();
-        final Settings settings = mCallbacks.getSettings();
+        final Settings settings = mAccountController.getAccount().settings;
         if (settings.priorityArrowsEnabled && conv.isImportant()) {
             sb.append('.');
             sb.setSpan(new PriorityIndicatorSpan(getContext(),

diff --git a/src/com/android/mail/browse/MessageCursor.java b/src/com/android/mail/browse/MessageCursor.java
index 3561a25..4f64d31 100644
--- a/src/com/android/mail/browse/MessageCursor.java
+++ b/src/com/android/mail/browse/MessageCursor.java

@@ -120,14 +120,23 @@
     public boolean isConversationStarred() {
         int pos = -1;
         while (moveToPosition(++pos)) {
-            Message m = getMessage();
-            if (m.starred) {
+            if (getMessage().starred) {
                 return true;
             }
         }
         return false;
     }
 
+
+    public boolean isConversationRead() {
+        int pos = -1;
+        while (moveToPosition(++pos)) {
+            if (!getMessage().read) {
+                return false;
+            }
+        }
+        return true;
+    }
     public void markMessagesRead() {
         int pos = -1;
         while (moveToPosition(++pos)) {

diff --git a/src/com/android/mail/browse/MessageHeaderView.java b/src/com/android/mail/browse/MessageHeaderView.java
index 58e7cd7..c1bc99f 100644
--- a/src/com/android/mail/browse/MessageHeaderView.java
+++ b/src/com/android/mail/browse/MessageHeaderView.java

@@ -44,6 +44,7 @@
 import com.android.mail.ContactInfoSource;
 import com.android.mail.FormattedDateBuilder;
 import com.android.mail.R;
+import com.android.mail.browse.ConversationViewAdapter.ConversationAccountController;
 import com.android.mail.browse.ConversationViewAdapter.MessageHeaderItem;
 import com.android.mail.browse.MessageCursor.ConversationMessage;
 import com.android.mail.compose.ComposeActivity;
@@ -138,14 +139,12 @@
 
     private boolean mPreMeasuring;
 
-    private Account mAccount;
+    private ConversationAccountController mAccountController;
 
     private Map<String, Address> mAddressCache;
 
     private boolean mShowImagePrompt;
 
-    private boolean mDefaultReplyAll;
-
     private int mDrawTranslateY;
 
     private CharSequence mTimestampShort;
@@ -308,15 +307,19 @@
         }
     }
 
-    public void initialize(FormattedDateBuilder dateBuilder, Account account,
+    public void initialize(FormattedDateBuilder dateBuilder,
+            ConversationAccountController accountController,
             Map<String, Address> addressCache) {
         mDateBuilder = dateBuilder;
-        mAccount = account;
+        mAccountController = accountController;
         mAddressCache = addressCache;
     }
 
-    public void bind(MessageHeaderItem headerItem, boolean defaultReplyAll,
-            boolean measureOnly) {
+    private Account getAccount() {
+        return mAccountController.getAccount();
+    }
+
+    public void bind(MessageHeaderItem headerItem, boolean measureOnly) {
         if (mMessageHeaderItem != null && mMessageHeaderItem == headerItem) {
             return;
         }
@@ -330,7 +333,6 @@
         mMessageHeaderItem = headerItem;
         mMessage = headerItem.message;
         mShowImagePrompt = mMessage.shouldShowImagePrompt();
-        mDefaultReplyAll = defaultReplyAll;
         setExpanded(headerItem.isExpanded());
 
         mTimestampMs = mMessage.dateReceivedMs;
@@ -363,7 +365,7 @@
         // the only possible fromAddress.
         String from = mMessage.from;
         if (TextUtils.isEmpty(from)) {
-            from = mAccount.name;
+            from = getAccount().name;
         }
         mSender = getAddress(from);
 
@@ -510,6 +512,11 @@
         }
     }
 
+    // update internal Account- or Settings-related state
+    public void onAccountChanged() {
+        updateChildVisibility();
+    }
+
     /**
      * Update the visibility of the many child views based on expanded/collapsed
      * and draft/normal state.
@@ -586,8 +593,10 @@
             return;
         }
 
-        setChildVisibility(mDefaultReplyAll ? GONE : VISIBLE, mReplyButton);
-        setChildVisibility(mDefaultReplyAll ? VISIBLE : GONE, mReplyAllButton);
+        final boolean defaultReplyAll = getAccount().settings.replyBehavior
+                == UIProvider.DefaultReplyBehavior.REPLY_ALL;
+        setChildVisibility(defaultReplyAll ? GONE : VISIBLE, mReplyButton);
+        setChildVisibility(defaultReplyAll ? VISIBLE : GONE, mReplyAllButton);
     }
 
     private static void setChildMarginRight(View childView, int marginRight) {
@@ -780,13 +789,13 @@
 
         switch (id) {
             case R.id.reply:
-                ComposeActivity.reply(getContext(), mAccount, mMessage);
+                ComposeActivity.reply(getContext(), getAccount(), mMessage);
                 break;
             case R.id.reply_all:
-                ComposeActivity.replyAll(getContext(), mAccount, mMessage);
+                ComposeActivity.replyAll(getContext(), getAccount(), mMessage);
                 break;
             case R.id.forward:
-                ComposeActivity.forward(getContext(), mAccount, mMessage);
+                ComposeActivity.forward(getContext(), getAccount(), mMessage);
                 break;
             case R.id.star: {
                 final boolean newValue = !v.isSelected();
@@ -795,7 +804,7 @@
                 break;
             }
             case R.id.edit_draft:
-                ComposeActivity.editDraft(getContext(), mAccount, mMessage);
+                ComposeActivity.editDraft(getContext(), getAccount(), mMessage);
                 break;
             case R.id.overflow: {
                 if (mPopup == null) {
@@ -804,8 +813,10 @@
                             mPopup.getMenu());
                     mPopup.setOnMenuItemClickListener(this);
                 }
-                mPopup.getMenu().findItem(R.id.reply).setVisible(mDefaultReplyAll);
-                mPopup.getMenu().findItem(R.id.reply_all).setVisible(!mDefaultReplyAll);
+                final boolean defaultReplyAll = getAccount().settings.replyBehavior
+                        == UIProvider.DefaultReplyBehavior.REPLY_ALL;
+                mPopup.getMenu().findItem(R.id.reply).setVisible(defaultReplyAll);
+                mPopup.getMenu().findItem(R.id.reply_all).setVisible(!defaultReplyAll);
 
                 mPopup.show();
                 break;
@@ -1031,7 +1042,7 @@
         if (!mCollapsedDetailsValid) {
             if (mMessageHeaderItem.recipientSummaryText == null) {
                 mMessageHeaderItem.recipientSummaryText = getRecipientSummaryText(getContext(),
-                        mAccount.name, mTo, mCc, mBcc, mAddressCache);
+                        getAccount().name, mTo, mCc, mBcc, mAddressCache);
             }
             ((TextView) findViewById(R.id.recipients_summary))
                     .setText(mMessageHeaderItem.recipientSummaryText);

diff --git a/src/com/android/mail/ui/ConversationListFragment.java b/src/com/android/mail/ui/ConversationListFragment.java
index 6f9922c..cede3e7 100644
--- a/src/com/android/mail/ui/ConversationListFragment.java
+++ b/src/com/android/mail/ui/ConversationListFragment.java

@@ -155,9 +155,7 @@
     public void onResume() {
         super.onResume();
         // Hacky workaround for http://b/6946182
-        if (mListView.isWedged()) {
-            Utils.markDirtyTillRoot("SwipeableListView", mListView);
-        }
+        Utils.fixSubTreeLayoutIfOrphaned(getView(), "ConversationListFragment");
     }
 
     /**

diff --git a/src/com/android/mail/ui/ConversationViewFragment.java b/src/com/android/mail/ui/ConversationViewFragment.java
index 1d0c692..3b79ea8 100644
--- a/src/com/android/mail/ui/ConversationViewFragment.java
+++ b/src/com/android/mail/ui/ConversationViewFragment.java

@@ -57,14 +57,15 @@
 import com.android.mail.browse.ConversationContainer;
 import com.android.mail.browse.ConversationOverlayItem;
 import com.android.mail.browse.ConversationViewAdapter;
+import com.android.mail.browse.ConversationViewAdapter.ConversationAccountController;
 import com.android.mail.browse.ConversationViewAdapter.MessageFooterItem;
 import com.android.mail.browse.ConversationViewAdapter.MessageHeaderItem;
 import com.android.mail.browse.ConversationViewAdapter.SuperCollapsedBlockItem;
 import com.android.mail.browse.ConversationViewHeader;
 import com.android.mail.browse.ConversationWebView;
 import com.android.mail.browse.MessageCursor;
-import com.android.mail.browse.MessageCursor.ConversationMessage;
 import com.android.mail.browse.MessageCursor.ConversationController;
+import com.android.mail.browse.MessageCursor.ConversationMessage;
 import com.android.mail.browse.MessageHeaderView;
 import com.android.mail.browse.MessageHeaderView.MessageHeaderViewCallbacks;
 import com.android.mail.browse.SuperCollapsedBlock;
@@ -76,7 +77,6 @@
 import com.android.mail.providers.Folder;
 import com.android.mail.providers.ListParams;
 import com.android.mail.providers.Message;
-import com.android.mail.providers.Settings;
 import com.android.mail.providers.UIProvider;
 import com.android.mail.providers.UIProvider.AccountCapabilities;
 import com.android.mail.providers.UIProvider.FolderCapabilities;
@@ -102,7 +102,8 @@
         ConversationViewHeader.ConversationViewHeaderCallbacks,
         MessageHeaderViewCallbacks,
         SuperCollapsedBlock.OnClickListener,
-        ConversationController {
+        ConversationController,
+        ConversationAccountController {
 
     private static final String LOG_TAG = LogTag.getLogTag();
     public static final String LAYOUT_TAG = "ConvLayout";
@@ -141,13 +142,6 @@
 
     private MenuItem mChangeFoldersMenuItem;
 
-    private final AccountObserver mAccountObserver = new AccountObserver() {
-        @Override
-        public void onChanged(Account newAccount) {
-            mAccount = newAccount;
-        }
-    };
-
     /**
      * Folder is used to help determine valid menu actions for this conversation.
      */
@@ -185,6 +179,17 @@
     private final MessageLoaderCallbacks mMessageLoaderCallbacks = new MessageLoaderCallbacks();
     private final ContactLoaderCallbacks mContactLoaderCallbacks = new ContactLoaderCallbacks();
 
+    private final AccountObserver mAccountObserver = new AccountObserver() {
+        @Override
+        public void onChanged(Account newAccount) {
+            mAccount = newAccount;
+
+            // settings may have been updated; refresh views that are known to depend on settings
+            mConversationContainer.getSnapHeader().onAccountChanged();
+            mAdapter.notifyDataSetChanged();
+        }
+    };
+
     private static final String ARG_ACCOUNT = "account";
     public static final String ARG_CONVERSATION = "conversation";
     private static final String ARG_FOLDER = "folder";
@@ -247,14 +252,14 @@
 
         final FormattedDateBuilder dateBuilder = new FormattedDateBuilder(mContext);
 
-        mAdapter = new ConversationViewAdapter(mActivity.getActivityContext(), mAccount,
+        mAdapter = new ConversationViewAdapter(mActivity.getActivityContext(), this,
                 getLoaderManager(), this, mContactLoaderCallbacks, this, this, mAddressCache,
                 dateBuilder);
         mConversationContainer.setOverlayAdapter(mAdapter);
 
         // set up snap header (the adapter usually does this with the other ones)
         final MessageHeaderView snapHeader = mConversationContainer.getSnapHeader();
-        snapHeader.initialize(dateBuilder, mAccount, mAddressCache);
+        snapHeader.initialize(dateBuilder, this, mAddressCache);
         snapHeader.setCallbacks(this);
         snapHeader.setContactInfoSource(mContactLoaderCallbacks);
 
@@ -363,6 +368,14 @@
     }
 
     @Override
+    public void onResume() {
+        super.onResume();
+
+        // Hacky workaround for http://b/6946182
+        Utils.fixSubTreeLayoutIfOrphaned(getView(), "ConversationViewFragment");
+    }
+
+    @Override
     public void onSaveInstanceState(Bundle outState) {
         if (mViewState != null) {
             outState.putParcelable(BUNDLE_VIEW_STATE, mViewState);
@@ -567,11 +580,7 @@
         boolean allowNetworkImages = false;
 
         // TODO: re-use any existing adapter item state (expanded, details expanded, show pics)
-        final Settings settings = mAccount.settings;
-        if (settings != null) {
-            mAdapter.setDefaultReplyAll(settings.replyBehavior ==
-                    UIProvider.DefaultReplyBehavior.REPLY_ALL);
-        }
+
         // Walk through the cursor and build up an overlay adapter as you go.
         // Each overlay has an entry in the adapter for easy scroll handling in the container.
         // Items are not necessarily 1:1 in cursor and adapter because of super-collapsed blocks.
@@ -618,7 +627,9 @@
 
             // save off "read" state from the cursor
             // later, the view may not match the cursor (e.g. conversation marked read on open)
-            mViewState.setReadState(msg, msg.read);
+            // however, if a previous state indicated this message was unread, trust that instead
+            // so "mark unread" marks all originally unread messages
+            mViewState.setReadState(msg, msg.read && !prevState.isUnread(msg));
 
             // We only want to consider this for inclusion in the super collapsed block if
             // 1) The we don't have previous state about this message  (The first time that the
@@ -756,10 +767,11 @@
 
         mViewState.setInfoForConversation(mConversation);
 
-        // mark viewed if not previously marked viewed by this conversation view
-        // ('mark read', if necessary, will also happen there)
+        // mark viewed/read if not previously marked viewed by this conversation view,
+        // or if unread messages still exist in the message list cursor
         // we don't want to keep marking viewed on rotation or restore
-        if (!mConversation.isViewed()) {
+        // but we do want future re-renders to mark read (e.g. "New message from X" case)
+        if (!mConversation.isViewed() || (mCursor != null && !mCursor.isConversationRead())) {
             final ConversationUpdater listController = activity.getConversationUpdater();
             // The conversation cursor may not have finished loading by now (when launched via
             // notification), so watch for when it finishes and mark it read then.
@@ -943,6 +955,11 @@
         return addr;
     }
 
+    @Override
+    public Account getAccount() {
+        return mAccount;
+    }
+
     private class ConversationWebViewClient extends WebViewClient {
 
         @Override
@@ -1260,11 +1277,6 @@
         }
     }
 
-    @Override
-    public Settings getSettings() {
-        return mAccount.settings;
-    }
-
     private class SetCookieTask extends AsyncTask<Void, Void, Void> {
         final String mUri;
         final String mCookie;

diff --git a/src/com/android/mail/ui/FolderListFragment.java b/src/com/android/mail/ui/FolderListFragment.java
index 08067f9..38ffdeb 100644
--- a/src/com/android/mail/ui/FolderListFragment.java
+++ b/src/com/android/mail/ui/FolderListFragment.java

@@ -84,9 +84,7 @@
     public void onResume() {
         super.onResume();
         // Hacky workaround for http://b/6946182
-        if (isVisible() && mListView.getMeasuredHeight() == 0) {
-            Utils.markDirtyTillRoot("FolderListFragment", mListView);
-        }
+        Utils.fixSubTreeLayoutIfOrphaned(getView(), "FolderListFragment");
     }
     /**
      * Creates a new instance of {@link ConversationListFragment}, initialized

diff --git a/src/com/android/mail/ui/SwipeableListView.java b/src/com/android/mail/ui/SwipeableListView.java
index 4af5515..a6bf55c 100644
--- a/src/com/android/mail/ui/SwipeableListView.java
+++ b/src/com/android/mail/ui/SwipeableListView.java

@@ -19,13 +19,11 @@
 
 import android.content.Context;
 import android.content.res.Configuration;
-import android.content.res.Resources;
 import android.net.Uri;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewConfiguration;
-import android.view.ViewParent;
 import android.widget.AbsListView;
 import android.widget.AbsListView.OnScrollListener;
 import android.widget.ListView;
@@ -53,8 +51,6 @@
     private ConversationSelectionSet mConvSelectionSet;
     private int mSwipeAction;
     private Folder mFolder;
-    private boolean mAttachedToWindow;
-    private boolean mLayoutCalled;
 
     public SwipeableListView(Context context) {
         this(context, null);
@@ -72,27 +68,6 @@
                 pagingTouchSlop);
         setOnScrollListener(this);
     }
-    @Override
-    protected void onAttachedToWindow() {
-        mAttachedToWindow = true;
-        super.onAttachedToWindow();
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-        mAttachedToWindow = false;
-        super.onDetachedFromWindow();
-    }
-
-    @Override
-    protected void onLayout(boolean changed, int l, int t, int r, int b) {
-        mLayoutCalled = true;
-        super.onLayout(changed, l, t, r, b);
-    }
-
-    public final boolean isWedged(){
-        return mAttachedToWindow && !mLayoutCalled;
-    }
 
     @Override
     protected void onConfigurationChanged(Configuration newConfig) {

diff --git a/src/com/android/mail/utils/Utils.java b/src/com/android/mail/utils/Utils.java
index a541d43..c262987 100644
--- a/src/com/android/mail/utils/Utils.java
+++ b/src/com/android/mail/utils/Utils.java

@@ -1014,6 +1014,37 @@
         return sDefaultFolderBackgroundColor;
     }
 
+    public static void fixSubTreeLayoutIfOrphaned(View v, String tag) {
+        if (isLayoutSubTreeOrphaned(v)) {
+            markDirtyTillRoot(tag, v);
+        }
+    }
+
+    /**
+     * An orphaned subtree is one where child views have requested layout, but at least one
+     * ancestor is not marked for layout. In this scenario, any future layout requests on the root
+     * will ignore the orphaned subtree, and we have to force the issue.
+     * <p>
+     * Note: this might be okay if it's true while a layout pass is in progress. Callers should
+     * only trust this return value if not currently in layout.
+     *
+     */
+    public static boolean isLayoutSubTreeOrphaned(View v) {
+        if (v == null) {
+            return false;
+        }
+
+        final boolean isLayoutRequested = v.isLayoutRequested();
+        ViewParent parent = v.getParent();
+        while (isLayoutRequested && parent != null) {
+            if (!parent.isLayoutRequested()) {
+                return true;
+            }
+            parent = parent.getParent();
+        }
+        return false;
+    }
+
     /**
      * Hacky method to allow invalidating views all the way up the hierarchy.
      */
commit	93c6399658f8f4c9f9d50af57b077cf435732d36	[log] [tgz]
author	Peter Ng <petergng@google.com>	Tue Aug 21 15:38:04 2012 -0700
committer	Android (Google) Code Review <android-gerrit@google.com>	Tue Aug 21 15:38:05 2012 -0700
tree	05eca89daf158ce20682460230400cde235e8284
parent	3dc68949fc08678194cce8aae5d75bff58191eec [diff]
parent	7dc120e3712727d8cba3b40694aeb4a446678826 [diff]