Import revised translations. Change-Id: I0560d5aa478c7878a67e3047237d39a05676768e

commit: 151037ec333fdbb277e0d072cd6488ebea012edc [log] [tgz]
author: Eric Fischer <enf@google.com> Mon Oct 03 13:42:00 2011 -0700
committer: Eric Fischer <enf@google.com> Mon Oct 03 13:42:00 2011 -0700
tree: c68136519155684933457434f2c8bb186a2f481d
parent: 1d8302e88ba2e25db1016ebbbbc4df7bbac97f1d [diff]
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 4262899..b8239c2 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domein\\Gebruikernaam"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Gebruik veilige verbinding (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Aanvaar alle SSL-sertifikate"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Kliëntsertifikaat"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Kies"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Gebruik kliëntsertifikaat"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Verwyder"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Geen"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Mobiele toestel se ID"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Rekeninginstellings"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Rekeningopsies"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Gebruikernaam of wagwoord verkeerd."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Kan nie veilig aan bediener koppel nie."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Kan nie veilig aan bediener koppel nie."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Kliëntsertifikaat vereis. Koppel aan bediener met kliëntsertifikaat?"</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Kliëntsertifikaat vereis. Koppel aan bediener met die kliëntsertifikaat?"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"Sertifikaat ongeldig of ontoeganklik."</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Die bediener het met \'n fout gereageer; kontroleer jou gebruikernaam en wagwoord en probeer weer."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Kan nie aan bediener koppel nie."</string>
@@ -442,7 +445,7 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Groot"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Reusagtig"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Antwoord almal"</string>
-    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Maak \"Antwoord almal\" die verstek vir die antwoord van boodskappe"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Maak \"Antwoord almal\" die verstek vir reageer op boodskappe"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Laai verstek vir \"Wys prente\" terug"</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Laai verstek terug vir alle senders (moenie prente outomaties wys nie)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Wys prente\" uitgevee."</string>

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 2887e25..84fdd9b 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"ጎራ\\የተጠቃሚስም"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"ጥብቅ ተያያዥነት(SSL) ተጠቀም"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"ሁሉንም SSL ምስክርተቀበል"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"የደንበኛ ምስክር ወረቀት"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"ምረጥ"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"የደንበኛ ዕውቅና ማረጋገጫ  ተጠቀም"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"አስወግድ"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"የለም"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"የተንቀሳቃሽ መሣሪያ መታወቂያ"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"መለያ ቅንብሮች"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"የመለያ አማራጮች"</string>
@@ -303,7 +306,7 @@
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"በየ30 ደቂቃዎቹ"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"በየሰዓቱ"</string>
     <string name="account_setup_options_default_label" msgid="8869166381331276697">"ከዚህ መለያ በነባሪኢሜይል ላክ"</string>
-    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"ኢሜይል ሲደርስአሳውቀኝ።"</string>
+    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"ኢሜይል ሲደርስ አሳውቀኝ።"</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"ከዚህ መለያ ዕውቂያዎች አሳምር"</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"ከዚህ መለያ የቀን አቆጣጠር አሳምር።"</string>
     <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"ከዚህ መለያ ኢሜይል አሳምር።"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"ተጠቃሚ ስም ወይም ይለፍ ቃል ተሳስቷል።"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"ወደ አገልጋዩበደህና ማገናኘት አልተቻልም።"</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"ወደ አገልጋዩበደህና ማገናኘት አልተቻልም።"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"አገልጋይ ለማገናኘት የተጠቃሚ ዕውቅና ማረጋገጫ ይጠየቃል።"</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"የደንበኛ የዕውቅና ማረጋገጫ ይጠበቃል። ከደንበኛ የዕውቅና ማረጋገጫ ጋር ወደ አገልጋይ ይገናኝ?"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"ልክ ያልሆነ የዕውቅና ማረጋገጫ ወይም ተደራሽ ያልሆነ"</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"አገልጋዩ ከክስተት ጋር መልሷል፤ እባክዎ የተጠቃሚ ስምዎን እና የይለፍ ቃልዎን ይመልከቱ እና እንደገና ይሞክሩ።"</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"ወደ አገልጋይ መገናኘት አልቻልም።"</string>
@@ -334,7 +337,7 @@
     <string name="account_setup_failed_protocol_unsupported" msgid="5476633232659376833">"የተሳሳተ የአገልጋይ አድራሻ አስገብተዋል ወይም አገልጋዩ  ኢሜይሉ የማይደግፈው የፕሮቶኮል ሥሪት ይጠይቃል።"</string>
     <string name="account_setup_failed_access_denied" msgid="2571826611383388336">"ከዚህ አገልጋይ ጋር ለአስምር ፈቃድ የልዎትም። እባክዎ ለተጨማሪ መረጃ የአገልጋዮን አስተዳዳሪ ያግኙ።"</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"የሩቅ አስተዳደር ደህንነት"</string>
-    <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"<xliff:g id="SERVER">%s</xliff:g>አገልጋይየAndroid  መሣሪያዎ አንዳንድገፅታዎች በርቀት ለመቆጣጠር እንዲፈቅዱ ይጠይቃል። ይህን መለያ ጨርሰው ለማቀናበር ይፈልጋሉ?"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"<xliff:g id="SERVER">%s</xliff:g>አገልጋይየAndroid  መሣሪያዎ አንዳንድ ገፅታዎች በርቀት ለመቆጣጠር እንዲፈቅዱ ይጠይቃል። ይህን መለያ ጨርሰው ለማቀናበር ይፈልጋሉ?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="6647663405501663019">"ይህ አገልጋይ የእርስዎን Android መሣሪ የማይደግፈው የደህንነት ገፅታዎች ይጠይቃል፣<xliff:g id="ERROR">%s</xliff:g> ጨምሮ።"</string>
     <string name="account_setup_username_uneditable_error" msgid="9057508235700936322">"የመለያውን ተጠቃሚ ስም መለወጥ አይችሉም። መለያውን በተለየ ተጠቃሚ ስም ለማከል መለያ አክል ይንኩ።"</string>
     <string name="disable_admin_warning" msgid="4940147098039352135">"ማስጠንቀቂያ፡መሣሪያዎን ለማስተዳደር የኢሜይል ትግበራዎችን ኃላፊነት ማቦዘን የሚጠይቁትንሁሉ የኢሜይል መለያዎችከኢሜይል፣ዕውቂያዎች፣ቀን መቁጠሪያክስተቶች፣እና ሌላ ውሂብ ጋር አብሮ ይሰርዛል።"</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"መደበኛ"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"ትልቅ"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"ግዙፍ"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"ለሁሉም ምላሽ ስጥ"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"ለመልዕክቶች ለመመለስ \'ለሁሉም መልስ\'ን ነባሪ አድርግ"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"ለ\"ምስሎችን አሳይ\" ነባሪ እነበረበት መልስ"</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"ለሁሉም ላኪዎች(ፎቶዎችን በራስ ሰር አታሳይ) ነባሪ እነበረበት መልስ"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"ፎቶዎች አሳይ\" ጠርቷል።"</string>

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index e063f6b..f036ef1 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"نطاق/اسم المستخدم"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"استخدام اتصال آمن (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"قبول جميع شهادات طبقة المقابس الآمنة"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"شهادة العميل"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"تحديد"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"استخدام شهادة العميل"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"إزالة"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"بلا"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"معرّف جهاز الجوال"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"إعدادات الحساب"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"خيارات الحساب"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"اسم المستخدم أو كلمة المرور غير صحيحة."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"لا يمكن الاتصال بالخادم بأمان."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"لا يمكن الاتصال بالخادم بأمان."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"يلزم توفر شهادة المستخدم للاتصال بالخادم."</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"شهادة العميل مطلوبة. هل تريد الاتصال بالخادم باستخدام شهادة العميل؟"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"الشهادة غير صالحة أو لا يمكن الدخول إليها."</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"لقد استجاب الخادم بخطأ، الرجاء التحقق من اسم المستخدم وكلمة المرور وإعادة المحاولة."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"لا يمكن الاتصال بالخادم."</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"عادي"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"كبير"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"ضخم"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"الرد على الكل"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"جعل \"الرد على الكل\" هو الإعداد الافتراضي للرد على الرسائل"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"استعادة الإعداد الافتراضي لـ \"إظهار الصور\""</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"استعادة الإعداد الافتراضي لجميع المرسلين (عدم إظهار الصور تلقائيًا)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"تم إلغاء تحديد \"إظهار الصور\"."</string>

diff --git a/res/values-ar/uploader.xml b/res/values-ar/uploader.xml
index 3468f6c..dae9b4c 100644
--- a/res/values-ar/uploader.xml
+++ b/res/values-ar/uploader.xml

@@ -121,7 +121,7 @@
     <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"تحميلات الجوال"</string>
     <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"تحميلات التجوال"</string>
     <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"تحميل الصور ومقاطع الفيديو عند التجوال عبر شبكة بيانات"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"التحميلات المتأخرة بسبب البطارية"</string>
+    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"تحميلات عند الشحن"</string>
     <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"تحميل الصور ومقاطع الفيديو عند الشحن فقط"</string>
     <string name="preference_plus_sync_all" msgid="2563137874388611459">"تحميل الصور الحالية"</string>
     <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"تحميل أية صور ومقاطع فيديو حالية من الهاتف الآن"</string>

diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 5bdc056..04a408e 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Домейн/Потребителско име"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Използване на сигурна връзка (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Приемане на всички SSL сертификати"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Сертификат за клиентска програма"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Избиране"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Със сертификат за клиентска прогр."</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Премахване"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Нито един"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Идент. № на мобилното у-во"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Настройки на профила"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Опции за профила"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Неправилно потребителско име или парола."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Не може да се осъществи безопасна връзка със сървъра."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Не може да се осъществи безопасна връзка със сървъра."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Изисква се потребителски сертификат за връзка със сървъра."</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Изисква се сертификат за клиентска програма. Да се установи ли връзка със сървъра чрез него?"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"Сертификатът е невалиден или недостъпен."</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Сървърът отговори с грешка. Моля, проверете потребителското име и паролата си и опитайте отново."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Не може да се осъществи връзка със сървъра."</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Нормален"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Голям"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Огромен"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Отговор до всички"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"„Отговор до всички“ да е стандартната опция при отговор на съобщения"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Възстановяване на стандартните настройки за „Показване на снимките“"</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Възстановяване на стандартните настройки за всички податели (снимките да не се показват автоматично)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"„Показване на снимките“ е изчистено."</string>

diff --git a/res/values-bg/uploader.xml b/res/values-bg/uploader.xml
index 9439789..6e454f6 100644
--- a/res/values-bg/uploader.xml
+++ b/res/values-bg/uploader.xml

@@ -121,7 +121,7 @@
     <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Мобилни качвания"</string>
     <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Качвания при роуминг"</string>
     <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Качване на видеоклипове и снимки при роуминг в мрежата за данни"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Качвания за икономия на батерия"</string>
+    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Качване при зареждане"</string>
     <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Качване на снимки и видеоклипове само при зареждане"</string>
     <string name="preference_plus_sync_all" msgid="2563137874388611459">"Качване на съществуващите снимки"</string>
     <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Качване на всички съществуващи снимки и видеоклипове от телефона ви сега"</string>

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index e4fdc3f..e50d5f1 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domini\\Nom d\'usuari"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Utilitza una connexió segura (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Accepta tots els certificats SSL"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Certificat de client"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Selecciona"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Utilitza un certificat de client"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Elimina"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Cap"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID de dispositiu mòbil"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Configuració del compte"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Opcions del compte"</string>

diff --git a/res/values-ca/uploader.xml b/res/values-ca/uploader.xml
index fe86c1a..3b30a7a 100644
--- a/res/values-ca/uploader.xml
+++ b/res/values-ca/uploader.xml

@@ -121,7 +121,7 @@
     <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Càrregues de mòbil"</string>
     <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Càrregues d\'itinerància"</string>
     <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Penja les fotos i els vídeos a la xarxa de dades en itinerancia"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Càrregues amb bateria"</string>
+    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Pujades amb bateria"</string>
     <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Penja fotos i vídeos només quan s\'etigui carregant"</string>
     <string name="preference_plus_sync_all" msgid="2563137874388611459">"Càrrega de fotos existents"</string>
     <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Penja fotos i vídeos existents del telèfon ara"</string>

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index ba33655..2e2f6de 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Doména\\Uživatelské jméno"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Použít zabezpečené připojení (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Přijímat všechny certifikáty protokolu SSL"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Certifikát klienta"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Zvolit"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Použít klientský certifikát"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Odebrat"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Žádný"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID mobilního zařízení"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Nastavení účtu"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Možnosti účtu"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Uživatelské jméno nebo heslo není správné."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Nelze se bezpečně připojit k serveru."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Nelze se bezpečně připojit k serveru."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"K připojení k serveru je vyžadován uživatelský certifikát."</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Je vyžadován certifikát klienta. Chcete se připojit k serveru pomocí certifikátu klienta?"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"Certifikát je neplatný nebo nedostupný."</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Server odpověděl chybou. Zkontrolujte prosím uživatelské jméno a heslo a zkuste to znovu."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Nelze se připojit k serveru."</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normální"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Velký"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Velmi velký"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Odpovědět všem"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Nastavit volbu Odpovědět všem jako výchozí volbu odpovídání na zprávy"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Obnovit výchozí nastavení možnosti Zobrazovat obrázky"</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Obnovit výchozí nastavení pro všechny odesílatele (nezobrazovat obrázky automaticky)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"Nastavení Zobrazit obrázky bylo smazáno."</string>

diff --git a/res/values-cs/uploader.xml b/res/values-cs/uploader.xml
index 59cf744..1cadb7f 100644
--- a/res/values-cs/uploader.xml
+++ b/res/values-cs/uploader.xml

@@ -121,7 +121,7 @@
     <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Nahrávání pomocí mobilního datového připojení"</string>
     <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Nahrávání při roamingu"</string>
     <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Nahrávat fotky a videa při roamingu v datové síti"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Nahrávání podle baterie"</string>
+    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Nahr. podle baterie"</string>
     <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Fotografie a videa nahrávat jen při nabíjení"</string>
     <string name="preference_plus_sync_all" msgid="2563137874388611459">"Nahrát existující fotky"</string>
     <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Nahrát všechny existující fotky a videa z telefonu"</string>

diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 50b4fc9..6aa23ce 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domæne\\brugernavn"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Brug sikker forbindelse (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Accepter alle SSL-certifikater"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Klientcertifikat"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Vælg"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Brug klientcertifikat"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Fjern"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Intet"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Id for mobilenhed"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Indstillinger for konto"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Kontovalgmuligheder"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Brugernavn eller adgangskode er forkert."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Der kan ikke oprettes en sikker forbindelse til serveren."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Der kan ikke oprettes en sikker forbindelse til serveren."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Der kræves certifikat for at oprette forbindelse til serveren."</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Klientcertifikat kræves. Vil du oprette forbindelse til serveren med et klientcertifikat?"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"Certifikatet er ugyldigt eller ikke tilgængeligt."</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Serveren angiver en fejl. Kontroller dit brugernavn og din adgangskode, og prøv igen."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Der kan ikke oprettes forbindelse til serveren."</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normal"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Stor"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Kæmpestor"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Svar alle"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Gør \"Svar alle\" til standard, når du besvarer beskeder"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Gendan standard for \"Vis billeder\""</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Gendan standard for alle afsendere (vis ikke billeder automatisk)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Vis billeder\" er ryddet."</string>

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index ad9b870..f92c120 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domain-/Nutzername"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Sichere Verbindung (SSL) verwenden"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Alle SSL-Zertifikate akzeptieren"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Client-Zertifikat"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Auswählen"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Client-Zertifikat verwenden"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Entfernen"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Keine"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Mobilgerät-ID"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Kontoeinstellungen"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Konto-Optionen"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nutzername/Password falsch"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Keine sichere Verbindung zu Server möglich"</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Keine sichere Verbindung zum Server möglich"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Für die Serververbindung ist ein Nutzerzertifikat erforderlich."</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Client-Zertifikat erforderlich. Serververbindung mit Client-Zertifikat herstellen?"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"Zertifikat ungültig oder kein Zugriff möglich"</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Der Server hat einen Fehler zurückgegeben. Überprüfen Sie Ihren Nutzernamen und Ihr Passwort und versuchen Sie es erneut."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Keine Verbindung zu Server möglich"</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normal"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Groß"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Sehr groß"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Allen antworten"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"\"Allen antworten\" als Standard für die E-Mail-Beantwortung festlegen"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Auf Standardeinstellung für \"Bilder anzeigen\" zurücksetzen"</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Auf Standardeinstellung für alle Absender zurücksetzen (Bilder nicht automatisch anzeigen)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Bilder anzeigen\" gelöscht"</string>

diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index b015a7f..9dcb8c7 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Τομέας διαδικτύου\\Όνομα χρήστη"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Χρήση ασφαλούς σύνδεσης (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Αποδοχή όλων των πιστοποιητικών SSL"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Πιστοποιητικό πελάτη"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Επιλογή"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Χρήση του πιστοποιητικού πελάτη"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Κατάργηση"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Κανένα"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Αναγνωριστικό κινητής συσκευής"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Ρυθμίσεις λογαριασμού"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Επιλογές λογαριασμού"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Λάθος όνομα χρήστη ή κωδικός πρόσβασης."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Δεν είναι δυνατή η ασφαλής σύνδεση με τον διακομιστή."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Δεν είναι δυνατή η ασφαλής σύνδεση με τον διακομιστή."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Απαιτείται πιστοποιητικό χρήστη για τη σύνδεση στο διακομιστή."</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Απαιτείται πιστοποιητικό πελάτη. Να γίνει σύνδεση στο διακομιστή με χρήση πιστοποιητικού πελάτη;"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"Μη έγκυρο πιστοποιητικό ή δεν είναι δυνατή η πρόσβαση."</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Ο διακομιστής απάντησε με σφάλμα. Ελέγξτε το όνομα χρήστη και τον κωδικό πρόσβασης και δοκιμάστε ξανά."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Δεν είναι δυνατή η σύνδεση με τον διακομιστή."</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Κανονικό"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Μεγάλο"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Πολύ μεγάλο"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Απάντηση σε όλους"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Ορισμός \"Απάντηση σε όλους\" ως προεπιλογή για απάντηση σε μηνύματα."</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Επαναφορά προεπιλογής για την επιλογή \"Εμφάνιση εικόνων\""</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Επαναφορά προεπιλογών για όλους τους αποστολείς (να μην εμφανίζονται εικόνες αυτόματα)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"Καταργήθηκε η επιλογή του στοιχείου \"Εμφάνιση εικόνων\"."</string>

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 0753b1e..34f1d05 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domain\\Username"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Use secure connection (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Accept all SSL certificates"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Client certificate"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Select"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Use client certificate"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Remove"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"None"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Mobile Device ID"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Account settings"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Account options"</string>

diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 1b682d5..64b18e5 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Dominio\\Nombre de usuario"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Utilizar conexión segura (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Aceptar todos los certificados SSL"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Certificado de cliente"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Seleccionar"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Usar certificado de cliente"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Eliminar"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Ninguno"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID de dispositivo móvil"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Configuración de la cuenta"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Opciones de cuenta"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nombre de usuario o contraseña incorrecta."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"No se puede conectar de forma segura al servidor."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"No se puede conectar de forma segura al servidor."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Se necesita el certificado de usuario para conectarse al servidor."</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Se requiere un certificado de cliente. ¿Deseas conectarte al servidor con un certificado de cliente?"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"Certificado no válido o inaccesible"</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"El servidor respondió con un mensaje de error; verifica tu nombre de usuario y contraseña, y haz el intento de nuevo."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"No se puede conectar al servidor."</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normal"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Grande"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Enorme"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Responder a todos"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Elige \"Responder a todos\" como opción predeterminada para los mensajes."</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Restablecer predeterminado para \"Mostrar imágenes\""</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Restablecer predeterminado para todos los remitentes (no mostrar imágenes automáticamente)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"Se borró \"Mostrar imágenes\"."</string>

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 0b2c3d0..827f502 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Dominio\\nombre de usuario"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Utilizar conexión segura (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Aceptar todos los certificados SSL"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Certificado de cliente"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Seleccionar"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Utilizar certificado de cliente"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Eliminar"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Ninguno"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID de dispositivo móvil"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Ajustes de la cuenta"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Opciones de cuenta"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nombre de usuario o contraseña incorrecta"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"No se puede establecer una conexión de forma segura con el servidor."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"No se puede establecer una conexión de forma segura con el servidor."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Se necesita un certificado de usuario para conectarse al servidor."</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Se requiere un certificado de cliente. ¿Quieres conectarte al servidor con un certificado de cliente?"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"El certificado no es válido o no se puede acceder a él."</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"El servidor ha devuelto un error. Comprueba tu nombre de usuario y tu contraseña e inténtalo de nuevo."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"No se puede establecer una conexión con el servidor."</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normal"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Grande"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Enorme"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Responder a todos"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Elige Responder a todos como opción predeterminada para los mensajes"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Restaurar valores predeterminados para Mostrar imágenes"</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Restaurar valores predeterminados para todos los remitentes (no mostrar imágenes automáticamente)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"Se ha restaurado la opción Mostrar imágenes."</string>

diff --git a/res/values-es/uploader.xml b/res/values-es/uploader.xml
index 18ca965..c77ad1b 100644
--- a/res/values-es/uploader.xml
+++ b/res/values-es/uploader.xml

@@ -121,7 +121,7 @@
     <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Subidas móviles"</string>
     <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Subidas en itinerancia"</string>
     <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Subir fotos y vídeos en itinerancia en redes de datos"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Subir solo al cargar"</string>
+    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Subir en carga"</string>
     <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Subir fotos y vídeos solo cuando el dispositivo se está cargando"</string>
     <string name="preference_plus_sync_all" msgid="2563137874388611459">"Subir fotos y vídeos disponibles"</string>
     <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Subir fotos y vídeos disponibles en tu teléfono ahora mismo"</string>

diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 973fc74..8e9640a 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"دامنه/نام کاربری"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"از اتصال امن (SSL) استفاده شود"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"پذیرش همه گواهی های SSL"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"گواهی سرویس گیرنده"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"انتخاب"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"استفاده از گواهی مشتری"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"حذف"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"هیچکدام"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"شناسه تلفن همراه"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"تنظیمات حساب"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"گزینه های حساب"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"نام کاربری یا رمز ورود نادرست است. "\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"اتصال امن به سرور امکان پذیر نیست."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"اتصال امن به سرور امکان پذیر نیست. "\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"برای اتصال به سرور به گواهی کاربر نیاز است."</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"گواهی سرویس گیرنده مورد نیاز است. با گواهینامه سرویس گیرنده به سرور متصل می‌شوید؟"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"گواهی نامعتبر است و یا غیر قابل دسترس است."</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"سرور با یک خطا پاسخ داد؛ لطفاً نام کاربری و رمز ورود خود را بررسی کرده و دوباره امتحان کنید."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"اتصال به سرور امکان پذیر نیست."</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"معمولی"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"بزرگ"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"بسیار بزرگ"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"پاسخ به همه"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"\"پاسخ به همه\" پیش فرض پاسخگویی به پیام‌ها شود"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"بازیابی پیش فرض برای \"نمایش تصاویر\""</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"بازیابی پیش فرض برای همه ارسال کننده ها (تصاویر به صورت خودکار نشان داده نشود)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"نمایش تصاویر\" پاک شد."</string>

diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 18ead8d..3ad9983 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Toimialue\\käyttäjänimi"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Käytä suojattua yhteyttä (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Hyväksy kaikki SSL-varmenteet"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Asiakassovelluksen varmenne"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Valitse"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Käytä asiakasvarmennetta"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Poista"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Ei mitään"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Mobiililaitteen tunnus"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Tilin asetukset"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Tiliasetukset"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Virheellinen käyttäjänimi tai salasana."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Palvelimeen ei voi muodostaa suojattua yhteyttä."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Palvelimeen ei voi muodostaa suojattua yhteyttä."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Käyttäjävarmenne tarvitaan palvelimelle yhdistämiseen."</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Asiakasvarmenne vaaditaan. Yhdistetäänkö asiakasvarmenteelliseen palvelimeen?"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"Varmenne ei kelpaa tai ole käytettävissä."</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Palvelin lähetti virheilmoituksen. Tarkista käyttäjänimesi ja salasanasi ja yritä uudelleen."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Palvelimeen ei voi muodostaa yhteyttä."</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normaali"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Suuri"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Hyvin suuri"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Vastaa kaikille"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Aseta viesteihin vastaamisen oletusvalinnaksi Vastaa kaikille"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Palauta Näytä kuvat -oletusasetukset"</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Palauta kaikkien lähettäjien oletukset (kuvia ei näytetä automaattisesti)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"Näytä kuvat poistettu."</string>

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f805e78..914ea4d 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domaine\\Nom d\'utilisateur"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Utiliser une connexion sécurisée (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Accepter tous les certificats SSL"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Certificat client"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Sélectionner"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Utiliser un certificat client"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Supprimer"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Aucun"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Numéro d\'appareil mobile :"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Paramètres du compte"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Options de compte"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nom d\'utilisateur ou mot de passe incorrect."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Impossible d\'établir une connexion sécurisée avec le serveur."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Impossible d\'établir une connexion sécurisée avec le serveur."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Un certificat utilisateur est requis pour se connecter au serveur."</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Certificat client requis. Voulez-vous vous connecter au serveur avec le certificat client ?"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"Certificat non valide ou inaccessible."</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Erreur du serveur. Veuillez vérifier votre nom d\'utilisateur et votre mot de passe, puis réessayez."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Impossible d\'établir une connexion avec le serveur."</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normale"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Grande"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Très grande"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Répondre à tous"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Utiliser \"Répondre à tous\" par défaut pour répondre aux messages"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Restaurer les valeurs par défaut pour l\'option \"Afficher les images\""</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Restaurer les valeurs par défaut pour tous les expéditeurs (ne pas afficher les images automatiquement)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"Option \"Afficher les images\" désactivée."</string>

diff --git a/res/values-fr/uploader.xml b/res/values-fr/uploader.xml
index f8b44cb..3f9a2da 100644
--- a/res/values-fr/uploader.xml
+++ b/res/values-fr/uploader.xml

@@ -121,7 +121,7 @@
     <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Transferts via connexion mobile"</string>
     <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Transferts en itinérance"</string>
     <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Transférer les photos et les vidéos en itinérance"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Transferts lorsque la batterie est en charge"</string>
+    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Transferts en charge"</string>
     <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Transférer les photos et les vidéos uniquement lors de la mise en charge"</string>
     <string name="preference_plus_sync_all" msgid="2563137874388611459">"Transférer les photos existantes"</string>
     <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Transférer toutes les photos et les vidéos de votre téléphone"</string>

diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index b0264bf..64b06a2 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domena\\Korisničko ime"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Koristi sigurnu vezu (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Prihvati sve SSL certifikate"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Certifikat klijenta"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Odaberi"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Upotrijebi certifikat klijenta"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Ukloni"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Ništa"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID mobilnog uređaja"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Postavke računa"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Mogućnosti računa"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Korisničko ime ili zaporka nisu točni."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Sigurno povezivanje s poslužiteljem nije moguće."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Sigurno povezivanje s poslužiteljem nije moguće."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Za povezivanje s poslužiteljem potreban je korisnički certifikat."</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Potreban certifikat klijenta. Spojiti se na poslužitelj s certifikatom klijenta?"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"Certifikat je nevažeći ili nedostupan."</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Poslužitelj je odgovorio pogreškom; provjerite korisničko ime i zaporku i pokušajte ponovno."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Povezivanje s poslužiteljem nije moguće."</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normalan"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Velik"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Ogroman"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Odgovori svima"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Učini \"Odgovori svima\" zadanom postavkom za odgovor na poruke"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Vrati zadano za \"Prikaži slike\""</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Vrati zadano za sve pošiljatelje (ne prikazuj slike automatski)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Prikaži slike\" izbrisano."</string>

diff --git a/res/values-hr/uploader.xml b/res/values-hr/uploader.xml
index 59dca8a..2873f7b 100644
--- a/res/values-hr/uploader.xml
+++ b/res/values-hr/uploader.xml

@@ -121,7 +121,7 @@
     <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Mobilni prijenosi"</string>
     <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Prijenosi u roamingu"</string>
     <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Pošaljite fotografije i videozapise za vrijeme roaminga na mreži za prijenos podataka"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Šalji tijekom punjenja baterije"</string>
+    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Slanje tijekom punj."</string>
     <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Prijenos fotografija i videozapisa samo tijekom punjenja"</string>
     <string name="preference_plus_sync_all" msgid="2563137874388611459">"Prijenos postojećih fotografija"</string>
     <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Prijenos svih postojećih fotografija i videozapisa s telefona sada"</string>

diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 3dc5836..ef04dae 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domain\\felhasználónév"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Biztonságos kapcsolat (SSL) használata"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Minden SSL-tanúsítvány elfogadása"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Ügyféltanúsítvány"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Kiválasztás"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Ügyféltanúsítvány használata"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Eltávolítás"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Egy sem"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"A mobil eszköz azonosítója"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Fiókbeállítások"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Fiókbeállítások"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Helytelen felhasználónév vagy jelszó."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Nem lehet biztonságos kapcsolatot létesíteni a szerverrel."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Nem lehet biztonságos kapcsolatot létesíteni a szerverrel."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Felhasználói tanúsítvány szükséges a szerverhez való kapcsolódáshoz."</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Ügyféltanúsítvány szükséges. Csatlakozzon ügyféltanúsítvánnyal rendelkező szerverhez?"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"Tanúsítvány érvénytelen vagy elérhetetlen."</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"A szerver hibaüzenettel válaszolt. Kérjük, ellenőrizze felhasználónevét és jelszavát, majd próbálja újra."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Nem lehet kapcsolatot létesíteni a szerverrel."</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normál"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Nagy"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Óriási"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Válasz mindenkinek"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"A \"Válasz mindenkinek\" legyen az alapértelmezett válaszolási mód"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Alapértelmezett beállítások visszaállítása \"Képek megjelenítése\" esetén"</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Alapértelmezett beállítások visszaállítása minden feladó esetén (ne mutassa automatikusan a képeket)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Képek megjelenítése\" törölve."</string>

diff --git a/res/values-hu/uploader.xml b/res/values-hu/uploader.xml
index e3a8299..ef582cb 100644
--- a/res/values-hu/uploader.xml
+++ b/res/values-hu/uploader.xml

@@ -121,7 +121,7 @@
     <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Mobil feltöltések"</string>
     <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Feltöltés barangoláskor"</string>
     <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Fotók és videók feltöltése adathálózaton történő barangolás során"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Akkumulátorfeltöltések"</string>
+    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Akkufeltöltések"</string>
     <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Fotók és videók feltöltése csak töltés közben"</string>
     <string name="preference_plus_sync_all" msgid="2563137874388611459">"Már meglévő fotók feltöltése"</string>
     <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Bármely meglévő fotó és videó azonnali feltöltése telefonjáról"</string>

diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 7d64eb5..07c8adb 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domain\\Nama Pengguna"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Gunakan sambungan aman (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Terima semua sertifikat SSL"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Sertifikat klien"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Pilih"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Gunakan sertifikat klien"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Hapus"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Tidak ada"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID Perangkat Seluler"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Setelan akun"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Opsi akun"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nama pengguna atau sandi salah."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Tidak dapat terhubung ke server dengan aman."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Tidak dapat terhubung ke server dengan aman."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Sertifikat pengguna diperlukan untuk menyambung dengan server."</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Sertifikat klien diperlukan. Sambungkan ke server dengan sertifikat klien?"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"Sertifikat tidak valid atau tidak dapat diakses."</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Server menanggapi dengan galat; periksa nama pengguna dan sandi, lalu coba lagi."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Tidak dapat terhubung ke server."</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normal"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Besar"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Sangat besar"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Balas semua"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Jadikan \'Balas semua\' sebagai bawaan untuk menjawab pesan"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Pulihkan bawaan untuk \"Tampilkan gambar\""</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Pulihkan bawaan untuk semua pengirim (jangan tampilkan gambar secara otomatis)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Tampilkan gambar\" dihapus."</string>

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index e917010..d8e2672 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Dominio/nome utente"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Utilizza connessione sicura (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Accetta tutti i certificati SSL"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Certificato client"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Seleziona"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Usa certificato client"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Rimuovi"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Nessuno"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID dispositivo mobile"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Impostazioni account"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Opzioni account"</string>

diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 71dda1f..ede3189 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"דומיין/שם משתמש"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"השתמש בחיבור מאובטח (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"קבל את כל אישורי SSL"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"אישור לקוח"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"בחר"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"השתמש באישור לקוח"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"הסר"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"ללא"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"מזהה מכשיר נייד"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"הגדרות חשבון"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"אפשרויות חשבון"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"שם המשתמש או הסיסמה שגויים."\n"‏(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"אין אפשרות להתחבר לשרת באופן בטוח."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"לא ניתן להתחבר לשרת באופן בטוח."\n"‏(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"נדרש אישור משתמש כדי להתחבר לשרת."</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"נדרש אישור לקוח. להתחבר לשרת עם אישור לקוח?"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"האישור אינו חוקי או אינו נגיש."</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"השרת הגיב עם שגיאה. בדוק את שם המשתמש והסיסמה ונסה שוב."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"אין אפשרות להתחבר לשרת."</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"רגיל"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"גדול"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"ענק"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"השב לכולם"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"הפוך את \'השב לכולם\' לברירת המחדל של מענה להודעות"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"שחזר ברירת מחדל עבור \'הצג תמונות\'"</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"שחזר ברירת מחדל עבור כל השולחים (אל תציג תמונות באופן אוטומטי)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"רשימת \'הצג תמונות\' נוקתה."</string>

diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index bedf012..c557deb 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"ドメイン\\ユーザー名"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"安全な接続（SSL）を使用する"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"すべてのSSL証明書を承認"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"クライアント証明書"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"選択"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"クライアント証明書を使用"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"削除"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"なし"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"携帯端末ID"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"アカウントの設定"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"アカウントのオプション"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"ユーザー名かパスワードが間違っています。"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"サーバーへの安全な接続を確立できません。"</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"サーバーへの安全な接続を確立できません。"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"サーバーに接続するにはユーザーの証明書が必要です。"</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"クライアント証明書が必要です。クライアント証明書を使用してサーバーに接続しますか？"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"証明書が無効か、証明書にアクセスできません。"</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"サーバーからエラーが返されました。ユーザー名とパスワードを確認してもう一度お試しください。"</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"サーバーに接続できません。"</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"標準"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"大"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"極大"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"全員に返信"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"メールに返信する際に毎回「全員に返信」する"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"[画像を表示]をデフォルトに戻す"</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"すべての送信者をデフォルトに戻す（画像を自動的に表示しない）"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"[画像を表示]を解除しました。"</string>

diff --git a/res/values-ja/uploader.xml b/res/values-ja/uploader.xml
index df76962..3c5215c 100644
--- a/res/values-ja/uploader.xml
+++ b/res/values-ja/uploader.xml

@@ -121,7 +121,7 @@
     <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"モバイルアップロード"</string>
     <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"ローミング時にアップロード"</string>
     <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"データネットワークでのローミング時に画像と動画をアップロード"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"充電開始後にアップロード"</string>
+    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"充電中にアップロード"</string>
     <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"充電時にのみ画像と動画をアップロード"</string>
     <string name="preference_plus_sync_all" msgid="2563137874388611459">"既存の画像をアップロード"</string>
     <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"既存の画像と動画を携帯端末から今すぐアップロード"</string>

diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 1a6a157..c2ef42d 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"도메인\\사용자 이름"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"보안 연결(SSL) 사용"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"모든 SSL 인증서 수락"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"클라이언트 인증서"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"선택"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"클라이언트 인증서 사용"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"삭제"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"선택 취소"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"휴대기기 ID"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"계정 설정"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"계정 옵션"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"사용자 이름 또는 비밀번호가 잘못되었습니다."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"서버에 안전하게 연결할 수 없습니다."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"서버에 안전하게 연결할 수 없습니다."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"사용자 인증서를 서버에 연결해야 합니다."</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"클라이언트 인증서가 필요합니다. 클라이언트 인증서로 서버에 연결하시겠습니까?"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"인증서가 잘못되었거나 액세스할 수 없습니다."</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"서버에서 오류를 발견했습니다. 사용자 이름과 비밀번호를 확인한 다음 다시 시도해 주세요."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"서버에 연결할 수 없습니다."</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"보통"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"크게"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"아주 크게"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"전체답장"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"메일 답장 시, \'전체답장\'을 기본값으로 설정"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"\'이미지 표시\'에 대한 기본값 복원"</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"모든 발신자에 대한 기본값 복원(자동으로 이미지 표시 안함)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"\'이미지 표시\'가 초기화되었습니다."</string>

diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index ecf56cc..23d81c0 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domenas / naudotojo vardas"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Naudoti saugų ryšį (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Priimti visus SSL sertifikatus"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Kliento sertifikatas"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Pasirinkti"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Naudoti kliento sertifikatą"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Pašalinti"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Nėra"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Mobiliojo įrenginio ID"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Paskyros nustatymai"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Paskyros parinktys"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Neteisingas naudotojo vardas ar slaptažodis."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Negalima saugiai prisijungti prie serverio."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Nepavyksta saugiai prisijungti prie serverio."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Reikia prijungti naudotojo sertifikatą prie serverio."</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Reikia kliento sertifikato. Prisijungti prie serverio naudojant kliento sertifikatą?"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"Sertifikatas negalioja arba yra nepasiekiamas."</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Serveris atsakė pateikdamas klaidą; patikrinkite naudotojo vardą bei slaptažodį ir bandykite dar kartą."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Negali prisijungti prie serverio."</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Įprastas"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Didelis"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Itin didelis"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Atsakyti visiems"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Atsakyti į pranešimus pasirinkite „Atsakyti visiems“ kaip numat. nust."</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Atkurti numatytuosius funkcijos „Rodyti paveikslėlius“ nustatymus"</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Atkurti visų siuntėjų numatytuosius nustatymus (automatiškai nerodyti paveikslėlių)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"„Rodyti paveikslėlius“ išvalyta."</string>

diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 500ae5d..029ada3 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domēns\\lietotājvārds"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Lietot drošu savienojumu (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Pieņemt visus SSL sertifikātus"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Klienta sertifikāts"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Atlasīt"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Izmantot klienta sertifikātu"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Noņemt"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Nav"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Mobilās ierīces ID"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Konta iestatījumi"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Konta iespējas"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Lietotājvārds vai parole nav pareiza."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Nevar izveidot drošu savienojumu ar serveri."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Nevar izveidot drošu savienojumu ar serveri."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Lai izveidotu savienojumu ar serveri, ir nepieciešams lietotāja sertifikāts."</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Ir nepieciešams klienta sertifikāts. Vai izveidot savienojumu ar serveri, izmantojot klienta sertifikātu?"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"Sertifikāts nav derīgs vai nav pieejams."</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Serveris reaģēja ar kļūdu; lūdzu, pārbaudiet savu lietotājvārdu un paroli un mēģiniet vēlreiz."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Nevar izveidot savienojumu ar serveri."</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Parasts"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Liels"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Milzīgs"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Atbildēt visiem"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Atbildēšanai uz ziņojumiem kā noklusējumu iestatīt Atbildēt visiem"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Atjaunot noklusējuma vērtību iestatījumam Rādīt attēlus"</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Atjaunot noklusējuma iestatījumus visiem sūtītājiem (nerādīt attēlus automātiski)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"Iestatījums Rādīt attēlus ir notīrīts."</string>

diff --git a/res/values-lv/uploader.xml b/res/values-lv/uploader.xml
index 31fdc0d..32b1d19 100644
--- a/res/values-lv/uploader.xml
+++ b/res/values-lv/uploader.xml

@@ -121,7 +121,7 @@
     <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Augšupielādes, izmantojot mobilos sakarus"</string>
     <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Augšupielādes, izmantojot viesabonēšanu"</string>
     <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Augšupielādēt fotoattēlus un videoklipus datu tīklā viesabonēšanas laikā"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Augšupielādes, veicot akumulatora uzlādi"</string>
+    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Augšupielādes lādējot"</string>
     <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Augšupielādēt fotoattēlus un videoklipus tikai uzlādes laikā"</string>
     <string name="preference_plus_sync_all" msgid="2563137874388611459">"Augšupielādēt esošos fotoattēlus"</string>
     <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Augšupielādēt visus esošos fotoattēlus un videoklipus no tālruņa tūlīt"</string>

diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 939c14e..a439c58 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domain\\Nama Pengguna"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Gunakan sambungan selamat (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Terima semua sijil SSL"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Sijil klien"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Pilih"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Gunakan sijil klien"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Alih keluar"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Tiada"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID Peranti Mudah Alih"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Tetapan akaun"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Pilihan akaun"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nama pengguna atau kata laluan salah."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Tidak boleh bersambung ke pelayan dengan selamat."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Tidak dapat bersambung ke pelayan dengan selamat."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Sijil pengguna diperlukan untuk menyambung kepada pelayan."</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Sijil klien diperlukan. Sambung ke pelayan dengan sijil klien?"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"Sijil tidak sah atau tidak boleh diakses."</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Pelayan memberi respons dengan ralat; sila semak nama pengguna dan kata laluan anda dan cuba lagi."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Tidak dapat bersambung ke pelayan."</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Biasa"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Besar"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Sangat besar"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Balas kepada semua"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Jadikan \'Balas kepada semua\' lalai untuk membalas mesej"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Pulihkan lalai untuk \"Tunjukkan gambar\""</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Pulihkan lalai untuk semua pengirim (jangan tunjukkan gambar secara automatik)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Tunjukkan gambar\" sudah dipadam bersih."</string>

diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 9ee1bf4..657857a 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domene\\brukernavn"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Bruk sikker tilkobling (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Godkjenn alle SSL-sertifikater"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Klientsertifikat"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Velg"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Bruk klientsertifikat"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Fjern"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Ingen"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Mobilenhets-ID"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Kontoinnstillinger"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Alternativer for konto"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Feil brukernavn eller passord."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Kan ikke åpne en sikker tilkobling til tjeneren."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Kan ikke åpne en sikker tilkobling til tjeneren."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Brukersertifikat kreves for å koble til tjeneren."</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Klientsertifikat er påkrevd. Vil du koble til en tjener med klientsertifikat?"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"Sertifikatet er ugyldig eller utilgjengelig."</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Tjeneren svarte med en feil. Kontroller brukernavn og passord og prøv igjen."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Kan ikke koble til tjeneren."</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normal"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Stor"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Kjempestor"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Svar alle"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Bruk «Svar alle» som standard for å svare på e-poster"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Gjenopprett standard for «Vis bilder»"</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Gjenopprett standard for alle avsendere (ikke vis bilder automatisk)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"«Vis bilder» er tømt."</string>

diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 16f8c45..631053d 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domein/gebruikersnaam"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Beveiligde verbinding (SSL) gebruiken"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Alle SSL-certificaten accepteren"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Clientcertificaat"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Selecteren"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Klantcertificaat gebruiken"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Verwijderen"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Geen"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Mobiele apparaat-id"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Accountinstellingen"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Accountopties"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Gebruikersnaam of wachtwoord is onjuist."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Kan geen veilige verbinding met de server tot stand brengen."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Kan geen veilige verbinding met de server tot stand brengen."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Gebruikerscertificaat vereist voor verbinding met de server."</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Clientcertificaat vereist. Wilt u verbinding met de server maken met een clientcertificaat?"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"Certificaat ongeldig of niet toegankelijk."</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"De server heeft een fout geretourneerd. Controleer uw gebruikersnaam en wachtwoord en probeer het opnieuw."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Kan geen verbinding maken met de server."</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normaal"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Groot"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Enorm"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Allen beantwoorden"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"\'Allen beantwoorden\' gebruiken als standaard beantwoordingsoptie"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Standaardinstellingen herstellen voor \'Afbeeldingen weergeven\'"</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Standaardinstellingen voor alle afzenders herstellen (afbeeldingen niet automatisch weergeven)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"\'Afbeeldingen weergeven\' gewist."</string>

diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 1787aac..81a5645 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domena\\nazwa użytkownika"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Użyj bezpiecznego połączenia (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Akceptuj wszystkie certyfikaty SSL"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Certyfikat klienta"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Wybierz"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Użyj certyfikatu klienta"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Usuń"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Brak"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Identyfikator telefonu komórkowego"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Ustawienia konta"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Opcje konta"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nieprawidłowa nazwa użytkownika lub hasło."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Nie można nawiązać bezpiecznego połączenia z serwerem."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Nie można nawiązać bezpiecznego połączenia z serwerem."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Do nawiązania połączenia z serwerem wymagany jest certyfikat użytkownika."</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Wymagany certyfikat klienta. Czy połączyć z serwerem z certyfikatem klienta?"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"Certyfikat jest nieważny lub niedostępny."</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Serwer zgłosił błąd. Sprawdź nazwę użytkownika i hasło, a następnie spróbuj ponownie."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Nie można nawiązać połączenia z serwerem."</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normalny"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Duży"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Wielki"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Odpowiedz wszystkim"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Ustaw opcję „Odpowiedz wszystkim” jako domyślną dla wiadomości"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Przywróć wartość domyślną opcji „Pokaż obrazy”"</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Przywróć wartość domyślną dla wszystkich nadawców (nie pokazuj obrazów automatycznie)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"Opcja „Pokaż obrazy” została wyczyszczona."</string>

diff --git a/res/values-pl/uploader.xml b/res/values-pl/uploader.xml
index 06c1028..c409683 100644
--- a/res/values-pl/uploader.xml
+++ b/res/values-pl/uploader.xml

@@ -121,7 +121,7 @@
     <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Przesyłanie z komórki"</string>
     <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Przesyłanie w roamingu"</string>
     <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"W roamingu przesyłaj zdjęcia i filmy przez sieć transmisji danych"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Przesyłanie podczas ładowania baterii"</string>
+    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Do naładowania baterii"</string>
     <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Przesyłaj zdjęcia i filmy tylko podczas ładowania"</string>
     <string name="preference_plus_sync_all" msgid="2563137874388611459">"Prześlij istniejące zdjęcia"</string>
     <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Prześlij teraz wszystkie zdjęcia i filmy z telefonu"</string>

diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index dc53c20..5eac773 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domínio/Nome de utilizador"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Utilizar ligação segura (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Aceitar todos os certificados SLL"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Certificado do cliente"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Selecionar"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Utilizar certificado de cliente"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Remover"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Nenhum"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID do dispositivo móvel"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Definições da conta"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Opções da conta"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nome de utilizador ou palavra-passe incorretos."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Não é possível ligar ao servidor em segurança."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Não é possível ligar ao servidor em segurança."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"É necessário o certificado de utilizador para estabelecer ligação ao servidor."</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Certificado de cliente solicitado. Ligar ao servidor com o certificado de cliente?"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"Certificado inválido ou inacessível."</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"O servidor respondeu com um erro; verifique o nome de utilizador e palavra-passe e tente de novo."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Não é possível efectuar a ligação ao servidor."</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normal"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Grande"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Muito grande"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Responder a todos"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Tornar “Responder a todos” a opção predef. para responder a mensagens"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Repor predefinição para \"Mostrar imagens\""</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Repor predefinição para todos os remetentes (não mostrar imagens automaticamente)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Mostrar imagens\" desmarcada."</string>

diff --git a/res/values-pt-rPT/uploader.xml b/res/values-pt-rPT/uploader.xml
index 16567da..fc8ca4c 100644
--- a/res/values-pt-rPT/uploader.xml
+++ b/res/values-pt-rPT/uploader.xml

@@ -123,7 +123,7 @@
     <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Carregamentos móveis"</string>
     <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Carregamentos em roaming"</string>
     <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Carregar fotografias e vídeos em roaming na rede de dados"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Carregamentos da bateria"</string>
+    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Uploads de bateria"</string>
     <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Carregar fotografias e vídeos apenas quando está a carregar"</string>
     <string name="preference_plus_sync_all" msgid="2563137874388611459">"Carregar fotos existentes"</string>
     <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Carregar todas as fotografias e vídeos existentes no seu telemóvel agora"</string>

diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 4bb15af..c77e356 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domínio\\Nome de usuário"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Usar conexão segura (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Aceitar todos os certificados SSL"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Certificado do cliente"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Selecionar"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Usar certificado de cliente"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Remover"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Nenhum"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID do aparelho celular"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Configurações da conta"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Opções da conta"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nome de usuário ou senha incorretos. "\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Não é possível se conectar ao servidor com segurança."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Não é possível se conectar ao servidor com segurança."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"É necessário o certificado de usuário para se conectar ao servidor."</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"O certificado de cliente é obrigatório. Conectar-se ao servidor com o certificado de cliente?"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"Certificado inválido ou inacessível."</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"O servidor respondeu com um erro. Verifique seu nome de usuário e senha e tente novamente."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Não é possível se conectar ao servidor."</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normal"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Grande"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Enorme"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Responder a todos"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Tornar padrão a opção \"Responder a todos\" para responder a mensagens"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Restaurar padrão de \"Mostrar fotos\""</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Restaurar padrão para todos os remetentes (não mostrar fotos automaticamente)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"Opção \"Mostrar fotos\" desmarcada."</string>

diff --git a/res/values-pt/uploader.xml b/res/values-pt/uploader.xml
index 89ad180..fb07170 100644
--- a/res/values-pt/uploader.xml
+++ b/res/values-pt/uploader.xml

@@ -121,7 +121,7 @@
     <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Envios do celular"</string>
     <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Envios de roaming"</string>
     <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Enviar fotos e vídeos quando estiver em roaming na rede de dados"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Envios de bateria"</string>
+    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Uploads de bateria"</string>
     <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Enviar fotos e vídeos apenas quando estiver carregando"</string>
     <string name="preference_plus_sync_all" msgid="2563137874388611459">"Enviar fotos existentes"</string>
     <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Enviar agora todas as fotos e vídeos existentes em seu telefone"</string>

diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 55acbb8..bdebc8f 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml

@@ -363,10 +363,16 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domena/num d\'utilisader"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Utilisar ina connexiun segira (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Acceptar tut ils certificats SSL"</string>
+    <!-- no translation found for account_setup_exchange_certificate_title (8473793588405277962) -->
+    <skip />
+    <!-- no translation found for account_setup_exchange_select_certificate (1536103662037268683) -->
+    <skip />
     <!-- no translation found for account_setup_exchange_use_certificate (8690682770083161349) -->
     <skip />
     <!-- no translation found for account_setup_exchange_remove_certificate (5633249155510301766) -->
     <skip />
+    <!-- no translation found for account_setup_exchange_no_certificate (1119542961954780872) -->
+    <skip />
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID dad apparats mobils"</string>
     <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Opziuns da conto"</string>
     <!-- no translation found for account_setup_options_headline (4181274232835368085) -->

diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 2037300..2d5c500 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domeniu\\Nume de utilizator"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Utilizaţi o conexiune securizată (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Acceptaţi toate certificatele SSL"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Certificat client"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Selectaţi"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Utilizaţi certificatul de client"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Eliminaţi"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Niciunul"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID dispozitiv mobil"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Setări cont"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Opţiunile contului"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nume de utilizator sau parolă incorectă."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Nu este posibilă conectarea în siguranţă la server."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Nu este posibilă conectarea în siguranţă la server."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Certificatul de utilizator este necesar pentru conectarea la server."</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Este necesar certificatul client. Vă conectaţi la server cu certificatul client?"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"Certificat nevalid sau inaccesibil."</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Serverul a răspuns cu o eroare. Verificaţi numele de utilizator şi parola şi încercaţi din nou."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Nu se poate conecta la server."</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normală"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Mare"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Foarte mare"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Răspundeţi tuturor"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Setaţi „Răspundeţi tuturor” ca opţiune standard de răspuns la mesaje"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Reveniţi la setarea prestabilită pentru „Afişaţi fotografiile”"</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Reveniţi la setarea prestabilită pentru toţi expeditorii (nu afişaţi fotografiile în mod automat)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"Opţiunea „Afişaţi fotografiile” este debifată."</string>

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 8ef44fa..5776830 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Домен\\Имя пользователя"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Использовать защищенное соединение (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Принимать все сертификаты SSL"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Сертификат клиента"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Выбрать"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Использовать сертификат клиента"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Удалить"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Не используется"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Идентификатор мобильного устройства"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Настройки аккаунта"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Параметры аккаунта"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Неверное имя пользователя или пароль."\n"<xliff:g id="ERROR">%s</xliff:g>"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Не удается установить защищенное подключение к серверу."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Не удается установить защищенное подключение к серверу."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Для подключения к серверу необходим сертификат пользователя."</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Необходим сертификат клиента. Подключиться к серверу?"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"Сертификат недействителен или недоступен."</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Ошибка сервера; проверьте имя пользователя и пароль и повторите попытку."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Не удается подключиться к серверу."</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Обычный"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Крупный"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Огромный"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Ответить всем"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Всегда отвечать всем участникам переписки"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Восстановить значение по умолчанию для параметра \"Показать изображения\""</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Восстановить значения по умолчанию для всех отправителей (отключить автоматический показ их изображений)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"Показ изображений отключен."</string>

diff --git a/res/values-ru/uploader.xml b/res/values-ru/uploader.xml
index 688710b..08dbd9e 100644
--- a/res/values-ru/uploader.xml
+++ b/res/values-ru/uploader.xml

@@ -121,7 +121,7 @@
     <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Загрузка с мобильного устройства"</string>
     <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Загрузки в роуминге"</string>
     <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Загружать фото и видео в роуминге по каналу передачи данных"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Загрузка после подзарядки"</string>
+    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Загрузка при зарядке"</string>
     <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Загружать фотографии и видео только во время зарядки"</string>
     <string name="preference_plus_sync_all" msgid="2563137874388611459">"Загрузить имеющиеся фото"</string>
     <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Загрузить все имеющиеся на телефоне фотографии и видеоролики"</string>

diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 75eab23..ca7839b 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Doména\\Používateľské meno"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Použiť zabezpečené pripojenie (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Prijímať všetky certifikáty protokolu SSL"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Certifikát klienta"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Vybrať"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Použite certifikát klienta"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Odstrániť"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Žiadny"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID mobilného zariadenia"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Nastavenia účtu"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Možnosti účtu"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Používateľské meno alebo heslo nie je správne."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Nepodarilo sa bezpečne pripojiť k serveru."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Nepodarilo sa bezpečne pripojiť k serveru."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Na pripojenie k serveru je potrebný certifikát používateľa."</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Vyžaduje sa certifikát klienta. Pripojiť sa k serveru pomocou certifikátu klienta?"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"Certifikát je neplatný alebo neprístupný."</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Server odpovedal s chybou. Skontrolujte používateľské meno a heslo a skúste to znova."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Nepodarilo sa pripojiť k serveru."</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normálne"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Veľké"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Veľmi veľké"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Odpovedať všetkým"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Nastaviť voľbu „Odpovedať všetkým“ ako predvol. voľbu odpov. na správy"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Obnoviť predvolenú hodnotu pre nastavenie „Zobraziť obrázky“"</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Obnoviť predvolené hodnoty nastavení pre všetkých odosielateľov (nezobrazovať obrázky automaticky)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"Nastavenie „Zobraziť obrázky“ bolo vymazané."</string>

diff --git a/res/values-sk/uploader.xml b/res/values-sk/uploader.xml
index acf473b..ade89d7 100644
--- a/res/values-sk/uploader.xml
+++ b/res/values-sk/uploader.xml

@@ -121,7 +121,7 @@
     <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Odovzdávanie pomocou mobilného dátového pripojenia"</string>
     <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Odovzdávanie pri roamingu"</string>
     <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Odovzdávať fotografie a videá v roamingu v dátovej sieti"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Odovzdávanie podľa batérie"</string>
+    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Odovzd. podľa batérie"</string>
     <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Odovzdávať fotografie a videá len počas nabíjania"</string>
     <string name="preference_plus_sync_all" msgid="2563137874388611459">"Odovzdať fotografie"</string>
     <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Odovzdanie všetkých fotografií a videí z telefónu"</string>

diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 1011c71..6001cb3 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domena/uporabniško ime"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Uporabi varno povezavo (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Sprejmi vsa potrdila SSL"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Potrdilo odjemalca"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Izberi"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Uporaba potrdila odjemalca"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Odstrani"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Brez"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID mobilne naprave"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Nastavitve računa"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Možnosti računa"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nepravilno uporabniško ime ali geslo."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Ni se mogoče varno povezati s strežnikom."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Ni se mogoče varno povezati s strežnikom."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Za povezavo s strežnikom je potrebno uporabniško potrdilo."</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Potrebujete potrdilo odjemalca. Se želite s strežnikom povezati s potrdilom odjemalca?"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"Potrdilo je neveljavno ali nedostopno."</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Strežnik je odgovoril z napako; preverite uporabniško ime in geslo in poskusite znova."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Ni se mogoče povezati s strežnikom."</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Običajna"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Velika"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Velikanska"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Odgovori vsem"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Naj bo »Odgovori vsem« privzeta nastavitev za odgovore na sporočila"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Obnovi privzeto za »Pokaži slike«"</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Obnovi privzeto za vse pošiljatelje (slik ne pokaži samodejno)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"Možnost »Pokaži slike« je počiščena."</string>

diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 4d625d3..30e8a19 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Домен/корисничко име"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Користите безбедну везу (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Прихвати све SSL сертификате"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Сертификат клијента"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Изабери"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Користи сертификат клијента"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Уклони"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Ниједан"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ИД мобилног уређаја"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Подешавања налога"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Опције налога"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Корисничко име или лозинка нису тачни."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Безбедно повезивање са сервером није могуће."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Безбедно повезивање са сервером није могуће."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Сертификат корисника је обавезан за повезивање са сервером."</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Потребан је сертификат клијента. Желите ли да се повежете са сервером помоћу сертификата клијента?"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"Сертификат је неважећи или недоступан."</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Сервер је као одговор дао грешку, проверите корисничко име и лозинку и покушајте поново."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Повезивање са сервером није могуће."</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Нормалан"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Велика"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Огромно"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Одговори свима"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Постави опцију „Одговори свима“ као подразумевану за одговоре на поруке"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Враћање подразумеваних подешавања за „Прикажи слике“"</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Враћање подразумеваних подешавања за све пошиљаоце (слике се не приказују аутоматски)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"Избор опције „Прикажи слике“ је опозван."</string>

diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 07e8e68..4273a77 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domän\\Användarnamn"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Använd säker anslutning (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Acceptera alla SSL-certifikat"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Klientcertifikat"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Välj"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Använd klientcertifikat"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Ta bort"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Inga"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Den mobila enhetens ID"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Kontoinställningar"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Kontoalternativ"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Fel användarnamn eller lösenord."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Det går inte att upprätta en säker anslutning till servern."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Det går inte att upprätta en säker anslutning till servern."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Ett användarcertifikat krävs för att ansluta till servern."</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Klientcertifikat krävs. Vill du ansluta till servern med klientcertifikatet?"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"Certifikatet är ogiltigt eller otillgängligt."</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Servern svarade med ett fel. Kontrollera ditt användarnamn och lösenord och försök igen."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Det går inte att ansluta till servern."</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normal"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Stor"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Jättestor"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Svara alla"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Använd Svara alla som standard vid svar på meddelanden"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Återställ standard för \"Visa bilder\""</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Återställ standard för alla avsändare (visa inte bilder automatiskt)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Visa bilder\" rensas."</string>

diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index f11cd2c..62ec66a 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml

@@ -22,7 +22,7 @@
     <string name="permission_access_provider_desc" msgid="2549843731779487336">"Huruhusu programu hii kufikia hifadhidata yako ya barua pepe, pamoja na barua zilizopokewa, barua zilizotumwa, majina ya watumiaji na manenosiri."</string>
     <string name="app_name" msgid="5815426892327290362">"Barua pepe"</string>
     <string name="compose_title" msgid="427986915662706899">"Tunga"</string>
-    <string name="debug_title" msgid="5175710493691536719">"Rekebisha"</string>
+    <string name="debug_title" msgid="5175710493691536719">"Tatua"</string>
     <string name="next_action" msgid="3931301986364184415">"Ifuatayo"</string>
     <string name="okay_action" msgid="8365197396795675617">"Sawa"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Ghairi"</string>
@@ -57,7 +57,7 @@
     <string name="add_cc_bcc_menu" msgid="4757145078498200242">"Ongeza Nakala kwa/Nakala fiche kwa"</string>
     <string name="add_attachment_menu" msgid="6854757034409168845">"Ambatisha faili"</string>
     <string name="close_action" msgid="533058985745238100">"Funga"</string>
-    <string name="message_list_send_pending_messages_action" msgid="8502942186631824114">"Tuma ujumbe wote"</string>
+    <string name="message_list_send_pending_messages_action" msgid="8502942186631824114">"Tuma barua zote"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Chagua kiambatisho"</string>
     <string name="move_to_folder_dialog_title" msgid="2614318192482193898">"Sogeza hadi"</string>
     <string name="status_loading_messages" msgid="6552307237621292344">"Inapakia ujumbe..."</string>
@@ -106,14 +106,14 @@
     <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Rasimu"</string>
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Kikasha toezi"</string>
     <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Mwonekano wa mchanganyiko"</string>
-    <string name="mailbox_list_account_selector_show_all_folders" msgid="4185052839366909439">"Onyesha makabrasha yote"</string>
+    <string name="mailbox_list_account_selector_show_all_folders" msgid="4185052839366909439">"Onyesha folda zote"</string>
     <string name="mailbox_list_account_selector_account_header" msgid="4261295503836387876">"Akaunti"</string>
-    <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"Makabrasha <xliff:g id="EMAIL_ADDRESS">%s</xliff:g> ya hivi karibuni"</string>
-    <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"Ongeza makabrasha"</string>
-    <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"Makabrasha ya hivi karibuni"</string>
+    <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"Folda <xliff:g id="EMAIL_ADDRESS">%s</xliff:g> za hivi karibuni"</string>
+    <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"Folda zote"</string>
+    <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"Folda za hivi karibuni"</string>
     <string name="message_subject_description" msgid="3597047441062021199">"Kichwa"</string>
     <string name="message_is_empty_description" msgid="4004644319382041459">"Hakuna kichwa"</string>
-    <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Pakia ujumbe zaidi"</string>
+    <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Pakia barua zaidi"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">" <xliff:g id="MESSAGE_COUNT">%d</xliff:g> zimechaguliwa"</item>
     <item quantity="other" msgid="7901361399231876038">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> zimechaguliwa"</item>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> aliandika:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Maandishii yaliyonukuliwa"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Jumuisha maandishi"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Ni lazima uongeze angalau mpokezi mmoja"</string>
+    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Ni lazima uongeze angalau mpokeaji mmoja"</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Anwani zingine za barua pepe ni batili."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Faili ni kubwa sana kuambatishwa."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Ingiza majibu ya haraka"</string>
@@ -178,17 +178,17 @@
     <string name="message_view_message_details_dialog_title" msgid="5306529501287351018">"Maelezo ya Ujumbe"</string>
     <string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"Maelezo ya kiambatisho"</string>
     <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Inahitaji muunganisho wa Wi-Fi"</string>
-    <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Mipangilio ya Wi-Fi"</string>
+    <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Mipangilio ya mtandao-hewa"</string>
     <string name="attachment_info_application_settings" msgid="9128108769497191200">"Mipangilio ya programu"</string>
     <string name="attachment_info_unknown" msgid="8342655396805943320">"Haiwezi kufungua kiambatisho."</string>
-    <string name="attachment_info_malware" msgid="1478505616946912328">"Kwa sababu aina hii ya kiambatisho kinaweza kuwa na programu hatari, huwezi kuihifadhi au kuifungua."</string>
+    <string name="attachment_info_malware" msgid="1478505616946912328">"Kwa sababu aina hii ya kiambatisho inaweza kuwa na programu hatari, huwezi kuihifadhi au kuifungua."</string>
     <string name="attachment_info_policy" msgid="328224012587376154">"Kiambatisho hiki hakiwezi kuhifadhiwa au kufunguliwa kwa sababu ya sera za usalama zilizowekwa za akaunti hii."</string>
-    <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Kiambataisho hiki ni kirefu mno kuweza kupakua kuptia kwa mtandao wa simu. Unaweza vipakua wakati mwingine ukiunganisha kwa mtandao wa Wi-Fi"</string>
-    <string name="attachment_info_no_intent" msgid="5277484372596654977">"Hakuna programu ya kusanidi ambayo inaweza kufungua kiambatisho hiki. Jaribu kupakua programu inayofaa kutoka kwa Android Market"</string>
-    <string name="attachment_info_sideload_disabled" msgid="1884647432057183615">"Kiambatanisho hiki ni programu. Lazima uangalie vyanzo visivyojulikana katika mipangilio, kwenye programu, kabla ya kuisakini."</string>
-    <string name="attachment_info_apk_install_disabled" msgid="9077383681081393067">"Programu haiwezi kusakinishwa moja kwa moja kutoka kwa Barua pepe. Kwanza hifadhi programu hii na kisha isakinishe kwa kutumia programu ya Vipakuliwa."</string>
+    <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Kiambataisho hiki ni kirefu mno kuweza kupakua kupitia kwa mtandao wa simu. Unaweza kuipakua wakati mwingine ukiunganisha kwa mtandao-hewa."</string>
+    <string name="attachment_info_no_intent" msgid="5277484372596654977">"Hakuna programu iliyowekwa inayoweza kufungua kiambatisho hiki. Jaribu kupakua programu inayofaa kutoka kwa Android Market"</string>
+    <string name="attachment_info_sideload_disabled" msgid="1884647432057183615">"Kiambatanisho hiki ni programu. Lazima uangalie vyanzo visivyojulikana katika mipangilio, kwenye programu, kabla ya kuiweka."</string>
+    <string name="attachment_info_apk_install_disabled" msgid="9077383681081393067">"Programu haziwezi kusakinishwa moja kwa moja kutoka kwa Barua pepe. Kwanza hifadhi programu hii na kisha isakinishe kwa kutumia programu ya Vipakuliwa."</string>
     <string name="attachment_not_found" msgid="2593390852574725378">"Kiambatisho hakikuweza kupakuliwa."</string>
-    <string name="message_decode_error" msgid="7812862491622388416">"Hitilafu wakati wa ujumbe wa uondoaji msimbo."</string>
+    <string name="message_decode_error" msgid="7812862491622388416">"Hitilafu wakati wa kusimbua ujumbe."</string>
     <string name="eml_view_title" msgid="8827210108543430336">"Kutazama <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="message_delete_dialog_title" msgid="7189172554183139772">"Tupa ujumbe"</string>
   <plurals name="message_delete_confirm">
@@ -240,13 +240,13 @@
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Unaweza kusanidi akaunti ya Exchange ActiveSync kwa hatua chache tu."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Anwani ya barua pepe"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Nenosiri"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Tuma barua pepe kutoka kwa akaunti hii kwa chaguo-msingi"</string>
+    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Tuma barua pepe kutoka kwa akaunti hii kama chaguo-msingi"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Usanidi wa mkono"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Tafadhali andika anwani na nenosiri halali la barua pepe."</string>
     <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"Akaunti Rudufu"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"Uingiaji huu unatumika tayari kwa akaunti ya \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
-    <string name="account_password_spaces_error" msgid="8928309156658903257">"Nenosiri hili linaanza ama kumalizika na herufi moja ya nafasi. Seva nyingi hazikubali manenosiri yenye nafasi"</string>
-    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Kurudisha maelezo ya akaunti"</string>
+    <string name="account_password_spaces_error" msgid="8928309156658903257">"Nenosiri hili linaanza au kumalizika na herufi moja ya nafasi. Seva nyingi hazikubali manenosiri yenye nafasi."</string>
+    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Inarudisha maelezo ya akaunti"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Inakagua mipangilio ya seva inayoingia..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Inakagua mipangilio ya seva inayotoka nje..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Usanidi wa akaunti"</string>
@@ -256,7 +256,7 @@
     <string name="account_setup_names_user_name_empty_error" msgid="1251952000604599298">"Sehemu hii haiwezi kuwa tupu"</string>
     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Usanidi wa akaunti"</string>
     <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Aina ya akaunti"</string>
-    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Hii ni aina gani ya akaunti?"</string>
+    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Hii ni akaunti ya aina gani ?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Usanidi wa akaunti"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Mipangilio ya seva ya kuingia"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Jina la mtumiaji"</string>
@@ -272,15 +272,15 @@
     <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"STARTTLS"</string>
     <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Futa barua pepe kutoka kwa seva"</string>
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Katu"</string>
-    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Nikifuta kutoka kwa kisanduku pokezi"</string>
-    <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Kijia cha prefiksi ya IMAP"</string>
+    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Nikifuta kutoka kwa kikasha"</string>
+    <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Kiambishi cha njia ya IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Hiari"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Usanidi wa akaunti"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Mipangilio ya seva ya kutoka"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Seva ya SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Mlango"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Aina ya usalama"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Inahitaji kuingia"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Inahitaji uingie"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Jina la mtumiaji"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Nenosiri"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"Usanidi wa akaunti"</string>
@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Kikoa\\Jina la mtumiaji"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Tumia muunganisho salama (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Kubali vyeti vyote vya SSL"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Cheti cha mtteja"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Chagua"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Tumia cheti cha mteja"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Ondoa"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Hakuna"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Kitambulisho cha Kifaa cha Mkononi"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Mipangilio ya akaunti"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Chaguo za akaunti"</string>
@@ -302,12 +305,12 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Kila dakika 15"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Kila dakika 30"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Kila saa"</string>
-    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Tuma barua pepe kutoka kwa akaunti hii kwa chaguo-msingi"</string>
+    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Tuma barua pepe kutoka kwa akaunti hii kama chaguo-msingi"</string>
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Niarifu wakati barua pepe inpoingia"</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sawazisha anwani kutoka kwa akaunti hii."</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sawazisha kalenda kutoka kwa akaunti hii."</string>
     <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sawazisha barua pepe kutoka kwa akaunti hii."</string>
-    <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Pakua kiotomatiki viambatisho wakati umeunganishwa kwenye Wi-Fi"</string>
+    <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Pakua viambatisho kiotomatiki  wakati umeunganishwa kwenye mtandao-hewa"</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Haikumaliza kuweka"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Siku hadi Usawazishaji"</string>
     <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Kiotomatiki"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Jina la mtumiaji au nenosiri sio sahihi."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Haiwezi kuunganisha kwa seva kwa usalama."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Haiwezi kuunganisha kwa seva kwa usalama."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Cheti cha mtumiaji kinahitajika ili kuunganisha kwa seva."</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Cheti cha mteja kinahitajika. Unganisha kwa seva na cheti cha mteja?"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"Cheti ni batili au hakiwezi kufikiwa."</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Seva iliitikia na hitilafu; tafadhali kagua jina lako la mtumiaji na nenosiri na ujaribu tena."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Haiwezi kuunganisha kwa seva."</string>
@@ -336,38 +339,38 @@
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Udhibiti wa usalama kutoka mbali"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"Seva <xliff:g id="SERVER">%s</xliff:g> inahitaji uiruhusu kudhibiti kwa umbali baadhi ya vipengele vya usalama vya simu yako. Ungependa kumaliza kuweka mipangilio ya akaunti hii?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="6647663405501663019">"Seva hii inahitaji vipengele vya usalama ambavyo kifaa chako cha Android hakisaidii, ikijumlisha: <xliff:g id="ERROR">%s</xliff:g>"</string>
-    <string name="account_setup_username_uneditable_error" msgid="9057508235700936322">"Huwezi kubadilisha jina la mtumiaji la akaunti. Ili kuongeza akaunti na jina la mtumiaji tofauti, gusa Ongeza akaunti."</string>
+    <string name="account_setup_username_uneditable_error" msgid="9057508235700936322">"Huwezi kubadilisha jina la mtumiaji la akaunti. Ili kuongeza akaunti na jina tofauti la mtumiaji, gusa Ongeza akaunti."</string>
     <string name="disable_admin_warning" msgid="4940147098039352135">"ILANI: Kulemaza kibali cha programu ya Barua pepe ili kusimamia kifaa chako kutafuta akaunti zote za Barua pepe ambazo zinakihitaji, pamoja na barua pepe zake, anwani, matukio ya kalenda, na data nyingine."</string>
     <string name="account_security_dialog_title" msgid="1340675800634074043">"Uboreshaji wa usalama unahitajika"</string>
-    <string name="account_security_dialog_content_fmt" msgid="7950790060554861792">"<xliff:g id="ACCOUNT">%s</xliff:g>inakuhitaji kusasisha mipangilio yako ya usalama."</string>
+    <string name="account_security_dialog_content_fmt" msgid="7950790060554861792">"<xliff:g id="ACCOUNT">%s</xliff:g> inakuhitaji usasishe mipangilio yako ya usalama."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Akaunti \"<xliff:g id="ACCOUNT">%s</xliff:g>\" inahitaji kusasisha mipangilio ya usalama."</string>
     <string name="security_notification_content_title" msgid="3352841884304076235">"Uboreshaji wa usalama unahitajika"</string>
     <string name="account_security_title" msgid="4441470647344315196">"Usalama wa Kifaa"</string>
-    <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Seva <xliff:g id="SERVER">%s</xliff:g>inahitaji uiruhusu katika kudhibiti kwa umbali baadhi ya vipengele vya usalama vya simu yako."</string>
+    <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Seva <xliff:g id="SERVER">%s</xliff:g>inahitaji uiruhusu kudhibiti kwa umbali baadhi ya vipengele vya usalama vya simu yako."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Hariri maelezo"</string>
-    <string name="password_expire_warning_ticker_fmt" msgid="7367710094579526056">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" Inahitaji kubadilisha nywila yako ya skrini au nenosiri."</string>
+    <string name="password_expire_warning_ticker_fmt" msgid="7367710094579526056">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" inakuhitaji ubadilishe PIN yako ya skrini au nenosiri."</string>
     <string name="password_expire_warning_content_title" msgid="7174669014074849304">"Nenosiri la kufunga skrini linaisha muda"</string>
-    <string name="password_expired_ticker" msgid="4230570412974108968">"Nenosiri la kufungs skrini yako limechina."</string>
-    <string name="password_expired_content_title" msgid="4349518706602252979">"Nenosiri la kufunga skrini limechina"</string>
+    <string name="password_expired_ticker" msgid="4230570412974108968">"PIN au nenosiri lako la kufunga skrini yako limekwisha muda."</string>
+    <string name="password_expired_content_title" msgid="4349518706602252979">"Nenosiri la kufunga skrini limekwisha muda"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Nenosiri la kufunga skrini linaisha muda"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"Lazima ubadilishe nywila yako ya skrini au manenosiri, ama data ya <xliff:g id="ACCOUNT">%s</xliff:g> itafutwa. Ibadilishe saa hii?"</string>
-    <string name="password_expired_dialog_title" msgid="2186547998125938084">"Nenosiri la kufunga skrini limechina"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"Lazima ubadilishe PIN yako ya skrini au nenosiri hivi karibuni, ama data ya <xliff:g id="ACCOUNT">%s</xliff:g> itafutwa. Ibadilishe saa hii?"</string>
+    <string name="password_expired_dialog_title" msgid="2186547998125938084">"Nenosiri la kufunga skrini limekwisha muda"</string>
     <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"Data ya <xliff:g id="ACCOUNT">%s</xliff:g> inafutwa kutoka kwenye kifaa chako. Unaweza kuirejesha kwa kubadilisha PIN au nenosiri lako la kufunga skrini. Ibadilishe sasa?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Tupa mabadiliko yasiyohifadhiwa?"</string>
     <string name="account_settings_login_dialog_title" msgid="3348853165458574221">"imeshindwa kuingia"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Jina la mtumiaji au nenosiri la <xliff:g id="ACCOUNT">%s</xliff:g> si sahihi. Yaboreshe saa hii?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Jina la mtumiaji au nenosiri la <xliff:g id="ACCOUNT">%s</xliff:g> si sahihi. Yasasishe saa hii?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Akaunti chaguo-msingi"</string>
-    <string name="account_settings_default_summary" msgid="1531901438624688482">"Tuma ujumbe kutoka kwa akaunti hii kwa chaguo-msingi"</string>
+    <string name="account_settings_default_summary" msgid="1531901438624688482">"Tuma barua pepe kutoka kwa akaunti hii kwa chaguo-msingi"</string>
     <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"Pakua kioto viambatisho"</string>
-    <string name="account_settings_background_attachments_summary" msgid="8036004124395110306">"Pakua kiotomatiki viambatisho wakati umeunganishwa kwenye Wi-Fi"</string>
+    <string name="account_settings_background_attachments_summary" msgid="8036004124395110306">"Pakua viambatisho kiotomatiki wakati umeunganishwa kwenye mtandao-hewa"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Arifa za barua pepe"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Mara za kusawazisha, kutuma arifa, n.k."</string>
     <string name="account_settings_notify_summary" msgid="6301122709602752038">"Arifu katika upau wa hali barua pepe inapofika"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Mazoea ya kukagua kikasha"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Mipangilio inayoingia"</string>
-    <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Jina la mtumiaji, na mipangilio mingine ya seva inayoingia"</string>
-    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Mipangilio ya nje"</string>
-    <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Jina la mmtumiaji, neneosiri na mipangilio mingine ya nje ya seva."</string>
+    <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Jina la mtumiaji, nenosiri, na mipangilio mingine ya seva inayoingia"</string>
+    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Mipangilio ya kutoka"</string>
+    <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Jina la mmtumiaji, neneosiri na mipangilio mingine ya seva ya kutoka."</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Jina la akaunti"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Jina lako"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Sahihi"</string>
@@ -403,9 +406,9 @@
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="2957945231022052672">"Siku hadi Usawazishaji"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Akaunti ya barua pepe"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Chagua akaunti"</string>
-    <string name="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Chagua kabrasha"</string>
+    <string name="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Chagua folda"</string>
     <string name="toast_account_not_found" msgid="2483831308629565584">"Akaunti haipatikani. Huenda ikawa imeondolewa."</string>
-    <string name="toast_mailbox_not_found" msgid="4035254695648112767">"Kabrasha halipatikani. Huenda limeondolewa."</string>
+    <string name="toast_mailbox_not_found" msgid="4035254695648112767">"Folda haipatikani. Huenda imeondolewa."</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Akaunti zingine za \"plus\" tu ndizo zinazojumuisha ufikiaji wa POP na kwa hivyo kuruhusu programu hii kuunganisha. Kama huwezi kuingia na anwani na nenosiri lako sahihi la barua pepe, huenda usiwe na akaunti iliyolipiwa ya \"Plus\". Tafadhali zindua kivinjari Wavuti ili uweze kufikia akaunti hizi za barua."</string>
     <string name="provider_note_t_online" msgid="1973701903400232774">"Kabla ya kuweka mipangilio ya akaunti hii ya barua pepe, tafadhali tembelea tovuti ya T-Online na uunde nenosiri la kufikia barua pepe kwa POP3."</string>
     <string name="exchange_name" msgid="1190783774800310346">"Shirika"</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Kawaida"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Kubwa"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Kubwa mno"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Jibu wote"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Fanya \'Jibu wote\' iwe chaguo mbadala ya kujibu ujumbe"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Rejesha chaguo-msingi la \"Onyesha picha\""</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Rejesha chaguo-msingi kwa watumaji wote (usionyeshe picha kiotomatiki)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"Onyesha picha zilizoondolewa."</string>
@@ -466,5 +465,5 @@
     <string name="search_header_text_fmt" msgid="3857004638127418247">"Tafuta \"<xliff:g id="ID_1">%1$s</xliff:g>\" katika matokeo"</string>
     <string name="search_slow_warning_title" msgid="2826118321880530239">"Inasubiri matokeo"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Seva zingine zinaweza kuchukua muda mrefu."</string>
-    <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Makabrasha"</string>
+    <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Folda"</string>
 </resources>

diff --git a/res/values-sw/uploader.xml b/res/values-sw/uploader.xml
index 4274ecd..9544b3e 100644
--- a/res/values-sw/uploader.xml
+++ b/res/values-sw/uploader.xml

@@ -4,7 +4,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="application_name" msgid="7812006268714926951">"Upakiaji wa Papo Hapo"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Albamu ya Kupakia Moja kwa moja"</string>
+    <string name="picasa_default_destination" msgid="2052406684123992574">"Albamu ya Kupakia Papo Hapo"</string>
     <string name="summary_title_uploading" msgid="3357617474017589370">"Inapakia"</string>
     <string name="summary_title_finished" msgid="7775292294989807025">"Imemaliza"</string>
     <string name="summary_title_paused" msgid="8936561302881926595">"Imepumzishwa"</string>
@@ -76,13 +76,13 @@
     <string name="manager_sync_all" msgid="5207146576940014345">"Sawazisha zote"</string>
     <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Usawazishaji wa Mwisho:"\n"%1$s"\n"%2$s"</string>
     <string name="finished_empty" msgid="689924777356099393">"Orodha ya vipengee vilivyokamilika iko tupu."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Kupakia Moja kwa moja"</string>
+    <string name="notify_uploads" msgid="8593982942665493037">"Upakiaji wa Papo hapo"</string>
     <string name="notify_resolved" msgid="8111194870485485674">"Upakiaji umekamilika"</string>
     <string name="notify_paused" msgid="3999817913227671338">"Upakiaji umepumzishwa"</string>
     <string name="notify_activation_reminder" msgid="1639234651193843030">"Upakiaji wa papo hapo bado haujawashwa"</string>
     <string name="dialog_first_wifi" msgid="4318047428346248089">"Faili kubwa zitapakia kupitia kwa muunganisho wa Wi-Fi pekee."</string>
     <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Inatafuta faili..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"<xliff:g id="PHOTOCOUNT">%1$d</xliff:g>Inaandaa picha na video  za kupakiwa <xliff:g id="VIDEOCOUNT">%2$d</xliff:g>..."</string>
+    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"Inaandaa kupakia picha<xliff:g id="PHOTOCOUNT">%1$d</xliff:g> na video  za kupakiwa <xliff:g id="VIDEOCOUNT">%2$d</xliff:g>..."</string>
     <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"Hakuna picha/video za ziada zinazphitaji kupakiwa."</string>
     <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"Kulikuwa na tatizo la kuwasiliana na seva. Tafadhali jaribu tena baadaye."</string>
     <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"Sawazisha zote zilizoghairiwa"</string>
@@ -94,7 +94,7 @@
     <string name="preference_title_need_power" msgid="9165152026296632685">"Nishati"</string>
     <string name="preference_summary_need_power" msgid="1829578224249216151">"Pakia wakati simu yako inapochajiwa tu."</string>
     <string name="preference_title_need_wifi" msgid="2398468701949227352">"Mtandao-hewa"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Pakia tu wakati Mtandao hewa inapatikana."</string>
+    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Pakia tu wakati Mtandao-hewa unapatikana."</string>
     <string name="preference_category_title_photos" msgid="8558221017057440259">"Picha"</string>
     <string name="preference_title_photos_account" msgid="1235191190019405102">"Akaunti"</string>
     <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"Masharti ya kupakia"</string>
@@ -120,18 +120,18 @@
     <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Mahiri"</string>
     <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Vipakizi vya simu ya mkononi"</string>
     <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Vipakizi vya urandaji"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Pakiza picha na video za &amp; wakati  wa urandaji katika mtandao wa data"</string>
+    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Pakia picha na video za na; wakati  wa urandaji katika mtandao wa data"</string>
     <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Vipakizi vya betri"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Pakia picha na video &amp; wakati unachaji pekee"</string>
+    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Pakia picha na video na; viedo pekee unapochaji"</string>
     <string name="preference_plus_sync_all" msgid="2563137874388611459">"Pakia picha zilizopo"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Pakiza picha zozote zilizopo na video kutoka kwenye simu yako sasa"</string>
+    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Pakia picha zozote zilizopo na video kutoka kwenye simu yako sasa"</string>
     <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Imelemazwa"</string>
     <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
     <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"Inapakia (%1$d%%)"</string>
     <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d kati ya %2$d"</string>
     <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"Pumzishwa: gusa ili kuendelea na upakiaji"</string>
     <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Pakia picha zilizopo"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Kupakua picha na video ambazo tayari hazijapakizwa kutoka kwenye simu yako kwa albamu faragha ya wavuti kunaweza kuchukua muda, lakini kutafanyika katika usuli. Una hakika unataka kuendelea?"</string>
+    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Kupakia picha na video ambazo tayari hazijapakiwa kutoka kwenye simu yako kwa albamu faragha ya wavuti kunaweza kuchukua muda, lakini kutafanyika katika usuli. Una hakika unataka kuendelea?"</string>
     <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Ndiyo"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"Hakuna"</string>
+    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"La"</string>
 </resources>

diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index e2b8a34..c9c2f6f 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"โดเมน\\ชื่อผู้ใช้"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"ใช้การเชื่อมต่อที่ปลอดภัย (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"ยอมรับใบรับรอง SSL ทั้งหมด"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"ใบรับรองไคลเอ็นต์"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"เลือก"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"ใช้ใบรับรองไคลเอ็นต์"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"นำออก"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"ไม่มี"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID โทรศัพท์มือถือ"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"การตั้งค่าบัญชี"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"ตัวเลือกของบัญชี"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"ชื่อผู้ใช้หรือรหัสผ่านไม่ถูกต้อง "\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์ได้อย่างปลอดภัย"</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์ได้อย่างปลอดภัย"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"จำเป็นต้องมีใบรับรองของผู้ใช้สำหรับการเชื่อมต่อเซิร์ฟเวอร์"</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"ต้องใช้ใบรับรองไคลเอ็นต์ ต้องการเชื่อมต่อกับเซิร์ฟเวอร์ที่มีใบรับรองไคลเอ็นต์หรือไม่"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"ใบรับรองไม่ถูกต้องหรือไม่สามารถเข้าถึงได้"</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"เซิร์ฟเวอร์ตอบสนองโดยมีข้อผิดพลาด โปรดตรวจสอบชื่อผู้ใช้และรหัสผ่านของคุณ แล้วลองอีกครั้ง"</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์"</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"ปกติ"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"ใหญ่"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"ใหญ่มาก"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"ตอบกลับทั้งหมด"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"กำหนดให้ \"ตอบกลับทั้งหมด\" เป็นค่าเริ่มต้นสำหรับการตอบกลับข้อความ"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"กู้คืนค่าเริ่มต้นสำหรับ \"แสดงภาพ\""</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"กู้คืนค่าเริ่มต้นสำหรับผู้ส่งทั้งหมด (ไม่แสดงภาพโดยอัตโนมัติ)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"แสดงรูปภาพ\" ถูกยกเลิกการเลือก"</string>

diff --git a/res/values-th/uploader.xml b/res/values-th/uploader.xml
index 384cf0f..c29b3b9 100644
--- a/res/values-th/uploader.xml
+++ b/res/values-th/uploader.xml

@@ -121,7 +121,7 @@
     <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"การอัปโหลดทางมือถือ"</string>
     <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"การอัปโหลดขณะโรมมิ่ง"</string>
     <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"อัปโหลดรูปภาพและวิดีโอเมื่อโรมมิ่งบนเครือข่ายข้อมูล"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"การอัปโหลดขณะชาร์จแบตเตอรี่"</string>
+    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"อัปโหลดขณะชาร์จแบต"</string>
     <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"อัปโหลดรูปภาพและวิดีโอเมื่อชาร์จเท่านั้น"</string>
     <string name="preference_plus_sync_all" msgid="2563137874388611459">"อัปโหลดรูปภาพที่มีอยู่"</string>
     <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"อัปโหลดรูปภาพและวิดีโอที่มีอยู่จากโทรศัพท์ของคุณเดี๋ยวนี้"</string>

diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index abc4a98..ce91a4f 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domain\\Username"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Gumamit ng secure na koneksyon (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Tanggapin ang lahat ng mga SSL certificate"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Certificate ng client"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Piliin"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Gamitin ang certificate ng client"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Alisin"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Wala"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Mobile Device ID"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Mga setting ng account"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Mga pagpipilian sa account"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Mali ang username o password."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Hindi ligtas na makakonekta sa server."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Hindi ligtas na makakonekta sa server."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Kinakailangan ng certificate ng user upang makakonekta sa server."</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Kinakailangan ng certificate ng client. Kumonekta sa server gamit ang certificate ng client?"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"Di-wasto o hindi ma-access ang certificate."</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Tumugon ang server nang may error; pakitingnan ang iyong username at password at subukang muli."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Hindi makakontekta sa server."</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normal"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Malaki"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Malaki"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Tumugon sa lahat"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Gawing default ang \'Tumugon sa lahat\' para sa pagtugon sa mga mensahe"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Ibalik ang default para sa \"Ipakita ang mga larawan\""</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Ibalik ang default para sa lahat ng mga nagpapadala (huwag awtomatikong ipakita ang mga larawan)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"Na-clear ang \"Ipakita ang mga larawan\"."</string>

diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 7caf9a1..42ab523 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Alan adı/Kullanıcı adı"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Güvenli bağlantıyı kullan (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Tüm SSL sertifikalarını kabul et"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"İstemci sertifikası"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Seç"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"İstemci sertifikası kullan"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Kaldır"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Yok"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Mobil Cihaz Kimliği"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Hesap ayarları"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Hesap seçenekleri"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Kullanıcı adı veya şifre hatalı."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Sunucuya güvenli biçimde bağlanılamıyor."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Sunucuya güvenli biçimde bağlanılamıyor."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Sunucuya bağlanmak için kullanıcı sertifikası gerekli."</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"İstemci sertifikası gerekli. Sunucuya istemci sertifikasıyla bağlanılsın mı?"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"Sertifika geçersiz veya erişilemiyor."</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Sunucu hata gönderdi. Lütfen kullanıcı adınızı ve şifrenizi kontrol ettikten sonra yeniden deneyin."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Sunucuya bağlanılamıyor."</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normal"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Büyük"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Çok büyük"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Yanıtı tüm alıcılara gönder"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"İletileri yanıtlarken, \"Yanıtı tüm alıcılara gönder\" varsayılan olsun"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"\"Resimleri göster\" için varsayılan ayarları geri yükle"</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Tüm gönderenler için varsayılan ayarları geri yükle (resimleri otomatik olarak gösterme)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Resimleri göster\" temizlendi."</string>

diff --git a/res/values-tr/uploader.xml b/res/values-tr/uploader.xml
index e13d5d2..1fe2428 100644
--- a/res/values-tr/uploader.xml
+++ b/res/values-tr/uploader.xml

@@ -121,7 +121,7 @@
     <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Mobil yüklemeler"</string>
     <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Dolaşımda yüklemeler"</string>
     <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Fotoğrafları ve videoları veri ağında dolaşımdayken yükle"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Pil kullanılırken yüklemeler"</string>
+    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Pildeyken yüklemeler"</string>
     <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Fotoğrafları ve videoları yalnızca şarj olurken yükle"</string>
     <string name="preference_plus_sync_all" msgid="2563137874388611459">"Mevcut fotoğrafları yükle"</string>
     <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Telefonunuzdaki tüm mevcut fotoğrafları ve videoları şimdi yükleyin"</string>

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 0e95ea5..ec60d03 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Домен\\ім\'я корист."</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Викор. безпеч. з\'єднання (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Прийняти всі сертифікати SSL"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Сертифікат клієнта"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Вибрати"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Використати сертифікат клієнта"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Видалити"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Немає"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Ідентифікатор мобіл. пристрою"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Параметри облікового запису"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Параметри облікового запису"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Ім\'я корист. чи пароль неправильн."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Неможл. безпечно підкл. до сервера."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Неможл. безпечно підключ. до серв."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Для під’єднання до сервера потрібен сертифікат користувача."</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Потрібен сертифікат клієнта. Під’єднатися до сервера із сертифікатом клієнта?"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"Сертифікат недійсний або недоступний."</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Сервер повідомив про помилку. Перевірте своє ім\'я користувача та пароль і спробуйте ще."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Неможл. підключ. до сервера."</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Звичайний"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Великий"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Дуже великий"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Відповісти всім"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Зробити \"Відповісти всім\" відповіддю на повідомлення за умовчанням"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Відновити налаштування за умовчанням \"Показати зображення\""</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Відновити налаштування за умовчанням для всіх відправників (не показувати зображення автоматично)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"Налаштування \"Показати зображення\" очищено."</string>

diff --git a/res/values-uk/uploader.xml b/res/values-uk/uploader.xml
index 0b2fe3d..f2e3b1f 100644
--- a/res/values-uk/uploader.xml
+++ b/res/values-uk/uploader.xml

@@ -121,7 +121,7 @@
     <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Завантаження в мобільних мережах"</string>
     <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Завантаження в роумінгу"</string>
     <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Завантажувати фото та відео в роумінгу в мережі передавання даних"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Завантаження із зарядженим акумулятором"</string>
+    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Завантаж. при зарядж."</string>
     <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Завантажувати фото та відео лише під час заряджання"</string>
     <string name="preference_plus_sync_all" msgid="2563137874388611459">"Завантажити існуючі фото"</string>
     <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Завантажити будь-які існуючі фото та відео з телефону зараз"</string>

diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index c35c55e..2260885 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Tên miền\\Tên người dùng"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Sử dụng kết nối bảo mật (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Chấp nhận tất cả chứng chỉ SSL"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Chứng chỉ ứng dụng khách"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Chọn"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Sử dụng chứng chỉ ứng dụng khách"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Xóa"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Không"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID Thiết bị di động"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Cài đặt tài khoản"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Tùy chọn tài khoản"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Tên người dùng hoặc mật khẩu không chính xác."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Không thể kết nối an toàn với máy chủ."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Không thể kết nối an toàn với máy chủ."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Cần có chứng chỉ người dùng để kết nối với máy chủ."</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Cần chứng chỉ máy khách. Kết nối với máy chủ có chứng chỉ máy khách?"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"Chứng chỉ không hợp lệ hoặc không thể truy cập."</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Máy chủ trả về lỗi; vui lòng kiểm tra tên người dùng và mật khẩu và thử lại."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Không thể kết nối với máy chủ."</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Thường"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Lớn"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Rất lớn"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Trả lời tất cả"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Đặt \'Trả lời tất cả\' làm mặc định để trả lời thư"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Khôi phục cài đặt mặc định cho \"Hiển thị ảnh\""</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Khôi phục cài đặt mặc định cho tất cả người gửi (không tự động hiển thị ảnh)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"Đã xóa \"Hiển thị hình ảnh\"."</string>

diff --git a/res/values-vi/uploader.xml b/res/values-vi/uploader.xml
index 51385ec..f6b449e 100644
--- a/res/values-vi/uploader.xml
+++ b/res/values-vi/uploader.xml

@@ -121,7 +121,7 @@
     <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Nội dung tải lên qua di động"</string>
     <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Nội dung tải lên khi chuyển vùng"</string>
     <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Tải lên ảnh &amp; video khi chuyển vùng dữ liệu trên mạng dữ liệu"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Nội dung tải lên khi sạc pin"</string>
+    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Tải lên khi sạc pin"</string>
     <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Chỉ tải ảnh &amp; video lên khi đang sạc"</string>
     <string name="preference_plus_sync_all" msgid="2563137874388611459">"Tải lên ảnh hiện có"</string>
     <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Tải lên mọi ảnh &amp; video hiện có từ điện thoại của bạn ngay bây giờ"</string>

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 2a03705..14609e4 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"域名\\用户名"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"采用安全连接 (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"接受所有 SSL 证书"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"客户端证书"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"选择"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"使用客户端证书"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"删除"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"无"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"移动设备 ID"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"帐户设置"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"帐户选项"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"用户名或密码不正确。"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"无法安全地连接到服务器。"</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"无法安全地连接到服务器。"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"需要拥有用户证书才能连接到服务器。"</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"需要客户端证书。要使用客户端证书连接到服务器吗？"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"证书无效或无法访问。"</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"服务器返回了包含错误讯息的响应，请检查您的用户名和密码，然后重试。"</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"无法连接到服务器。"</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"正常"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"大"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"超大"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"全部回复"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"将“全部回复”作为回复邮件的默认设置"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"恢复“显示图片”的默认设置"</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"恢复所有发件人的默认设置（不自动显示图片）"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"“显示图片”设置已清除。"</string>

diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 745fa0b..7b01da4 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml

@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"網域\\使用者名稱"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"使用安全連線 (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"接受所有安全資料傳輸層 (SSL) 憑證"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"用戶端憑證"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"選取"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"使用用戶端憑證"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"移除"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"無"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"行動裝置 ID"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"帳戶設定"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"帳戶選項"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"使用者名稱或密碼不正確。"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"無法安全地連線至伺服器。"</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"無法安全地連線至伺服器。"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"需要使用者憑證才能連線至伺服器。"</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"需要用戶端憑證。要透過用戶端憑證連線至伺服器嗎？"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"憑證無效或無法使用。"</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"伺服器傳回錯誤，請檢查您的使用者名稱和密碼，然後再試一次。"</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"無法連線至伺服器。"</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"適中"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"大"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"最大"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"回覆所有人"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"將「回覆所有人」設為預設的回信方式"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"還原「顯示圖片」的預設值"</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"還原所有寄件者的預設值 (不要自動顯示圖片)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"「顯示圖片」已清除。"</string>

diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index ab88a40..46e9b2b 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml

@@ -199,8 +199,8 @@
     <item quantity="one" msgid="710742672464447084">"Umyalezo ususiwe."</item>
     <item quantity="other" msgid="6574961322865652255">"Imiyalezo isusiwe."</item>
   </plurals>
-    <string name="message_discarded_toast" msgid="3891461729325584026">"Umyalezo ulahliwe."</string>
-    <string name="message_saved_toast" msgid="8443125659172627665">"Umyalezo ulondolozwe njengokungaphelele"</string>
+    <string name="message_discarded_toast" msgid="3891461729325584026">"Umlayezo ulahliwe."</string>
+    <string name="message_saved_toast" msgid="8443125659172627665">"Umlayezo ulondolozwe njengokungaphelele"</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Lesi sinamathiseli asikwazi ukuboniswa."</string>
     <string name="message_view_load_attachment_failed_toast" msgid="342798484092215350">"Isinamathiseli \" <xliff:g id="FILENAME">%s</xliff:g> \" asikwazanga ukulayiswa."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Ivula umyalezo..."</string>
@@ -289,8 +289,11 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Isizinda/Igama lomsebenzisi"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Sebenzisa uxhumano oluphephile (I-SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Yamukela zonke izitifikethi ze-SSL"</string>
+    <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Isitifikethi sekhasimende"</string>
+    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Khetha"</string>
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Sebenzisa isitifiketi sekhasimende"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Susa"</string>
+    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Lutho"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"i-ID Yedivaysi Yefoni"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Izilungiselelo ze-akhawunti"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Okukhethwa kukho kwe-akhawunti"</string>
@@ -322,7 +325,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Igama lomsebenzisi noma iphasiwedi ayilungile."\n"<xliff:g id="ERROR">%s</xliff:g>"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Ayikwazi ukuxhuma ngokuphephile kwiseva."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Ayikwazi ukuxhuma ngokuphephile kwiseva. "\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- outdated translation 7425428621499591492 -->     <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Isitifiketi somsebenzisi siyadingeka ukuze uxhumane nesiphakeli."</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Kudingeka isitifiketi sekilayenti. Xhuma esiphakelini ngesitifiketi sekilayenti?"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"Isitifiketi asivumelekile noma asingeneki"</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Iseva iphendule ngephutha, sicela uhlole igama lakho lomsebenzisi nephasiwedi bese uzama futhi."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Ayikwazi ukuxhuma kwiseva."</string>
@@ -354,7 +357,7 @@
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"I-password yokuvala isikrini iphelelwe isikhathi"</string>
     <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"Idatha ye <xliff:g id="ACCOUNT">%s</xliff:g> iyasulwa kudivayisi yakho. Ungayibuyisa ngokushintsha iphinikhodi yakho yokuvala isikrini noma i-password. Ishintshe manje?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Lahla izinguquko ezingagciniwe?"</string>
-    <string name="account_settings_login_dialog_title" msgid="3348853165458574221">"ukungena ngemvume kwehlulekile"</string>
+    <string name="account_settings_login_dialog_title" msgid="3348853165458574221">"Ukungena ngemvume kwehlulekile"</string>
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Igama lomsebenzisi noma i-password ka <xliff:g id="ACCOUNT">%s</xliff:g> ayilungile. Wabuyekeze manje?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"I-akhawunti ezenzakalelayo"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Thumela i-imeyli kusuka kule akhawunti ngokuzenzakalelayo"</string>
@@ -441,12 +444,8 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Kuvamile"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Okukhulu"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Khulu"</string>
-    <!-- no translation found for general_preference_reply_all_label (7806833609810003510) -->
-    <!-- no translation found for general_preference_reply_all_label (6469564953937885304) -->
-    <skip />
-    <!-- no translation found for general_preference_reply_all_summary (917669156784760966) -->
-    <!-- no translation found for general_preference_reply_all_summary (3356918650886350497) -->
-    <skip />
+    <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Phendula konke"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Yenza okuthi \"Phendula Konke\" kube okumisiwe kokuphenudula imiyalezo"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Buyisela okuzenzakalelayo koku \"Bonisa izithombe\""</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Buyisela okuzenzakalelayo kwabathumeli bonke (ungabonisi izithombe ngokuzenzakalelayo)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Bonisa izithombe\" ezisusiwe"</string>
commit	151037ec333fdbb277e0d072cd6488ebea012edc	[log] [tgz]
author	Eric Fischer <enf@google.com>	Mon Oct 03 13:42:00 2011 -0700
committer	Eric Fischer <enf@google.com>	Mon Oct 03 13:42:00 2011 -0700
tree	c68136519155684933457434f2c8bb186a2f481d
parent	1d8302e88ba2e25db1016ebbbbc4df7bbac97f1d [diff]