DO NOT MERGE: Move emailcommon2 sources to emailcommon

Change-Id: I06df7e467cd2e0117df8b8db3ddc6ff9da13f1c7
diff --git a/res/drawable-hdpi/attachment_bg_holo.9.png b/res/drawable-hdpi/attachment_bg_holo.9.png
deleted file mode 100644
index 43983c5..0000000
--- a/res/drawable-hdpi/attachment_bg_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_check_off_normal_holo_light.png b/res/drawable-hdpi/btn_check_off_normal_holo_light.png
deleted file mode 100644
index 351a4f0..0000000
--- a/res/drawable-hdpi/btn_check_off_normal_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_check_on_normal_holo_light.png b/res/drawable-hdpi/btn_check_on_normal_holo_light.png
deleted file mode 100644
index 4b4364c..0000000
--- a/res/drawable-hdpi/btn_check_on_normal_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_maybe_off.png b/res/drawable-hdpi/btn_maybe_off.png
deleted file mode 100644
index f907a9d..0000000
--- a/res/drawable-hdpi/btn_maybe_off.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_no_off.png.png b/res/drawable-hdpi/btn_no_off.png.png
deleted file mode 100644
index f88b5a7..0000000
--- a/res/drawable-hdpi/btn_no_off.png.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_star_off_convo_holo_light.png b/res/drawable-hdpi/btn_star_off_convo_holo_light.png
deleted file mode 100644
index 8d0c6c2..0000000
--- a/res/drawable-hdpi/btn_star_off_convo_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_star_off_normal_email_holo_light.png b/res/drawable-hdpi/btn_star_off_normal_email_holo_light.png
deleted file mode 100644
index 5076fbf..0000000
--- a/res/drawable-hdpi/btn_star_off_normal_email_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_star_on_convo_holo_light.png b/res/drawable-hdpi/btn_star_on_convo_holo_light.png
deleted file mode 100644
index 718186a..0000000
--- a/res/drawable-hdpi/btn_star_on_convo_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_star_on_normal_email_holo_light.png b/res/drawable-hdpi/btn_star_on_normal_email_holo_light.png
deleted file mode 100644
index 3042cb7..0000000
--- a/res/drawable-hdpi/btn_star_on_normal_email_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_yes_off.png.png b/res/drawable-hdpi/btn_yes_off.png.png
deleted file mode 100644
index 94e1480..0000000
--- a/res/drawable-hdpi/btn_yes_off.png.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/divider_horizontal_holo_light.9.png b/res/drawable-hdpi/divider_horizontal_holo_light.9.png
deleted file mode 100644
index 064cf07..0000000
--- a/res/drawable-hdpi/divider_horizontal_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/expander_close_holo_light.9.png b/res/drawable-hdpi/expander_close_holo_light.9.png
deleted file mode 100644
index 2dd4548..0000000
--- a/res/drawable-hdpi/expander_close_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/expander_open_holo_light.9.png b/res/drawable-hdpi/expander_open_holo_light.9.png
deleted file mode 100644
index 7cec83a..0000000
--- a/res/drawable-hdpi/expander_open_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/gradient_bg_email_widget_holo.9.png b/res/drawable-hdpi/gradient_bg_email_widget_holo.9.png
deleted file mode 100644
index 0ed36df..0000000
--- a/res/drawable-hdpi/gradient_bg_email_widget_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/header_bg_email_widget_holo.9.png b/res/drawable-hdpi/header_bg_email_widget_holo.9.png
deleted file mode 100644
index 6216ba3..0000000
--- a/res/drawable-hdpi/header_bg_email_widget_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/header_convo_view_sender_bg_holo.9.png b/res/drawable-hdpi/header_convo_view_sender_bg_holo.9.png
deleted file mode 100644
index bfc020e..0000000
--- a/res/drawable-hdpi/header_convo_view_sender_bg_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_badge_attachment.png b/res/drawable-hdpi/ic_badge_attachment.png
deleted file mode 100644
index a3db7ef..0000000
--- a/res/drawable-hdpi/ic_badge_attachment.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_badge_forward_holo_light.png b/res/drawable-hdpi/ic_badge_forward_holo_light.png
deleted file mode 100644
index 1b2d54f..0000000
--- a/res/drawable-hdpi/ic_badge_forward_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_badge_invite_holo_light.png b/res/drawable-hdpi/ic_badge_invite_holo_light.png
deleted file mode 100644
index beb6c30..0000000
--- a/res/drawable-hdpi/ic_badge_invite_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_badge_reply_forward_holo_light.png b/res/drawable-hdpi/ic_badge_reply_forward_holo_light.png
deleted file mode 100644
index e89b301..0000000
--- a/res/drawable-hdpi/ic_badge_reply_forward_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_badge_reply_holo_light.png b/res/drawable-hdpi/ic_badge_reply_holo_light.png
deleted file mode 100644
index 1c0e822..0000000
--- a/res/drawable-hdpi/ic_badge_reply_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_forward_holo_dark.png b/res/drawable-hdpi/ic_forward_holo_dark.png
deleted file mode 100644
index 1f1349d..0000000
--- a/res/drawable-hdpi/ic_forward_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_list_combined_inbox.png b/res/drawable-hdpi/ic_list_combined_inbox.png
deleted file mode 100644
index a70ad8e..0000000
--- a/res/drawable-hdpi/ic_list_combined_inbox.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_mailbox_collapsed_holo_light.png b/res/drawable-hdpi/ic_mailbox_collapsed_holo_light.png
deleted file mode 100644
index 2c395b8..0000000
--- a/res/drawable-hdpi/ic_mailbox_collapsed_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_compose_normal_holo_light.png b/res/drawable-hdpi/ic_menu_compose_normal_holo_light.png
deleted file mode 100644
index b590822..0000000
--- a/res/drawable-hdpi/ic_menu_compose_normal_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_mark_read_holo_light.png b/res/drawable-hdpi/ic_menu_mark_read_holo_light.png
deleted file mode 100644
index e2f898c..0000000
--- a/res/drawable-hdpi/ic_menu_mark_read_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_mark_unread_holo_light.png b/res/drawable-hdpi/ic_menu_mark_unread_holo_light.png
deleted file mode 100644
index d8d8f28..0000000
--- a/res/drawable-hdpi/ic_menu_mark_unread_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_move_to_holo_light.png b/res/drawable-hdpi/ic_menu_move_to_holo_light.png
deleted file mode 100644
index 21a10b0..0000000
--- a/res/drawable-hdpi/ic_menu_move_to_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_refresh_holo_light.png b/res/drawable-hdpi/ic_menu_refresh_holo_light.png
deleted file mode 100644
index 8591b69..0000000
--- a/res/drawable-hdpi/ic_menu_refresh_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_search_holo_light.png b/res/drawable-hdpi/ic_menu_search_holo_light.png
deleted file mode 100644
index dae6979..0000000
--- a/res/drawable-hdpi/ic_menu_search_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_send_disabled_holo_light.png b/res/drawable-hdpi/ic_menu_send_disabled_holo_light.png
deleted file mode 100644
index 24232e4..0000000
--- a/res/drawable-hdpi/ic_menu_send_disabled_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_send_holo_light.png b/res/drawable-hdpi/ic_menu_send_holo_light.png
deleted file mode 100644
index 95fc4fc..0000000
--- a/res/drawable-hdpi/ic_menu_send_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_send_normal_holo_light.png b/res/drawable-hdpi/ic_menu_send_normal_holo_light.png
deleted file mode 100644
index 0aa3651..0000000
--- a/res/drawable-hdpi/ic_menu_send_normal_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_star_holo_light.png b/res/drawable-hdpi/ic_menu_star_holo_light.png
deleted file mode 100644
index 3051ead..0000000
--- a/res/drawable-hdpi/ic_menu_star_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_star_off_holo_light.png b/res/drawable-hdpi/ic_menu_star_off_holo_light.png
deleted file mode 100644
index 257abf7..0000000
--- a/res/drawable-hdpi/ic_menu_star_off_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_trash_holo_light.png b/res/drawable-hdpi/ic_menu_trash_holo_light.png
deleted file mode 100644
index 47676f0..0000000
--- a/res/drawable-hdpi/ic_menu_trash_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_newer_arrow_disabled_holo_light.png b/res/drawable-hdpi/ic_newer_arrow_disabled_holo_light.png
deleted file mode 100644
index dc73d2e..0000000
--- a/res/drawable-hdpi/ic_newer_arrow_disabled_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_newer_arrow_holo_light.png b/res/drawable-hdpi/ic_newer_arrow_holo_light.png
deleted file mode 100644
index 065bdd6..0000000
--- a/res/drawable-hdpi/ic_newer_arrow_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_older_arrow_disabled_holo_light.png b/res/drawable-hdpi/ic_older_arrow_disabled_holo_light.png
deleted file mode 100644
index 6a08afa..0000000
--- a/res/drawable-hdpi/ic_older_arrow_disabled_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_older_arrow_holo_light.png b/res/drawable-hdpi/ic_older_arrow_holo_light.png
deleted file mode 100644
index 47cbf86..0000000
--- a/res/drawable-hdpi/ic_older_arrow_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_remove_attachment_holo_light.png b/res/drawable-hdpi/ic_remove_attachment_holo_light.png
deleted file mode 100644
index fe4bd89..0000000
--- a/res/drawable-hdpi/ic_remove_attachment_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_reply.png b/res/drawable-hdpi/ic_reply.png
deleted file mode 100644
index 0816a51..0000000
--- a/res/drawable-hdpi/ic_reply.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_reply_all.png b/res/drawable-hdpi/ic_reply_all.png
deleted file mode 100644
index 0da72bb..0000000
--- a/res/drawable-hdpi/ic_reply_all.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_reply_all_holo_dark.png b/res/drawable-hdpi/ic_reply_all_holo_dark.png
deleted file mode 100644
index 26bdd18..0000000
--- a/res/drawable-hdpi/ic_reply_all_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_reply_holo_dark.png b/res/drawable-hdpi/ic_reply_holo_dark.png
deleted file mode 100644
index 41acf9d..0000000
--- a/res/drawable-hdpi/ic_reply_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_show_images_holo_light.png b/res/drawable-hdpi/ic_show_images_holo_light.png
deleted file mode 100644
index c5ae595..0000000
--- a/res/drawable-hdpi/ic_show_images_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_spam_normal_holo_light.png b/res/drawable-hdpi/ic_spam_normal_holo_light.png
deleted file mode 100644
index 21a0fa6..0000000
--- a/res/drawable-hdpi/ic_spam_normal_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/list_div_top_btm_email_widget_holo.9.png b/res/drawable-hdpi/list_div_top_btm_email_widget_holo.9.png
deleted file mode 100644
index 8c54379..0000000
--- a/res/drawable-hdpi/list_div_top_btm_email_widget_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/attachment_bg_holo.9.png b/res/drawable-mdpi/attachment_bg_holo.9.png
deleted file mode 100644
index 040bbd0..0000000
--- a/res/drawable-mdpi/attachment_bg_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_check_off_normal_holo_light.png b/res/drawable-mdpi/btn_check_off_normal_holo_light.png
deleted file mode 100644
index f1b9c7a..0000000
--- a/res/drawable-mdpi/btn_check_off_normal_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_check_on_normal_holo_light.png b/res/drawable-mdpi/btn_check_on_normal_holo_light.png
deleted file mode 100644
index aede531..0000000
--- a/res/drawable-mdpi/btn_check_on_normal_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_maybe_off.png b/res/drawable-mdpi/btn_maybe_off.png
deleted file mode 100644
index 2a22a27..0000000
--- a/res/drawable-mdpi/btn_maybe_off.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_no_off.png.png b/res/drawable-mdpi/btn_no_off.png.png
deleted file mode 100644
index 4e8590e..0000000
--- a/res/drawable-mdpi/btn_no_off.png.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_star_off_convo_holo_light.png b/res/drawable-mdpi/btn_star_off_convo_holo_light.png
deleted file mode 100644
index af65e65..0000000
--- a/res/drawable-mdpi/btn_star_off_convo_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_star_off_normal_email_holo_light.png b/res/drawable-mdpi/btn_star_off_normal_email_holo_light.png
deleted file mode 100644
index 7c0d5ad..0000000
--- a/res/drawable-mdpi/btn_star_off_normal_email_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_star_on_convo_holo_light.png b/res/drawable-mdpi/btn_star_on_convo_holo_light.png
deleted file mode 100644
index 1c2997a..0000000
--- a/res/drawable-mdpi/btn_star_on_convo_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_star_on_normal_email_holo_light.png b/res/drawable-mdpi/btn_star_on_normal_email_holo_light.png
deleted file mode 100644
index 23a63b4..0000000
--- a/res/drawable-mdpi/btn_star_on_normal_email_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_yes_off.png.png b/res/drawable-mdpi/btn_yes_off.png.png
deleted file mode 100644
index 0bad669..0000000
--- a/res/drawable-mdpi/btn_yes_off.png.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/divider_horizontal_holo_light.9.png b/res/drawable-mdpi/divider_horizontal_holo_light.9.png
deleted file mode 100644
index 064cf07..0000000
--- a/res/drawable-mdpi/divider_horizontal_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/expander_close_holo_light.9.png b/res/drawable-mdpi/expander_close_holo_light.9.png
deleted file mode 100644
index 2ea9668..0000000
--- a/res/drawable-mdpi/expander_close_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/expander_open_holo_light.9.png b/res/drawable-mdpi/expander_open_holo_light.9.png
deleted file mode 100644
index 28b9ec7..0000000
--- a/res/drawable-mdpi/expander_open_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/gradient_bg_email_widget_holo.9.png b/res/drawable-mdpi/gradient_bg_email_widget_holo.9.png
deleted file mode 100644
index 8d319d1..0000000
--- a/res/drawable-mdpi/gradient_bg_email_widget_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/header_bg_email_widget_holo.9.png b/res/drawable-mdpi/header_bg_email_widget_holo.9.png
deleted file mode 100644
index 500cc4c..0000000
--- a/res/drawable-mdpi/header_bg_email_widget_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/header_convo_view_sender_bg_holo.9.png b/res/drawable-mdpi/header_convo_view_sender_bg_holo.9.png
deleted file mode 100644
index 2afef3c..0000000
--- a/res/drawable-mdpi/header_convo_view_sender_bg_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_badge_attachment.png b/res/drawable-mdpi/ic_badge_attachment.png
deleted file mode 100644
index 7ce9ecf..0000000
--- a/res/drawable-mdpi/ic_badge_attachment.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_badge_forward_holo_light.png b/res/drawable-mdpi/ic_badge_forward_holo_light.png
deleted file mode 100644
index 7e801b8..0000000
--- a/res/drawable-mdpi/ic_badge_forward_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_badge_invite_holo_light.png b/res/drawable-mdpi/ic_badge_invite_holo_light.png
deleted file mode 100644
index febdc6d..0000000
--- a/res/drawable-mdpi/ic_badge_invite_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_badge_reply_forward_holo_light.png b/res/drawable-mdpi/ic_badge_reply_forward_holo_light.png
deleted file mode 100644
index c46ba10..0000000
--- a/res/drawable-mdpi/ic_badge_reply_forward_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_badge_reply_holo_light.png b/res/drawable-mdpi/ic_badge_reply_holo_light.png
deleted file mode 100644
index 7a7b07b..0000000
--- a/res/drawable-mdpi/ic_badge_reply_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_forward_holo_dark.png b/res/drawable-mdpi/ic_forward_holo_dark.png
deleted file mode 100644
index 0894ce5..0000000
--- a/res/drawable-mdpi/ic_forward_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_list_combined_inbox.png b/res/drawable-mdpi/ic_list_combined_inbox.png
deleted file mode 100644
index 1d3bde1..0000000
--- a/res/drawable-mdpi/ic_list_combined_inbox.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_mailbox_collapsed_holo_light.png b/res/drawable-mdpi/ic_mailbox_collapsed_holo_light.png
deleted file mode 100644
index 5b1a815..0000000
--- a/res/drawable-mdpi/ic_mailbox_collapsed_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_compose_normal_holo_light.png b/res/drawable-mdpi/ic_menu_compose_normal_holo_light.png
deleted file mode 100644
index 4f194f8..0000000
--- a/res/drawable-mdpi/ic_menu_compose_normal_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_mark_read_holo_light.png b/res/drawable-mdpi/ic_menu_mark_read_holo_light.png
deleted file mode 100644
index 05294de..0000000
--- a/res/drawable-mdpi/ic_menu_mark_read_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_mark_unread_holo_light.png b/res/drawable-mdpi/ic_menu_mark_unread_holo_light.png
deleted file mode 100644
index 21adb5e..0000000
--- a/res/drawable-mdpi/ic_menu_mark_unread_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_move_to_holo_light.png b/res/drawable-mdpi/ic_menu_move_to_holo_light.png
deleted file mode 100644
index 2ad5910..0000000
--- a/res/drawable-mdpi/ic_menu_move_to_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_refresh_holo_light.png b/res/drawable-mdpi/ic_menu_refresh_holo_light.png
deleted file mode 100644
index 3621798..0000000
--- a/res/drawable-mdpi/ic_menu_refresh_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_search_holo_light.png b/res/drawable-mdpi/ic_menu_search_holo_light.png
deleted file mode 100644
index 2769fd2..0000000
--- a/res/drawable-mdpi/ic_menu_search_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_send_disabled_holo_light.png b/res/drawable-mdpi/ic_menu_send_disabled_holo_light.png
deleted file mode 100644
index f013053..0000000
--- a/res/drawable-mdpi/ic_menu_send_disabled_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_send_holo_light.png b/res/drawable-mdpi/ic_menu_send_holo_light.png
deleted file mode 100644
index e90a8c1..0000000
--- a/res/drawable-mdpi/ic_menu_send_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_send_normal_holo_light.png b/res/drawable-mdpi/ic_menu_send_normal_holo_light.png
deleted file mode 100644
index 3275d70..0000000
--- a/res/drawable-mdpi/ic_menu_send_normal_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_star_holo_light.png b/res/drawable-mdpi/ic_menu_star_holo_light.png
deleted file mode 100644
index e9ab7ef..0000000
--- a/res/drawable-mdpi/ic_menu_star_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_star_off_holo_light.png b/res/drawable-mdpi/ic_menu_star_off_holo_light.png
deleted file mode 100644
index 15f5845..0000000
--- a/res/drawable-mdpi/ic_menu_star_off_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_trash_holo_light.png b/res/drawable-mdpi/ic_menu_trash_holo_light.png
deleted file mode 100644
index 7e7c3fe..0000000
--- a/res/drawable-mdpi/ic_menu_trash_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_newer_arrow_disabled_holo_light.png b/res/drawable-mdpi/ic_newer_arrow_disabled_holo_light.png
deleted file mode 100644
index 4c24026..0000000
--- a/res/drawable-mdpi/ic_newer_arrow_disabled_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_newer_arrow_holo_light.png b/res/drawable-mdpi/ic_newer_arrow_holo_light.png
deleted file mode 100644
index 02d5289..0000000
--- a/res/drawable-mdpi/ic_newer_arrow_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_older_arrow_disabled_holo_light.png b/res/drawable-mdpi/ic_older_arrow_disabled_holo_light.png
deleted file mode 100644
index 1e5a11d..0000000
--- a/res/drawable-mdpi/ic_older_arrow_disabled_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_older_arrow_holo_light.png b/res/drawable-mdpi/ic_older_arrow_holo_light.png
deleted file mode 100644
index 3b72b13..0000000
--- a/res/drawable-mdpi/ic_older_arrow_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_remove_attachment_holo_light.png b/res/drawable-mdpi/ic_remove_attachment_holo_light.png
deleted file mode 100644
index 677c1ca..0000000
--- a/res/drawable-mdpi/ic_remove_attachment_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_reply.png b/res/drawable-mdpi/ic_reply.png
deleted file mode 100644
index 55288fa..0000000
--- a/res/drawable-mdpi/ic_reply.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_reply_all.png b/res/drawable-mdpi/ic_reply_all.png
deleted file mode 100644
index 4cb89d6..0000000
--- a/res/drawable-mdpi/ic_reply_all.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_reply_all_holo_dark.png b/res/drawable-mdpi/ic_reply_all_holo_dark.png
deleted file mode 100644
index aa1f3cd..0000000
--- a/res/drawable-mdpi/ic_reply_all_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_reply_holo_dark.png b/res/drawable-mdpi/ic_reply_holo_dark.png
deleted file mode 100644
index 303b296..0000000
--- a/res/drawable-mdpi/ic_reply_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_show_images_holo_light.png b/res/drawable-mdpi/ic_show_images_holo_light.png
deleted file mode 100644
index 46c9e51..0000000
--- a/res/drawable-mdpi/ic_show_images_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_spam_normal_holo_light.png b/res/drawable-mdpi/ic_spam_normal_holo_light.png
deleted file mode 100644
index 5abe493..0000000
--- a/res/drawable-mdpi/ic_spam_normal_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/list_div_top_btm_email_widget_holo.9.png b/res/drawable-mdpi/list_div_top_btm_email_widget_holo.9.png
deleted file mode 100644
index 7d59de2..0000000
--- a/res/drawable-mdpi/list_div_top_btm_email_widget_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/btn_check_off_normal_holo_light.png b/res/drawable-sw600dp-hdpi/btn_check_off_normal_holo_light.png
deleted file mode 100644
index 402bef3..0000000
--- a/res/drawable-sw600dp-hdpi/btn_check_off_normal_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/btn_check_on_normal_holo_light.png b/res/drawable-sw600dp-hdpi/btn_check_on_normal_holo_light.png
deleted file mode 100644
index 0e49c5e..0000000
--- a/res/drawable-sw600dp-hdpi/btn_check_on_normal_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/btn_star_off_normal_email_holo_light.png b/res/drawable-sw600dp-hdpi/btn_star_off_normal_email_holo_light.png
deleted file mode 100644
index 985ca74..0000000
--- a/res/drawable-sw600dp-hdpi/btn_star_off_normal_email_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/btn_star_on_normal_email_holo_light.png b/res/drawable-sw600dp-hdpi/btn_star_on_normal_email_holo_light.png
deleted file mode 100644
index f500c67..0000000
--- a/res/drawable-sw600dp-hdpi/btn_star_on_normal_email_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/btn_check_off_normal_holo_light.png b/res/drawable-sw600dp-mdpi/btn_check_off_normal_holo_light.png
deleted file mode 100644
index f1b9c7a..0000000
--- a/res/drawable-sw600dp-mdpi/btn_check_off_normal_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/btn_check_on_normal_holo_light.png b/res/drawable-sw600dp-mdpi/btn_check_on_normal_holo_light.png
deleted file mode 100644
index aede531..0000000
--- a/res/drawable-sw600dp-mdpi/btn_check_on_normal_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/btn_star_off_normal_email_holo_light.png b/res/drawable-sw600dp-mdpi/btn_star_off_normal_email_holo_light.png
deleted file mode 100644
index a4d4140..0000000
--- a/res/drawable-sw600dp-mdpi/btn_star_off_normal_email_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/btn_star_on_normal_email_holo_light.png b/res/drawable-sw600dp-mdpi/btn_star_on_normal_email_holo_light.png
deleted file mode 100644
index fb93247..0000000
--- a/res/drawable-sw600dp-mdpi/btn_star_on_normal_email_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/btn_check_off_normal_holo_light.png b/res/drawable-sw600dp-xhdpi/btn_check_off_normal_holo_light.png
deleted file mode 100644
index 2863acf..0000000
--- a/res/drawable-sw600dp-xhdpi/btn_check_off_normal_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/btn_check_on_normal_holo_light.png b/res/drawable-sw600dp-xhdpi/btn_check_on_normal_holo_light.png
deleted file mode 100644
index 121986c..0000000
--- a/res/drawable-sw600dp-xhdpi/btn_check_on_normal_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/btn_star_off_normal_email_holo_light.png b/res/drawable-sw600dp-xhdpi/btn_star_off_normal_email_holo_light.png
deleted file mode 100644
index e740d9b..0000000
--- a/res/drawable-sw600dp-xhdpi/btn_star_off_normal_email_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/btn_star_on_normal_email_holo_light.png b/res/drawable-sw600dp-xhdpi/btn_star_on_normal_email_holo_light.png
deleted file mode 100644
index c515417..0000000
--- a/res/drawable-sw600dp-xhdpi/btn_star_on_normal_email_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/attachment_bg_holo.9.png b/res/drawable-xhdpi/attachment_bg_holo.9.png
deleted file mode 100644
index b59af1d..0000000
--- a/res/drawable-xhdpi/attachment_bg_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/btn_check_off_normal_holo_light.png b/res/drawable-xhdpi/btn_check_off_normal_holo_light.png
deleted file mode 100644
index d3809fa..0000000
--- a/res/drawable-xhdpi/btn_check_off_normal_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/btn_check_on_normal_holo_light.png b/res/drawable-xhdpi/btn_check_on_normal_holo_light.png
deleted file mode 100644
index 7e1bc8c..0000000
--- a/res/drawable-xhdpi/btn_check_on_normal_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/btn_maybe_off.png b/res/drawable-xhdpi/btn_maybe_off.png
deleted file mode 100644
index 59c7a4a..0000000
--- a/res/drawable-xhdpi/btn_maybe_off.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/btn_no_off.png.png b/res/drawable-xhdpi/btn_no_off.png.png
deleted file mode 100644
index c8bcae4..0000000
--- a/res/drawable-xhdpi/btn_no_off.png.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/btn_star_off_convo_holo_light.png b/res/drawable-xhdpi/btn_star_off_convo_holo_light.png
deleted file mode 100644
index 8edd94c..0000000
--- a/res/drawable-xhdpi/btn_star_off_convo_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/btn_star_off_normal_email_holo_light.png b/res/drawable-xhdpi/btn_star_off_normal_email_holo_light.png
deleted file mode 100644
index 7129d00..0000000
--- a/res/drawable-xhdpi/btn_star_off_normal_email_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/btn_star_on_convo_holo_light.png b/res/drawable-xhdpi/btn_star_on_convo_holo_light.png
deleted file mode 100644
index 1974ca6..0000000
--- a/res/drawable-xhdpi/btn_star_on_convo_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/btn_star_on_normal_email_holo_light.png b/res/drawable-xhdpi/btn_star_on_normal_email_holo_light.png
deleted file mode 100644
index d91c8bc..0000000
--- a/res/drawable-xhdpi/btn_star_on_normal_email_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/btn_yes_off.png.png b/res/drawable-xhdpi/btn_yes_off.png.png
deleted file mode 100644
index 97d169b..0000000
--- a/res/drawable-xhdpi/btn_yes_off.png.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/divider_horizontal_holo_light.9.png b/res/drawable-xhdpi/divider_horizontal_holo_light.9.png
deleted file mode 100644
index ce44486..0000000
--- a/res/drawable-xhdpi/divider_horizontal_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/expander_close_holo_light.9.png b/res/drawable-xhdpi/expander_close_holo_light.9.png
deleted file mode 100644
index 333dd24..0000000
--- a/res/drawable-xhdpi/expander_close_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/expander_open_holo_light.9.png b/res/drawable-xhdpi/expander_open_holo_light.9.png
deleted file mode 100644
index 67ed4c0..0000000
--- a/res/drawable-xhdpi/expander_open_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/gradient_bg_email_widget_holo.9.png b/res/drawable-xhdpi/gradient_bg_email_widget_holo.9.png
deleted file mode 100644
index b481cad..0000000
--- a/res/drawable-xhdpi/gradient_bg_email_widget_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/header_bg_email_widget_holo.9.png b/res/drawable-xhdpi/header_bg_email_widget_holo.9.png
deleted file mode 100644
index fa41141..0000000
--- a/res/drawable-xhdpi/header_bg_email_widget_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/header_convo_view_sender_bg_holo.9.png b/res/drawable-xhdpi/header_convo_view_sender_bg_holo.9.png
deleted file mode 100644
index 3f57a7b..0000000
--- a/res/drawable-xhdpi/header_convo_view_sender_bg_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_badge_attachment.png b/res/drawable-xhdpi/ic_badge_attachment.png
deleted file mode 100644
index 8376cdf..0000000
--- a/res/drawable-xhdpi/ic_badge_attachment.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_badge_forward_holo_light.png b/res/drawable-xhdpi/ic_badge_forward_holo_light.png
deleted file mode 100644
index 0f5a80a..0000000
--- a/res/drawable-xhdpi/ic_badge_forward_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_badge_invite_holo_light.png b/res/drawable-xhdpi/ic_badge_invite_holo_light.png
deleted file mode 100644
index b3f1c50..0000000
--- a/res/drawable-xhdpi/ic_badge_invite_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_badge_reply_forward_holo_light.png b/res/drawable-xhdpi/ic_badge_reply_forward_holo_light.png
deleted file mode 100644
index 79b07e0..0000000
--- a/res/drawable-xhdpi/ic_badge_reply_forward_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_badge_reply_holo_light.png b/res/drawable-xhdpi/ic_badge_reply_holo_light.png
deleted file mode 100644
index 3f69cc4..0000000
--- a/res/drawable-xhdpi/ic_badge_reply_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_forward_holo_dark.png b/res/drawable-xhdpi/ic_forward_holo_dark.png
deleted file mode 100644
index b36b81a..0000000
--- a/res/drawable-xhdpi/ic_forward_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_list_combined_inbox.png b/res/drawable-xhdpi/ic_list_combined_inbox.png
deleted file mode 100644
index 11a61b8..0000000
--- a/res/drawable-xhdpi/ic_list_combined_inbox.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_mailbox_collapsed_holo_light.png b/res/drawable-xhdpi/ic_mailbox_collapsed_holo_light.png
deleted file mode 100644
index 132282e..0000000
--- a/res/drawable-xhdpi/ic_mailbox_collapsed_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_compose_normal_holo_light.png b/res/drawable-xhdpi/ic_menu_compose_normal_holo_light.png
deleted file mode 100644
index a2d821a..0000000
--- a/res/drawable-xhdpi/ic_menu_compose_normal_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_mark_read_holo_light.png b/res/drawable-xhdpi/ic_menu_mark_read_holo_light.png
deleted file mode 100644
index cfd5e34..0000000
--- a/res/drawable-xhdpi/ic_menu_mark_read_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_mark_unread_holo_light.png b/res/drawable-xhdpi/ic_menu_mark_unread_holo_light.png
deleted file mode 100644
index f023cb0..0000000
--- a/res/drawable-xhdpi/ic_menu_mark_unread_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_move_to_holo_light.png b/res/drawable-xhdpi/ic_menu_move_to_holo_light.png
deleted file mode 100644
index fb13638..0000000
--- a/res/drawable-xhdpi/ic_menu_move_to_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_refresh_holo_light.png b/res/drawable-xhdpi/ic_menu_refresh_holo_light.png
deleted file mode 100644
index 9b4a49d..0000000
--- a/res/drawable-xhdpi/ic_menu_refresh_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_search_holo_light.png b/res/drawable-xhdpi/ic_menu_search_holo_light.png
deleted file mode 100644
index 4c6aade..0000000
--- a/res/drawable-xhdpi/ic_menu_search_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_send_disabled_holo_light.png b/res/drawable-xhdpi/ic_menu_send_disabled_holo_light.png
deleted file mode 100644
index b3143f6..0000000
--- a/res/drawable-xhdpi/ic_menu_send_disabled_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_send_holo_light.png b/res/drawable-xhdpi/ic_menu_send_holo_light.png
deleted file mode 100644
index 9f4c797..0000000
--- a/res/drawable-xhdpi/ic_menu_send_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_send_normal_holo_light.png b/res/drawable-xhdpi/ic_menu_send_normal_holo_light.png
deleted file mode 100644
index 294f476..0000000
--- a/res/drawable-xhdpi/ic_menu_send_normal_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_star_holo_light.png b/res/drawable-xhdpi/ic_menu_star_holo_light.png
deleted file mode 100644
index b69c034..0000000
--- a/res/drawable-xhdpi/ic_menu_star_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_star_off_holo_light.png b/res/drawable-xhdpi/ic_menu_star_off_holo_light.png
deleted file mode 100644
index b7417f1..0000000
--- a/res/drawable-xhdpi/ic_menu_star_off_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_trash_holo_light.png b/res/drawable-xhdpi/ic_menu_trash_holo_light.png
deleted file mode 100644
index 203ba4c..0000000
--- a/res/drawable-xhdpi/ic_menu_trash_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_newer_arrow_disabled_holo_light.png b/res/drawable-xhdpi/ic_newer_arrow_disabled_holo_light.png
deleted file mode 100644
index 6bde914..0000000
--- a/res/drawable-xhdpi/ic_newer_arrow_disabled_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_newer_arrow_holo_light.png b/res/drawable-xhdpi/ic_newer_arrow_holo_light.png
deleted file mode 100644
index aba0e9b..0000000
--- a/res/drawable-xhdpi/ic_newer_arrow_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_older_arrow_disabled_holo_light.png b/res/drawable-xhdpi/ic_older_arrow_disabled_holo_light.png
deleted file mode 100644
index 6ef30a7..0000000
--- a/res/drawable-xhdpi/ic_older_arrow_disabled_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_older_arrow_holo_light.png b/res/drawable-xhdpi/ic_older_arrow_holo_light.png
deleted file mode 100644
index 0f220ea..0000000
--- a/res/drawable-xhdpi/ic_older_arrow_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_remove_attachment_holo_light.png b/res/drawable-xhdpi/ic_remove_attachment_holo_light.png
deleted file mode 100644
index 5879105..0000000
--- a/res/drawable-xhdpi/ic_remove_attachment_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_reply.png b/res/drawable-xhdpi/ic_reply.png
deleted file mode 100644
index 01467a4..0000000
--- a/res/drawable-xhdpi/ic_reply.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_reply_all.png b/res/drawable-xhdpi/ic_reply_all.png
deleted file mode 100644
index 8761b75..0000000
--- a/res/drawable-xhdpi/ic_reply_all.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_reply_all_holo_dark.png b/res/drawable-xhdpi/ic_reply_all_holo_dark.png
deleted file mode 100644
index 3852a1d..0000000
--- a/res/drawable-xhdpi/ic_reply_all_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_reply_holo_dark.png b/res/drawable-xhdpi/ic_reply_holo_dark.png
deleted file mode 100644
index 6fccf46..0000000
--- a/res/drawable-xhdpi/ic_reply_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_show_images_holo_light.png b/res/drawable-xhdpi/ic_show_images_holo_light.png
deleted file mode 100644
index 571bc57..0000000
--- a/res/drawable-xhdpi/ic_show_images_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_spam_normal_holo_light.png b/res/drawable-xhdpi/ic_spam_normal_holo_light.png
deleted file mode 100644
index 4edbfe0..0000000
--- a/res/drawable-xhdpi/ic_spam_normal_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/list_div_top_btm_email_widget_holo.9.png b/res/drawable-xhdpi/list_div_top_btm_email_widget_holo.9.png
deleted file mode 100644
index 6934c5f..0000000
--- a/res/drawable-xhdpi/list_div_top_btm_email_widget_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/attachment_background.xml b/res/drawable/attachment_background.xml
deleted file mode 100644
index 559d33f..0000000
--- a/res/drawable/attachment_background.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true">
-        <shape type="rectangle">
-            <solid android:color="#ffffaf00" />
-            <corners android:radius="8dp" />
-        </shape>
-        <stroke android:width="2dip" android:color="#ff000000" />
-    </item>
-
-    <item android:state_selected="false">
-        <shape type="rectangle">
-            <solid android:color="#ff444444" />
-            <corners android:radius="8dp" />
-        </shape>
-        <stroke android:width="2dip" android:color="#ff000000" />
-    </item>
-</selector>
diff --git a/res/drawable/menu_item_newer.xml b/res/drawable/menu_item_newer.xml
deleted file mode 100644
index 195c1be..0000000
--- a/res/drawable/menu_item_newer.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true" android:drawable="@drawable/ic_newer_arrow_holo_light" />
-    <item android:state_enabled="false" android:drawable="@drawable/ic_newer_arrow_disabled_holo_light" />
-</selector>
diff --git a/res/drawable/menu_item_older.xml b/res/drawable/menu_item_older.xml
deleted file mode 100644
index 42dc10d..0000000
--- a/res/drawable/menu_item_older.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true" android:drawable="@drawable/ic_older_arrow_holo_light" />
-    <item android:state_enabled="false" android:drawable="@drawable/ic_older_arrow_disabled_holo_light" />
-</selector>
diff --git a/res/layout-land/message_view_header_actions.xml b/res/layout-land/message_view_header_actions.xml
deleted file mode 100644
index 5c60d9c..0000000
--- a/res/layout-land/message_view_header_actions.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <ImageButton
-        android:id="@+id/favorite"
-        style="@style/message_view_action_buttons"
-        android:src="@drawable/btn_star_off_convo_holo_light"
-        android:contentDescription="@string/favorite_action"
-        />
-    <ImageButton
-        android:id="@+id/reply"
-        style="@style/message_view_action_buttons"
-        android:src="@drawable/ic_reply_holo_dark"
-        android:contentDescription="@string/reply_action"
-        />
-    <ImageButton
-        android:id="@+id/reply_all"
-        style="@style/message_view_action_buttons"
-        android:src="@drawable/ic_reply_all_holo_dark"
-        android:contentDescription="@string/reply_all_action"
-        />
-
-    <ImageButton
-        android:id="@+id/forward"
-        style="@style/message_view_action_buttons"
-        android:src="@drawable/ic_forward_holo_dark"
-        android:contentDescription="@string/forward_action"
-        />
-</merge>
diff --git a/res/layout-sw600dp-land/account_setup_exchange.xml b/res/layout-sw600dp-land/account_setup_exchange.xml
deleted file mode 100644
index 812e9bc..0000000
--- a/res/layout-sw600dp-land/account_setup_exchange.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Exchange Setup - XL - landscape - see layout/ for small-screen version -->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingTop="@dimen/setup_padding_top"
-        android:paddingLeft="@dimen/setup_padding_left"
-        android:paddingRight="@dimen/setup_padding_right"
-        >
-
-        <!-- Headline and hairline divider -->
-        <TextView
-            android:id="@+id/headline"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentLeft="true"
-            android:layout_marginLeft="16dip"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/account_setup_exchange_headline"
-            android:textAppearance="@style/accountSetupHeadline" />
-        <View
-            android:id="@+id/top_divider"
-            android:layout_below="@+id/headline"
-            android:layout_marginBottom="16dip"
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:background="@color/account_setup_divider_color" />
-
-        <!-- Buttons on the right -->
-        <Button
-            android:id="@+id/previous"
-            android:layout_below="@+id/top_divider"
-            android:layout_alignParentRight="true"
-            android:layout_marginTop="@dimen/setup_buttons_padding_top"
-            android:layout_marginRight="@dimen/setup_buttons_padding_right"
-            style="@style/accountSetupButton"
-            android:text="@string/previous_action" />
-        <Button
-            android:id="@+id/next"
-            android:layout_below="@+id/previous"
-            android:layout_alignParentRight="true"
-            android:layout_marginTop="@dimen/setup_buttons_vertical_spacing"
-            android:layout_marginRight="@dimen/setup_buttons_padding_right"
-            style="@style/accountSetupButton"
-            android:text="@string/next_action" />
-
-        <!-- Fragment on the left containing the setup info -->
-        <FrameLayout
-            android:layout_below="@+id/top_divider"
-            android:layout_alignParentLeft="true"
-            android:layout_toLeftOf="@+id/next"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingLeft="16dip"
-            android:paddingRight="64dip"
-            >
-            <fragment
-                android:id="@+id/setup_fragment"
-                class="com.android.email.activity.setup.AccountSetupExchangeFragment"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                />
-        </FrameLayout>
-    </RelativeLayout>
-</ScrollView>
\ No newline at end of file
diff --git a/res/layout-sw600dp-land/message_view_invitation.xml b/res/layout-sw600dp-land/message_view_invitation.xml
deleted file mode 100644
index f80593f..0000000
--- a/res/layout-sw600dp-land/message_view_invitation.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- tablet -->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/invite_section"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@color/message_view_info_back_color"
-    android:orientation="vertical"
-    >
-    <View
-        android:layout_width="match_parent"
-        style="@style/message_view_horizontal_divider"
-        />
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="64dip"
-        android:orientation="horizontal"
-        >
-        <!-- TODO: The plan is to show a calendar icon here. -->
-        <ImageView
-            android:layout_width="64dip"
-            android:layout_height="64dip"
-            android:layout_weight="0"
-            android:src="@null"
-            android:visibility="gone"
-            />
-        <LinearLayout
-            android:layout_width="200dip"
-            android:layout_weight="1"
-            android:layout_height="64dip"
-            android:orientation="horizontal"
-            android:divider="?android:attr/dividerVertical"
-            android:showDividers="middle"
-            android:dividerPadding="16dip"
-            >
-            <RelativeLayout
-                android:layout_width="0dip"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                >
-                <CheckBox
-                    android:id="@+id/accept"
-                    android:layout_width="104dip"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentBottom="true"
-                    android:layout_alignParentLeft="true"
-                    android:layout_marginLeft="32dip"
-                    android:text="@string/message_view_invite_accept"
-                    android:textSize="14dip"
-                    android:textColor="@color/text_primary_color"
-                    android:singleLine="true"
-                    android:ellipsize="end"
-                    />
-                <CheckBox
-                    android:id="@+id/maybe"
-                    android:layout_width="104dip"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentBottom="true"
-                    android:layout_toRightOf="@id/accept"
-                    android:layout_marginLeft="24dip"
-                    android:text="@string/message_view_invite_maybe"
-                    android:textSize="14dip"
-                    android:textColor="@color/text_primary_color"
-                    android:singleLine="true"
-                    android:ellipsize="end"
-                    />
-                <CheckBox
-                    android:id="@+id/decline"
-                    android:layout_width="104dip"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentBottom="true"
-                    android:layout_toRightOf="@id/maybe"
-                    android:layout_marginLeft="24dip"
-                    android:text="@string/message_view_invite_decline"
-                    android:textSize="14dip"
-                    android:textColor="@color/text_primary_color"
-                    android:singleLine="true"
-                    android:ellipsize="end"
-                    />
-
-                <!-- "Going?" -->
-                <TextView
-                    android:layout_width="0dip"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentTop="true"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentRight="true"
-                    android:layout_above="@id/accept"
-                    android:layout_marginLeft="32dip"
-                    android:layout_marginRight="32dip"
-                    android:singleLine="true"
-                    android:ellipsize="end"
-                    android:text="@string/message_view_invite_text"
-                    android:textSize="18dip"
-                    android:textColor="@color/text_primary_color"
-                    android:gravity="left|bottom"
-                    />
-
-            </RelativeLayout>
-            <Button
-                android:id="@+id/invite_link"
-                android:layout_width="192dip"
-                android:layout_height="match_parent"
-                android:layout_marginLeft="16dip"
-                android:layout_marginRight="16dip"
-                style="@android:style/Widget.Holo.Button.Borderless"
-                android:padding="0dip"
-                android:text="@string/message_view_invite_view"
-                android:textSize="14dip"
-                android:textColor="@color/text_primary_color"
-                android:textStyle="bold"
-                android:singleLine="true"
-                android:ellipsize="end"
-                android:gravity="center"
-                />
-        </LinearLayout>
-    </LinearLayout>
-    <View
-        android:layout_width="match_parent"
-        style="@style/message_view_horizontal_divider"
-        />
-</LinearLayout>
diff --git a/res/layout-sw600dp-port/account_setup_exchange.xml b/res/layout-sw600dp-port/account_setup_exchange.xml
deleted file mode 100644
index 34ba399..0000000
--- a/res/layout-sw600dp-port/account_setup_exchange.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Exchange Setup - XL - portrait - see layout/ for small-screen version -->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fillViewport="true"
-    >
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingTop="@dimen/setup_padding_top"
-        android:paddingLeft="@dimen/setup_padding_left"
-        android:paddingRight="@dimen/setup_padding_right"
-        >
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            >
-
-            <!-- Headline and hairline divider -->
-            <TextView
-                android:id="@+id/headline"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentLeft="true"
-                android:layout_marginLeft="16dip"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/account_setup_exchange_headline"
-                android:textAppearance="@style/accountSetupHeadline" />
-            <View
-                android:id="@+id/top_divider"
-                android:layout_below="@+id/headline"
-                android:layout_marginBottom="16dip"
-                android:layout_width="match_parent"
-                android:layout_height="1px"
-                android:background="@color/account_setup_divider_color" />
-
-            <!-- Fragment on the top containing the setup info -->
-            <FrameLayout
-                android:layout_below="@+id/top_divider"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingLeft="16dip"
-                android:paddingRight="96dip"
-                >
-                <fragment
-                    android:id="@+id/setup_fragment"
-                    class="com.android.email.activity.setup.AccountSetupExchangeFragment"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    />
-            </FrameLayout>
-        </RelativeLayout>
-
-        <!-- Buttons below -->
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/setup_buttons_padding_bottom"
-            >
-            <Button
-                android:id="@+id/previous"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentLeft="true"
-                android:layout_marginLeft="@dimen/setup_buttons_padding_left"
-                style="@style/accountSetupButton"
-                android:text="@string/previous_action" />
-            <Button
-                android:id="@+id/next"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentRight="true"
-                android:layout_marginRight="@dimen/setup_buttons_padding_right"
-                style="@style/accountSetupButton"
-                android:text="@string/next_action" />
-        </RelativeLayout>
-    </LinearLayout>
-</ScrollView>
\ No newline at end of file
diff --git a/res/layout-sw600dp-port/message_view_invitation.xml b/res/layout-sw600dp-port/message_view_invitation.xml
deleted file mode 100644
index eaf8d63..0000000
--- a/res/layout-sw600dp-port/message_view_invitation.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- tablet -->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/invite_section"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@color/message_view_info_back_color"
-    android:orientation="vertical"
-    >
-    <View
-        android:layout_width="match_parent"
-        style="@style/message_view_horizontal_divider"
-        />
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="64dip"
-        android:orientation="horizontal"
-        >
-        <!-- TODO: The plan is to show a calendar icon here. -->
-        <ImageView
-            android:layout_width="64dip"
-            android:layout_height="64dip"
-            android:layout_weight="0"
-            android:src="@null"
-            android:visibility="gone"
-            />
-        <LinearLayout
-            android:layout_width="200dip"
-            android:layout_weight="1"
-            android:layout_height="64dip"
-            android:orientation="horizontal"
-            android:divider="?android:attr/dividerVertical"
-            android:showDividers="middle"
-            android:dividerPadding="16dip"
-            >
-            <RelativeLayout
-                android:layout_width="0dip"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                >
-                <CheckBox
-                    android:id="@+id/accept"
-                    android:layout_width="104dip"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentBottom="true"
-                    android:layout_alignParentLeft="true"
-                    android:layout_marginLeft="16dip"
-                    android:text="@string/message_view_invite_accept"
-                    android:textSize="14dip"
-                    android:textColor="@color/text_primary_color"
-                    android:singleLine="true"
-                    android:ellipsize="end"
-                    />
-                <CheckBox
-                    android:id="@+id/maybe"
-                    android:layout_width="104dip"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentBottom="true"
-                    android:layout_toRightOf="@id/accept"
-                    android:layout_marginLeft="8dip"
-                    android:text="@string/message_view_invite_maybe"
-                    android:textSize="14dip"
-                    android:textColor="@color/text_primary_color"
-                    android:singleLine="true"
-                    android:ellipsize="end"
-                    />
-                <CheckBox
-                    android:id="@+id/decline"
-                    android:layout_width="104dip"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentBottom="true"
-                    android:layout_toRightOf="@id/maybe"
-                    android:layout_marginLeft="8dip"
-                    android:text="@string/message_view_invite_decline"
-                    android:textSize="14dip"
-                    android:textColor="@color/text_primary_color"
-                    android:singleLine="true"
-                    android:ellipsize="end"
-                    />
-
-                <!-- "Going?" -->
-                <TextView
-                    android:layout_width="0dip"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentTop="true"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentRight="true"
-                    android:layout_above="@id/accept"
-                    android:layout_marginLeft="16dip"
-                    android:layout_marginRight="16dip"
-                    android:singleLine="true"
-                    android:ellipsize="end"
-                    android:text="@string/message_view_invite_text"
-                    android:textSize="18dip"
-                    android:textColor="@color/text_primary_color"
-                    android:gravity="left|bottom"
-                    />
-
-            </RelativeLayout>
-            <Button
-                android:id="@+id/invite_link"
-                android:layout_width="162dip"
-                android:layout_height="match_parent"
-                android:layout_marginLeft="8dip"
-                android:layout_marginRight="8dip"
-                style="@android:style/Widget.Holo.Button.Borderless"
-                android:padding="0dip"
-                android:text="@string/message_view_invite_view"
-                android:textSize="14dip"
-                android:textColor="@color/text_primary_color"
-                android:textStyle="bold"
-                android:singleLine="true"
-                android:ellipsize="end"
-                android:gravity="center"
-                />
-        </LinearLayout>
-    </LinearLayout>
-    <View
-        android:layout_width="match_parent"
-        style="@style/message_view_horizontal_divider"
-        />
-</LinearLayout>
diff --git a/res/layout-sw600dp/account_setup_account_type.xml b/res/layout-sw600dp/account_setup_account_type.xml
index 0c2139a..c6d8a66 100644
--- a/res/layout-sw600dp/account_setup_account_type.xml
+++ b/res/layout-sw600dp/account_setup_account_type.xml
@@ -38,13 +38,13 @@
         android:layout_below="@+id/headline"
         android:layout_marginBottom="16dip"
         android:layout_width="match_parent"
-        android:layout_height="1px"
+        android:layout_height="1dp"
         android:background="@color/account_setup_divider_color" />
 
     <!-- Layout on the left containing the setup info -->
     <RelativeLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/main_content"
+        android:id="@+id/accountTypes"
         android:layout_below="@+id/top_divider"
         android:layout_alignParentLeft="true"
         android:layout_marginRight="64dip"
@@ -60,30 +60,6 @@
             android:layout_marginLeft="16dip"
             android:text="@string/account_setup_account_type_instructions"
             android:textAppearance="@style/accountSetupInfoText" />
-        <Button
-            android:id="@+id/pop"
-            android:layout_below="@+id/instructions"
-            android:layout_alignParentLeft="true"
-            android:layout_marginTop="@dimen/setup_buttons_vertical_spacing"
-            android:layout_marginLeft="48dip"
-            style="@style/accountSetupButton"
-            android:text="@string/account_setup_account_type_pop_action" />
-        <Button
-            android:id="@+id/imap"
-            android:layout_below="@+id/pop"
-            android:layout_alignParentLeft="true"
-            android:layout_marginTop="@dimen/setup_buttons_vertical_spacing"
-            android:layout_marginLeft="48dip"
-            style="@style/accountSetupButton"
-            android:text="@string/account_setup_account_type_imap_action" />
-        <Button
-            android:id="@+id/exchange"
-            android:layout_below="@+id/imap"
-            android:layout_alignParentLeft="true"
-            android:layout_marginTop="@dimen/setup_buttons_vertical_spacing"
-            android:layout_marginLeft="48dip"
-            style="@style/accountSetupButton"
-            android:text="@string/account_setup_account_type_exchange_action" />
     </RelativeLayout>
 
     <!-- Previous button (can be below or to the right) -->
diff --git a/res/layout-sw600dp/account_setup_exchange_fragment.xml b/res/layout-sw600dp/account_setup_exchange_fragment.xml
deleted file mode 100644
index e99df3c..0000000
--- a/res/layout-sw600dp/account_setup_exchange_fragment.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Exchange server settings - tablet - see layout/ for phone UX variant -->
-<!-- This is used directly by the account setup activity, but during settings it is
-     wrapped in an outer layout (account_settings_exchange_fragment) -->
-<TableLayout  xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:stretchColumns="1" >
-
-    <TableRow
-        android:paddingTop="16dip" >
-        <TextView
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:layout_marginRight="16dip"
-            android:text="@string/account_setup_exchange_username_label" />
-        <EditText
-            android:id="@+id/account_username"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:contentDescription="@string/account_setup_exchange_username_label"
-            android:inputType="textEmailAddress"
-            android:imeOptions="actionDone" />
-    </TableRow>
-    <TableRow
-        android:paddingTop="16dip" >
-        <TextView
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:layout_marginRight="16dip"
-            android:text="@string/account_setup_incoming_password_label" />
-        <EditText
-            android:id="@+id/account_password"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:contentDescription="@string/account_setup_incoming_password_label"
-            android:inputType="textPassword"
-            android:imeOptions="actionDone" />
-    </TableRow>
-    <TableRow
-        android:paddingTop="16dip" >
-        <TextView
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:layout_marginRight="16dip"
-            android:text="@string/account_setup_exchange_server_label" />
-        <!-- Note: we use inputType=textUri as the closest approximation to a server name -->
-        <EditText
-            android:id="@+id/account_server"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:contentDescription="@string/account_setup_exchange_server_label"
-            android:inputType="textUri"
-            android:imeOptions="actionDone" />
-    </TableRow>
-    <!-- Note, this row is not a TableRow, and it will span the entire table - no columns -->
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="32dip"
-        android:orientation="vertical" >
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:background="@color/account_setup_divider_color" />
-        <CheckBox
-            android:id="@+id/account_ssl"
-            android:layout_marginTop="16dip"
-            android:layout_marginBottom="16dip"
-            android:layout_marginLeft="32dip"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/account_setup_exchange_ssl_label" />
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:background="@color/account_setup_divider_color" />
-        <CheckBox
-            android:id="@+id/account_trust_certificates"
-            android:layout_marginTop="16dip"
-            android:layout_marginBottom="16dip"
-            android:layout_marginLeft="32dip"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/account_setup_exchange_trust_certificates_label"
-            android:visibility="gone" />
-        <View
-            android:id="@+id/account_trust_certificates_divider"
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:background="@color/account_setup_divider_color"
-            android:visibility="gone" />
-        <include
-            android:id="@+id/client_certificate_selector"
-            layout="@layout/client_certificate_selector"
-            android:visibility="gone" />
-        <View
-            android:id="@+id/client_certificate_divider"
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:background="@color/account_setup_divider_color"
-            android:visibility="gone" />
-    </LinearLayout>
-    <TableRow
-        android:paddingTop="32dip" >
-        <TextView
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:layout_marginRight="16dip"
-            android:text="@string/account_setup_exchange_device_id_label" />
-        <!-- TODO - when adding back in styles, this should be slightly different (was "medium") -->
-        <TextView
-            android:id="@+id/device_id"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="#ffbebebe" />
-    </TableRow>
-</TableLayout>
-
diff --git a/res/layout-sw600dp/account_setup_incoming_fragment.xml b/res/layout-sw600dp/account_setup_incoming_fragment.xml
index 826ad26..d996226 100644
--- a/res/layout-sw600dp/account_setup_incoming_fragment.xml
+++ b/res/layout-sw600dp/account_setup_incoming_fragment.xml
@@ -60,13 +60,13 @@
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
             android:layout_marginRight="16dip"
-            android:text="@string/account_setup_incoming_pop_server_label" />
+            android:text="@string/account_setup_incoming_server_label" />
         <!-- Note: we use inputType=textUri as the closest approximation to a server name -->
         <EditText
             android:id="@+id/account_server"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:contentDescription="@string/account_setup_incoming_pop_server_label"
+            android:contentDescription="@string/account_setup_incoming_server_label"
             android:inputType="textUri"
             android:imeOptions="actionDone" />
     </TableRow>
@@ -98,6 +98,10 @@
             android:inputType="number"
             android:imeOptions="actionDone" />
     </TableRow>
+    <include
+        android:id="@+id/client_certificate_selector"
+        layout="@layout/client_certificate_selector"
+        android:visibility="gone" />
     <TableRow
         android:paddingTop="16dip" >
         <TextView
@@ -129,5 +133,21 @@
             android:inputType="text"
             android:imeOptions="actionDone" />
     </TableRow>
+    <TableRow
+        android:id="@+id/device_id_section"
+        android:paddingTop="32dip"
+        android:visibility="gone" >
+        <TextView
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginRight="16dip"
+            android:text="@string/account_setup_exchange_device_id_label" />
+        <!-- TODO - when adding back in styles, this should be slightly different (was "medium") -->
+        <TextView
+            android:id="@+id/device_id"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="#ffbebebe" />
+    </TableRow>
 </TableLayout>
 
diff --git a/res/layout-sw600dp/address_text_view.xml b/res/layout-sw600dp/address_text_view.xml
deleted file mode 100644
index c0ca115..0000000
--- a/res/layout-sw600dp/address_text_view.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<com.android.email.activity.AddressTextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:inputType="textEmailAddress|textMultiLine"
-    android:imeOptions="actionNext"
-    style="@style/message_compose_header_field_value"/>
\ No newline at end of file
diff --git a/res/layout-sw600dp/compose_area_buttons.xml b/res/layout-sw600dp/compose_area_buttons.xml
deleted file mode 100644
index 9c7ff27..0000000
--- a/res/layout-sw600dp/compose_area_buttons.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<!--  For add attachments and +cc/bcc -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_height="match_parent"
-    android:layout_width="wrap_content"
-    style="@style/ComposeButtonColumn">
-
-    <LinearLayout android:id="@+id/compose_buttons_spacer"
-        android:layout_height="0dip"
-        android:layout_width="match_parent"
-        android:layout_weight="1" />
-
-    <Button android:id="@+id/add_cc_bcc"
-        android:text="@string/plus_cc_label"
-        style="@style/ComposeButton"
-        android:layout_marginLeft="16dip" />
-
-    <ImageView android:id="@+id/add_attachment"
-        android:text="@string/add_file_attachment"
-        android:layout_width="32dip"
-        android:layout_height="32dip"
-        android:src="@drawable/ic_attachment_holo_light"
-        android:clickable="true"
-        android:layout_gravity="center_vertical|left"
-        android:gravity="left"
-        android:layout_marginLeft="14dip" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw600dp/message_compose.xml b/res/layout-sw600dp/message_compose.xml
deleted file mode 100644
index 0a6dc67..0000000
--- a/res/layout-sw600dp/message_compose.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_height="match_parent"
-    android:layout_width="match_parent"
-    android:fillViewport="true">
-
-    <LinearLayout
-      android:id="@+id/compose_scrollview"
-      android:orientation="vertical"
-      android:layout_width="@dimen/compose_scrollview_width"
-      android:layout_height="match_parent"
-      android:paddingTop="8dip"
-      android:background="@android:color/white"
-      android:layout_gravity="center_horizontal">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical"
-                android:paddingLeft="100dip">
-
-                <LinearLayout android:id="@+id/content"
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <!--  For the to, cc, bcc, and subject -->
-                    <LinearLayout android:id="@+id/wrapper"
-                        android:orientation="vertical"
-                        android:layout_width="wrap_content"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content">
-
-                        <include layout="@layout/compose_from"/>
-
-                        <include layout="@layout/compose_area_recipients"/>
-
-                    </LinearLayout>
-            
-                    <include layout="@layout/compose_area_buttons"/>
-            
-                </LinearLayout>
-
-                <!--  Attachments -->
-                <LinearLayout android:id="@+id/attachment_container"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="8dip"
-                    android:orientation="vertical"
-                    android:visibility="gone"
-                    android:layout_marginRight="100dip"
-                >
-                    <!--
-                        Empty container for storing attachments. We'll stick
-                        instances of message_compose_attachment.xml in here.
-                    -->
-                    <LinearLayout android:id="@+id/attachments"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        />
-                </LinearLayout>
-
-                <!-- Compose Area -->
-                <FrameLayout android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="100dip">
-
-                    <include layout="@layout/compose_body"/>
-
-                </FrameLayout>
-
-                <RelativeLayout android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="100dip">
-                    <include layout="@layout/quoted_text"/>
-                </RelativeLayout>
-                <FrameLayout
-                  android:id="@+id/composearea_tap_trap_bottom"
-                  android:layout_weight="1"
-                  android:layout_height="0dip"
-                  android:layout_width="match_parent"
-                  android:clickable="true"/>
-
-            </LinearLayout>
-    </LinearLayout>
-</ScrollView>
\ No newline at end of file
diff --git a/res/layout-sw600dp/message_view_attachment.xml b/res/layout-sw600dp/message_view_attachment.xml
deleted file mode 100644
index 7706216..0000000
--- a/res/layout-sw600dp/message_view_attachment.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- tablet -->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="64dip"
-    android:orientation="horizontal"
-    android:background="@drawable/attachment_bg_holo"
-    >
-    <FrameLayout
-        android:layout_width="64dip"
-        android:layout_height="64dip"
-        android:orientation="vertical"
-        android:background="#e5e5e5"
-        >
-        <ImageView
-            android:id="@+id/attachment_icon"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:src="@drawable/ic_attachment_holo_light"
-            android:scaleType="center"
-            />
-        <ProgressBar
-            android:id="@+id/progress"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="0dip"
-            style="?android:attr/progressBarStyleHorizontal"
-            android:max="100"
-            android:visibility="invisible"
-            />
-    </FrameLayout>
-    <LinearLayout
-        android:layout_width="0dip"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:orientation="horizontal"
-        android:divider="?android:attr/dividerVertical"
-        android:showDividers="middle"
-        android:dividerPadding="16dip"
-        >
-        <RelativeLayout
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="32dip"
-            android:layout_marginRight="16dip"
-            >
-            <TextView
-                android:id="@+id/attachment_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:textSize="18dip"
-                android:textColor="#333333"
-                android:singleLine="true"
-                android:ellipsize="middle"
-                />
-            <TextView
-                android:id="@+id/attachment_info"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_below="@+id/attachment_name"
-                android:textSize="14sp"
-                android:textColor="@color/text_secondary_color"
-                android:singleLine="true"
-                />
-        </RelativeLayout>
-
-        <!-- Buttons -->
-        <LinearLayout
-            android:layout_width="224dip"
-            android:layout_height="match_parent"
-            android:layout_weight="0"
-            android:orientation="horizontal"
-            android:divider="?android:attr/dividerVertical"
-            android:showDividers="middle"
-            >
-            <Button
-                android:id="@+id/load"
-                style="@style/Attachment.Button"
-                android:text="@string/message_view_attachment_load_action"
-                android:visibility="gone"
-                />
-            <Button
-                android:id="@+id/cancel"
-                style="@style/Attachment.Button"
-                android:text="@string/message_view_attachment_cancel_action"
-                android:visibility="gone"
-                />
-            <Button
-                android:id="@+id/info"
-                style="@style/Attachment.Button"
-                android:text="@string/message_view_attachment_info_action"
-                android:visibility="gone"
-                />
-            <Button
-                android:id="@+id/open"
-                style="@style/Attachment.Button"
-                android:text="@string/message_view_attachment_view_action"
-                android:visibility="gone"
-                />
-            <Button
-                android:id="@+id/save"
-                style="@style/Attachment.Button"
-                android:text="@string/message_view_attachment_save_action"
-                android:visibility="gone"
-                />
-        </LinearLayout>
-    </LinearLayout>
-</LinearLayout>
diff --git a/res/layout-sw600dp/message_view_fragment.xml b/res/layout-sw600dp/message_view_fragment.xml
deleted file mode 100644
index e0bc2c9..0000000
--- a/res/layout-sw600dp/message_view_fragment.xml
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- tablet -->
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@android:color/white"
-    >
-    <ProgressBar
-        android:id="@+id/loading_progress"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        style="?android:attr/progressBarStyleLarge"
-        />
-    <com.android.email.view.NonLockingScrollView
-        android:id="@+id/main_panel"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        >
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingLeft="16dip"
-            android:paddingRight="16dip"
-            android:orientation="vertical"
-            >
-
-            <!-- Subject -->
-            <TextView
-                android:id="@+id/subject"
-                android:layout_width="match_parent"
-                android:layout_height="48dip"
-                android:gravity="center_vertical"
-                style="@style/message_view_subject"
-                />
-
-            <View
-                android:id="@+id/subject_divider"
-                android:layout_marginBottom="16dip"
-                android:layout_width="match_parent"
-                style="@style/message_view_horizontal_divider"
-                />
-
-            <!-- Upper header. Outer container needed only since the relative layout
-                 params can't be passed in an include tag.-->
-            <FrameLayout
-                android:id="@+id/message_view_header_upper"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                >
-                <include layout="@layout/message_view_header_upper" />
-            </FrameLayout>
-
-            <!-- Addresses, timestamp  -->
-            <FrameLayout
-                android:id="@+id/message_view_subheader"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="16dip"
-                android:layout_marginRight="16dip"
-                >
-                <include layout="@layout/message_view_subheader" />
-            </FrameLayout>
-
-            <View
-                android:id="@+id/address_divider"
-                android:layout_width="match_parent"
-                style="@style/message_view_horizontal_divider"
-                />
-
-            <!-- The rest: tab + body + command buttons.  -->
-            <!-- Tabs + divider -->
-            <LinearLayout
-                android:id="@+id/message_tabs_section"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                >
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="40dip"
-                    android:layout_marginLeft="14dip"
-                    android:orientation="horizontal"
-                    >
-                    <Button
-                        android:id="@+id/show_message"
-                        android:layout_width="128dip"
-                        android:layout_height="match_parent"
-                        android:gravity="center"
-                        android:text="@string/message_view_show_message_action"
-                        android:textSize="14dip"
-                        android:textColor="@color/text_primary_color"
-                        android:singleLine="true"
-                        android:ellipsize="end"
-                        style="@android:style/Widget.Holo.Light.Tab"
-                        />
-                    <Button
-                        android:id="@+id/show_invite"
-                        android:layout_width="128dip"
-                        android:layout_height="match_parent"
-                        android:gravity="center"
-                        android:text="@string/message_view_show_invite_action"
-                        android:textSize="14dip"
-                        android:textColor="@color/text_primary_color"
-                        android:singleLine="true"
-                        android:ellipsize="end"
-                        style="@android:style/Widget.Holo.Light.Tab"
-                        />
-                    <Button
-                        android:id="@+id/show_attachments"
-                        android:layout_width="128dip"
-                        android:layout_height="match_parent"
-                        android:gravity="center"
-                        android:textSize="14dip"
-                        android:textColor="@color/text_primary_color"
-                        android:singleLine="true"
-                        android:ellipsize="end"
-                        style="@android:style/Widget.Holo.Light.Tab"
-                        />
-                    <!-- filler -->
-                    <View
-                        android:layout_width="0dip"
-                        android:layout_height="0dip"
-                        android:layout_weight="1"
-                        />
-                    <Button
-                        android:id="@+id/show_pictures"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:gravity="center"
-                        style="?android:attr/borderlessButtonStyle"
-                        android:padding="0dip"
-                        android:text="@string/message_view_show_pictures_action"
-                        android:textSize="14dip"
-                        android:textColor="@color/text_ternary_color"
-                        android:drawableRight="@drawable/ic_show_images_holo_light"
-                        android:drawablePadding="8dip"
-                        />
-                    <Button
-                        android:id="@+id/always_show_pictures_button"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:gravity="center"
-                        style="?android:attr/borderlessButtonStyle"
-                        android:padding="0dip"
-                        android:text="@string/message_view_always_show_pictures_prompt"
-                        android:textSize="14dip"
-                        android:textColor="@color/text_ternary_color"
-                        android:drawableRight="@drawable/ic_show_images_holo_light"
-                        android:drawablePadding="8dip"
-                        android:visibility="gone"
-                        />
-                    <View
-                        android:layout_width="16dip"
-                        android:layout_height="0dip"
-                        />
-                </LinearLayout>
-                <View
-                    android:layout_width="match_parent"
-                    style="@style/message_view_horizontal_divider"
-                    />
-            </LinearLayout>
-
-            <!-- margin -->
-            <View
-                android:layout_width="0dip"
-                android:layout_height="16dip"
-                />
-
-            <!-- content area - only one of them is visible at a time -->
-            <!-- Message body -->
-            <com.android.email.view.RigidWebView
-                android:id="@+id/message_content"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@android:color/white"
-                android:visibility="gone"
-                />
-
-            <!-- TODO: get rid of these useless _scroll elements now that
-                 they're no longer needed -->
-            <!-- Invite: Even though this section is only for MessageViewFragment,
-                 Its visibility is controlled by MessageViewFragmentBase for simplicity.
-                 MessageFileViewFragment shouldn't touch this. -->
-            <FrameLayout
-                android:id="@+id/invite_scroll"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:visibility="gone"
-                >
-                <include layout="@layout/message_view_invitation" />
-            </FrameLayout>
-
-            <!-- Attachments -->
-            <FrameLayout
-                android:id="@+id/attachments_scroll"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:visibility="gone"
-                >
-                <LinearLayout
-                    android:id="@+id/attachments"
-                    android:orientation="vertical"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:divider="?android:attr/dividerHorizontal"
-                    android:showDividers="beginning|middle|end"
-                    />
-            </FrameLayout>
-        </LinearLayout>
-    </com.android.email.view.NonLockingScrollView>
-</FrameLayout>
diff --git a/res/layout-sw600dp/message_view_header_actions.xml b/res/layout-sw600dp/message_view_header_actions.xml
deleted file mode 100644
index 983eac2..0000000
--- a/res/layout-sw600dp/message_view_header_actions.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <ImageButton
-        android:id="@+id/reply"
-        style="@style/message_view_action_buttons"
-        android:src="@drawable/ic_reply_holo_dark"
-        android:contentDescription="@string/reply_action"
-        android:baselineAlignBottom="true"
-        />
-    <ImageButton
-        android:id="@+id/reply_all"
-        style="@style/message_view_action_buttons"
-        android:src="@drawable/ic_reply_all_holo_dark"
-        android:contentDescription="@string/reply_all_action"
-        android:baselineAlignBottom="true"
-        />
-    <ImageButton
-        android:id="@+id/forward"
-        style="@style/message_view_action_buttons"
-        android:src="@drawable/ic_forward_holo_dark"
-        android:contentDescription="@string/forward_action"
-        android:baselineAlignBottom="true"
-        />
-    <ImageButton
-        android:id="@+id/favorite"
-        style="@style/message_view_action_buttons"
-        android:src="@drawable/btn_star_off_convo_holo_light"
-        android:contentDescription="@string/favorite_action"
-        android:baselineAlignBottom="true"
-        />
-</merge>
-
diff --git a/res/layout-sw600dp/three_pane.xml b/res/layout-sw600dp/three_pane.xml
deleted file mode 100644
index 450844d..0000000
--- a/res/layout-sw600dp/three_pane.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Note the width of each pane is set by code at runtime.  -->
-<com.android.email.activity.ThreePaneLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:splitMotionEvents="true"
-    >
-
-    <include layout="@layout/three_pane_collapsible_impl" />
-
-</com.android.email.activity.ThreePaneLayout>
-
diff --git a/res/layout-sw600dp/waiting_for_sync_message.xml b/res/layout-sw600dp/waiting_for_sync_message.xml
deleted file mode 100644
index 8c98c09..0000000
--- a/res/layout-sw600dp/waiting_for_sync_message.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/waiting_for_sync_message"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:padding="16dip"
-    >
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:textSize="32dip"
-        android:text="@string/waitinf_for_sync_message_1"
-        />
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:layout_marginTop="32dip"
-        android:textSize="20dip"
-        android:text="@string/waitinf_for_sync_message_2"
-        />
-    <ProgressBar
-        style="?android:attr/progressBarStyleLarge"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginTop="32dip"
-        />
-</LinearLayout>
diff --git a/res/layout-sw800dp-land/three_pane.xml b/res/layout-sw800dp-land/three_pane.xml
deleted file mode 100644
index ba0bb31..0000000
--- a/res/layout-sw800dp-land/three_pane.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Note the width of each pane is set by code at runtime.  -->
-<com.android.email.activity.ThreePaneLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:splitMotionEvents="true"
-    >
-
-    <include layout="@layout/three_pane_impl" />
-
-</com.android.email.activity.ThreePaneLayout>
-
-
diff --git a/res/layout-sw800dp-port b/res/layout-sw800dp-port
deleted file mode 100644
index f80593f..0000000
--- a/res/layout-sw800dp-port
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- tablet -->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/invite_section"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@color/message_view_info_back_color"
-    android:orientation="vertical"
-    >
-    <View
-        android:layout_width="match_parent"
-        style="@style/message_view_horizontal_divider"
-        />
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="64dip"
-        android:orientation="horizontal"
-        >
-        <!-- TODO: The plan is to show a calendar icon here. -->
-        <ImageView
-            android:layout_width="64dip"
-            android:layout_height="64dip"
-            android:layout_weight="0"
-            android:src="@null"
-            android:visibility="gone"
-            />
-        <LinearLayout
-            android:layout_width="200dip"
-            android:layout_weight="1"
-            android:layout_height="64dip"
-            android:orientation="horizontal"
-            android:divider="?android:attr/dividerVertical"
-            android:showDividers="middle"
-            android:dividerPadding="16dip"
-            >
-            <RelativeLayout
-                android:layout_width="0dip"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                >
-                <CheckBox
-                    android:id="@+id/accept"
-                    android:layout_width="104dip"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentBottom="true"
-                    android:layout_alignParentLeft="true"
-                    android:layout_marginLeft="32dip"
-                    android:text="@string/message_view_invite_accept"
-                    android:textSize="14dip"
-                    android:textColor="@color/text_primary_color"
-                    android:singleLine="true"
-                    android:ellipsize="end"
-                    />
-                <CheckBox
-                    android:id="@+id/maybe"
-                    android:layout_width="104dip"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentBottom="true"
-                    android:layout_toRightOf="@id/accept"
-                    android:layout_marginLeft="24dip"
-                    android:text="@string/message_view_invite_maybe"
-                    android:textSize="14dip"
-                    android:textColor="@color/text_primary_color"
-                    android:singleLine="true"
-                    android:ellipsize="end"
-                    />
-                <CheckBox
-                    android:id="@+id/decline"
-                    android:layout_width="104dip"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentBottom="true"
-                    android:layout_toRightOf="@id/maybe"
-                    android:layout_marginLeft="24dip"
-                    android:text="@string/message_view_invite_decline"
-                    android:textSize="14dip"
-                    android:textColor="@color/text_primary_color"
-                    android:singleLine="true"
-                    android:ellipsize="end"
-                    />
-
-                <!-- "Going?" -->
-                <TextView
-                    android:layout_width="0dip"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentTop="true"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentRight="true"
-                    android:layout_above="@id/accept"
-                    android:layout_marginLeft="32dip"
-                    android:layout_marginRight="32dip"
-                    android:singleLine="true"
-                    android:ellipsize="end"
-                    android:text="@string/message_view_invite_text"
-                    android:textSize="18dip"
-                    android:textColor="@color/text_primary_color"
-                    android:gravity="left|bottom"
-                    />
-
-            </RelativeLayout>
-            <Button
-                android:id="@+id/invite_link"
-                android:layout_width="192dip"
-                android:layout_height="match_parent"
-                android:layout_marginLeft="16dip"
-                android:layout_marginRight="16dip"
-                style="@android:style/Widget.Holo.Button.Borderless"
-                android:padding="0dip"
-                android:text="@string/message_view_invite_view"
-                android:textSize="14dip"
-                android:textColor="@color/text_primary_color"
-                android:textStyle="bold"
-                android:singleLine="true"
-                android:ellipsize="end"
-                android:gravity="center"
-                />
-        </LinearLayout>
-    </LinearLayout>
-    <View
-        android:layout_width="match_parent"
-        style="@style/message_view_horizontal_divider"
-        />
-</LinearLayout>
diff --git a/res/layout-v14/compose_area_recipients.xml b/res/layout-v14/compose_area_recipients.xml
deleted file mode 100644
index f46d44d..0000000
--- a/res/layout-v14/compose_area_recipients.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/compose_recipients_wrapper"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <!-- To -->
-
-    <LinearLayout android:id="@+id/to_content"
-        style="@style/RecipientComposeFieldLayout">
-        <LinearLayout android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:addStatesFromChildren="true"
-            android:gravity="center_vertical"
-            android:layout_gravity="center_vertical">
-
-            <TextView style="@style/RecipientComposeHeading"
-                android:text="@string/to"
-                android:id="@+id/to_label"
-                android:contentDescription="@string/to"/>
-
-            <com.android.email.activity.ChipsAddressTextView
-                android:id="@+id/to"
-                style="@style/RecipientEditTextViewStyle"/>
-
-        </LinearLayout>
-
-        <View style="@style/RecipientComposeFieldSpacer"/>
-    </LinearLayout>
-
-
-    <RelativeLayout android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:id="@+id/cc_bcc_wrapper"
-        android:layout_below="@id/to_content"
-        android:visibility="gone">
-
-        <LinearLayout style="@style/RecipientComposeFieldLayout"
-            android:id="@+id/cc_content"
-            android:layout_alignParentTop="true">
-
-            <LinearLayout android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:addStatesFromChildren="true"
-                android:gravity="center_vertical">
-
-                <TextView
-                    style="@style/RecipientComposeHeading"
-                    android:text="@string/cc"
-                    android:id="@+id/cc_label"
-                    android:contentDescription="@string/cc"/>
-
-                <com.android.email.activity.ChipsAddressTextView
-                    android:id="@+id/cc"
-                    style="@style/RecipientEditTextViewStyle"/>
-            </LinearLayout>
-
-            <View style="@style/RecipientComposeFieldSpacer"/>
-        </LinearLayout>
-
-        <LinearLayout style="@style/RecipientComposeFieldLayout"
-            android:id="@+id/bcc_content"
-            android:layout_below="@id/cc_content">
-
-            <LinearLayout android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:addStatesFromChildren="true"
-                android:gravity="center_vertical">
-
-                <TextView style="@style/RecipientComposeHeading"
-                    android:text="@string/bcc"
-                    android:id="@+id/bcc_label"
-                    android:contentDescription="@string/bcc"/>
-
-                <com.android.email.activity.ChipsAddressTextView
-                    android:id="@+id/bcc"
-                    style="@style/RecipientEditTextViewStyle"/>
-
-            </LinearLayout>
-
-            <View style="@style/RecipientComposeFieldSpacer"/>
-        </LinearLayout>
-
-    </RelativeLayout>
-
-    <RelativeLayout style="@style/ComposeFieldLayout"
-                android:layout_below="@id/cc_bcc_wrapper">
-        <!-- Subject: localization cannot control what field pressing tab will bring the user to. This is controlled at runtime.  -->
-        <EditText android:id="@+id/subject"
-            android:inputType="textEmailSubject|textAutoCorrect|textCapSentences|textImeMultiLine|textMultiLine"
-            android:hint="@string/subject_hint"
-            android:textColorHint="@color/compose_label_text"
-            android:imeOptions="actionDone|flagNoExtractUi"
-            style="@style/ComposeEditTextView" />
-    </RelativeLayout>
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/account_settings_exchange_fragment.xml b/res/layout/account_settings_exchange_fragment.xml
deleted file mode 100644
index b218cb3..0000000
--- a/res/layout/account_settings_exchange_fragment.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Exchange server settings.  This is a wrapper around the "exchange setup" fragment
-     that adds scrollview & buttons and makes it more compatible with a 2-pane PreferenceActivity
-     such as AccountSettingsXL. -->
-<ScrollView  xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fillViewport="true"
-    >
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingTop="@dimen/settings_fragment_padding_top"
-        android:paddingLeft="@dimen/settings_fragment_padding_left"
-        android:paddingRight="@dimen/settings_fragment_padding_right"
-        >
-
-        <!-- Fields entry -->
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            >
-            <include
-                layout="@layout/account_setup_exchange_fragment"
-                />
-        </FrameLayout>
-
-        <!-- This spacer fills the viewport and moves the buttons to the bottom -->
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0dip"
-            android:layout_weight="1" />
-
-        <include layout="@layout/account_settings_buttons" />
-    </LinearLayout>
-</ScrollView>
\ No newline at end of file
diff --git a/res/layout/account_setup_account_type.xml b/res/layout/account_setup_account_type.xml
index 3e6ff53..c6ff972 100644
--- a/res/layout/account_setup_account_type.xml
+++ b/res/layout/account_setup_account_type.xml
@@ -17,6 +17,7 @@
 <!-- small -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/accountTypes"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
@@ -31,32 +32,4 @@
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:textColor="?android:attr/textColorPrimary"
           />
-    <Button
-        android:id="@+id/pop"
-        android:text="@string/account_setup_account_type_pop_action"
-        android:layout_height="wrap_content"
-        android:layout_width="150sp"
-        android:layout_marginTop="25dip"
-        android:minWidth="@dimen/button_minWidth"
-        android:layout_gravity="center_horizontal"
-        />
-    <Button
-        android:id="@+id/imap"
-        android:text="@string/account_setup_account_type_imap_action"
-        android:layout_height="wrap_content"
-        android:layout_width="150sp"
-        android:layout_marginTop="25dip"
-        android:minWidth="@dimen/button_minWidth"
-        android:layout_gravity="center_horizontal"
-        />
-    <Button
-        android:id="@+id/exchange"
-        android:text="@string/account_setup_account_type_exchange_action"
-        android:layout_height="wrap_content"
-        android:layout_width="150sp"
-        android:layout_marginTop="25dip"
-        android:minWidth="@dimen/button_minWidth"
-        android:layout_gravity="center_horizontal"
-        android:visibility="gone"
-        />
 </LinearLayout>
diff --git a/res/layout/account_setup_exchange.xml b/res/layout/account_setup_exchange.xml
deleted file mode 100644
index 78549da..0000000
--- a/res/layout/account_setup_exchange.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fillViewport="true">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingTop="@dimen/setup_fragment_padding_top"
-        android:paddingLeft="@dimen/setup_fragment_padding_left"
-        android:paddingRight="@dimen/setup_fragment_padding_right" >
-
-        <fragment
-            android:id="@+id/setup_fragment"
-            class="com.android.email.activity.setup.AccountSetupExchangeFragment"
-            android:layout_alignParentTop="true"
-            android:layout_width="match_parent"
-            android:layout_height="0dip"
-            android:layout_weight="1"
-        />
-
-        <include layout="@layout/account_setup_buttons" />
-
-    </LinearLayout>
-</ScrollView>
diff --git a/res/layout/account_setup_exchange_fragment.xml b/res/layout/account_setup_exchange_fragment.xml
deleted file mode 100644
index e792c56..0000000
--- a/res/layout/account_setup_exchange_fragment.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Exchange server settings - default - see layout-xlarge/ for XL variant -->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_weight="1"
-    android:orientation="vertical" >
-    <TextView
-        android:text="@string/account_setup_exchange_username_label"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textColor="?android:attr/textColorPrimary" />
-    <EditText
-        android:id="@+id/account_username"
-        android:inputType="textEmailAddress"
-        android:imeOptions="actionNext"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:contentDescription="@string/account_setup_exchange_username_label" />
-    <TextView
-        android:text="@string/account_setup_incoming_password_label"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textColor="?android:attr/textColorPrimary" />
-    <EditText
-        android:id="@+id/account_password"
-        android:inputType="textPassword"
-        android:imeOptions="actionNext"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent" />
-    <!-- This text may be changed in code if the server is IMAP, etc. -->
-    <TextView
-        android:text="@string/account_setup_exchange_server_label"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textColor="?android:attr/textColorPrimary" />
-    <!-- Note: we use inputType=textUri as the closest approximation to a server name -->
-    <EditText
-        android:id="@+id/account_server"
-        android:inputType="textUri"
-        android:imeOptions="actionDone"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:contentDescription="@string/account_setup_exchange_server_label" />
-    <CheckBox
-        android:id="@+id/account_ssl"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:text="@string/account_setup_exchange_ssl_label" />
-    <CheckBox
-        android:id="@+id/account_trust_certificates"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:text="@string/account_setup_exchange_trust_certificates_label" />
-    <include
-        android:id="@+id/client_certificate_selector"
-        layout="@layout/client_certificate_selector"
-        android:visibility="gone" />
-    <TextView
-        android:text="@string/account_setup_exchange_device_id_label"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:textColor="?android:attr/textColorPrimary" />
-    <TextView
-        android:id="@+id/device_id"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textColor="#ffbebebe" />
-</LinearLayout>
diff --git a/res/layout/account_setup_incoming_fragment.xml b/res/layout/account_setup_incoming_fragment.xml
index 625e1fc..b5e5b48 100644
--- a/res/layout/account_setup_incoming_fragment.xml
+++ b/res/layout/account_setup_incoming_fragment.xml
@@ -49,7 +49,7 @@
     <!-- This text may be changed in code if the server is IMAP, etc. -->
     <TextView
         android:id="@+id/account_server_label"
-        android:text="@string/account_setup_incoming_pop_server_label"
+        android:text="@string/account_setup_incoming_server_label"
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
         android:textAppearance="?android:attr/textAppearanceSmall"
@@ -60,7 +60,7 @@
         android:id="@+id/account_server"
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
-        android:contentDescription="@string/account_setup_incoming_pop_server_label"
+        android:contentDescription="@string/account_setup_incoming_server_label"
         android:inputType="textUri"
         android:imeOptions="actionNext" />
     <TextView
@@ -87,6 +87,10 @@
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
         android:contentDescription="@string/account_setup_incoming_security_label" />
+    <include
+        android:id="@+id/client_certificate_selector"
+        layout="@layout/client_certificate_selector"
+        android:visibility="gone" />
     <TextView
         android:id="@+id/account_delete_policy_label"
         android:text="@string/account_setup_incoming_delete_policy_label"
@@ -119,4 +123,22 @@
             android:inputType="text"
             android:imeOptions="actionDone" />
     </LinearLayout>
+    <LinearLayout
+        android:id="@+id/device_id_section"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:visibility="gone">
+        <TextView
+            android:text="@string/account_setup_exchange_device_id_label"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:textColor="?android:attr/textColorPrimary" />
+        <TextView
+            android:id="@+id/device_id"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="#ffbebebe" />
+    </LinearLayout>
 </LinearLayout>
diff --git a/res/layout/action_bar_custom_view.xml b/res/layout/action_bar_custom_view.xml
deleted file mode 100644
index 423b546..0000000
--- a/res/layout/action_bar_custom_view.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!--
-    Custom view set to the action bar.
-
-    layout_width/height are set at runtime using ActionBar.setCustomView()
--->
-
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/action_bar_custom_view"
-    >
-    <include
-        android:id="@+id/account_spinner_container"
-        layout="@layout/action_bar_spinner"
-        android:visibility="gone"
-        />
-</FrameLayout>
diff --git a/res/layout/action_bar_indeterminate_progress.xml b/res/layout/action_bar_indeterminate_progress.xml
deleted file mode 100644
index 87c7ecf..0000000
--- a/res/layout/action_bar_indeterminate_progress.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="64dip"
-    android:layout_height="wrap_content"
-    android:gravity="center"
-    >
-    <!-- 32dip = size of the refresh button -->
-    <ProgressBar
-        android:layout_width="32dip"
-        android:layout_height="32dip"
-        android:layout_gravity="center"
-        style="?android:attr/indeterminateProgressStyle"
-        />
-</FrameLayout>
diff --git a/res/layout/action_bar_search.xml b/res/layout/action_bar_search.xml
deleted file mode 100644
index e2cd960..0000000
--- a/res/layout/action_bar_search.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<SearchView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/search_view"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_gravity="center_vertical"
-    android:iconifiedByDefault="true"
-    />
diff --git a/res/layout/action_bar_spinner.xml b/res/layout/action_bar_spinner.xml
deleted file mode 100644
index 35b8319..0000000
--- a/res/layout/action_bar_spinner.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/AccountSwitchSpinnerItem"
-    android:layout_height="match_parent"
-    android:paddingLeft="0dip"
-    android:layout_marginLeft="0dip">
-
-    <TextView
-        android:id="@+id/spinner_count"
-        android:layout_alignParentRight="true"
-        android:layout_marginLeft="4dp"
-        style="@style/unreadCountActionBar" />
-
-    <!-- This spacer is here just to soak up horizontal space. -->
-    <!-- If this is omitted, the spinner triangle is too far from the text. -->
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_alignParentLeft="true"
-        android:layout_toLeftOf="@id/spinner_count">
-
-        <LinearLayout
-            android:id="@+id/account_spinner"
-            style="?android:attr/actionDropDownStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:gravity="center_vertical">
-            <TextView
-                android:id="@+id/spinner_line_1"
-                style="@style/action_bar_spinner_primary_text"
-                android:singleLine="true"
-                android:ellipsize="end"
-                android:includeFontPadding="false"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-            <TextView
-                android:id="@+id/spinner_line_2"
-                style="@android:style/TextAppearance.Holo.Widget.ActionBar.Subtitle"
-                android:singleLine="true"
-                android:ellipsize="end"
-                android:includeFontPadding="false"
-                android:layout_marginRight="4dp"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-        </LinearLayout>
-
-    </FrameLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/action_bar_spinner_dropdown.xml b/res/layout/action_bar_spinner_dropdown.xml
deleted file mode 100644
index d39d1f1..0000000
--- a/res/layout/action_bar_spinner_dropdown.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!--
-    The list items for the account spinner drop down.
-    Popup width is set at runtime from @dimen/account_dropdown_dropdownwidth
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    style="?android:attr/spinnerDropDownItemStyle"
-    android:layout_height="wrap_content"
-    android:layout_width="match_parent"
-    android:gravity="center_vertical">
-
-    <RelativeLayout
-        android:layout_height="wrap_content"
-        android:layout_width="0dip"
-        android:layout_weight="1">
-        <TextView
-            android:id="@+id/display_name"
-            android:singleLine="true"
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:ellipsize="end"
-            style="@android:style/TextAppearance.Holo.Widget.ActionBar.Title"/>
-
-        <TextView
-            android:id="@+id/email_address"
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:ellipsize="end"
-            android:layout_below="@id/display_name"
-            android:layout_alignWithParentIfMissing="true"
-            android:layout_centerVertical="true"
-            style="@android:style/TextAppearance.Holo.Widget.ActionBar.Subtitle"/>
-
-    </RelativeLayout>
-    <RelativeLayout
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content">
-        <View
-            android:id="@+id/color_chip"
-            android:layout_width="32dip"
-            android:layout_height="6dip"
-            android:layout_marginBottom="2dip"
-            android:layout_alignParentTop="true"
-            android:layout_marginLeft="8dip"
-            android:background="@android:color/black"
-            />
-        <TextView
-            android:id="@+id/unread_count"
-            style="@style/unreadCount"
-            android:layout_centerVertical="true" />
-    </RelativeLayout>
-
-</LinearLayout>
-
diff --git a/res/layout/action_bar_spinner_dropdown_header.xml b/res/layout/action_bar_spinner_dropdown_header.xml
deleted file mode 100644
index 2f4aad9..0000000
--- a/res/layout/action_bar_spinner_dropdown_header.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/display_name"
-    android:ellipsize="end"
-    style="?android:attr/listSeparatorTextViewStyle" />
diff --git a/res/layout/compose_area_recipients.xml b/res/layout/compose_area_recipients.xml
deleted file mode 100644
index bac5e38..0000000
--- a/res/layout/compose_area_recipients.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<!-- We must have unique ID's for the address fields in order to have the text
-automatically saved by framework.-->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/compose_recipients_wrapper"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <!-- To -->
-
-    <LinearLayout android:id="@+id/to_content"
-        style="@style/RecipientComposeFieldLayout">
-        <LinearLayout android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:addStatesFromChildren="true"
-            android:gravity="center_vertical"
-            android:layout_gravity="center_vertical">
-
-            <TextView style="@style/RecipientComposeHeading"
-                android:text="@string/to"
-                android:id="@+id/to_label"
-                android:contentDescription="@string/to"/>
-
-            <com.android.email.activity.AddressTextView
-                android:id="@+id/to"
-                style="@style/RecipientEditTextViewStyle"/>
-
-        </LinearLayout>
-
-        <View style="@style/RecipientComposeFieldSpacer"/>
-    </LinearLayout>
-
-
-    <RelativeLayout android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:id="@+id/cc_bcc_wrapper"
-        android:layout_below="@id/to_content"
-        android:visibility="gone">
-
-        <LinearLayout style="@style/RecipientComposeFieldLayout"
-            android:id="@+id/cc_content"
-            android:layout_alignParentTop="true">
-
-            <LinearLayout android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:addStatesFromChildren="true"
-                android:gravity="center_vertical">
-
-                <TextView
-                    style="@style/RecipientComposeHeading"
-                    android:text="@string/cc"
-                    android:id="@+id/cc_label"
-                    android:contentDescription="@string/cc"/>
-
-                <com.android.email.activity.AddressTextView
-                    android:id="@+id/cc"
-                    style="@style/RecipientEditTextViewStyle"/>
-            </LinearLayout>
-
-            <View style="@style/RecipientComposeFieldSpacer"/>
-        </LinearLayout>
-
-        <LinearLayout style="@style/RecipientComposeFieldLayout"
-            android:id="@+id/bcc_content"
-            android:layout_below="@id/cc_content">
-
-            <LinearLayout android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:addStatesFromChildren="true"
-                android:gravity="center_vertical">
-
-                <TextView style="@style/RecipientComposeHeading"
-                    android:text="@string/bcc"
-                    android:id="@+id/bcc_label"
-                    android:contentDescription="@string/bcc"/>
-
-                <com.android.email.activity.AddressTextView
-                    android:id="@+id/bcc"
-                    style="@style/RecipientEditTextViewStyle"/>
-
-            </LinearLayout>
-
-            <View style="@style/RecipientComposeFieldSpacer"/>
-        </LinearLayout>
-
-    </RelativeLayout>
-
-    <RelativeLayout style="@style/ComposeFieldLayout"
-                android:layout_below="@id/cc_bcc_wrapper">
-        <!-- Subject: localization cannot control what field pressing tab will bring the user to. This is controlled at runtime.  -->
-        <EditText android:id="@+id/subject"
-            android:inputType="textEmailSubject|textAutoCorrect|textCapSentences|textImeMultiLine|textMultiLine"
-            android:hint="@string/subject_hint"
-            android:textColorHint="@color/compose_label_text"
-            android:imeOptions="actionDone|flagNoExtractUi"
-            style="@style/ComposeEditTextView" />
-    </RelativeLayout>
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/compose_body.xml b/res/layout/compose_body.xml
deleted file mode 100644
index 119cac7..0000000
--- a/res/layout/compose_body.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/ComposeFieldLayout">
-
-    <EditText android:id="@+id/body_text"
-        style="@style/ComposeBodyStyle"
-        android:hint="@string/body_hint"/>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/compose_from.xml b/res/layout/compose_from.xml
deleted file mode 100644
index 6c02ec3..0000000
--- a/res/layout/compose_from.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/ComposeFieldLayout"
-    android:layout_height="48dip"
-    android:layout_marginTop="4dip">
-
-    <TextView android:id="@+id/from"
-        android:layout_width="match_parent"
-        android:singleLine="true"
-        android:ellipsize="end"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:background="@android:color/transparent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center_vertical"
-        android:gravity="center_vertical" />
-
-</LinearLayout>
diff --git a/res/layout/debug.xml b/res/layout/debug.xml
index 6312ae2..de31555 100644
--- a/res/layout/debug.xml
+++ b/res/layout/debug.xml
@@ -19,32 +19,24 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     >
-    <TextView
-        android:id="@+id/version"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/debug_version_fmt"
-        />
     <CheckBox
         android:id="@+id/debug_logging"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/debug_enable_debug_logging_label"
         />
-<!-- EXCHANGE-REMOVE-SECTION-START -->
     <CheckBox
-        android:id="@+id/exchange_logging"
+        android:id="@+id/verbose_logging"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/debug_enable_exchange_logging_label"
+        android:text="@string/debug_enable_verbose_logging_label"
     />
     <CheckBox
-        android:id="@+id/exchange_file_logging"
+        android:id="@+id/file_logging"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/debug_enable_exchange_file_logging_label"
+        android:text="@string/debug_enable_file_logging_label"
     />
-<!-- EXCHANGE-REMOVE-SECTION-END -->
     <Button
         android:id="@+id/clear_webview_cache"
         android:layout_width="wrap_content"
diff --git a/res/layout/email_activity_one_pane.xml b/res/layout/email_activity_one_pane.xml
deleted file mode 100644
index 7dc8cfe..0000000
--- a/res/layout/email_activity_one_pane.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    >
-
-    <!-- Error message goes over the normal view -->
-    <TextView
-        android:id="@+id/error_message"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/error_message_height"
-        android:paddingLeft="8dip"
-        android:paddingRight="8dip"
-        android:gravity="left|center_vertical"
-        android:singleLine="true"
-        android:ellipsize="end"
-        android:background="@color/error_bar_background"
-        />
-    <FrameLayout
-        android:id="@+id/fragment_placeholder"
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"
-        />
-</LinearLayout>
diff --git a/res/layout/email_activity_two_pane.xml b/res/layout/email_activity_two_pane.xml
deleted file mode 100644
index 10735b6..0000000
--- a/res/layout/email_activity_two_pane.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    >
-
-    <!-- Error message goes over the normal view -->
-    <TextView
-        android:id="@+id/error_message"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/error_message_height"
-        android:paddingLeft="78dip"
-        android:paddingRight="78dip"
-        android:gravity="left|center_vertical"
-        android:textSize="16dip"
-        android:textColor="#000"
-        android:singleLine="true"
-        android:ellipsize="end"
-        android:background="@color/error_bar_background"
-        />
-
-    <include
-        android:id="@+id/three_pane"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        layout="@layout/three_pane"
-        />
-</LinearLayout>
diff --git a/res/layout/mailbox_list_fragment.xml b/res/layout/mailbox_list_fragment.xml
deleted file mode 100644
index fd9219d..0000000
--- a/res/layout/mailbox_list_fragment.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Wrap list_content in a frame layout to apply the top margin. -->
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    >
-    <include layout="@android:layout/list_content" />
-</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/mailbox_list_header.xml b/res/layout/mailbox_list_header.xml
deleted file mode 100644
index 4bef0c5..0000000
--- a/res/layout/mailbox_list_header.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/display_name"
-    android:layout_width="match_parent"
-    android:ellipsize="end"
-    style="?android:attr/listSeparatorTextViewStyle"
-    android:layout_marginLeft="@dimen/mailbox_list_padding_left" />
diff --git a/res/layout/mailbox_list_item.xml b/res/layout/mailbox_list_item.xml
deleted file mode 100644
index d1c45b6..0000000
--- a/res/layout/mailbox_list_item.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- extends RelativeLayout  -->
-<!--
-  NOTE: Don't set padding for this.
-  Background of this view will be changed by code for D&D, which resets padding.
--->
-<com.android.email.activity.MailboxListItem
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="48dip"
-    android:background="?android:attr/activatedBackgroundIndicator"
-    >
-    <TextView
-        android:id="@+id/message_count"
-        android:layout_alignParentRight="true"
-        android:layout_marginRight="@dimen/mailbox_list_padding_right"
-        style="@style/unreadCount"
-        />
-    <RelativeLayout
-        android:layout_alignParentLeft="true"
-        android:layout_centerVertical="true"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/mailbox_list_padding_left"
-        android:layout_toLeftOf="@id/message_count"
-        >
-        <ImageView
-            android:id="@+id/folder_icon"
-            android:layout_width="32dip"
-            android:layout_height="32dip"
-            android:layout_centerVertical="true"
-            android:layout_marginRight="8dip"
-            />
-        <TextView
-            android:id="@+id/mailbox_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_toRightOf="@id/folder_icon"
-            android:layout_centerVertical="true"
-            android:ellipsize="end"
-            android:singleLine="true"
-            android:textSize="18dip"
-            android:textColor="@color/text_color_primary_invertible"
-            />
-    </RelativeLayout>
-    <!-- Color chips are shown only for account rows on combined view. -->
-    <View
-        android:id="@+id/color_chip"
-        android:layout_width="32dip"
-        android:layout_height="8dip"
-        android:layout_marginLeft="@dimen/mailbox_list_padding_left"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentLeft="true"
-        android:visibility="gone"
-        />
-    <ImageView
-        android:id="@+id/folder_expanded_icon"
-        android:layout_width="16dip"
-        android:layout_height="16dip"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:visibility="gone"
-        />
-</com.android.email.activity.MailboxListItem>
diff --git a/res/layout/message_command_button_view.xml b/res/layout/message_command_button_view.xml
deleted file mode 100644
index b58142e..0000000
--- a/res/layout/message_command_button_view.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- extends LinearLayout -->
-<com.android.email.activity.MessageCommandButtonView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="64dip"
-    android:orientation="horizontal"
-    android:gravity="center_vertical"
-    android:paddingLeft="16dip"
-    android:paddingRight="16dip"
-    android:background="#fff"
-    >
-    <Button
-        android:id="@+id/move_to_newer_button"
-        android:text="@string/message_view_move_to_newer"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:minWidth="128dip"
-        />
-    <!-- Filler -->
-    <View
-        android:layout_height="0dip"
-        android:layout_width="0dip"
-        android:layout_weight="1"
-        android:visibility="invisible"
-        />
-    <TextView
-        android:id="@+id/message_position"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:gravity="center"
-        android:textSize="14dip"
-        android:textColor="@color/text_secondary_color"
-        android:singleLine="true"
-        />
-    <!-- Filler -->
-    <View
-        android:layout_height="0dip"
-        android:layout_width="0dip"
-        android:layout_weight="1"
-        android:visibility="invisible"
-        />
-    <Button
-        android:id="@+id/move_to_older_button"
-        android:text="@string/message_view_move_to_older"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:minWidth="128dip"
-        />
-</com.android.email.activity.MessageCommandButtonView>
diff --git a/res/layout/message_compose.xml b/res/layout/message_compose.xml
deleted file mode 100644
index e2c035e..0000000
--- a/res/layout/message_compose.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- small -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_height="match_parent" android:layout_width="match_parent"
-    android:orientation="vertical">
-    <ScrollView android:layout_width="match_parent"
-        android:layout_height="0dip" android:layout_weight="1"
-        android:fillViewport="true"
-        android:paddingLeft="16dip"
-        android:paddingRight="16dip">
-        <LinearLayout android:orientation="vertical"
-            android:layout_width="match_parent" android:layout_height="wrap_content">
-            <LinearLayout android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <!-- Not actually editable -->
-                <include layout="@layout/compose_from"/>
-
-                <include layout="@layout/compose_area_recipients"/>
-
-                <!--
-                    Empty container for storing attachments. We'll stick
-                    instances of message_compose_attachment.xml in here.
-                -->
-                <LinearLayout android:id="@+id/attachments"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical" />
-                <!-- Dummy view to keep it compatible with the xlarge counterpart -->
-                <View
-                    android:id="@+id/attachment_container"
-                    android:layout_width="0dip"
-                    android:layout_height="0dip"
-                    android:visibility="gone"
-                    />
-            </LinearLayout>
-            <include layout="@layout/compose_body"/>
-            <!--  quoted text bar -->
-            <include layout="@layout/quoted_text"/>
-        </LinearLayout>
-    </ScrollView>
-</LinearLayout>
diff --git a/res/layout/message_file_view.xml b/res/layout/message_file_view.xml
deleted file mode 100644
index 790f09a..0000000
--- a/res/layout/message_file_view.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@android:color/white"
-    >
-    <fragment
-        android:id="@+id/message_file_view_fragment"
-        class="com.android.email.activity.MessageFileViewFragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        />
-</FrameLayout>
diff --git a/res/layout/message_list_fragment.xml b/res/layout/message_list_fragment.xml
deleted file mode 100644
index 97363ab..0000000
--- a/res/layout/message_list_fragment.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!--
-  The default ListFragment layout (include) + the "send outgoing message" button.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    >
-
-    <!-- Search header is dynamically inserted here for search results -->
-
-    <include
-        layout="@android:layout/list_content"
-        android:id="@+id/list_panel"
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"
-        />
-
-    <!-- Message list error overlays are dynamically inserted here -->
-
-</LinearLayout>
diff --git a/res/layout/message_list_item_footer.xml b/res/layout/message_list_item_footer.xml
deleted file mode 100644
index a4ecb8d..0000000
--- a/res/layout/message_list_item_footer.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight"
-    android:gravity="center"
-    android:orientation="horizontal">
-    <ProgressBar
-        android:id="@+id/progress"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        style="?android:attr/progressBarStyleSmall"
-        android:paddingRight="10dip"
-        android:visibility="gone"
-        />
-    <TextView
-        android:id="@+id/main_text"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textColor="?android:attr/textColorPrimary"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        />
-</LinearLayout>
diff --git a/res/layout/message_list_item_normal.xml b/res/layout/message_list_item_normal.xml
deleted file mode 100644
index 188c080..0000000
--- a/res/layout/message_list_item_normal.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- This layout is used as a template to create a custom message item view
-    in normal mode. To be able to get the correct measurements, every source field should
-    be populated with data here. E.g:
-    - Text View should set text to a random long string (android:text="@string/long_string")
-    - Image View should set source to a specific asset -->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/message_list_item_normal"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/message_list_item_height_normal"
-    android:orientation="horizontal">
-    <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:paddingLeft="8dip"
-        android:paddingRight="8dip"
-        >
-        <ImageView
-            android:id="@+id/reply_state"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/replystate_margin_top"
-            android:layout_marginLeft="@dimen/replystate_margin_left"
-            android:layout_alignParentTop="true"
-            android:src="@drawable/ic_badge_reply_holo_light"
-            />
-        <ImageView
-            android:id="@+id/checkmark"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:src="@drawable/btn_check_on_normal_holo_light"
-            android:layout_marginTop="@dimen/checkmark_margin_top"
-            android:layout_below="@id/reply_state"
-            />
-    </RelativeLayout>
-
-    <!-- No top padding, since the color chips have no padding -
-         individual children should set their own top margins -->
-    <RelativeLayout
-        android:layout_width="0dip"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:paddingRight="16dip"
-        >
-        <View
-            android:id="@+id/color_chip"
-            android:layout_width="@dimen/message_list_item_color_tip_width"
-            android:layout_height="@dimen/message_list_item_color_tip_height"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentRight="true"
-            />
-        <ImageView
-            android:id="@+id/star"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_marginTop="@dimen/star_margin_top"
-            android:src="@drawable/btn_star_off_normal_email_holo_light" />
-
-        <LinearLayout
-            android:id="@+id/date_container"
-            android:layout_width="80dip"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_marginTop="@dimen/date_margin_top"
-            android:orientation="horizontal"
-            >
-            <!-- reserve enough vertical space for two icons -->
-            <ImageView
-                android:id="@+id/paperclip"
-                android:layout_width="36dip"
-                android:layout_height="16dip"
-                android:layout_gravity="top"
-                android:src="@drawable/ic_badge_attachment" />
-            <TextView
-                android:id="@+id/date"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textSize="@dimen/date_font_size"
-                android:text="@string/long_string"
-                android:lines="1" />
-        </LinearLayout>
-
-        <TextView
-            android:id="@+id/senders"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentLeft="true"
-            android:layout_toLeftOf="@+id/date_container"
-            android:layout_marginTop="8dip"
-            android:text="@string/long_string"
-            android:textSize="@dimen/senders_font_size"
-            android:lines="1" />
-        <TextView
-            android:id="@+id/subject"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentBottom="true"
-            android:layout_toLeftOf="@+id/star"
-            android:layout_marginBottom="8dip"
-            android:text="@string/long_string"
-            android:textSize="@dimen/subject_font_size"
-            android:lines="2" />
-    </RelativeLayout>
-</LinearLayout>
diff --git a/res/layout/message_list_item_wide.xml b/res/layout/message_list_item_wide.xml
deleted file mode 100644
index 01c06d7..0000000
--- a/res/layout/message_list_item_wide.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-
-<!-- This layout is used as a template to create custom message list item view
-    in wide mode. To be able to get the correct measurements, every source field should
-    be populated with data here. E.g:
-    - Text View should set text to a random long string (android:text="@string/long_string")
-    - Image View should set source to a specific asset -->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/message_list_item_wide"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="horizontal">
-    <ImageView
-        android:id="@+id/checkmark"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="16dip"
-        android:layout_marginRight="16dip"
-        android:layout_gravity="center_vertical"
-        android:src="@drawable/btn_check_on_normal_holo_light" />
-    <TextView
-        android:id="@+id/senders"
-        android:layout_width="0dip"
-        android:layout_height="wrap_content"
-        android:layout_weight="0.3"
-        android:layout_gravity="center_vertical"
-        android:text="@string/long_string"
-        android:textSize="@dimen/wide_senders_font_size"
-        android:lines="1" />
-    <ImageView
-        android:id="@+id/reply_state"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="16dip"
-        android:layout_marginRight="16dip"
-        android:layout_gravity="center_vertical"
-        android:src="@drawable/ic_badge_reply_holo_light" />
-    <TextView
-        android:id="@+id/subject"
-        android:layout_width="0dip"
-        android:layout_height="wrap_content"
-        android:layout_weight="0.7"
-        android:layout_marginLeft="16dip"
-        android:layout_marginRight="16dip"
-        android:layout_gravity="center_vertical"
-        android:text="@string/long_string"
-        android:textSize="@dimen/wide_subject_font_size"
-        android:lines="2" />
-    <RelativeLayout
-        android:layout_width="144dip"
-        android:layout_height="match_parent">
-        <View
-            android:id="@+id/color_chip"
-            android:layout_width="@dimen/message_list_item_color_tip_width"
-            android:layout_height="@dimen/message_list_item_color_tip_height"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentRight="true"
-            android:paddingTop="2dip" />
-
-        <ImageView
-            android:id="@+id/paperclip"
-            android:layout_width="36dip"
-            android:layout_height="16dip"
-            android:layout_centerVertical="true"
-            android:layout_marginRight="4dip"
-            android:src="@drawable/ic_attachment_holo_light" />
-
-        <TextView
-            android:id="@+id/date"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_alignParentRight="true"
-            android:text="@string/long_string"
-            android:lines="1" />
-
-    </RelativeLayout>
-    <ImageView
-        android:id="@+id/star"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="16dip"
-        android:layout_marginRight="16dip"
-        android:layout_gravity="center_vertical"
-        android:src="@drawable/btn_star_off_normal_email_holo_light" />
-</LinearLayout>
diff --git a/res/layout/message_list_search_header.xml b/res/layout/message_list_search_header.xml
deleted file mode 100644
index e1b398a..0000000
--- a/res/layout/message_list_search_header.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/search_header"
-    style="@style/search_header"
-    android:gravity="center_vertical"
-    android:background="#666"
-    android:visibility="gone"
-    >
-    <TextView
-        android:id="@+id/search_count"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:textColor="@android:color/white"
-        />
-    <TextView
-        android:id="@+id/search_header_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:textColor="@android:color/white"
-        />
-</RelativeLayout>
diff --git a/res/layout/message_list_warning.xml b/res/layout/message_list_warning.xml
deleted file mode 100644
index 80b865d..0000000
--- a/res/layout/message_list_warning.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!--
-  The default ListFragment layout (include) + the "send outgoing message" button.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="0dip"
-    android:layout_weight="1"
-    android:orientation="vertical"
-    android:gravity="center"
-    >
-
-    <ProgressBar style="?android:attr/progressBarStyleLarge"
-        android:id="@+id/spinner"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        />
-
-    <TextView
-        android:id="@+id/message_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="16dip"
-        android:layout_marginRight="16dip"
-        android:layout_marginTop="4dip"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        />
-
-    <TextView
-        android:id="@+id/message_warning"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="32dip"
-        android:layout_marginRight="32dip"
-        android:layout_marginTop="4dip"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        />
-
-</LinearLayout>
diff --git a/res/layout/message_view_attachment.xml b/res/layout/message_view_attachment.xml
deleted file mode 100644
index eeb1592..0000000
--- a/res/layout/message_view_attachment.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- phone -->
-<!--
-  TODO Remove the default visibility and always set them from code.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:divider="?android:attr/dividerHorizontal"
-    android:showDividers="middle"
-    android:background="@drawable/attachment_bg_holo"
-    >
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        >
-        <FrameLayout
-            android:id="@+id/attachment_container"
-            android:layout_width="48dip"
-            android:layout_height="48dip"
-            android:background="#e5e5e5"
-            >
-            <ImageView
-                android:id="@+id/attachment_icon"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:src="@drawable/ic_attachment_holo_light"
-                android:scaleType="center"
-                />
-            <ProgressBar
-                android:id="@+id/progress"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:padding="0dip"
-                style="?android:attr/progressBarStyleHorizontal"
-                android:max="100"
-                android:visibility="invisible"
-                />
-        </FrameLayout>
-        <TextView
-            android:id="@+id/attachment_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_toRightOf="@+id/attachment_container"
-            android:layout_marginLeft="16dip"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="#333333"
-            android:singleLine="true"
-            android:ellipsize="middle"
-            />
-        <TextView
-            android:id="@+id/attachment_info"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_toRightOf="@+id/attachment_container"
-            android:layout_below="@+id/attachment_name"
-            android:layout_marginLeft="16dip"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="@color/text_secondary_color"
-            android:singleLine="true"
-            android:ellipsize="middle"
-            />
-    </RelativeLayout>
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:divider="?android:attr/dividerVertical"
-        android:showDividers="middle"
-        android:dividerPadding="8dip"
-        >
-        <Button
-            android:id="@+id/load"
-            style="@style/Attachment.Button"
-            android:text="@string/message_view_attachment_load_action"
-            android:visibility="gone"
-            />
-        <Button
-            android:id="@+id/cancel"
-            style="@style/Attachment.Button"
-            android:text="@string/message_view_attachment_cancel_action"
-            android:visibility="gone"
-            />
-        <Button
-            android:id="@+id/info"
-            style="@style/Attachment.Button"
-            android:text="@string/message_view_attachment_info_action"
-            android:visibility="gone"
-            />
-        <Button
-            android:id="@+id/save"
-            style="@style/Attachment.Button"
-            android:text="@string/message_view_attachment_save_action"
-            android:visibility="gone"
-            />
-        <Button
-            android:id="@+id/open"
-            style="@style/Attachment.Button"
-            android:text="@string/message_view_attachment_view_action"
-            android:visibility="gone"
-            />
-    </LinearLayout>
-</LinearLayout>
diff --git a/res/layout/message_view_details.xml b/res/layout/message_view_details.xml
deleted file mode 100644
index ece3c6b..0000000
--- a/res/layout/message_view_details.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<TableLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_toLeftOf="@+id/show_details"
-    android:paddingTop="14dp"
-    android:paddingBottom="7dp"
-    android:orientation="vertical"
-    android:stretchColumns="2"
-    android:shrinkColumns="2"
-    >
-    <TableRow
-        android:id="@+id/date_row"
-        >
-        <TextView
-            android:layout_column="1"
-            android:text="@string/message_view_date_label"
-            style="@style/message_details_label"
-            />
-
-        <!-- Put in some margin on the right to accomodate for the "hide
-             details" icon -->
-        <TextView
-            android:id="@+id/date"
-            style="@style/message_details_value"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="32dip"
-            />
-    </TableRow>
-    <TableRow
-        android:id="@+id/to_row"
-        >
-        <TextView
-            android:layout_column="1"
-            android:text="@string/message_view_to_label"
-            style="@style/message_details_label"
-            />
-        <TextView
-            android:id="@+id/to"
-            android:autoLink="email"
-            style="@style/message_details_value_selectable"
-            />
-    </TableRow>
-    <TableRow
-        android:id="@+id/cc_row"
-        >
-        <TextView
-            android:layout_column="1"
-            android:text="@string/message_view_cc_label"
-            style="@style/message_details_label"
-            />
-        <TextView
-            android:id="@+id/cc"
-            android:autoLink="email"
-            style="@style/message_details_value_selectable"
-            />
-    </TableRow>
-    <TableRow
-        android:id="@+id/bcc_row"
-        >
-        <TextView
-            android:layout_column="1"
-            android:text="@string/message_view_bcc_label"
-            style="@style/message_details_label"
-            />
-        <TextView
-            android:id="@+id/bcc"
-            android:autoLink="email"
-            style="@style/message_details_value_selectable"
-            />
-    </TableRow>
-</TableLayout>
diff --git a/res/layout/message_view_fragment.xml b/res/layout/message_view_fragment.xml
deleted file mode 100644
index 966bf56..0000000
--- a/res/layout/message_view_fragment.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- small -->
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@android:color/white"
-    >
-    <ProgressBar
-        android:id="@+id/loading_progress"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        style="?android:attr/progressBarStyleLarge"
-        />
-    <com.android.email.view.NonLockingScrollView
-        android:id="@+id/main_panel"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        >
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            >
-            <TextView
-                android:id="@+id/subject"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dip"
-                android:layout_marginBottom="4dip"
-                android:layout_marginLeft="8dip"
-                android:layout_marginRight="8dip"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="?android:attr/textColorSecondary"
-                android:textStyle="bold"
-                />
-            <!-- Upper header area. -->
-            <include layout="@layout/message_view_header_upper" />
-
-            <!-- Addresses, timestamp, "show details" -->
-            <FrameLayout
-                android:id="@+id/message_view_subheader"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="16dip"
-                android:layout_marginRight="16dip"
-                >
-                <include layout="@layout/message_view_subheader" />
-            </FrameLayout>
-
-            <!-- divider -->
-            <View
-                android:layout_width="match_parent"
-                android:layout_marginLeft="16dip"
-                android:layout_marginRight="16dip"
-                style="@style/message_view_horizontal_divider"
-                />
-
-            <LinearLayout
-                android:id="@+id/message_tabs_section"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="16dip"
-                android:layout_marginRight="16dip"
-                android:orientation="vertical"
-                >
-                <Button
-                    android:id="@+id/show_pictures"
-                    style="?android:attr/borderlessButtonStyle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="48dip"
-                    android:drawableLeft="@drawable/ic_show_images_holo_light"
-                    android:drawablePadding="8dip"
-                    android:text="@string/message_view_show_pictures_action"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    />
-
-                <Button
-                    android:id="@+id/always_show_pictures_button"
-                    style="?android:attr/borderlessButtonStyle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="48dip"
-                    android:drawableLeft="@drawable/ic_show_images_holo_light"
-                    android:drawablePadding="8dip"
-                    android:text="@string/message_view_always_show_pictures_prompt"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:visibility="gone" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    >
-                    <Button
-                        android:id="@+id/show_message"
-                        android:text="@string/message_view_show_message_action"
-                        android:layout_width="wrap_content"
-                        style="@style/message_view_tab"
-                        />
-                    <!--
-                        Even though the "invite" section is only for MessageViewFragment, it's managed
-                        by MessageViewFragmentBase for simplicity.
-                    -->
-                    <Button
-                        android:id="@+id/show_invite"
-                        android:text="@string/message_view_show_invite_action"
-                        android:layout_width="wrap_content"
-                        style="@style/message_view_tab"
-                        />
-                    <Button
-                        android:id="@+id/show_attachments"
-                        android:layout_width="wrap_content"
-                        style="@style/message_view_tab"
-                        />
-                    <View
-                        android:layout_width="0dip"
-                        android:layout_height="0dip"
-                        android:layout_weight="1"
-                        />
-                </LinearLayout>
-                <View
-                    android:layout_width="match_parent"
-                    style="@style/message_view_horizontal_divider"
-                    />
-            </LinearLayout>
-            <!-- end of tab area -->
-            <!--
-                content area - only one of them is visible at a time.
-            -->
-            <com.android.email.view.RigidWebView
-                android:id="@+id/message_content"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="16dip"
-                android:layout_marginRight="16dip"
-                android:background="@android:color/white"
-                android:visibility="gone"
-                />
-
-            <!-- TODO: remove these useless scroll views. They are carry-over
-                 from an existing design and are no longer needed. -->
-            <!--
-                Even though the "invite" section is only for MessageViewFragment,
-                Its visibility is controlled by MessageViewFragmentBase for simplicity.
-            -->
-            <ScrollView
-                android:id="@+id/invite_scroll"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="16dip"
-                android:layout_marginRight="16dip"
-                android:paddingTop="16dip"
-                android:paddingBottom="16dip"
-                android:visibility="gone"
-                >
-                <!--
-                    Invite section - the views in it are controlled only by MessageViewFragment.
-                    MessageViewFragment shouldn't know what's inside it.
-                -->
-                <include layout="@layout/message_view_invitation" />
-            </ScrollView>
-            <ScrollView
-                android:id="@+id/attachments_scroll"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="16dip"
-                android:layout_marginRight="16dip"
-                android:visibility="gone"
-                >
-                <LinearLayout
-                    android:id="@+id/attachments"
-                    android:orientation="vertical"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:padding="4dip"
-                    android:background="@android:color/white"
-                    />
-            </ScrollView>
-            <!-- end of content area -->
-        </LinearLayout>
-    </com.android.email.view.NonLockingScrollView>
-</FrameLayout>
diff --git a/res/layout/message_view_header_actions.xml b/res/layout/message_view_header_actions.xml
deleted file mode 100644
index dd55e81..0000000
--- a/res/layout/message_view_header_actions.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <ImageButton
-        android:id="@+id/favorite"
-        style="@style/message_view_action_buttons"
-        android:src="@drawable/btn_star_off_convo_holo_light"
-        android:contentDescription="@string/favorite_action"
-        />
-    <!-- Either reply or replyall will be set to gone in code depending on setting -->
-    <ImageButton
-        android:id="@+id/reply"
-        style="@style/message_view_action_buttons"
-        android:src="@drawable/ic_reply_holo_dark"
-        android:contentDescription="@string/reply_action"
-        />
-    <ImageButton
-        android:id="@+id/reply_all"
-        style="@style/message_view_action_buttons"
-        android:src="@drawable/ic_reply_all_holo_dark"
-        android:contentDescription="@string/reply_all_action"
-        />
-    <ImageButton
-        android:id="@+id/more"
-        style="@android:style/Widget.Holo.ActionButton.Overflow"
-        android:layout_width="48dip"
-        android:layout_height="match_parent"
-        />
-</merge>
diff --git a/res/layout/message_view_header_upper.xml b/res/layout/message_view_header_upper.xml
deleted file mode 100644
index c89bb8b..0000000
--- a/res/layout/message_view_header_upper.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Upper header area for a message view. This contains the message actions
-     (e.g. reply, forward), and sender info -->
-<!-- Note the bottom padding is to compensate for the drop shadow in the asset -->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/message_header_height"
-    android:background="@drawable/header_convo_view_sender_bg_holo"
-    android:orientation="horizontal"
-    android:gravity="center_vertical"
-    >
-    <QuickContactBadge
-        android:id="@+id/badge"
-        android:layout_width="@dimen/message_header_badge_width"
-        android:layout_height="@dimen/message_header_badge_width"
-        android:scaleType="centerCrop"
-        />
-    <View
-        android:layout_width="1dip"
-        android:layout_height="match_parent"
-        android:background="@android:color/white"
-        />
-    <RelativeLayout
-        android:layout_width="0dip"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:layout_marginLeft="@dimen/message_header_name_margin"
-        >
-        <TextView
-            android:id="@+id/from_name"
-            style="@style/message_header_sender_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            />
-        <ImageView
-            android:id="@+id/presence"
-            android:src="@android:drawable/presence_offline"
-            android:layout_below="@+id/from_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="2dip"
-            android:visibility="gone"
-            />
-        <TextView
-            android:id="@+id/from_address"
-            style="@style/message_header_sender_address"
-            android:layout_below="@+id/from_name"
-            android:layout_toRightOf="@+id/presence"
-            android:layout_alignWithParentIfMissing="true"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="14dip"
-            android:textColor="@color/text_secondary_color_inverse"
-            android:singleLine="true"
-            android:ellipsize="end"
-            />
-    </RelativeLayout>
-    <include layout="@layout/message_view_header_actions" />
-</LinearLayout>
-
diff --git a/res/layout/message_view_invitation.xml b/res/layout/message_view_invitation.xml
deleted file mode 100644
index 5efc05b..0000000
--- a/res/layout/message_view_invitation.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Non-xlarge -->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/invite_section"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    >
-
-    <RelativeLayout
-         android:layout_width="match_parent"
-         android:layout_height="wrap_content"
-         >
-
-        <TextView
-             android:layout_width="wrap_content"
-             android:layout_height="wrap_content"
-             android:singleLine="true"
-             android:ellipsize="end"
-             android:text="@string/message_view_invite_title"
-             android:textAppearance="?android:attr/textAppearanceSmall"
-             android:drawableLeft="@drawable/ic_badge_invite_holo_light"
-             android:layout_marginLeft="12dip"
-             android:layout_alignParentLeft="true"
-             android:layout_centerVertical="true"
-             />
-
-        <Button
-             android:id="@+id/invite_link"
-             android:layout_width="wrap_content"
-             android:layout_height="wrap_content"
-             android:singleLine="true"
-             android:ellipsize="end"
-             android:text="@string/message_view_invite_view"
-             android:textAppearance="?android:attr/textAppearanceSmall"
-             android:layout_marginRight="3dip"
-             android:layout_alignParentRight="true"
-             android:layout_centerVertical="true"
-             />
-    </RelativeLayout>
-
-    <!-- Divider -->
-    <View
-         android:layout_width="match_parent"
-         android:layout_height="1px"
-         android:background="#ff808080"
-         />
-
-    <TextView
-         android:id="@+id/invite_info"
-         android:layout_height="wrap_content"
-         android:layout_width="match_parent"
-         android:layout_marginTop="4dip"
-         android:layout_marginLeft="12dip"
-         android:layout_marginRight="6dip"
-         android:singleLine="true"
-         android:ellipsize="end"
-         android:text="@string/message_view_invite_text"
-         android:textAppearance="?android:attr/textAppearanceSmall"
-         />
-
-    <LinearLayout
-         android:layout_width="match_parent"
-         android:layout_height="44dip"
-         android:orientation="horizontal"
-         android:gravity="center_vertical"
-         android:layout_marginLeft="12dip"
-         android:layout_marginRight="6dip"
-         >
-
-        <TextView
-             android:id="@+id/accept"
-             android:layout_width="0dip"
-             android:layout_height="wrap_content"
-             android:layout_weight="1"
-             android:layout_marginRight="6dip"
-             android:text="@string/message_view_invite_accept"
-             android:singleLine="true"
-             android:textAppearance="?android:attr/textAppearanceSmall"
-             android:drawableLeft="@drawable/btn_yes_off"
-             android:gravity="center_vertical"
-             android:focusable="true"
-             />
-
-        <TextView
-             android:id="@+id/maybe"
-             android:layout_width="0dip"
-             android:layout_height="wrap_content"
-             android:layout_weight="1"
-             android:layout_marginRight="6dip"
-             android:text="@string/message_view_invite_maybe"
-             android:singleLine="true"
-             android:textAppearance="?android:attr/textAppearanceSmall"
-             android:drawableLeft="@drawable/btn_maybe_off"
-             android:gravity="center_vertical"
-             android:focusable="true"
-             />
-
-        <TextView
-             android:id="@+id/decline"
-             android:layout_width="0dip"
-             android:layout_height="wrap_content"
-             android:layout_weight="1"
-             android:text="@string/message_view_invite_decline"
-             android:singleLine="true"
-             android:textAppearance="?android:attr/textAppearanceSmall"
-             android:drawableLeft="@drawable/btn_no_off"
-             android:gravity="center_vertical"
-             android:focusable="true"
-             />
-
-    </LinearLayout>
-</LinearLayout>
diff --git a/res/layout/message_view_subheader.xml b/res/layout/message_view_subheader.xml
deleted file mode 100644
index 026c921..0000000
--- a/res/layout/message_view_subheader.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- The expandable list of recipient addressese and date information at
-     the top of a message view -->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- Collapsed version -->
-    <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/sub_header_contents_collapsed"
-        android:layout_width="match_parent"
-        android:layout_height="48dip"
-        android:gravity="center_vertical"
-        >
-        <!-- To, Cc, Bcc addresses -->
-        <TextView
-            android:id="@+id/addresses"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_marginLeft="8dip"
-            android:singleLine="true"
-            android:ellipsize="end"
-            style="@style/message_view_text"
-            />
-        <TextView
-            android:id="@+id/datetime"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="16dip"
-            android:singleLine="true"
-            style="@style/message_view_text"
-            />
-        <!--  Set proper background to reflect selected state -->
-        <ImageView
-            android:id="@+id/show_details"
-            android:src="@drawable/expander_open_holo_light"
-            android:layout_width="wrap_content"
-            android:layout_height="48dip"
-            android:layout_marginLeft="4dip"
-            android:scaleType="center"
-            android:background="?android:attr/selectableItemBackground"
-            />
-    </LinearLayout>
-
-    <!-- Expanded version -->
-    <FrameLayout
-        android:id="@+id/sub_header_contents_expanded"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        >
-
-        <include layout="@layout/message_view_details" />
-
-        <!-- Overlay the collapse details icon.
-             The height here needs to match the height of the collapsed subheader -->
-        <ImageView
-            android:id="@+id/show_details"
-            android:src="@drawable/expander_close_holo_light"
-            android:layout_width="wrap_content"
-            android:layout_height="48dip"
-            android:layout_marginLeft="4dip"
-            android:scaleType="center"
-            android:layout_gravity="right"
-            />
-    </FrameLayout>
-
-</merge>
-
diff --git a/res/layout/quoted_text.xml b/res/layout/quoted_text.xml
deleted file mode 100644
index 85b3455..0000000
--- a/res/layout/quoted_text.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/quoted_text_area"
-    android:layout_height="wrap_content"
-    android:layout_width="match_parent">
-
-    <RelativeLayout android:layout_width="match_parent"
-        android:layout_height="48dip"
-        android:id="@+id/quoted_text_bar">
-
-        <RelativeLayout android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:id="@+id/quoted_text_row"
-            android:layout_alignParentLeft="true">
-
-            <CheckBox android:id="@+id/include_quoted_text"
-                android:layout_height="match_parent"
-                android:layout_width="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:gravity="center_vertical"
-                android:contentDescription="@string/message_compose_quoted_text_label"/>
-
-            <TextView
-                android:text="@string/message_compose_quoted_text_label"
-                android:textAllCaps="true"
-                android:layout_height="match_parent"
-                android:layout_width="wrap_content"
-                android:layout_marginLeft="8dip"
-                style="@style/QuotedTextHeaderStyle"
-                android:layout_toRightOf="@+id/include_quoted_text"
-                android:gravity="center_vertical|left"/>
-        </RelativeLayout>
-
-    </RelativeLayout>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="2dip"
-        android:background="#babebe"
-        android:layout_below="@id/quoted_text_bar"
-        android:id="@+id/divider_bar" />
-
-    <WebView android:id="@+id/quoted_text"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:layout_below="@id/divider_bar" />
-
-</RelativeLayout>
diff --git a/res/layout/recipient_dropdown_item.xml b/res/layout/recipient_dropdown_item.xml
deleted file mode 100644
index dcae43e..0000000
--- a/res/layout/recipient_dropdown_item.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="50dip"
-    android:orientation="horizontal"
-    android:layout_centerVertical="true"
-    android:layout_gravity="center_vertical">
-    <TextView android:id="@+id/text1"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_centerVertical="true"
-        android:gravity="center_vertical"
-        android:paddingLeft="6dip"
-        android:singleLine="true"
-        android:ellipsize="end"
-        />
-    <TextView android:id="@+id/text2"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toRightOf="@id/text1"
-        android:layout_centerVertical="true"
-        android:gravity="center_vertical"
-        android:paddingLeft="6dip"
-        android:singleLine="true"
-        android:ellipsize="end"
-        />
-</RelativeLayout>
diff --git a/res/layout/recipient_dropdown_item_loading.xml b/res/layout/recipient_dropdown_item_loading.xml
deleted file mode 100644
index a1dd3f0..0000000
--- a/res/layout/recipient_dropdown_item_loading.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="50dip"
-    android:orientation="horizontal"
-    android:layout_centerVertical="true"
-    android:layout_gravity="center_vertical">
-    <TextView android:id="@+id/text1"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_centerVertical="true"
-        android:gravity="center_vertical"
-        android:paddingLeft="6dip"
-        android:singleLine="true"
-        android:ellipsize="end"
-        />
-    <ProgressBar android:id="@+id/progress_circular"
-        style="?android:attr/progressBarStyleSmall"
-        android:max="10000"
-        android:layout_centerVertical="true"
-        android:layout_alignParentRight="true"
-        android:layout_marginLeft="6dip"
-        android:layout_marginRight="6dip"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-</RelativeLayout>
diff --git a/res/layout/three_pane_collapsible_impl.xml b/res/layout/three_pane_collapsible_impl.xml
deleted file mode 100644
index e86da90..0000000
--- a/res/layout/three_pane_collapsible_impl.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- ThreePaneLayout is based on LinearLayout with the orientation always horizontal -->
-
-<!-- Implementation of a three pane layout where in some modes, the left pane is
-     collapsible. -->
-<!-- Note the width of each pane is set by code at runtime.  -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <FrameLayout
-        android:id="@+id/left_pane"
-        android:layout_width="0dip"
-        android:layout_height="match_parent"
-        />
-    <FrameLayout
-        android:id="@+id/middle_pane"
-        android:layout_width="0dip"
-        android:layout_height="match_parent"
-        />
-    <FrameLayout
-        android:id="@+id/right_pane_with_fog"
-        android:layout_width="0dip"
-        android:layout_height="match_parent"
-        >
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            >
-            <FrameLayout
-                android:id="@+id/right_pane"
-                android:layout_width="match_parent"
-                android:layout_height="0dip"
-                android:layout_weight="1"
-                />
-            <include
-                layout="@layout/message_command_button_view"
-                android:id="@+id/message_command_buttons"
-                />
-        </LinearLayout>
-        <!-- View to snatch all touch events.  100% transparent. -->
-        <View
-            android:id="@+id/fogged_glass"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@android:color/transparent"
-            />
-    </FrameLayout>
-</merge>
diff --git a/res/layout/three_pane_impl.xml b/res/layout/three_pane_impl.xml
deleted file mode 100644
index 7b2c46f..0000000
--- a/res/layout/three_pane_impl.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- ThreePaneLayout is based on LinearLayout with the orientation always horizontal -->
-
-<!-- Implementation of a three pane layout where two panes are always visible at
-     any given time. -->
-<!-- Note the width of each pane is set by code at runtime.  -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <FrameLayout
-        android:id="@+id/left_pane"
-        android:layout_width="0dip"
-        android:layout_height="match_parent"
-        />
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        >
-        <FrameLayout
-            android:id="@+id/middle_pane"
-            android:layout_width="0dip"
-            android:layout_height="0dip"
-            android:layout_weight="1"
-            />
-        <include
-            layout="@layout/message_command_button_view"
-            android:id="@+id/message_command_buttons"
-            />
-    </LinearLayout>
-    <FrameLayout
-        android:id="@+id/right_pane"
-        android:layout_width="0dip"
-        android:layout_height="match_parent"
-        />
-</merge>
diff --git a/res/layout/waiting_for_sync_message.xml b/res/layout/waiting_for_sync_message.xml
deleted file mode 100644
index a9d8aad..0000000
--- a/res/layout/waiting_for_sync_message.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/waiting_for_sync_message"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:padding="16dip"
-    >
-    <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center|top"
-        >
-        <ProgressBar
-            android:id="@+id/progress"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginRight="8dip"
-            />
-        <TextView
-          android:id="@+id/title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_toRightOf="@+id/progress"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:text="@string/waitinf_for_sync_message_1"
-            />
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_toRightOf="@+id/progress"
-            android:layout_below="@+id/title"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:text="@string/waitinf_for_sync_message_2"
-            />
-    </RelativeLayout>
-</FrameLayout>
diff --git a/res/layout/widget.xml b/res/layout/widget.xml
deleted file mode 100644
index 397be43..0000000
--- a/res/layout/widget.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_marginTop="6dip"
-    android:layout_marginBottom="6dip"
-    android:orientation="vertical">
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="48dip"
-        android:gravity="center_vertical"
-        android:paddingLeft="8dip"
-        android:paddingRight="8dip"
-        android:orientation="horizontal"
-        android:background="@drawable/header_bg_email_widget_holo">
-        <ImageView
-            android:id="@+id/widget_logo"
-            android:layout_width="32dip"
-            android:layout_height="32dip"
-            android:layout_marginRight="8dip"
-            android:src="@mipmap/ic_launcher_email" />
-        <LinearLayout
-            android:id="@+id/widget_header"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="vertical">
-            <TextView
-                android:id="@+id/widget_title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="@string/widget_all_mail"
-                android:textColor="@color/widget_title_color"
-                />
-            <TextView
-                android:id="@+id/widget_tap"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:singleLine="true"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:text="@string/widget_other_views"
-                android:textColor="@color/widget_title_color"
-                />
-        </LinearLayout>
-        <!-- Note: We can't set "freezesText" on the widget_unread_count view, as the launcher can
-            restore stale data over updated data. -->
-        <TextView
-            android:id="@+id/widget_count"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="12dip"
-            android:textSize="36sp"
-            android:textStyle="bold"
-            android:textColor="@color/widget_unread_color" />
-        <ImageView
-            android:id="@+id/widget_compose"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/ic_menu_compose_normal_holo_light" />
-    </LinearLayout>
-    <ListView
-        android:id="@+id/message_list"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:cacheColorHint="#00000000"
-        android:background="@drawable/gradient_bg_email_widget_holo" />
-
-    <!-- TODO: remove this tap to configure logic. It's obsolete. -->
-    <TextView
-        android:id="@+id/tap_to_configure"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="5dip"
-        android:layout_marginRight="5dip"
-        android:layout_weight="1"
-        android:layout_gravity="fill"
-        android:gravity="center"
-        android:text="@string/widget_touch_to_configure"
-        android:textSize="16sp"
-        android:visibility="gone"/>
-    <ImageView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/list_div_top_btm_email_widget_holo" />
-</LinearLayout>
diff --git a/res/layout/widget_list_item.xml b/res/layout/widget_list_item.xml
deleted file mode 100644
index b447f98..0000000
--- a/res/layout/widget_list_item.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/widget_message"
-    android:layout_width="match_parent"
-    android:layout_height="64sp"
-    android:background="@drawable/conversation_unread_selector"
-    >
-    <ImageView
-        android:id="@+id/color_chip"
-        android:layout_width="32dip"
-        android:layout_height="4dip"
-        android:layout_marginRight="16dip"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentRight="true"
-        android:visibility="visible"
-        />
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="16dip"
-        android:layout_marginRight="16dip"
-        android:layout_centerVertical="true"
-        android:orientation="vertical"
-        >
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            >
-            <TextView
-                android:id="@+id/widget_from"
-                style="@style/widget_list_item"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:paddingRight="16dip"
-                android:singleLine="true" />
-            <!-- Use negative margins to align attachment icon with text -->
-            <ImageView
-                android:id="@+id/widget_invite"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="-4sp"
-                android:src="@drawable/ic_badge_invite_holo_light" />
-            <ImageView
-                android:id="@+id/widget_attachment"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="-4sp"
-                android:src="@drawable/ic_attachment_holo_light" />
-            <TextView
-                android:id="@+id/widget_date"
-                style="@style/widget_list_item"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-        </LinearLayout>
-        <TextView
-            android:id="@+id/widget_subject"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            style="@style/widget_list_item"
-            android:layout_marginTop="-4sp"
-            android:maxLines="2"/>
-    </LinearLayout>
-</RelativeLayout>
diff --git a/res/layout/widget_loading.xml b/res/layout/widget_loading.xml
deleted file mode 100644
index a25e32d..0000000
--- a/res/layout/widget_loading.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="50dip"
-    android:orientation="horizontal">
-    <TextView
-        android:id="@+id/loading_text"
-        android:layout_height="fill_parent"
-        android:layout_width="fill_parent"
-        android:gravity="center"
-        android:textColor="#60FFFFFF"
-        android:textSize="20sp"
-        android:shadowColor="#FF000000"
-        android:shadowDx="0.0"
-        android:shadowDy="1.0"
-        android:shadowRadius="2.0" />
-</LinearLayout>
\ No newline at end of file
diff --git a/res/menu-sw600dp/email_activity_options.xml b/res/menu-sw600dp/email_activity_options.xml
deleted file mode 100644
index 71aebb7..0000000
--- a/res/menu-sw600dp/email_activity_options.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Email activity menu options for the tablet -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/compose"
-        android:orderInCategory="100"
-        android:alphabeticShortcut="c"
-        android:title="@string/compose_action"
-        android:icon="@drawable/ic_menu_compose_normal_holo_light"
-        android:showAsAction="ifRoom"
-    />
-    <item
-        android:id="@+id/search"
-        android:orderInCategory="200"
-        android:alphabeticShortcut="s"
-        android:title="@string/search_action"
-        android:icon="@drawable/ic_menu_search_holo_light"
-        android:showAsAction="ifRoom"
-    />
-
-    <!-- Message view options go here -->
-
-    <item
-        android:id="@+id/refresh"
-        android:orderInCategory="1500"
-        android:alphabeticShortcut="r"
-        android:title="@string/refresh_action"
-        android:icon="@drawable/ic_menu_refresh_holo_light"
-        android:showAsAction="ifRoom"
-    />
-    <!-- Newer/older are not menu items on tablet, but we have them here to keep compatibility
-         with the phone menu. -->
-    <item
-        android:id="@+id/newer"
-        android:visible="false"
-    />
-    <item
-        android:id="@+id/older"
-        android:visible="false"
-    />
-    <item
-        android:id="@+id/mailbox_settings"
-        android:orderInCategory="2000"
-        android:title="@string/mailbox_settings_action"
-        android:icon="@android:drawable/ic_menu_preferences"
-    />
-    <item
-        android:id="@+id/account_settings"
-        android:orderInCategory="3000"
-        android:title="@string/settings_action"
-        android:icon="@android:drawable/ic_menu_preferences"
-    />
-</menu>
diff --git a/res/menu-sw600dp/message_compose_option.xml b/res/menu-sw600dp/message_compose_option.xml
deleted file mode 100644
index 617c868..0000000
--- a/res/menu-sw600dp/message_compose_option.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/send"
-        android:orderInCategory="1000"
-        android:title="@string/send_action"
-        android:showAsAction="ifRoom|withText"
-        android:icon="@drawable/ic_menu_send_holo_light"
-        android:alphabeticShortcut="s"
-    />
-    <item
-        android:id="@+id/save"
-        android:orderInCategory="1100"
-        android:title="@string/save_draft_action"
-        android:showAsAction="ifRoom"
-        android:alphabeticShortcut="d"
-    />
-    <item
-        android:id="@+id/discard"
-        android:orderInCategory="1200"
-        android:title="@string/discard_action"
-        android:showAsAction="ifRoom"
-        android:icon="@drawable/ic_menu_trash_holo_light"
-        android:alphabeticShortcut="q"
-    />
-    <item
-        android:id="@+id/show_quick_text_list_dialog"
-        android:orderInCategory="1300"
-        android:title="@string/show_quick_text_list_dialog_action"
-        android:alphabeticShortcut="r"
-    />
-    <item
-        android:id="@+id/settings"
-        android:orderInCategory="2000"
-        android:title="@string/settings_action"
-        android:icon="@android:drawable/ic_menu_preferences"
-    />
-</menu>
-
diff --git a/res/menu-sw600dp/message_view_fragment_option.xml b/res/menu-sw600dp/message_view_fragment_option.xml
deleted file mode 100644
index 41a60f1..0000000
--- a/res/menu-sw600dp/message_view_fragment_option.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Message view menu options for the tablet -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- Higher order options go here -->
-    <item
-        android:id="@+id/delete"
-        android:orderInCategory="1000"
-        android:title="@string/delete_action"
-        android:icon="@drawable/ic_menu_trash_holo_light"
-        android:showAsAction="ifRoom"
-    />
-    <item
-        android:id="@+id/move"
-        android:orderInCategory="1100"
-        android:title="@string/move_action"
-        android:icon="@drawable/ic_menu_move_to_holo_light"
-        android:showAsAction="ifRoom"
-    />
-    <item
-        android:id="@+id/mark_as_unread"
-        android:orderInCategory="1200"
-        android:title="@string/mark_as_unread_action"
-        android:showAsAction="ifRoom"
-        android:icon="@drawable/ic_menu_mark_unread_holo_light"
-    />
-</menu>
diff --git a/res/menu/email_activity_options.xml b/res/menu/email_activity_options.xml
deleted file mode 100644
index 33ee507..0000000
--- a/res/menu/email_activity_options.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Email activity menu options for the phone -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/compose"
-        android:orderInCategory="100"
-        android:alphabeticShortcut="c"
-        android:title="@string/compose_action"
-        android:icon="@drawable/ic_menu_compose_normal_holo_light"
-        android:showAsAction="ifRoom"
-    />
-    <item
-        android:id="@+id/search"
-        android:orderInCategory="200"
-        android:alphabeticShortcut="s"
-        android:title="@string/search_action"
-        android:icon="@drawable/ic_menu_search_holo_light"
-        android:showAsAction="ifRoom"
-    />
-    <item
-        android:id="@+id/show_all_mailboxes"
-        android:orderInCategory="300"
-        android:alphabeticShortcut="c"
-        android:title="@string/mailbox_list_account_selector_show_all_folders"
-        android:icon="@drawable/ic_menu_move_to_holo_light"
-        android:showAsAction="ifRoom"
-    />
-    <item
-        android:id="@+id/refresh"
-        android:orderInCategory="400"
-        android:alphabeticShortcut="r"
-        android:title="@string/refresh_action"
-        android:icon="@drawable/ic_menu_refresh_holo_light"
-        android:showAsAction="ifRoom"
-    />
-    <!-- Note the order; we want to show them to the right of delete/move -->
-    <item
-        android:id="@+id/newer"
-        android:orderInCategory="1500"
-        android:icon="@drawable/menu_item_newer"
-        android:showAsAction="always"
-        android:visible="false"
-    />
-    <item
-        android:id="@+id/older"
-        android:orderInCategory="1600"
-        android:icon="@drawable/menu_item_older"
-        android:showAsAction="always"
-        android:visible="false"
-    />
-    <item
-        android:id="@+id/mailbox_settings"
-        android:orderInCategory="2000"
-        android:title="@string/mailbox_settings_action"
-        android:icon="@android:drawable/ic_menu_preferences"
-    />
-    <item
-        android:id="@+id/account_settings"
-        android:orderInCategory="3000"
-        android:title="@string/settings_action"
-        android:icon="@android:drawable/ic_menu_preferences"
-    />
-</menu>
diff --git a/res/menu/message_compose_option.xml b/res/menu/message_compose_option.xml
deleted file mode 100644
index d3b13f1..0000000
--- a/res/menu/message_compose_option.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/send"
-        android:title="@string/send_action"
-        android:showAsAction="ifRoom|withText"
-        android:icon="@drawable/ic_menu_send_holo_light"
-        android:alphabeticShortcut="s"
-    />
-    <item
-        android:id="@+id/add_attachment"
-        android:title="@string/add_file_attachment"
-    />
-    <item
-        android:id="@+id/add_cc_bcc"
-        android:title="@string/add_cc_bcc_menu"
-    />
-    <item
-        android:id="@+id/save"
-        android:title="@string/save_draft_action"
-        android:alphabeticShortcut="d"
-    />
-    <item
-        android:id="@+id/discard"
-        android:title="@string/discard_action"
-        android:icon="@drawable/ic_menu_trash_holo_light"
-        android:alphabeticShortcut="q"
-    />
-    <item
-        android:id="@+id/show_quick_text_list_dialog"
-        android:title="@string/show_quick_text_list_dialog_action"
-        android:alphabeticShortcut="r"
-    />
-    <item
-        android:id="@+id/settings"
-        android:title="@string/settings_action"
-        android:icon="@android:drawable/ic_menu_preferences"
-    />
-</menu>
diff --git a/res/menu/message_header_overflow_menu.xml b/res/menu/message_header_overflow_menu.xml
deleted file mode 100644
index 8ba33f1..0000000
--- a/res/menu/message_header_overflow_menu.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- Reply or replyall may be removed in code depending on setting and layout -->
-    <item
-        android:id="@+id/reply"
-        android:title="@string/reply_action"
-    />
-    <item
-        android:id="@+id/reply_all"
-        android:title="@string/reply_all_action"
-    />
-    <item
-        android:id="@+id/forward"
-        android:title="@string/forward_action"
-    />
-</menu>
-
diff --git a/res/menu/message_list_fragment_cab_options.xml b/res/menu/message_list_fragment_cab_options.xml
deleted file mode 100644
index 848dd0c..0000000
--- a/res/menu/message_list_fragment_cab_options.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/delete" android:title="@string/delete_action"
-        android:icon="@drawable/ic_menu_trash_holo_light"
-        android:showAsAction="always" />
-    <item android:id="@+id/move" android:title="@string/move_action"
-        android:icon="@drawable/ic_menu_move_to_holo_light"
-        android:showAsAction="always" />
-    <item android:id="@+id/mark_read" android:title="@string/read_action"
-        android:icon="@drawable/ic_menu_mark_read_holo_light"
-        android:showAsAction="always" />
-    <item android:id="@+id/mark_unread" android:title="@string/unread_action"
-        android:icon="@drawable/ic_menu_mark_unread_holo_light"
-        android:showAsAction="always" />
-    <item android:id="@+id/add_star" android:title="@string/set_star_action"
-        android:icon="@drawable/ic_menu_star_holo_light"
-        android:showAsAction="always" />
-    <item android:id="@+id/remove_star" android:title="@string/remove_star_action"
-        android:icon="@drawable/ic_menu_star_off_holo_light"
-        android:showAsAction="always" />
-</menu>
diff --git a/res/menu/message_list_fragment_option.xml b/res/menu/message_list_fragment_option.xml
deleted file mode 100644
index df07964..0000000
--- a/res/menu/message_list_fragment_option.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/send"
-        android:orderInCategory="50"
-        android:title="@string/message_list_send_pending_messages_action"
-        android:showAsAction="ifRoom|withText"
-        android:icon="@drawable/ic_menu_send_holo_light"
-    />
-</menu>
diff --git a/res/menu/message_view_fragment_option.xml b/res/menu/message_view_fragment_option.xml
deleted file mode 100644
index 845c822..0000000
--- a/res/menu/message_view_fragment_option.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Message view menu options for the phone -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/move"
-        android:orderInCategory="1100"
-        android:title="@string/move_action"
-        android:icon="@drawable/ic_menu_move_to_holo_light"
-        android:showAsAction="ifRoom"
-    />
-    <item
-        android:id="@+id/delete"
-        android:orderInCategory="1000"
-        android:title="@string/delete_action"
-        android:icon="@drawable/ic_menu_trash_holo_light"
-        android:showAsAction="ifRoom"
-    />
-    <item
-        android:id="@+id/mark_as_unread"
-        android:orderInCategory="1200"
-        android:title="@string/mark_as_unread_action"
-        android:showAsAction="never"
-        android:icon="@drawable/ic_menu_mark_unread_holo_light"
-    />
-</menu>
diff --git a/res/menu/welcome.xml b/res/menu/welcome.xml
deleted file mode 100644
index 4f0cd47..0000000
--- a/res/menu/welcome.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Menu items for the "Welcome" screen when the user is waiting for initial
-     sync -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/account_settings"
-        android:title="@string/settings_action"
-        android:icon="@android:drawable/ic_menu_preferences"
-    />
-</menu>
-
diff --git a/res/mipmap-hdpi/ic_launcher_email.png b/res/mipmap-hdpi/ic_launcher_email.png
deleted file mode 100644
index 2616df7..0000000
--- a/res/mipmap-hdpi/ic_launcher_email.png
+++ /dev/null
Binary files differ
diff --git a/res/mipmap-mdpi/ic_launcher_email.png b/res/mipmap-mdpi/ic_launcher_email.png
deleted file mode 100644
index 5459027..0000000
--- a/res/mipmap-mdpi/ic_launcher_email.png
+++ /dev/null
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_launcher_email.png b/res/mipmap-xhdpi/ic_launcher_email.png
deleted file mode 100644
index 91c768e..0000000
--- a/res/mipmap-xhdpi/ic_launcher_email.png
+++ /dev/null
Binary files differ
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 18e47e5..8854840 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"Lees e-posaanhegsels"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Laat hierdie program toe om jou e-pos-aanhegsels te lees."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Laat die program toe om jou e-pos se aanhegsels te lees."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Kry toegang tot e-posverskafferdata"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Gee hierdie program toegang tot jou e-posdatabasis, insluitend ontvangde boodskappe, gestuurde boodskappe, gebruikername en wagwoorde."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Laat die program toe om toegang te kry tot jou e-posdatabasis, insluitend ontvangde boodskappe, gestuurde boodskappe, gebruikername en wagwoorde."</string>
     <string name="app_name" msgid="5815426892327290362">"E-pos"</string>
     <string name="compose_title" msgid="427986915662706899">"Skryf"</string>
     <string name="debug_title" msgid="5175710493691536719">"Ontfout"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"Gedoen"</string>
     <string name="create_action" msgid="3062715563215392251">"Skep nuwe"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"Vee uit"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"Geen vinnige antwoorde nie"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Geen vinnige reaksies nie."</string>
     <string name="discard_action" msgid="6532206074859505968">"Gooi weg"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"Stoor konsep"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Voer vinnige antwoord in"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"Soek"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Rekeninginstellings"</string>
     <string name="settings_action" msgid="6334807007967459412">"Instellings"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"Sinkroniseeropsies"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Sinkroniseeropsies"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Merk as ongelees"</string>
     <string name="move_action" msgid="3059189775933985898">"Skuif"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> het geskryf:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Sluit aangehaalde teks in"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Sluit teks in"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Jy moet ten minste een ontvanger byvoeg."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"Voeg ten minste een ontvanger by."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Sekere e-posadresse is ongeldig."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Lêer te groot om aan te heg."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Voer vinnige antwoord in"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Gestoor"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Stop"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Aanhegsel gestoor as <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Kon nie die aanhegsel stoor nie."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Let wel: Een of meer aanhegsels in jou aangestuurde boodskap sal afgelaai word voor dit gestuur word."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"Kon nie aanhegsel stoor nie."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Een of meer aanhegsels in jou aangestuurde boodskap sal afgelaai word voor dit gestuur word."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Boodskap"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Nooi uit"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Kon een of meer aanhegsels nie aanstuur nie"</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Aanhegsel nie aangestuur nie"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g>-aanmelding het misluk"</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> se aanmelding is onsuksesvol."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"Kan nie aanmeld nie"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Ouer"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Rekening-opstelling"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Voeg \'n Exchange-rekening by"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Voeg \'n Exchange ActiveSync-rekening by"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"E-posrekening"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"Jy kan e-pos vir die meeste rekeninge in net \'n paar stappe opstel."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Jy kan \'n Exchange-rekening in net \'n paar stappe opstel."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Jy kan \'n Exchange ActiveSync-rekening in net \'n paar stappe opstel."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Jy kan jou rekening in net \'n paar stappe opstel."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"E-posadres"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Wagwoord"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Stuur e-pos by verstek vanaf hierdie rekening."</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"Stuur e-pos van hierdie rekening by verstek"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Handmatige opstelling"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Voer asseblief \'n geldige e-posadres en wagwoord in."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Duplikaatrekening"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Kontroleer tans inkomende bedienerinstellings…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Kontroleer tans uitgaande bedienerinstellings…"</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Rekening-opstelling"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"Jou rekening is nou opgestel en e-pos is op pad!"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"Jou rekening is opgestel en die e-pos is op pad!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Gee hierdie rekening \'n naam (opsioneel)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Jou naam (staan op uitgaande boodskappe)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Hierdie veld kan nie leeg wees nie."</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Inkomende bedienerinstellings"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Gebruikernaam"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Wagwoord"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3-bediener"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"IMAP-bediener"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Bediener"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Poort"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Sekuriteitstipe"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Geen"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP-bediener"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Poort"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Sekuriteitstipe"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Vereis aanmelding."</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Vereis aanmelding"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Gebruikernaam"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Wagwoord"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"Rekening-opstelling"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Elke 15 minute"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Elke 30 minute"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Elke uur"</string>
-    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Stuur e-pos by verstek vanaf hierdie rekening."</string>
-    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Laat my weet wanneer ek e-pos kry."</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sinkroniseer kontakte uit hierdie rekening."</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sinkroniseer kalender vanaf hierdie rekening."</string>
-    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sinkroniseer e-pos vanaf hierdie rekening."</string>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"Stuur e-pos van hierdie rekening by verstek"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Laat my weet wanneer e-pos aankom"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Sinkroniseer kontakte uit hierdie rekening"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Sinkroniseer kalender uit hierdie rekening"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Sinkroniseer e-pos uit hierdie rekening"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Laai aanhegsels outomaties af wanneer aan Wi-Fi gekoppel is"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Kon nie voltooi word nie"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Dae om te sinkroniseer"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Een maand"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Alle"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Gebruik rekening se verstek"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Gebruikernaam of wagwoord verkeerd."</string>
-    <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_auth_message" msgid="426627755590431364">"Gebruikernaam of wagwoord verkeerd."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"Gebruikernaam of wagwoord is verkeerd"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Kan nie veilig aan bediener koppel nie."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Kan nie veilig aan bediener koppel nie."\n"<xliff:g id="ERROR">%s</xliff:g>"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"Kliëntsertifikaat word vereis. Koppel aan bediener met kliëntsertifikaat?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"Sertifikaat is ongeldig of ontoeganklik."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"Die bediener het met \'n fout gereageer; kontroleer jou gebruikernaam en wagwoord en probeer weer."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"\'n Kliëntsertifikaat word vereis. Wil jy aan die bediener koppel met \'n kliëntsertifikaat?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"Die sertifikaat is ongeldig of ontoeganklik."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"Die bediener het gereageer met \'n foutboodskap. Kontroleer jou gebruikernaam en wagwoord, en herprobeer dan."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"Kan nie aan bediener koppel nie."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Kan nie aan bediener koppel nie."\n"<xliff:g id="ERROR">%s</xliff:g>"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS vereis, maar nie deur bediener ondersteun nie."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"LET WEL: Deaktivering van die e-posprogram se magtiging om jou toestel te administreer, sal alle e-posrekeninge wat dit benodig, uitvee, asook hul e-posse, kontakte, kalendergebeure en ander data."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Sekuriteitsopdatering"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> vereis dat jy jou sekuriteitsinstellings opdateer."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Rekening \"<xliff:g id="ACCOUNT">%s</xliff:g>\" vereis opdatering van sekuriteitsinstellings."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"Sekuriteitsopdatering vereis"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Rekening \"<xliff:g id="ACCOUNT">%s</xliff:g>\" kan nie gesinchroniseer word nie weens sekuriteitvereistes."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"Rekening \"<xliff:g id="ACCOUNT">%s</xliff:g>\" vereis opdatering van sekuriteitsinstellings."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"Rekening \"<xliff:g id="ACCOUNT">%s</xliff:g>\" het sy sekuriteitsinstellings verander; geen handeling deur die gebruiker is nodig nie."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Sekuriteitsopdatering vereis"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Sekuriteitsbeleide het verander"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Kan nie sekuriteitbeleid nakom nie"</string>
     <string name="account_security_title" msgid="3511543138560418587">"Toestelsekuriteit"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Die bediener <xliff:g id="SERVER">%s</xliff:g> vereis dat jy dit toelaat om sekere sekuriteitskenmerke van jou Android-toestel afgeleë te beheer."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Redigeer details"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"Jou skermslot se PIN of wagwoord het verval."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"Wagwoord vir skermslot het verval"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Wagwoord vir skermslot verval"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"Jy moet jou skermslot se PIN of wagwoord gou verander, anders gaan <xliff:g id="ACCOUNT">%s</xliff:g> se data uitgevee word. Wil jy dit nou verander?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Jy moet jou skermslot-PIN of -wagwoord binnekort verander, anders sal die data vir <xliff:g id="ACCOUNT">%s</xliff:g> uitgevee word. Wil jy dit nou verander?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"Wagwoord vir skermslot het verval"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"Die data vir <xliff:g id="ACCOUNT">%s</xliff:g> word van jou toestel afgevee. Jy kan dit teruglaai deur jou skermslot se PIN of wagwoord te verander. Wil jy dit nou verander?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"Die data vir <xliff:g id="ACCOUNT">%s</xliff:g> word uit jou toestel gevee. Jy kan dit teruglaai deur jou skermslot-PIN of -wagwoord te verander. Wil jy dit nou verander?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Raak van ongestoorde veranderinge ontslae?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Kon nie aanmeld nie."</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Die gebruikernaam of wagwoord vir <xliff:g id="ACCOUNT">%s</xliff:g> is verkeerd. Dateer hulle nou op?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"Die gebruikernaam of wagwoord vir <xliff:g id="ACCOUNT">%s</xliff:g> is verkeerd. Wil jy dit nou opdateer?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Verstek rekening"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Stuur e-pos by verstek vanaf hierdie rekening"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Laai aanhegsels af"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Laai outomaties aanhegsels van onlangse boodskappe via Wi-Fi af"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"E-poskennisgewings"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Sinkroniseerfrekwensie, kennisgewings, ens."</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"Wys in statusbalk wanneer e-pos aankom"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Stuur berig wanneer e-pos aankom"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Kontroleer inkassie elke"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Inkomende instellings"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Gebruikernaam, wagwoord en ander instellings vir inkomende bediener"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Uitgaande instellings"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Gebruikernaam, wagwoord en ander instellings vir uitgaandebediener-instellings"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Beleide toegepas"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Geen"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Nie-ondersteunde beleide"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Geen"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"Probeer sinkroniseer"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Raak hier om hierdie rekening te sinkroniseer"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Rekeningnaam"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Jou naam"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Handtekening"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Vinnige reaksies"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Redigeer teks wat jy gereeld invoeg wanneer jy e-posse skryf"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Redigeer teks wat jy gereeld invoeg wanneer jy e-pos skryf"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Las teks by die boodskappe wat jy stuur"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Kennisgewingsinstellings"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Datagebruik"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"Sekuriteitsbeleide"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Redigeer vinnige antwoord"</string>
     <string name="save_action" msgid="1988862706623227093">"Stoor"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Sinkroniseer kontakte"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sinkroniseer kontakte vir hierdie rekening"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sinkroniseer kalender"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Sinkroniseer kalender vir hierdie rekening"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Sinkroniseer kalender"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Sinkroniseer kalendergebeurtenis uit hierdie rekening"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sinkroniseer e-pos"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sinkroniseer e-pos vir hierdie rekening"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibreer"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> resultate van <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Instellings"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"Algemeen"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Algemene instellings"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"Program"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Outovoortgaan"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Kies watter skerm moet wys nadat jy \'n boodskap uitgevee het"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Versteek merkblokkies"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"Raak aan en hou om boodskappe uit lys te kies"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Bevestig voor uitvee"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Boodskappe"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Bevestig voor stuur"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Boodskappe"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Gaan voort na"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Nuwer boodskap"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Ouer boodskap"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"Wag vir resultate"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Sommige bedieners neem \'n lang tyd."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Vouers"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Weier gebruik van die toestel se kamera"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Vereis toestelwagwoord"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"Beperk die hergebruik van onlangse wagwoorde"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"Vereis dat wagwoorde verval"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"Vereis dat \'n ledige toestel sy skerm sluit"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"Beperk die aantal kalendergebeurtenisse wat gesinchroniseer word"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"Beperk die aantal e-posse wat gesinchroniseer word"</string>
+    <string name="quick_1" msgid="3426057697353380951">"Dankie!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"Klink vir my goed!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"Ek sal dit later lees en jou antwoord."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Kom ons skeduleer \'n vergadering om dit te bespreek."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Agtergrond-sinkronisasie vir hierdie rekening is gedeaktiveer tydens swerwing."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"Stuur tans antwoord..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"Geen boodskappe nie."</string>
 </resources>
diff --git a/res/values-af/uploader.xml b/res/values-af/uploader.xml
index 25ec5f0..904581f 100644
--- a/res/values-af/uploader.xml
+++ b/res/values-af/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Versteek details"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Instellings"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"%s opgelaai"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Rekening"</string>
     <string name="upload" msgid="2615541458361216022">"Laai op"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 9564151..f38cbcd 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"የኢሜይል ዓባሪዎችን አንብብ"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"ይህ መተግበሪያ የኢሜይል አባሪዎችህን እንዲያነብ ይፈቅዳል።"</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"የኢሜይል አባሪዎችህን እንዲያነብ ለመተግበሪያ ይፈቅዳል።"</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"የኢሜይል አቅራቢ ውሂብ ድረስ።"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"ይህ መተግበሪያ የኢሜይል የውሂብ ጎታህን፣ የደረሱ መልዕክቶች፣ የተላኩ መልዕክቶች፣ ተጠቃሚ ስሞች እና የይለፍ ቃሎችን ጨምሮ ለመድረስ ይፈቅዳል።"</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">" የኢሜይል የውሂብ ጎታህን፣ የደረሱ መልዕክቶች፣ የተላኩ መልዕክቶች፣ ተጠቃሚ ስሞች እና የይለፍ ቃሎችን ጨምሮ ለመድረስ ለመተግበሪያ ይፈቅዳል።"</string>
     <string name="app_name" msgid="5815426892327290362">"ኢሜይል"</string>
     <string name="compose_title" msgid="427986915662706899">"ፅሁፍ አዘጋጅ"</string>
     <string name="debug_title" msgid="5175710493691536719">"አርም"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"ተከናውኗል"</string>
     <string name="create_action" msgid="3062715563215392251">"አዲስ ፍጠር"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"ሰርዝ"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"ምንም ፈጣን ምላሾች የሉም"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"ምንም ፈጣን ምላሾች የሉም።"</string>
     <string name="discard_action" msgid="6532206074859505968">"አስወግድ"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"ረቂቅ አስቀምጥ"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"ፈጣን ምላሽ አስገባ"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">" ፈልግ"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"መለያ ቅንብሮች"</string>
     <string name="settings_action" msgid="6334807007967459412">"ቅንብሮች"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"አሳምር አማራጮች"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"የማመሳሰል አማራጮች"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"እንዳልተነበበ ምልክት አድርግ"</string>
     <string name="move_action" msgid="3059189775933985898">"አንቀሳቅስ"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ካርቦን ቅጂ/ስውር ቅጂ"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g>ፃፈ፡"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"የተጠቀሰ ጽሁፍ አካትት"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"ፅሁፍ አካት"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"ቢያንስ አንድ ተቀባይ ማከል አለብዎ።"</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"እባክህን ቢያንስ አንድ ተቀባይ አክል።"</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"አንዳንድ ኢሜይል አድራሻዎች ትክክል አይደሉም።"</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"የፋይል መጠንለማያያዝ በጣም ትልቅ ነው።"</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"ፈጣን ምላሽ አስገባ"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"ተቀምጧል"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"ቁም"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"አባሪ እንደ <xliff:g id="FILENAME">%s</xliff:g> ተቀምጧል።"</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"ዓባሪውን ማስቀመጥ አልተቻለም::"</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"ማስታወሻ፡ በሚተላለፈው መልዕክትዎ ውስጥ አንድ ወይም ተጨማሪ አባሪዎች ከመላኩ አስቀድሞ ይወርዳሉ።"</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"ዓባሪውን ማስቀመጥ አልተቻለም።"</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"በሚተላለፈው መልዕክትህ ውስጥ አንድ ወይም ተጨማሪ አባሪዎች ከመላኩ አስቀድሞ ይወርዳሉ።"</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"መልዕክት"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"ጋብዝ"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"አንድ ወይም ከዛ በላይ ዓባሪዎችን ለማስተላለፍ አልተቻለም::"</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"አባሪ አልተላለፈም"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> በመለያ መግባት ተሰናክሏል::"</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> በመለያ መግባት አልተሳካም።"</string>
     <string name="login_failed_title" msgid="7624349996212476176">"በመለያ መግባት አልተቻለም፡፡"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"የድሮ"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"መለያ አዘጋጅ"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"ተለዋጭ መለያ አክል"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Exchange ActiveSync መለያ አክል"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"የኢሜይል መለያ"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"በጥቂት እርምጃ ለአብዛኛው መለያዎች ኢሜይል ማዋቀር ትችላለህ።"</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"በጥቂት እርምጃ የልውውጥ መለያ ማዘጋጀት ትችላለህ።"</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"በጥቂት እርምጃዎች Exchange ActiveSync መለያ ማዘጋጀት ትችላለህ።"</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"መለያህን በጥቂት ደረጃዎች ብቻ ማዋቀር ትችላለህ።"</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"ኢሜይል አድራሻ"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"የይለፍ ቃል፡"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"ከዚህ መለያ በነባሪኢሜይል ላክ"</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"ከዚህ መለያ በነባሪ ኢሜይል ላክ"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"በእጅ አዘጋጅ"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"እባክህ ትክክለኛ ኢሜይል አድራሻ እና ይለፍ ቃል ፃፍ።"</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"ተመሳሳይ መለያ"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"የገቢ አገልጋይ ቅንብሮች በመመልከት ላይ...."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"የወጪ አገልጋይ ቅንብሮች በመመልከት ላይ...."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"መለያ አዘጋጅ"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"መለያዎ ዝግጁ ነው፣ኢሜይልዎ መንገድ ላይ ነው!"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"መለያህ ተዋቅሯል፣ ኢሜይልህም መንገድ ላይ ነው!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"ለዚሀመለያ ስም ስጥ(አማራጭ)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"ስምዎ(በወጪ መልዕክቶች ላይ አሳይቷል)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"ይህ መስክ ባዶ መሆን አይችልም።"</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"የገቢ አገልጋይ ቅንብሮች"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"የተጠቃሚ ስም"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"የይለፍ ቃል"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"የPOP3 አገልጋይ"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"የIMAP አገልጋይ"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"አገልጋይ"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"ወደብ"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"የደህንነትአይነት"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"አንዱም"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"የSMTP አገልጋይ"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"ወደብ"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"የደህንነትአይነት"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"ግባ ይጠበቃል።"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"ከፍቶ መግባት ይፈልጋል"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"የተጠቃሚ ስም"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"የይለፍ ቃል"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"መለያ አዘጋጅ"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"በየ15 ደቂቃዎቹ"</string>
     <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_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>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"ከዚህ መለያ በነባሪ ኢሜይል ላክ"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"ኢሜይል ሲደርስ አሳውቀኝ"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"ከዚህ መለያ ዕውቂያዎች አመሳስል"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"ከዚህ መለያ የቀን አቆጣጠር አመሳስል"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"ከዚህ መለያ ኢሜይል አመሳስል"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"ወደ Wi-Fi ስትገናኝ አባሪዎችን በራስ ሰር አውርድ"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"ማጠናቀቅ አልተቻለም"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"ቀኖች አሳምር"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"አንድ ወር"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"ሁሉም"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"የመለያ ነባሪ ተጠቀም"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"ተጠቃሚ ስም ወይም ይለፍ ቃል ተሳስቷል።"</string>
-    <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_auth_message" msgid="426627755590431364">"ተጠቃሚ ስም ወይም ይለፍ ቃል የተሳሳተ ነው።"</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"የተጠቃሚው ስም ወይም ይለፍ ቃል የተሳሳተ ነው። "\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"ወደ አገልጋዩ በሰላም ማገናኘት አልተቻለም።"</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"ወደ አገልጋዩ በሰላም ማገናኘት አልተቻለም።"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"የደንበኛ የዕውቅና ማረጋገጫ ይጠበቃል። ከደንበኛ የዕውቅና ማረጋገጫ ጋር ወደ አገልጋይ ይገናኝ?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"የዕውቅና ማረጋገጫው ልክ ያልሆነ  ወይም ተደራሽ ያልሆነ ነው::"</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"አገልጋዩ ከክስተት ጋር መልሷል፤ እባክህ የተጠቃሚ ስምህን እና የይለፍ ቃልህን ተመልከት እና እንደገና ሞክር።"</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"የተገልጋይ ሰርቲፊኬት ያስፈልጋል። በተገልጋይ ሰርቲፊኬት ወደ አገልጋይ መገናኘት ትፈልጋለህ?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"የዕውቅና ማረጋገጫው ልክ ያልሆነ  ወይም ተደራሽ ያልሆነ ነው።"</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"አገልጋዩ ከስህተት ጋር መልሷል፤ የተጠቃሚ ስምህን እና የይለፍ ቃልህን ተመልከት እና እንደገና ሞክር።"</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"ወደ አገልጋይ መገናኘት አይቻልም።"</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"ወደ አገልጋዩ ማገናኘት አይችልም።"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS ይጠየቃል ነገር ግን በአገልጋይ አይደገፍም።"</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"ማስጠንቀቂያ፣ መሣሪያህን ለማስተዳደር የኢሜይል ትግበራዎችን ኃላፊነት ማቦዘን የሚጠይቁትን ሁሉ የኢሜይል መለያዎች ከኢሜይል፣ ዕውቂያዎች፣ ቀን መቁጠሪያ ክስተቶች፣ እና ሌላ ውሂብ ጋር አብሮ ይሰርዛል።"</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"ደህንነት ዝማኔ"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> የደህንነት ቅንጅቶችህን ማዘመን ይጠይቅሃል።"</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"መለያ \"<xliff:g id="ACCOUNT">%s</xliff:g> \" የደህንነት ቅንብሮችን ማዘመን ይጠይቃል።"</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"የደህንነት አዘምን ይጠበቃል"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"በደህንነት ጥያቄዎች ምክንያት መለያ «<xliff:g id="ACCOUNT">%s</xliff:g>» ሊመሳሰል አልቻለም።"</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"መለያ \"<xliff:g id="ACCOUNT">%s</xliff:g>\" የደህንነት ቅንብሮችን ማዘመን ይጠይቃል።"</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"መለያ<xliff:g id="ACCOUNT">%s</xliff:g> የደህንነት ቅንብሮቹን ለውጧል፤ምንም የተጠቃሚ እርምጃ አይጠበቅም፡፡"</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"የደህንነት አዘምን ይጠበቃል"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"የደህንነት ቋሚ መመሪያዎች ተለውጠዎል"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"የደህንነት ቋሚ መመሪያዎች ሊሟሉ አይችሉም"</string>
     <string name="account_security_title" msgid="3511543138560418587">"የመሣሪያ ደህንነት"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"<xliff:g id="SERVER">%s</xliff:g> አገልጋይየAndroid  መሣሪያዎ አንዳንድገፅታዎች በርቀት ለመቆጣጠር እንዲፈቅዱ ይጠይቃል። ይህን መለያ ጨርሰው ለማቀናበር ይፈልጋሉ?"</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"ዝርዝሮችን አርትዕ"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"የእርስዎ የማያመቆለፊያ PIN ወይም ይለፍ ቃል ጊዜው አልፏል።"</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"የማያ ቆልፍ ይለፍ ቃል ጊዜው አልፏል"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"የማያ ቆልፍ ይለፍ ቃል ጊዜው እያለፈነው"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"የማያ መቆለፊያዎንPIN ወይም ይለፍቃል በቅርቡ መለወጥ አለብዎ፣ ወይም የ <xliff:g id="ACCOUNT">%s</xliff:g> ውሂብ ይሰረዛል። አሁን ይለወጥ?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"በቅርቡ የማሳያህ ቆልፍ ፒን ወይም የይለፍ ቃል መለወጥ ያስፈልግሃል፤ አለበለዚያ የ<xliff:g id="ACCOUNT">%s</xliff:g>  ውሂብ ይሰረዛል። አሁን እንዲለወጥ ትፈልጋለህ?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"የማያ ቆልፍ ይለፍ ቃል ጊዜው አልፏል"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"የ<xliff:g id="ACCOUNT">%s</xliff:g> ውሂብ ከመሣሪያዎ ላይ ተሰርዟል።የማያ መቆለፊያ PIN ወይም ይለፍቃል በመለወጥ እነበረበት መመለስ ይችላሉ። አሁን ይለወጥ?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"የ<xliff:g id="ACCOUNT">%s</xliff:g> ውሂብ ከመሳሪያህ ላይ እየተሰረዘ ነው። የማያ መቆለፊያ PIN ወይም ይለፍ ቃል በመለወጥ እነበረበት መመለስ ትችላለህ። አሁን መለወጥ ትፈልጋለህ?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"ያልተቀመጠ ለውጦችን ይወገዱ?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"በመለያ መግባት አልተቻለም፡፡"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">" የ<xliff:g id="ACCOUNT">%s</xliff:g> ተጠቃሚ ስም ወይም ይለፍቃል የተሳሳተ ነው። አሁን ይዘምኑ?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"የ<xliff:g id="ACCOUNT">%s</xliff:g> የተጠቃሚው ስም ወይም ይለፍ ቃል የተሳሳተ ነው። አሁን ልታዘምናቸው ትፈልጋለህ?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"ነባሪ መለያ"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"ከዚህ መለያ በነባሪኢሜይል ላክ"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"አባሪዎችን አውርድ"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"ራስሰር-አውርድ አባሪዎች ወደ በቅርብ ጊዜ በWi-Fi የተላኩ መልዕክቶች"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"የኢሜይል ማሳወቂያ"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"ድግግሞሽ፣ ማሳወቂያዎች፣ ወዘተ አሳምር።"</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"ኢሜይል ሲደርስ በሁኔታ አሞሌ ውስጥ አሳውቅ"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"ኢሜይል ሲመጣ ማሳወቂያ አሳይ"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"የገቢ መልዕክት ምልከታ ድግግሞሽ"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"የገቢ ቅንብሮች"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"የተጠቃሚ ስም፣ ይለፍቃል፣ እና ሌላ የገቢ አገልጋይ ቅንብሮች"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"የወጪ  ቅንብሮች"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"የተጠቃሚ ስም፣ ይለፍቃል፣ እና ሌላ የወጪ አገልጋይ ቅንብሮች"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"ቋሚ መመሪያዎችን አስገድድ"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"ምንም"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"ያልተደገፉ ቋሚ መመሪያዎች"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"ምንም"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"ማመሳሰል ሞክር"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"ይህን መለያ ለማመሳሰል እዚጋ ንካ"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"የመለያ ስም"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"ስምዎ"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"ፊርማ"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"ፈጣን ምላሾች"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"ኢሜይል ሲያቀናብሩ በተደጋጋሚ የሚያስገቡትን ፅሁፍ አርትዕ ያድርጉ"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"ኢሜይል ስትጽፍ በተደጋጋሚ የምታስገባውን ፅሁፍ አርትዕ አድርግ"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"ወደ ሚልኩት መለልዕክቶች ፅሁፍ  ይጨምሩ"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"የማሳወቂያ ቅንብሮች"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"የውሂብ አጠቃቀም"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"የደህንነት ቋሚ መመሪያዎች"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"ፈጣን ምላሽ አርትዕ"</string>
     <string name="save_action" msgid="1988862706623227093">"አስቀምጥ"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"ዕውቂያዎች አሳምር"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"ለዚህ መለያ እውቂያዎች አሳምር"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"የቀን አቆጣጠር አሳምር"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"ለዚህ መለያ የቀን አቆጣጠር አሳምር"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"የቀን አቆጣጠር አሳምር"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"ለዚህ መለያ የቀን መቁጠሪያ ክስተት አመሳስል"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"ኢሜይል አመሳስል"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"ለዚህ መለያ ኢሜይል አሳምር"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"ንዘር"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g>ውጤቶች ከ<xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"ቅንብሮች"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"አጠቃላይ"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"ጠቅላላ ቅንብሮች"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"መተግበሪያ"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"ራስ- ላቅ"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"መልዕክት ከሰረዝክ በኋላ በየትኛው ማያ ለማሳየት እንደምትፈልግ ምረጥ።"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"ኣመልካች ሳጥኖች ደብቅ"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"በመልዕክቶች ዝርዝሮች ውስጥ ለመምረጥ ንካና ያዝ"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"ከመሰረዝህ በፊት አረጋግጥ"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"መልእክቶች"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"ከመላክህ በፊት አረጋግጥ"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"መልእክቶች"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"ለ የላቀ"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"በጣም አዲስ መልዕክት"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"በጣም የድሮ መልዕክት"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"ውጤቶችን በመጠበቅ ላይ"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"አንዳንድ አገልጋዮች ረጅም ጊዜ ሊወስዱ ይችላሉ።"</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"አቃፊዎች"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"የመሳሪያውን ካሜራ መጠቀምን አትፍቀድ"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"የመሳሪያ የይለፍ ቃል ጠይቅ"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"የቅርብ የይለፍ ቃሎችን ዳግመኛ መጠቀምን ከልክል"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"የይለፍ ቃሎች ጊዜያቸው እንዲያልፍባቸው ይፈልጋል"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"ስራ የፈታን መሳሪያ  ማሳያውን እንዲቆልፍ ይጠብቃል"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"የሚመሳሰሉ የቀን መቁጠሪያ ክስተቶችን ቁጥር ወሰን አድርግ"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"የሚመሳሰሉ ኢሜይሎችን ቁጥር ወሰን አድርግ"</string>
+    <string name="quick_1" msgid="3426057697353380951">"እናመሰግናለን!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"ለኔ ጥሩ ይመስላል!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"በኋላ ይሄንን አነባለው እና ወደ አንተ እመለሳለሁ፡፡"</string>
+    <string name="quick_4" msgid="3988974084396883051">"ስብሰባ እናዘጋጅ እስቲ ይሄንን ለመወያየት፡፡"</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"ውጫዊ አገልግሎት በማድረግ ጊዜ የዳራ ማመሳሰል ለዚህ መለያ ቦዝኗል፡፡"</string>
+    <string name="confirm_response" msgid="5747902757569543165">"ምላሽ በመላክ ላይ..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"መልዕክቶች የሉም።"</string>
 </resources>
diff --git a/res/values-am/uploader.xml b/res/values-am/uploader.xml
index 5a0c08e..6ec5625 100644
--- a/res/values-am/uploader.xml
+++ b/res/values-am/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"ዝርዝሮች ደብቅ"</string>
     <string name="menu_settings" msgid="5088116127086866634">"ቅንብሮች"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"%s ተሰቅሏል"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"መለያ"</string>
     <string name="upload" msgid="2615541458361216022">"ስቀል"</string>
     <string name="ok" msgid="2516349681897895312">"እሺ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 896f6ab..8dbb6e8 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"قراءة مرفقات البريد الإلكتروني"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"للسماح لهذا التطبيق بقراءة مرفقات البريد الإلكتروني."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"للسماح للتطبيق بقراءة مرفقات البريد الإلكتروني."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"الدخول إلى بيانات موفر البريد الإلكتروني"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"للسماح للتطبيق بالدخول إلى قاعدة بيانات بريدك الإلكتروني، بما في ذلك الرسائل المتلقاة والرسائل المرسلة وأسماء المستخدمين وكلمات المرور."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"للسماح للتطبيق بالدخول إلى قاعدة بيانات بريدك الإلكتروني، بما في ذلك الرسائل المستلمة والرسائل المرسلة وأسماء المستخدمين وكلمات المرور."</string>
     <string name="app_name" msgid="5815426892327290362">"بريد"</string>
     <string name="compose_title" msgid="427986915662706899">"إنشاء"</string>
     <string name="debug_title" msgid="5175710493691536719">"تصحيح الأخطاء"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"تم"</string>
     <string name="create_action" msgid="3062715563215392251">"إنشاء رد جديد"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"حذف"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"ليست هناك ردود سريعة"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"ليست هناك ردود سريعة."</string>
     <string name="discard_action" msgid="6532206074859505968">"إلغاء"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"حفظ المسودة"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"إدراج رد سريع"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"بحث"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"إعدادات الحساب"</string>
     <string name="settings_action" msgid="6334807007967459412">"الإعدادات"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"خيارات المزامنة"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"خيارات المزامنة"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"تعليمها بـ \"غير مقروءة\""</string>
     <string name="move_action" msgid="3059189775933985898">"نقل"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+نسخة إلى/ مخفية"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> كتَب:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"إدراج النص المقتبس"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"تضمين نص"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"يلزم إضافة مستلم واحد على الأقل."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"أضف مستلمًا واحدًا على الأقل."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"بعض عناوين البريد الإلكتروني غير صالحة"</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"الملف كبير جدًا بحيث لا يمكن إرفاقه."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"إدراج رد سريع"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"تم الحفظ"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"إيقاف"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"تم حفظ المرفق باسم <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"تعذر حفظ المرفق."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"ملاحظة: هناك واحد أو أكثر من المرفقات في الرسالة المعاد توجيهها سيتم تنزيله قبل الإرسال."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"تعذر حفظ المرفق."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"سيتم تنزيل مرفق أو أكثر في الرسالة التي تمت إعادة توجيهها قبل الإرسال."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"الرسالة"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"دعوة"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"تتعذر إعادة توجيه واحد أو أكثر من المرفقات."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"لم تتم إعادة توجيه المرفق"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"أخفق تسجيل الدخول إلى <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"لم يتم تسجيل <xliff:g id="ACCOUNT_NAME">%s</xliff:g> بنجاح."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"تعذر تسجيل الدخول"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> بايت"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"أقدم"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"إعداد الحساب"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"إضافة حساب Exchange"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"إضافة حساب Exchange ActiveSync"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"حساب بريد إلكتروني"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"يمكنك إعداد البريد الإلكتروني لمعظم الحسابات من خلال اتباع خطوات قليلة."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"يمكنك إعداد حساب Exchange من خلال اتباع خطوات قليلة."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"يمكنك إعداد حساب Exchange ActiveSync من خلال اتباع خطوات قليلة."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"يمكنك إعداد حسابك من خلال اتباع خطوات قليلة."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"عنوان البريد الإلكتروني"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"كلمة المرور"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"إرسال الرسائل الإلكترونية من هذا الحساب افتراضيًا."</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"إرسال البريد الإلكتروني من هذا الحساب افتراضيًا"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"إعداد يدوي"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"اكتب عنوان بريد إلكتروني وكلمة مرور صالحين."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"حساب متكرر"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"جارٍ فحص إعدادات خادم البريد الوارد…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"جارٍ فحص إعدادات خادم البريد الصادر…"</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"إعداد الحساب"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"تمّ إعداد حسابك، وستصلك رسالة إلكترونية قريبًا!"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"تمّ إعداد حسابك، وستصلك رسالة إلكترونية بعد قليل."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"تسمية هذا الحساب (اختياري)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"الاسم (يظهر في الرسائل الصادرة)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"لا يمكن أن يكون هذا الحقل فارغًا."</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"إعدادات خادم البريد الوارد"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"اسم المستخدم"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"كلمة المرور"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"خادم POP3"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"خادم IMAP"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"الخادم"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"المنفذ"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"نوع الأمان"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"لا شيء"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"خادم SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"المنفذ"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"نوع الأمان"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"يلزم تسجيل الدخول."</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"طلب تسجيل الدخول"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"اسم المستخدم"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"كلمة المرور"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"إعداد الحساب"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"كل 15 دقيقة"</string>
     <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_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>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"إرسال البريد الإلكتروني من هذا الحساب افتراضيًا"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"تنبيهي عند استلام رسالة إلكترونية"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"مزامنة جهات الاتصال من هذا الحساب"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"مزامنة التقويم من هذا الحساب"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"مزامنة البريد الإلكتروني من هذا الحساب"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"تنزيل المرفقات تلقائيًا عند الاتصال بشبكة Wi-Fi"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"تعذر الإنهاء"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"الأيام المطلوب مزامنتها"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"شهر واحد"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"الكل"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"استخدام الإعدادات الافتراضية للحساب"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"اسم المستخدم أو كلمة المرور غير صحيحة."</string>
-    <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_auth_message" msgid="426627755590431364">"اسم المستخدم غير صحيح أو كلمة مرور غير صحيحة."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"اسم المستخدم غير صحيح أو كلمة المرور غير صحيحة."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"لا يمكن الاتصال بالخادم بأمان."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"لا يمكن الاتصال بالخادم بأمان."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"شهادة العميل مطلوبة. هل تريد الاتصال بالخادم باستخدام شهادة العميل؟"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"الشهادة غير صالحة أو لا يمكن الدخول إليها."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"لقد استجاب الخادم بخطأ. تحقق من اسم المستخدم وكلمة المرور ثم أعد المحاولة."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"يستلزم الأمر شهادة عميل. هل تريد الاتصال بالخادم باستخدام شهادة عميل؟"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"الشهادة غير صالحة أو يتعذر الدخول إليها."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"لقد استجاب الخادم بخطأ. تحقق من اسم المستخدم وكلمة المرور ثم أعد المحاولة."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"لا يمكن الاتصال بالخادم."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"لا يمكن الاتصال بالخادم."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"يلزم وجود TLS لكن لا يتيح الخادم استخدامه."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"تحذير: سيؤدي إلغاء تنشيط صلاحية تطبيق البريد الإلكتروني لإدارة الجهاز إلى حذف جميع حسابات البريد الإلكتروني التي تتطلب الصلاحية، وأيضًا حذف البريد الإلكتروني وجهات الاتصال وأحداث التقويم وغيرها من البيانات."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"تحديث أمني"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"يتطلب \"<xliff:g id="ACCOUNT">%s</xliff:g>\" تحديث إعدادات الأمان."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"يتطلب الحساب \"<xliff:g id="ACCOUNT">%s</xliff:g>\" تحديث إعدادات الأمان."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"تحديث الأمان مطلوب"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"تتعذر مزامنة الحساب \"<xliff:g id="ACCOUNT">%s</xliff:g>\" بسبب متطلبات الأمان."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"يتطلب الحساب \"<xliff:g id="ACCOUNT">%s</xliff:g>\" تحديث إعدادات الأمان."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"غير الحساب \"<xliff:g id="ACCOUNT">%s</xliff:g>\" إعدادات الأمان له؛ ولا يلزم اتخاذ أي إجراء من قبل المستخدم."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"يلزم تحديث الأمان"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"لقد تغيرت سياسات الأمان"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"لا يمكن تلبية سياسات الأمان"</string>
     <string name="account_security_title" msgid="3511543138560418587">"أمان الجهاز"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"يتطلب الخادم <xliff:g id="SERVER">%s</xliff:g> أن تسمح له بالتحكم في بعض ميزات الأمان في جهاز Android عن بعد."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"تعديل التفاصيل"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"لقد انتهت صلاحية رقم التعريف الشخصي (PIN) أو كلمة مرور لتأمين الشاشة."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"انتهت كلمة مرور تأمين الشاشة"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"ستنتهي صلاحية كلمة مرور تأمين الشاشة"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"يجب تغيير رقم التعريف الشخصي (PIN) أو كلمة المرور الخاصة بتأمين الشاشة قريبًا، أو سيتم محو بيانات <xliff:g id="ACCOUNT">%s</xliff:g>. هل تريد التغيير الآن؟"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"يلزمك تغيير رقم التعريف الشخصي لشاشة التأمين أو كلمة المرور قريبًا، وإلا فسيتم محو بيانات <xliff:g id="ACCOUNT">%s</xliff:g>. هل تريد تغييره الآن؟"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"انتهت كلمة مرور تأمين الشاشة"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"يتم حاليًا محو بيانات <xliff:g id="ACCOUNT">%s</xliff:g> من جهازك. ويمكنك استعادتها من خلال تغيير رقم التعريف الشخصي (PIN) أو كلمة مرور الخاصة بتأمين الشاشة. هل تريد التغيير الآن؟"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"تتم الآن إزالة بيانات <xliff:g id="ACCOUNT">%s</xliff:g> من جهازك. يمكنك استعادتها من خلال تغيير رقم التعريف الشخصي لشاشة التأمين أو كلمة المرور. هل تريد تغييره الآن؟"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"أتريد إلغاء أي تغييرات غير محفوظة؟"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"تعذر تسجيل الدخول"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"اسم المستخدم أو كلمة مرور <xliff:g id="ACCOUNT">%s</xliff:g> غير صحيحة. هل تريد التحديث الآن؟"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"اسم المستخدم أو كلمة المرور للحساب <xliff:g id="ACCOUNT">%s</xliff:g> غير صحيح؟. هل تريد تحديثهما الآن؟"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"الحساب الافتراضي"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"إرسال البريد الإلكتروني من هذا الحساب افتراضيًا"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"تنزيل المرفقات"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"تنزيل مرفقات الرسائل الأخيرة تلقائيًا عبر WiFi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"إشعارات البريد إلكتروني"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"معدل المزامنة والتنبيهات وما إلى ذلك"</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"التنبيه في شريط النظام عند استلام رسالة إلكترونية"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"إرسال إشعار عند وصول بريد إلكتروني"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"معدل الإطلاع على البريد الوارد"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"إعدادات البريد الوارد"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"اسم المستخدم وكلمة المرور وإعدادات خادم الوارد الأخرى"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"إعدادات البريد الصادر"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"اسم المستخدم وكلمة المرور وإعدادات خادم الصادر الأخرى"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"السياسات المطبقة"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"بلا"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"سياسات غير معتمدة"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"بلا"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"محاولة المزامنة"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"المس هنا لمزامنة الحساب"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"اسم الحساب"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"الاسم"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"التوقيع"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"الردود السريعة"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"تعديل النص الذي تدرجه بشكل متكرر عند إنشاء رسائل إلكترونية"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"تعديل النص الذي تدرجه بشكل متكرر عند إنشاء رسالة إلكترونية"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"إلحاق نص بالرسائل التي يتم إرسالها"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"إعدادات التنبيه"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"استخدام البيانات"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"سياسات الأمان"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"تعديل رد سريع"</string>
     <string name="save_action" msgid="1988862706623227093">"حفظ"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"مزامنة جهات الاتصال"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"مزامنة جهات الاتصال لهذا الحساب"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"مزامنة التقويم"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"مزامنة التقويم لهذا الحساب"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"مزامنة التقويم"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"مزامنة حدث التقويم لهذا الحساب"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"مزامنة البريد الإلكتروني"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"مزامنة البريد الإلكتروني لهذا الحساب"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"اهتزاز"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> من النتائج من <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"الإعدادات"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"عامة"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"الإعدادات العامة"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"التطبيق"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"التقدم التلقائي"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"اختيار الشاشة التي تظهر بعد حذف رسالة"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"إخفاء مربعات الاختيار"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"في قوائم الرسائل، المس مع الاستمرار للتحديد"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"تأكيد قبل الحذف"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"الرسائل"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"تأكيد قبل الإرسال"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"الرسائل"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"التوجه إلى"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"رسالة أحدث"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"رسائل أقدم"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"في انتظار النتائج"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"قد يستغرق بعض الخوادم وقتًا طويلاً."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"المجلدات"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"عدم السماح لاستخدام كاميرا الجهاز"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"يلزم كلمة مرور الجهاز"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"تقييد إعادة استخدام كلمات المرور الأخيرة"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"يلزم انتهاء صلاحية كلمات المرور"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"يلزم جهاز بوضع الخمول لتأمين شاشته"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"تقييد عدد أحداث التقويم المتزامنة"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"تقييد عدد الرسائل الإلكترونية المتزامنة"</string>
+    <string name="quick_1" msgid="3426057697353380951">"شكرًا!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"يبدو جيدًا بالنسبة إليّ!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"سأقرأ هذا لاحقًا، وسأرد عليك."</string>
+    <string name="quick_4" msgid="3988974084396883051">"دعونا نعد اجتماعًا لمناقشة هذا الأمر."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"تم تعطيل المزامنة في الخلفية لهذا الحساب أثناء التجوال."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"جارٍ إرسال الرد..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"ليست هناك أية رسائل."</string>
 </resources>
diff --git a/res/values-ar/uploader.xml b/res/values-ar/uploader.xml
index dae9b4c..dd150b1 100644
--- a/res/values-ar/uploader.xml
+++ b/res/values-ar/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"إخفاء التفاصيل"</string>
     <string name="menu_settings" msgid="5088116127086866634">"الإعدادات"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"تم تحميل %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"الحساب"</string>
     <string name="upload" msgid="2615541458361216022">"تحميل"</string>
     <string name="ok" msgid="2516349681897895312">"موافق"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 14a8c4e..82f3960 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"Чытаць далучаныя файлы ў электроннай пошце"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Дазваляе прыкладанням чытаць далучаныя файлы ў вашай электроннай пошце."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Дазваляе прыкладанням чытаць вашыя далучэнні да электронных лістоў."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Доступ да дадзеных пастаўшчыка паслуг электроннай пошты"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Дазваляе гэтаму прыкладанню атрымліваць доступ да базы дадзеных вашай электроннай пошты, у тым ліку да атрыманых і адпраўленых паведамленняў, імёнаў карыстальнікаў і пароляў."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Дазваляе прыкладанням атрымліваць доступ да базы дадзеных вашай электроннай пошты, у тым ліку да атрыманых і адпраўленых паведамленняў, імёнаў карыстальнікаў і пароляў."</string>
     <string name="app_name" msgid="5815426892327290362">"Электронная пошта"</string>
     <string name="compose_title" msgid="427986915662706899">"Напісаць"</string>
     <string name="debug_title" msgid="5175710493691536719">"Адладка"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"Зроблена"</string>
     <string name="create_action" msgid="3062715563215392251">"Стварыць"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"Выдаліць"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"Няма хуткіх адказаў"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Хуткіх адказаў няма."</string>
     <string name="discard_action" msgid="6532206074859505968">"Адхіліць"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"Захаваць праект"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Уставіць хуткі адказ"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"Пошук"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Налады ўліковага запісу"</string>
     <string name="settings_action" msgid="6334807007967459412">"Налады"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"Параметры сінхранізацыі"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Параметры сінхранізацыі"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Пазначыць як непрачытанае"</string>
     <string name="move_action" msgid="3059189775933985898">"Перанесці"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ Копія/УК"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"Карыстальнiк <xliff:g id="SENDER">%s</xliff:g> пісаў: "\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Уключыць цытаваны тэкст"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Уключыць тэкст"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Неабходна дадаць хаця б аднаго атрымальніка."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"Дадайце хаця б аднаго атрымальнiка."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Некаторыя адрасы электроннай пошты несапраўдныя."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Файл занадта вялікі для далучэння."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Уставіць хуткі адказ"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Захавана"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Спыніць"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Укладанне захаванае як <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Немагчыма захаваць далучаны файл."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Нататка. Адно або некалькі ўкладанняў у перанапраўленным паведамленні будуць загружаныя перад адпраўкай."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"Немагчыма захаваць далучэнне."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Адзін або некалькі далучаных файлаў у пераадрасаваным паведамленні будуць перад адпраўкай спампаваны."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Паведамленне"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Запрасіць"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Не атрымалася перанакiраваць адзін або некалькі далучаных файлаў."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Далуч. файлы не перасылаюцца"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"Не атрымалася ўвайсцi ва ўлiковы запiс <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"Няўдалы ўваход з уліковага запісу <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"Не атрымалася ўвайсці"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> Б"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Старэйшы"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" ... "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Усталяванне ўліковага запісу"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Дадаць уліковы запіс Exchange"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Дадаць уліковы запіс Exchange ActiveSync"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"Уліковы запіс электроннай пошты"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"Вы можаце наладзіць электронную пошту для вялiкай колькасцi ўлiковых запiсаў усяго за некалькі крокаў."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Вы можаце наладзіць улiковы запiс Exchange ўсяго за некалькі крокаў."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Вы можаце наладзіць уліковы запіс Exchange ActiveSync усяго за некалькі крокаў."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Вы можаце зарэгістраваць свой уліковы запіс усяго за некалькі крокаў."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Адрас электроннай пошты"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Пароль"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Адпраўляць пошту з гэтага уліковага запісу па змаўчанні."</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"Адпраўляць пошту з гэтага ўліковага запісу па змаўчанні"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Самастойнае ўсталяванне"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Увядзіце правільны адрас электроннай пошты і пароль."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Дублікат уліковага запісу"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Праверка ўваходных налад сервера..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Праверка выходных налад сервера..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Усталяванне ўліковага запісу"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"Ваш уліковы запіс створаны, электронная пошта адпраўленая"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"Уліковы запіс створаны, электронная пошта адпраўляецца."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Дайце гэтаму ўліковаму запісу назву (не абавязкова)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Вашае імя (адлюстроўваецца на выходных паведамленнях)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Гэта поле не можа быць пустым"</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Уваходныя параметры сервера"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Імя карыстальніка"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Пароль"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3-сервер"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"Сервер IMAP"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Сервер"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Порт"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Тып бяспекі"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Няма"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Сервер SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Порт"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Тып бяспекі"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Патрабаваць ўваход ў сістэму."</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Патрабаваць уваход"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Імя карыстальніка"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Пароль"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"Усталяванне ўліковага запісу"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Кожныя 15 хвілін"</string>
     <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_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>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"Адпраўляць пошту з гэтага ўліковага запісу па змаўчанні"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Паведамляць мне аб атрыманні электроннай пошты"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Сінхранізаваць кантакты з гэтага ўліковага запісу"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Сінхранізаваць каляндар з гэтага ўліковага запісу"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Сінхранізаваць электронную пошту з гэтага ўліковага запісу"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Аўтаматычна спампоўваць далучаныя файлы пры падключэнні да Wi-Fi"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Не атрымалася скончыць"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Дні для сінхранізацыі"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Адзін месяц"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Усе"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Выкарыстоўваць параметры ўліковага запісу па змаўчанню"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Няправільнае імя карыстальніка ці пароль."</string>
-    <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_auth_message" msgid="426627755590431364">"Няправiльны пароль цi iмя карыстальнiка."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"Імя карыстальніка ці пароль няправільныя."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Не атрымлiваецца ўсталяваць бяспечнае злучэнне з серверам."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Не атрымліваецца ўсталяваць бяспечнае злучэнне з серверам."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"Патрабуецца сертыфікат кліента. Падключыцца да сервера з сертыфікатам кліента?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"Сертыфікат несапраўдны або недаступны."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"Сервер адказаў з памылкай; праверце свае імя карыстальніка і пароль і паспрабуйце яшчэ раз."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"Патрабуецца сертыфікат кліента. Жадаеце падключыцца да сервера з сертыфікатам кліента?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"Несапраўдны або недаступны сертыфікат."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"Адказ сервера змяшчае памылку. Праверце сваe імя карыстальніка і пароль, а потым паспрабуйце яшчэ раз."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"Немагчыма падключыцца да сервера."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Не атрымлiваецца падлучыцца да сервера."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS патрабуецца, але не падтрымліваецца серверам."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"УВАГА! Адключэнне кіравання прыкладаннем электроннай пошты, прызначаным для адміністравання вашай прылады, прывядзе да выдалення ўсiх уліковых запісаў электроннай пошты, якія яго патрабуюць, разам з электроннай поштай, кантактамі, мерапрыемствамi календара і іншымі дадзенымі."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Абнаўленне бяспекі"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"Патрэбна абнавіць налады бяспекі ўлiковага запiсу <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Уліковы запіс \"<xliff:g id="ACCOUNT">%s</xliff:g>\" патрабуе абнаўлення налад бяспекі."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"Абнавіце сістэму бяспекі"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Немагчыма сiнхранiзаваць улiковы запiс \"<xliff:g id="ACCOUNT">%s</xliff:g>\" з-за патрабаванняў бяспекі."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"Уліковы запіс \"<xliff:g id="ACCOUNT">%s</xliff:g>\" патрабуе абнаўлення налад бяспекі."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"Змянiлiся налады бяспекi для ўлiковага запiсу \"<xliff:g id="ACCOUNT">%s</xliff:g>\". Не патрабуюцца дзеяннi карыстальнiка."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Абнавіце сістэму бяспекі"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Правiлы бяспекі змяніліся"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Немагчыма выконваць правiлы бяспекі"</string>
     <string name="account_security_title" msgid="3511543138560418587">"Бяспека прылады"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Сервер <xliff:g id="SERVER">%s</xliff:g> патрабуе дазволу аддалена кіраваць некаторымі функцыямі бяспекі вашай прылады Android."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Рэдагаваць дэталі"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"Скончыўся тэрмін дзеяння вашага PIN-кода альбо пароля блакавання экрана."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"Скончылася дзеянне пароля блак. экрана"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Заканчваецца дзеянне пароля блак. экрана"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"Вы павінны змяніць свой ​​PIN-код альбо пароль блакавання экрана ў бліжэйшы час, у адваротным выпадку дадзеныя ўліковага запісу <xliff:g id="ACCOUNT">%s</xliff:g> будуць выдаленыя. Змяніць цяпер?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Вы павінны змяніць свой ​​PIN-код для блакiроўкi экрана або пароль у бліжэйшы час, iнакш дадзеныя для ўліковага запісу <xliff:g id="ACCOUNT">%s</xliff:g> будуць выдалены. Змяніць PIN-код зараз?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"Скончылася дзеянне пароля блак. экрана"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"Дадзеныя для ўліковага запісу <xliff:g id="ACCOUNT">%s</xliff:g> выдаляюцца з памяці прылады. Вы можаце аднавіць іх, змяніўшы ПІН-код альбо пароль блакавання экрана. Змяніць цяпер?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"Дадзеныя для ўліковага запісу <xliff:g id="ACCOUNT">%s</xliff:g> выдаляюцца з памяці прылады. Вы можаце аднавіць іх пры змене PIN-кода для блакiроўкi экрана або пароля. Змяніць яго цяпер?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Скасаваць незахаваныя змяненні?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Не атрымалася ўвайсці"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Імя карыстальніка і пароль для ўваходу ва ўліковы запіс <xliff:g id="ACCOUNT">%s</xliff:g> не сапраўдныя. Абнавіць іх цяпер?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"Імя карыстальніка і пароль для ўліковага запісу <xliff:g id="ACCOUNT">%s</xliff:g> няправільныя. Абнавіць іх зараз?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Уліковы запіс па змаўчанні"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Адпраўляць пошту з гэтага ўліковага запісу па змаўчанні"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Спампаваць далучэнні"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Аўтаматычнае спампаванне далучэнняў з апошніх паведамленняў праз Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Апавяшчэннi па электроннай пошце"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Сінхранізаваць частату, паведамленні і г. д."</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"Паведамляць аб атрыманні электроннага ліста ў сістэмным радку"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Дасылаць апавяшчэнне пры атрыманні электроннай пошты"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Частата праверкі ўваходных паведамленняў"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Уваходныя налады"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Імя карыстальніка, пароль і іншыя налады сервера ўвах. паведамл."</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Выходныя налады"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Імя карыстальніка, пароль і іншыя налады сервера вых. паведамл."</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Правiлы парушаны"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Няма"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Правiлы не падтрымліваюцца"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Няма"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"Спроба сінхранізацыі"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Націсніце тут, каб сінхранізаваць гэты ўліковы запіс"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Назва уліковага запісу:"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Вашае імя"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Подпіс"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Хуткія адказы"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Змяніць тэкст, які часта ўстаўляецца пры напiсанні паведамлення"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Змяніць тэкст, які часта ўстаўляецца пры напiсанні паведамлення"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Дадаць тэкст у паведамленні, што вы адпраўляеце"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Налады апавяшчэнняў"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Выкарыстанне дадзеных"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"Правiлы бяспекі"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Змяніць хуткі адказ"</string>
     <string name="save_action" msgid="1988862706623227093">"Захаваць"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Сінхранізаваць кантакты"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Сінх. кантактаў для гэтага ўл. зап."</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Сінхр. каляндар"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Сінх. каляндар для гэтага ўл. зап."</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Сінхранізаваць каляндар"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Сінхр.. мерапр. для гэтага ўл. зап."</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Сінхранізаваць электронную пошту"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Сінхранізацыя электроннай пошты для гэтага ўліковага запісу"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Вібрацыя"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"Вынікі (<xliff:g id="RESULTS">%1$d</xliff:g>) з дамену <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Налады"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"Агульныя"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Агульныя налады"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"Прыкладанне"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Аўтаматычна рухацца наперад"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Выберыце экран, якi будзе паказвацца пасля выдалення паведамлення"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Схаваць палі"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"Націсніце на паведамленне ў спісе i ўтрымлівайце яго, каб выбраць"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Пацвердзіць перад выдаленнем"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Паведамленні"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Пацвердзіць перад адпраўкай"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Паведамленні"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Пераход да"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Навейшае паведамленне"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Больш даўняе паведамленне"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"Чаканне вынікаў"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Некаторыя серверы могуць заняць працяглы час."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Папкі"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Забараніць выкарыстанне камеры прылады"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Патрабаваць пароль прылады"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"Абмежаваць паўторнае выкарыстанне апошніх пароляў"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"Запытаць заканчэнне дзеяння пароля"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"Патр. рэж. праст. прыл. для блак. экр."</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"Абмежаванне колькасці сінхр. мерапр. календара"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"Абмежаванне колькасці сінхр. паведамл. эл. пошты"</string>
+    <string name="quick_1" msgid="3426057697353380951">"Дзякуй!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"Гучыць нядрэнна!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"Я прачытаю гэта пазней i звяжуся з вамi."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Давайце прызначым сустрэчу, каб абмеркаваць гэта."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Фонавая сінхранізацыя для гэтага ўліковага запісу адключана ў роўмінгу."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"Адпраўка адказу..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"Паведамленняў няма."</string>
 </resources>
diff --git a/res/values-be/uploader.xml b/res/values-be/uploader.xml
index eef060d..f8aee8e 100644
--- a/res/values-be/uploader.xml
+++ b/res/values-be/uploader.xml
@@ -28,7 +28,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Схаваць падрабязнасці"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Налады"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Загружана %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Уліковы запіс"</string>
     <string name="upload" msgid="2615541458361216022">"Загрузіць"</string>
     <string name="ok" msgid="2516349681897895312">"ОК"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 682c96a..d9dca7a 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"Четене на прикачени файлове в имейла"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Разрешава на това приложение да чете прикачените файлове в имейла ви."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Разрешава на приложението да чете прикачените файлове в имейла ви."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Достъп до данни на доставчика на имейл"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Дава на това приложение достъп до базата от данни на имейла ви, включително получени и изпратени съобщения, потребителски имена и пароли."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Дава на приложението достъп до базата от данни на имейла ви, включително получени и изпратени съобщения, потребителски имена и пароли."</string>
     <string name="app_name" msgid="5815426892327290362">"Имейл"</string>
     <string name="compose_title" msgid="427986915662706899">"Ново съобщение"</string>
     <string name="debug_title" msgid="5175710493691536719">"Отстраняване на грешки"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"Готово"</string>
     <string name="create_action" msgid="3062715563215392251">"Създаване на нов"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"Изтриване"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"Няма бързи отговори"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Няма бързи отговори."</string>
     <string name="discard_action" msgid="6532206074859505968">"Отхвърляне"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"Запазване на чернова"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Вмъкване на бърз отговор"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"Търсене"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Настройки на профил"</string>
     <string name="settings_action" msgid="6334807007967459412">"Настройки"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"Опции за синхронизиране"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Опции за синхронизиране"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Непрочетено"</string>
     <string name="move_action" msgid="3059189775933985898">"Местене"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ Як/Ск"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> написа:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Включване на цитирания текст"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Включване на текста"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Трябва да добавите поне един получател."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"Добавете поне един получател."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Някои имейл адреси са невалидни."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Файлът е твърде голям за прикачване."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Вмъкване на бърз отговор"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Запазено"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Стоп"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Запазен прикачен файл: <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Прикач. файл не бе запазен."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Забележка: Един или повече прикачени файла в препратеното ви съобщение ще бъдат изтеглени преди изпращане."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"Прикач. файл не бе запазен."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Един или повече прикачени файла в препратеното ви съобщение ще бъдат изтеглени преди изпращане."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Съобщение"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Покана"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Един или повече прикачени файла не можаха да се препратят."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Прикаченото не бе препратено"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"Не влязохте: <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"Не успяхте да влезете в профила си <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"Не можах да вляза в профила си"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> Б"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"По-стари"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" – "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Настройка на профила"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Добавяне на нов профил от Exchange"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Добавяне на нов профил от Exchange ActiveSync"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"Имейл профил"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"Можете да настроите имейла за повечето профили само с няколко стъпки."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Можете да настроите профил в Exchange само с няколко стъпки."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Можете да настроите профил в Exchange ActiveSync само с няколко стъпки."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Можете да настроите профила си само с няколко стъпки."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Имейл адрес"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Парола"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Изпращане на имейл от този профил по подразбиране."</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"Изпращане на имейл от този профил по подразбиране"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Ръчна настройка"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Въведете валиден имейл адрес и парола."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Дублиращ профил"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Настройките на вх. сървър се проверяват..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Настройките на изх. сървър се проверяват..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Настройка на профила"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"Профилът ви е настроен и имейлите са на път!"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"Профилът ви е настроен и имейлите са на път!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Именуване на този профил (незадължително)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Името ви (показвано в изходящи съобщения)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Това поле трябва да се попълни."</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Настройки на входящия сървър"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Потребителско име"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Парола"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3 сървър"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"IMAP сървър"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Сървър"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Порт"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Вид защита"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Няма"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP сървър"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Порт"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Вид защита"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Изисква влизане в профил."</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Изисква влизане в профил"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Потребителско име"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Парола"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"Настройка на профила"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"На всеки 15 мин"</string>
     <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_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>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"Изпращане на имейл от този профил по подразбиране"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Известие при получаване на имейл"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Синхронизиране на контактите в този профил"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Синхронизиране на календара в този профил"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Синхронизиране на имейлите от този профил"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Автоматично изтегляне на прикачените файлове при връзка с Wi-Fi"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Не можа да завърши"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Дни за синхронизиране"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Един месец"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Всички"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Стандартното за профила"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Неправилно потребителско име или парола."</string>
-    <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_auth_message" msgid="426627755590431364">"Неправилно потребителско име или парола."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"Неправилно потребителско име или парола."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Не може да се осъществи безопасна връзка със сървъра."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Не може да се осъществи безопасна връзка със сървъра."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"Изисква се сертификат за клиентска програма. Да се установи ли връзка със сървъра чрез него?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"Сертификатът е невалиден или недостъпен."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"Сървърът отговори с грешка. Проверете потребителското име и паролата си и опитайте отново."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"Изисква се сертификат за клиентска програма. Да се установи ли връзка със сървъра чрез него?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"Сертификатът е невалиден или недостъпен."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"Сървърът отговори с грешка. Проверете потребителското име и паролата си, след което опитайте отново."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"Не може да се осъществи връзка със сървъра."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Не може да се осъществи връзка със сървъра."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"Изисква се TLS, но не се поддържа от сървъра."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"ПРЕДУПРЕЖДЕНИЕ: Деактивирането на възможността приложението Имейл да администрира устройството ви ще изтрие всички имейл адреси, които го изискват, заедно с имейлите, контактите, събитията от календара и други данни в тях."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Атуализация на защитата"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> изисква да актуализирате защитните си настройки."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Профилът „<xliff:g id="ACCOUNT">%s</xliff:g>“ изисква актуализация на защитните настройки."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"Изисква се актуална защита"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Профилът „<xliff:g id="ACCOUNT">%s</xliff:g>“ не може да бъде синхронизиран поради изискванията за сигурност."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"Профилът „<xliff:g id="ACCOUNT">%s</xliff:g>“ изисква актуализация на настройките за сигурност."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"Настройките за сигурност на профила „<xliff:g id="ACCOUNT">%s</xliff:g>“ са променени. Не е необходимо действие от страна на потребителя."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Актуализирайте за сигурност"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Променени правила за сигурност"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Неизпълнени правила за сигурност"</string>
     <string name="account_security_title" msgid="3511543138560418587">"Сигурност на устройството"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Сървърът <xliff:g id="SERVER">%s</xliff:g> изисква отдалечен контрол над някои от защитните функции на устройството ви с Android."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Редактиране на подробностите"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"PIN кодът или паролата за заключен екран изтече."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"Паролата изтече"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Паролата за заключен екран изтича"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"Трябва скоро да промените PIN кода или паролата си за заключен екран или данните за <xliff:g id="ACCOUNT">%s</xliff:g> ще бъдат изтрити. Искате ли да извършите промяната сега?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Трябва скоро да промените ПИН кода или паролата си за заключен екран или данните за <xliff:g id="ACCOUNT">%s</xliff:g> ще бъдат изтрити. Искате ли да извършите промяната сега?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"Паролата за заключен екран изтече"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"Данните за <xliff:g id="ACCOUNT">%s</xliff:g> се изтриват от устройството ви. Можете да ги възстановите, като промените PIN кода или паролата си за заключен екран. Искате ли да извършите промяната сега?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"Данните за <xliff:g id="ACCOUNT">%s</xliff:g> се изтриват от устройството ви. Можете да ги възстановите, като промените ПИН кода или паролата си за заключен екран. Искате ли да извършите промяната сега?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Да се отхвърлят ли незапазените промени?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Не можах да вляза в профила си"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Потребителското име или паролата за <xliff:g id="ACCOUNT">%s</xliff:g> не са правилни. Искате ли да ги актуализирате сега?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"Неправилно потребителско име или парола за <xliff:g id="ACCOUNT">%s</xliff:g>. Искате ли да ги актуализирате сега?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Основен профил"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Изпращане на имейл от този профил по подразбиране"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Изтегляне на прикачените файлове"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Автоизтегляне на прик. файлове към скорошни съобщения през Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Известия за имейл"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Честота на синхронизиране, известия и т.н."</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"Известие в системната лента при получаване на имейл"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Изпращане на известие при получаване на имейл"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Честота на проверяване за входяща поща"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Входящи настройки"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Потребителско име, парола и други настройки на входящия сървър"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Изходящи настройки"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Потребителско име, парола и други настройки на изходящия сървър"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Наложени правила"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Нито едно"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Неподдържани правила"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Нито едно"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"Опит за синхронизиране"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Докоснете тук, за да синхронизирате този профил"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Име на профила"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Името ви"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Подпис"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Бързи отговори"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Редактиране на текст, който често вмъквате при писане на имейли"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Редактиране на текст, който често вмъквате при писане на имейл"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Прибавяне на текст към изпращаните от вас съобщения"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Настройки за известия"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Използване на данни"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"Правила за сигурност"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Редактиране на бърз отговор"</string>
     <string name="save_action" msgid="1988862706623227093">"Запазване"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Синхронизиране на контакти"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Синхр. на контактите за този профил"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Синхрон на календара"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Синхрон на календара за този профил"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Синхронизиране на календар"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Синхр. на календарно събитие за профила"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Синхрон на имейлите"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Синхрон на имейлите за този профил"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Вибриране"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> резултата от <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Настройки"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"Общи"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Общи настройки"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"Приложение"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Автоматично преминаване"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Изберете екран, който да се показва след изтриване на съобщение"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Квадратчета за отметка: Скриване"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"В списъците със съобщения докоснете и задръжте, за да изберете"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Потвърждаване преди изтриване"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Съобщения"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Потвърждаване преди изпращане"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Съобщения"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Преминаване към"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"По-ново съобщение"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"По-старо съобщение"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"Резултатите се изчакват"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Някои сървъри може да отнемат много време."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Папки"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Забраняване на използването на камерата"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Изискване на парола за устройството"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"Без повторно ползване на скорошни пароли"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"Изискване паролите да изтичат"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"Неактивно у-во за заключ. на екрана"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"Ограничаване на броя синхрон. събития в календара"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"Ограничаване на броя синхронизирани имейли"</string>
+    <string name="quick_1" msgid="3426057697353380951">"Благодаря!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"Звучи добре!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"Ще прочета това по-късно и ще се свържа с Вас."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Нека да насрочим среща, за да обсъдим това."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Синхронизирането на заден план за този профил е деактивирано при роуминг."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"Отговорът се изпраща..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"Няма съобщения."</string>
 </resources>
diff --git a/res/values-bg/uploader.xml b/res/values-bg/uploader.xml
index 1c38811..74ce71d 100644
--- a/res/values-bg/uploader.xml
+++ b/res/values-bg/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Скриване на подробностите"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Настройки"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Качени: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Профил"</string>
     <string name="upload" msgid="2615541458361216022">"Качване"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index c2cb7a5..3bf2bb5 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"Llegeix els fitxers adjunts al correu electrònic"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Permet que aquesta aplicació llegeixi els fitxers adjunts al correu electrònic."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Permet que l\'aplicació llegeixi els fitxers adjunts al correu electrònic."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Accedeix a les dades del proveïdor de correu electrònic"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Permet que aquesta aplicació accedeixi a la base de dades del teu correu electrònic, inclosos els missatges rebuts, els missatges enviats, els noms d\'usuari i les contrasenyes."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Permet que l\'aplicació accedeixi a la base de dades del teu correu electrònic, inclosos els missatges rebuts, els missatges enviats, els noms d\'usuari i les contrasenyes."</string>
     <string name="app_name" msgid="5815426892327290362">"Correu electrònic"</string>
     <string name="compose_title" msgid="427986915662706899">"Redacció"</string>
     <string name="debug_title" msgid="5175710493691536719">"Depuració"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"Fet"</string>
     <string name="create_action" msgid="3062715563215392251">"Crea"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"Suprimeix"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"No hi ha respostes ràpides"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"No hi ha respostes ràpides."</string>
     <string name="discard_action" msgid="6532206074859505968">"Descarta"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"Desa l\'esborrany"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Insereix resposta ràpida"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"Cerca"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Configuració del compte"</string>
     <string name="settings_action" msgid="6334807007967459412">"Configuració"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"Opcions de sincronització"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Opcions de sincronització"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Marca com a no llegit"</string>
     <string name="move_action" msgid="3059189775933985898">"Mou"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Cco"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> ha escrit:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Inclou el text citat"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Inclou text"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Heu d\'afegir com a mínim un destinatari."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"Afegeix com a mínim un destinatari."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Algunes adreces electròniques no són vàlides."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"El fitxer és massa gran per adjuntar-lo."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Inserció d\'una resposta ràpida"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Desat"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Atura"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Fitxer adjunt desat com a <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"No s\'ha pogut desar el fitxer adjunt."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Nota: Un o més fitxers adjunts del teu missatge reenviat es baixaran abans de l\'enviament."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"No es pot desar fitxer adjunt."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Nota: Un o més fitxers adjunts del teu missatge reenviat es baixaran abans de l\'enviament."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Missatge"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Invitació"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"No s\'han pogut reenviar un o més fitxers adjunts."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"El fitxer adjunt no s\'ha reenviat"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"L\'inici de sessió de <xliff:g id="ACCOUNT_NAME">%s</xliff:g> ha fallat."</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"Error en l\'inici de sessió a <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"No es pot iniciar la sessió"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Més antics"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Configuració del compte"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Afegeix un compte d\'Exchange"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Afegeix un compte d\'Exchange ActiveSync"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"Compte de correu electrònic"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"Pots configurar el correu electrònic per a la majoria de comptes en només uns quants passos."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Pots configurar un compte d\'Exchange en només uns quants passos."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Pots configurar un compte d\'Exchange ActiveSync en només uns quants passos."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Pots configurar el teu compte en només un quants passos."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Adreça electrònica"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Contrasenya"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Envia correu electrònic des d\'aquest compte de manera predeterminada."</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"Envia correu electrònic des d\'aquest compte de manera predeterminada"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Configuració manual"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Escriu una adreça electrònica i una contrasenya vàlides."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Compte duplicat"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"S\'està comprovant la configuració del servidor d\'entrada…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"S\'està comprovant la configuració del servidor de sortida…"</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Configuració del compte"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"El compte s\'ha configurat i aviat rebre un correu electrònic."</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"El compte s\'ha configurat i aviat rebràs un correu electrònic."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Assigneu un nom al compte (opcional)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"El vostre nom (visualitzat als missatges de sortida)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Aquest camp no pot estar en blanc."</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Configuració del servidor d\'entrada"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nom d\'usuari"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Contrasenya"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Servidor POP3"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"Servidor IMAP"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Servidor"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Tipus de seguretat"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Cap"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Servidor SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Tipus de seguretat"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Requereix l\'inici de sessió."</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Requereix l\'inici de sessió"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nom d\'usuari"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Contrasenya"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"Configuració del compte"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Cada 15 minuts"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Cada 30 minuts"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Cada hora"</string>
-    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Envia correu electrònic des d\'aquest compte de manera predeterminada."</string>
-    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Notifica\'m quan arribi correu electrònic nou."</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sincronitza els contactes d\'aquest compte."</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sincronitza el calendari d\'aquest compte."</string>
-    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sincronitza el correu electrònic d\'aquest compte."</string>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"Envia correu electrònic des d\'aquest compte de manera predeterminada"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Notifica\'m quan arribi un correu electrònic"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Sincronitza els contactes d\'aquest compte"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Sincronitza el calendari d\'aquest compte"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Sincronitza el correu electrònic d\'aquest compte"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Baixa automàticament els fitxers adjunts en connectar-te a Wi-Fi"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"No s\'ha pogut acabar"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Dies per sincronitzar"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Un mes"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Tots"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Utilitza l\'opció predeterminada del compte"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Nom d\'usuari o contrasenya incorrectes."</string>
-    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nom d\'usuari o contrasenya incorrectes."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_dlg_auth_message" msgid="426627755590431364">"El nom d\'usuari o la contrasenya no són correctes."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"El nom d\'usuari o la contrasenya són incorrectes."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"No es pot establir una connexió segura amb el servidor."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"No es pot establir una connexió segura amb el servidor."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"Es necessita un certificat de client. Et vols connectar al servidor amb el certificat de client?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"El certificat no és vàlid o bé no s\'hi pot accedir."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"El servidor ha contestat amb un error. Comprova el nom d\'usuari i la contrasenya i torna-ho a provar."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"Es necessita un certificat de client. Et vols connectar al servidor amb un certificat de client?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"El certificat no és vàlid o no s\'hi pot accedir."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"El servidor ha contestat amb un error. Comprova el nom d\'usuari i la contrasenya i torna-ho a provar."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"No es pot establir la connexió amb el servidor."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"No es pot connectar amb el servidor."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS necessari, però no compatible amb el servidor."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"ADVERTIMENT: Desactivar l\'autoritat de l\'aplicació de correu electrònic per administrar el dispositiu suprimirà tots els comptes de correu electrònic que ho requereixin, juntament amb els correus electrònics, els contactes, els esdeveniments de calendari i altres dades."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Actualització de seguretat"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> necessita que actualitzis la configuració de seguretat."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Cal actualitzar la configuració de seguretat del compte \"<xliff:g id="ACCOUNT">%s</xliff:g>\"."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"Cal fer una actualització de seguretat"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"El compte \"<xliff:g id="ACCOUNT">%s</xliff:g>\" no es pot sincronitzar a causa de requisits de seguretat."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"Cal actualitzar la configuració de seguretat del compte \"<xliff:g id="ACCOUNT">%s</xliff:g>\"."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"El compte \"<xliff:g id="ACCOUNT">%s</xliff:g>\" ha canviat la configuració de seguretat; no es requereix cap acció de l\'usuari."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Cal actualització de seguretat"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Les polítiques de seguretat han canviat"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"No es compleixen polít. segur."</string>
     <string name="account_security_title" msgid="3511543138560418587">"Seguretat del dispositiu"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"El servidor <xliff:g id="SERVER">%s</xliff:g> requereix que li permetis controlar de manera remota algunes funcions de seguretat del dispositiu Android."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Edita\'n els detalls"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"La contrasenya o el PIN de bloqueig de pantalla ha caducat."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"La contrasenya de bloqueig de pantalla ha caducat"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"La contrasenya de bloqueig de pantalla està a punt de caducar"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"Has de canviar la contrasenya o el PIN de bloqueig de pantalla aviat. Si no ho fas, s\'esborraran les dades de <xliff:g id="ACCOUNT">%s</xliff:g>. Vols fer el canvi ara?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Has de canviar la contrasenya o el PIN de bloqueig de pantalla aviat. Si no ho fas, s\'esborraran les dades de <xliff:g id="ACCOUNT">%s</xliff:g>. Vols fer el canvi ara?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"La contrasenya de bloqueig de pantalla ha caducat"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"Les dades de <xliff:g id="ACCOUNT">%s</xliff:g> s\'estan esborrant del dispositiu. Pots restaurar-les si canvies la contrasenya o el PIN de bloqueig de pantalla. Vols fer el canvi ara?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"Les dades de <xliff:g id="ACCOUNT">%s</xliff:g> s\'estan esborrant del dispositiu. Pots restaurar-les si canvies la contrasenya o el PIN de bloqueig de pantalla. Vols fer el canvi ara?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Vols descartar els canvis no desats?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"No es pot iniciar la sessió"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"El nom d\'usuari o la contrasenya de <xliff:g id="ACCOUNT">%s</xliff:g> són incorrectes. Vols actualitzar-los ara?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"El nom d\'usuari o la contrasenya de <xliff:g id="ACCOUNT">%s</xliff:g> no són correctes. Vols actualitzar-los ara?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Compte predeterminat"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Envia correu electrònic des d\'aquest compte de manera predeterminada"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Baixada de fitxers adjunts"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Baixa automàtic. fitxers adjunts de missatges recents per Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Notificacions de correu electrònic"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Freqüència de sincronització, notificacions, etc."</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"Notifica a la barra del sistema quan arribi un correu electrònic"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Envia una notificació quan arribi un correu electrònic"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Freqüència de comprovació de la safata d\'entrada"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Configuració d\'entrada"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Nom d\'usuari, contrasenya i altres opcions de configuració del servidor d\'entrada"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Configuració de sortida"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Nom d\'usuari, contrasenya i altres opcions de configuració del servidor de sortida"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Polítiques aplicades"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Cap"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Polítiques no compatibles"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Cap"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"Intenta la sincronització"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Toca aquí per sincronitzar aquest compte"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Nom del compte"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"El vostre nom"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Signatura"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Respostes ràpides"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Edita text que insereixes sovint en redactar correu electrònic"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Edita text que insereixes sovint en redactar correus electrònics"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Annexa text als missatges que envieu"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Configuració de notificacions"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Ús de dades"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"Polítiques de seguretat"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Edita una resposta ràpida"</string>
     <string name="save_action" msgid="1988862706623227093">"Desa"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Sincronitza els contactes"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sincr. contactes d\'aquest compte"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sincronitza el calendari"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Sincr. calendari p. aq. compte"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Sincronitza el calendari"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Sincr. esdev. calend. per al compte"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincronitza el correu electrònic"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincr. miss. correu d\'aquest compte"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibra"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> resultats de <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Configuració"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"General"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Configuració general"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"Aplicació"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Avança automàticament"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Selecciona quina pantalla s\'ha de mostrar després de suprimir un missatge"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Amaga les caselles de selecció"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"En les llistes de missatges, toca i mantén premut per seleccionar"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Confirma abans de suprimir"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Missatges"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Confirma abans d\'enviar"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Missatges"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Vés a"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Missatge més recent"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Missatge més antic"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"S\'estan esperant els resultats"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Alguns servidors poden trigar molt."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Carpetes"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"No permetis l\'ús de la càmera del dispositiu"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Requereix la contrasenya del dispositiu"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"Restringeix la reutilització de contrasenyes recents"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"Requereix que les contrasenyes caduquin"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"Requereix un dispositiu absent per bloquejar-ne la pantalla"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"Limita el nombre d\'esdev. calendari sincronitzats"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"Limita el nombre de correus electr. sincronitzats"</string>
+    <string name="quick_1" msgid="3426057697353380951">"Gràcies."</string>
+    <string name="quick_2" msgid="4188036352885736617">"Em sembla molt bé."</string>
+    <string name="quick_3" msgid="8061819976353395585">"Ho llegiré més tard i et respondré."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Organitzem una reunió per parlar-ne."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"La sincronització de fons per a aquest compte està desactivada en itinerància."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"S\'està enviant la resposta..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"No hi ha missatges."</string>
 </resources>
diff --git a/res/values-ca/uploader.xml b/res/values-ca/uploader.xml
index 13b33af..8e251c9 100644
--- a/res/values-ca/uploader.xml
+++ b/res/values-ca/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Amaga els detalls"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Configuració"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Penjats: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Compte"</string>
     <string name="upload" msgid="2615541458361216022">"Penja"</string>
     <string name="ok" msgid="2516349681897895312">"D\'acord"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index ba3fbd3..0ecc4b5 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -17,11 +17,11 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"Číst přílohy e-mailů"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Umožňuje této aplikaci číst přílohy e-mailů."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Umožňuje této aplikaci číst přílohy vašich e-mailů."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Přístup k datům poskytovatele e-mailu"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Povoluje této aplikaci přístup do databáze e-mailů, včetně přijatých a odeslaných zpráv, uživatelských jmen a hesel."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Povoluje aplikaci přístup do databáze e-mailů, a to včetně přijatých a odeslaných zpráv, uživatelských jmen a hesel."</string>
     <string name="app_name" msgid="5815426892327290362">"E-mail"</string>
-    <string name="compose_title" msgid="427986915662706899">"Napsat"</string>
+    <string name="compose_title" msgid="427986915662706899">"Nová zpráva"</string>
     <string name="debug_title" msgid="5175710493691536719">"Ladit"</string>
     <string name="next_action" msgid="3931301986364184415">"Další"</string>
     <string name="okay_action" msgid="8365197396795675617">"OK"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"Hotovo"</string>
     <string name="create_action" msgid="3062715563215392251">"Vytvořit novou"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"Smazat"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"Žádné rychlé odpovědi"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Žádné rychlé odpovědi."</string>
     <string name="discard_action" msgid="6532206074859505968">"Zahodit"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"Uložit koncept"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Vložit rychlou odpověď"</string>
@@ -46,11 +46,11 @@
     <string name="remove_star_action" msgid="6689770999647007163">"Odebrat hvězdičku"</string>
     <string name="refresh_action" msgid="5951383001436708175">"Aktualizovat"</string>
     <string name="add_account_action" msgid="8835736309476033727">"Přidat účet"</string>
-    <string name="compose_action" msgid="4045702519637388045">"Napsat"</string>
+    <string name="compose_action" msgid="4045702519637388045">"Nová zpráva"</string>
     <string name="search_action" msgid="6325101454876682308">"Hledat"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Nastavení účtu"</string>
     <string name="settings_action" msgid="6334807007967459412">"Nastavení"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"Možnosti synchronizace"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Možnosti synchronizace"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Označit jako nepřečtené"</string>
     <string name="move_action" msgid="3059189775933985898">"Přesunout"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ Kopie/skrytá"</string>
@@ -128,12 +128,12 @@
     <string name="cc" msgid="7017720927911078193">"Kopie"</string>
     <string name="bcc" msgid="3098643138241111579">"Skrytá kopie"</string>
     <string name="subject_hint" msgid="7253964583324677128">"Předmět"</string>
-    <string name="body_hint" msgid="4279864165439577668">"Napsat e-mail"</string>
+    <string name="body_hint" msgid="4279864165439577668">"Napsat zprávu"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Původní zpráva --------"\n"Předmět: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Odesílatel: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Komu: <xliff:g id="TO">%3$s</xliff:g>"\n"Kopie: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g>napsal/a:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Zahrnout text v uvozovkách"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Zahrnout text"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Je třeba přidat nejméně jednoho příjemce."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"Přidejte alespoň jednoho příjemce."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Některé e-mailové adresy jsou neplatné."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Soubor nelze připojit, protože je příliš velký."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Vložit rychlou odpověď"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Uloženo"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Zastavit"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Příloha uložena jako <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Přílohu nelze uložit."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Poznámka: Jedna či více příloh v přeposílané zprávě bude před odesláním stažena."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"Přílohu se nepodařilo uložit."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Jedna či více příloh v přeposílané zprávě bude před odesláním stažena."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Zpráva"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Pozvánka"</string>
   <plurals name="message_view_show_attachments_action">
@@ -185,7 +185,7 @@
     <string name="attachment_info_policy" msgid="3560422300127587508">"Tuto přílohu nelze uložit ani otevřít kvůli zásadám zabezpečení účtu."</string>
     <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Tato příloha je příliš velká, aby ji bylo možné stáhnout pomocí mobilní sítě. Můžete ji stáhnout při příštím připojení k síti Wi-Fi."</string>
     <string name="attachment_info_no_intent" msgid="8139209405745777924">"Nemáte nainstalovanou žádnou aplikaci, která by dokázala tuto přílohu otevřít. Zkuste příslušnou aplikaci stáhnout ze služby Android Market."</string>
-    <string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Tato příloha je aplikace. Chcete-li ji nainstalovat, zaškrtněte nejdříve v části Nastavení &gt; Aplikace možnost Neznámé zdroje."</string>
+    <string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Tato příloha je aplikace. Chcete-li ji nainstalovat, zaškrtněte nejdříve v sekci Nastavení &gt; Aplikace možnost Neznámé zdroje."</string>
     <string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Aplikace nelze instalovat přímo z e-mailu. Nejdříve aplikaci uložte a poté ji nainstalujte pomocí aplikace Stahování."</string>
     <string name="attachment_not_found" msgid="7155322700141145123">"Přílohu nelze stáhnout."</string>
     <string name="message_decode_error" msgid="5016042255170947834">"Při dekódování zprávy došlo k chybě."</string>
@@ -199,7 +199,7 @@
     <item quantity="one" msgid="710742672464447084">"Zpráva byla smazána."</item>
     <item quantity="other" msgid="6574961322865652255">"Zprávy byly smazány."</item>
   </plurals>
-    <string name="message_discarded_toast" msgid="3891461729325584026">"Zpráva byla zrušena."</string>
+    <string name="message_discarded_toast" msgid="3891461729325584026">"Zpráva byla zahozena."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Zpráva byla uložena jako koncept."</string>
     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Přílohu nelze zobrazit."</string>
     <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Přílohu <xliff:g id="FILENAME">%s</xliff:g> nelze načíst."</string>
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Nepodařilo se přeposlat jednu nebo více příloh."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Příloha nebyla přeposlána"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"Přihlášení selhalo: <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"Přihlášení k účtu <xliff:g id="ACCOUNT_NAME">%s</xliff:g> se nezdařilo."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"Přihlášení se nezdařilo."</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Starší"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">"  – "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Nastavení účtu"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Přidat účet Exchange"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Přidat účet Exchange ActiveSync"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"E-mailový účet"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"Většinu e-mailových účtů můžete nakonfigurovat v několika snadných krocích."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Účet Exchange můžete nakonfigurovat v několika snadných krocích."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Účet služby Exchange ActiveSync můžete nakonfigurovat v několika snadných krocích."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Účet můžete nakonfigurovat v několika snadných krocích."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"E-mailová adresa"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Heslo"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Ve výchozím nastavení odesílat e-maily z tohoto účtu."</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"Použít tento účet jako výchozí pro odesílání e-mailů"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Ruční nastavení"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Zadejte platnou e-mailovou adresu a heslo."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Duplicitní účet"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Kontrola nastavení serveru příchozí pošty..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Kontrola nastavení serveru odchozí pošty..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Nastavení účtu"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"Váš účet je nastaven, e-mail je na cestě!"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"Váš účet je nastaven, e-mail je na cestě!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Pojmenovat tento účet (nepovinné)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Vaše jméno (zobrazované na odchozích zprávách)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Toto pole nesmí být prázdné."</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Nastavení serveru příchozí pošty"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Uživatelské jméno"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Heslo"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Server POP"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"Server IMAP"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Server"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Typ zabezpečení"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Žádný"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Server SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Typ zabezpečení"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Požadovat přihlášení"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Vyžadovat přihlášení"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Uživatelské jméno"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Heslo"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"Nastavení účtu"</string>
@@ -290,7 +285,7 @@
     <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_select_certificate" msgid="1536103662037268683">"Vybrat"</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>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Každých 15 minut"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Každých 30 minut"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Každou hodinu"</string>
-    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Ve výchozím nastavení odesílat e-maily z tohoto účtu."</string>
-    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Upozornit mě na příchod e-mailu"</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Synchronizovat kontakty z tohoto účtu."</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Synchronizovat kalendář z tohoto účtu."</string>
-    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Synchronizovat e-mail z tohoto účtu."</string>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"Použít tento účet jako výchozí pro odesílání e-mailů"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Upozornit mě na příchod e-mailu"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Synchronizovat kontakty z tohoto účtu"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Synchronizovat kalendář z tohoto účtu"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Synchronizovat e-mail z tohoto účtu"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Během připojení k síti Wi-Fi automaticky stahovat přílohy"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Nelze dokončit"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Počet dní k synchronizaci"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Jeden měsíc"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Vše"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Použít výchozí nastavení účtu"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Uživatelské jméno nebo heslo není správné"</string>
-    <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_auth_message" msgid="426627755590431364">"Uživatelské jméno nebo heslo jsou nesprávné."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"Uživatelské jméno nebo heslo jsou nesprávné."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Nelze se bezpečně připojit k serveru."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Nelze se bezpečně připojit k serveru."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"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="7245835883180762722">"Certifikát je neplatný nebo nedostupný."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"Server odpověděl chybou. Zkontrolujte prosím uživatelské jméno a heslo a zkuste to znovu."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"Je vyžadován certifikát klienta. Chcete se k serveru připojit pomocí certifikátu klienta?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"Certifikát je neplatný nebo nedostupný."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"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="4942810054116129684">"Nelze se připojit k serveru."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Nelze se připojit k serveru."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"Služba TLS je požadována, ale není podporována na serveru."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"UPOZORNĚNÍ: Deaktivujete-li oprávnění aplikace E-mail spravovat toto zařízení, budou smazány všechny účty aplikace E-mail, které toto oprávnění vyžadují. Společně s těmito účty budou smazány i všechny jejich e-maily, kontakty, události v kalendářích a další údaje."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Aktualizace zabezpečení"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"Účet <xliff:g id="ACCOUNT">%s</xliff:g> vyžaduje aktualizaci nastavení zabezpečení."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Účet <xliff:g id="ACCOUNT">%s</xliff:g> požaduje aktualizaci nastavení zabezpečení."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"Je třeba aktualizovat zabezp."</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Účet „<xliff:g id="ACCOUNT">%s</xliff:g>“ nelze synchronizovat z důvodu požadavků na zabezpečení."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"Účet <xliff:g id="ACCOUNT">%s</xliff:g> požaduje aktualizaci nastavení zabezpečení."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"Nastavení zabezpečení účtu <xliff:g id="ACCOUNT">%s</xliff:g> byla změněna. Uživatel nemusí provádět žádnou akci."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Je třeba aktualizovat zabezp."</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Zásady zabezpečení se změnily"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Nelze splnit zásady zabezp."</string>
     <string name="account_security_title" msgid="3511543138560418587">"Zabezpečení zařízení"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Server <xliff:g id="SERVER">%s</xliff:g> žádá o povolení, aby mohl vzdáleně ovládat některé funkce zabezpečení v zařízení Android."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Upravit podrobnosti"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"Platnost kódu PIN nebo hesla pro uzamčení obrazovky vypršela."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"Platnost hesla pro uzamčení obrazovky vypršela"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Heslo zámku obrazovky brzy vyprší"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"Brzy bude třeba změnit kód PIN nebo heslo pro uzamčení obrazovky. Pokud tak neučiníte, budou data účtu <xliff:g id="ACCOUNT">%s</xliff:g> vymazána. Chcete nyní změnit kód PIN nebo heslo?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Je nutné, abyste si brzy změnili kód PIN nebo heslo pro uzamčení obrazovky, jinak dojde k vymazání údajů účtu <xliff:g id="ACCOUNT">%s</xliff:g>. Chcete tuto změnu provést hned?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"Platnost hesla zámku obrazovky vypršela"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"Ze zařízení jsou mazána data účtu <xliff:g id="ACCOUNT">%s</xliff:g>. Data můžete obnovit změnou kódu PIN nebo hesla pro uzamčení obrazovky."</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"Ze zařízení jsou mazány údaje účtu <xliff:g id="ACCOUNT">%s</xliff:g>. Můžete je obnovit změnou kódu PIN nebo hesla pro uzamčení obrazovky. Chcete tuto změnu provést hned?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Zahodit neuložené změny?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Přihlášení se nezdařilo."</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Uživatelské jméno nebo heslo pro účet <xliff:g id="ACCOUNT">%s</xliff:g> je nesprávné. Chcete údaje aktualizovat?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"Uživatelské jméno nebo heslo k účtu <xliff:g id="ACCOUNT">%s</xliff:g> je nesprávné. Chcete je aktualizovat?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Výchozí účet"</string>
-    <string name="account_settings_default_summary" msgid="1531901438624688482">"Ve výchozím nastavení odesílat e-maily z tohoto účtu"</string>
-    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Stáhnout přílohy"</string>
+    <string name="account_settings_default_summary" msgid="1531901438624688482">"Použít tento účet jako výchozí pro odesílání e-mailů"</string>
+    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Stahovat přílohy"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Automaticky stahovat přílohy posledních zpráv pomocí sítě Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"E-mailová upozornění"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Frekvence synchronizace, oznámení apod."</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"Oznámit příchod e-mailu na systémové liště"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Zaslat upozornění, když přijde e-mail"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Četnost kontroly doručené pošty"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Nastavení příchozí pošty"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Uživatelské jméno, heslo a jiná nastavení serveru příchozí pošty"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Nastavení odchozí pošty"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Uživatelské jméno, heslo a jiná nastavení serveru odchozí pošty"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Vynucené zásady"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Žádné"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Zásady, které nejsou podporované"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Žádné"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"Pokusit se synchronizovat"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Pokud chcete účet synchronizovat, dotkněte se tohoto tlačítka"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Název účtu"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Vaše jméno"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Podpis"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Rychlé odpovědi"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Upravit text, který při psaní e-mailů často vkládáte"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Upravit text, který při psaní e-mailů často vkládáte"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Připojit text k odesílaným zprávám"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Nastavení upozornění"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Využití dat"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"Zásady zabezpečení"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Upravit rychlou odpověď"</string>
     <string name="save_action" msgid="1988862706623227093">"Uložit"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Synchronizovat kontakty"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Synchronizovat kontakty pro tento účet"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Synchronizovat kalendář"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Synchronizovat kalendář pro tento účet"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Synchronizovat kalendář"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Synch. udál. kalend. pro tento účet"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synchronizovat e-maily"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synchronizovat e-mail pro tento účet"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrace"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"Počet výsledků: <xliff:g id="RESULTS">%1$d</xliff:g> z webu <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Nastavení"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"Obecné"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Obecná nastavení"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"Aplikace"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Automaticky pokračovat"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Vyberte, kterou obrazovku chcete zobrazit po smazání zprávy."</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Skrýt zaškrtávací políčka"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"V seznamu zpráv provedete výběr klepnutím s podržením."</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Před smazáním potvrdit"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Zprávy"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Před odesláním potvrdit"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Zprávy"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Pokračovat na"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Novější zpráva"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Starší zpráva"</string>
@@ -446,8 +458,8 @@
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Velmi velký"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Odpovědět všem"</string>
     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"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="507988226277210305">"Dotazovat se na zobrazování obrázků"</string>
-    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Obrázky ve zprávách se automaticky nezobrazí"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Dotaz na zobrazování obrázků"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Obrázky ve zprávách se nebudou zobrazovat automaticky"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"Nastavení Zobrazit obrázky bylo smazáno."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> z <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Čekání na synchronizaci"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"Čekání na výsledky"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Některým serverům může tento proces trvat dlouho."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Složky"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Zakázat používání fotoaparátu v zařízení"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Požadovat heslo zařízení"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"Omezit opětovné použití nedávných hesel"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"Požadovat omezenou platnost hesel"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"Při nečinnosti zamknout obrazovku"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"Omezit počet synchronizovaných událostí kalendáře"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"Omezit počet synchronizovaných e-mailů"</string>
+    <string name="quick_1" msgid="3426057697353380951">"Díky!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"To zní dobře!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"Přečtu si to později a ozvu se."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Můžeme si dohodnout schůzku, abychom to prodiskutovali."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Synchronizace na pozadí je v tomto účtu při roamingu zakázána."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"Odesílání odpovědi..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"Žádné zprávy."</string>
 </resources>
diff --git a/res/values-cs/uploader.xml b/res/values-cs/uploader.xml
index 0ce8a86..f15f987 100644
--- a/res/values-cs/uploader.xml
+++ b/res/values-cs/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Skrýt podrobnosti"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Nastavení"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Nahráno: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Účet"</string>
     <string name="upload" msgid="2615541458361216022">"Nahrát"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 5427439..920742b 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"Læs vedhæftede filer i e-mails"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Tillader, at denne applikation læser vedhæftede filer i dine e-mails."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Tillader, at appen kan læse vedhæftede filer i dine e-mails."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Få adgang til data om e-mailudbyder"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Tillader, at denne applikation får adgang til din e-maildatabase, f.eks. modtagne beskeder, sendte beskeder, brugernavne og adgangskoder."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Tillader, at denne app kan få adgang til din e-maildatabase, f.eks. modtagne beskeder, sendte beskeder, brugernavne og adgangskoder."</string>
     <string name="app_name" msgid="5815426892327290362">"E-mail"</string>
     <string name="compose_title" msgid="427986915662706899">"Skriv"</string>
     <string name="debug_title" msgid="5175710493691536719">"Fejlretning"</string>
@@ -33,10 +33,10 @@
     <string name="delete_action" msgid="8421026208288857155">"Slet"</string>
     <string name="forward_action" msgid="669174181042344116">"Videresend"</string>
     <string name="favorite_action" msgid="4664259801498253756">"Stjernemarker"</string>
-    <string name="done_action" msgid="7497990549515580249">"Udfør"</string>
+    <string name="done_action" msgid="7497990549515580249">"Færdig"</string>
     <string name="create_action" msgid="3062715563215392251">"Opret nyt"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"Slet"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"Ingen hurtige svar"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Ingen hurtige svar."</string>
     <string name="discard_action" msgid="6532206074859505968">"Kassér"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"Gem kladde"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Indsæt hurtigt svar"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"Søg"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Indstillinger for konto"</string>
     <string name="settings_action" msgid="6334807007967459412">"Indstillinger"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"Indstillinger for synkronisering"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Muligheder for synkronisering"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Markér som ulæst"</string>
     <string name="move_action" msgid="3059189775933985898">"Flyt"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> skrev:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Inkluder citeret tekst"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Medtag tekst"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Du skal tilføje mindst en modtager."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"Tilføj mindst én modtager."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Nogle e-mailadresser er ugyldige."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Filen er for stor til at vedhæfte."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Indsæt hurtigt svar"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Gemt"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Stop"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Vedhæftelse gemmes som <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Vedhæftning kunne ikke gemmes."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Bemærk: En eller flere vedhæftede filer i din videresendte besked downloades før afsendelse."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"Vedhæftning kunne ikke gemmes"</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"En eller flere vedhæftede filer i din videresendte besked downloades før afsendelse."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Besked"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Inviter"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"En eller flere vedhæftede filer kunne ikke videresendes."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Vedhæftet fil er ikke sendt"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> kunne ikke logge ind."</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> kunne ikke logge ind."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"Login mislykkedes"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> b"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Ældre"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" – "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Kontoindstillinger"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Tilføj en Exchange-konto"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Tilføj en Exchange ActiveSync-konto"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"E-mailkonto"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"Du kan nemt konfigurere e-mail for de fleste konti."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Du kan nemt konfigurere en Exchange-konto."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Du kan nemt konfigurere en Exchange ActiveSync-konto."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Du kan nemt og hurtigt oprette din konto."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"E-mailadresse"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Adgangskode"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Send e-mail fra denne konto som standard."</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"Send e-mail fra denne konto som standard"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuel opsætning"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Indtast en gyldig e-mailadresse og adgangskode."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Dobbeltforekomst af konto"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Kontrollerer indstillinger for indgående server ..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Kontrollerer indstillinger for udgående server ..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Kontoindstillinger"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"Din konto er oprettet, og der er e-mail på vej."</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"Din konto er konfigureret, og der er e-mail på vej."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Giv kontoen et navn (valgfrit)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Dit navn (vist på udgående beskeder)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Dette felt må ikke være tomt."</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Indstillinger for indgående server"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Brugernavn"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Adgangskode"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3-server"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"IMAP-server"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Server"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Sikkerhedstype"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Ingen"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP-server"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Sikkerhedstype"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Kræver login"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Kræv login"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Brugernavn"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Adgangskode"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"Kontoindstillinger"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Hvert 15. minut"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Hvert 30. minut"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Hver time"</string>
-    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Send e-mail fra denne konto som standard."</string>
-    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Underret mig, når der kommer e-mail."</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Synkroniser kontaktpersoner fra denne konto."</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Synkroniser kalender fra denne konto."</string>
-    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Synkroniser e-mail fra denne konto."</string>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"Send e-mail fra denne konto som standard"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Giv mig besked ved nye e-mails"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Synkroniser kontaktpersoner fra denne konto"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Synkroniser kalender fra denne konto"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Synkroniser e-mails fra denne konto"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Download vedhæftede filer automatisk, når forbundet til Wi-Fi"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Kunne ikke afsluttes"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Dage, der skal synkroniseres"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"En måned"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Alle"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Anvend kontostandarden"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Brugernavn eller adgangskode er forkert."</string>
-    <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_auth_message" msgid="426627755590431364">"Brugernavn eller adgangskode er forkert."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"Brugernavn eller adgangskode er forkert."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Der kan ikke oprettes en sikker forbindelse til serveren."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Der kan ikke oprettes en sikker forbindelse til serveren."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"Klientcertifikat kræves. Vil du oprette forbindelse til serveren med et klientcertifikat?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"Certifikatet er ugyldigt eller ikke tilgængeligt."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"Serveren reagerede med en fejl. Kontroller dit brugernavn og din adgangskode, og prøv igen."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"Der kræves et klientcertifikat. Vil du oprette forbindelse til serveren med et klientcertifikat?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"Certifikatet er ugyldigt eller ikke tilgængeligt."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"Serveren reagerede med en fejl. Kontroller dit brugernavn og din adgangskode, og prøv igen."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"Der kan ikke oprettes forbindelse til serveren."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Der kan ikke oprettes forbindelse til serveren."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS er påkrævet, men understøttes ikke af serveren."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"ADVARSEL! Hvis du deaktiverer appen E-mails tilladelse til at administrere din enhed, slettes alle konti i E-mail, der kræver dette, sammen med alle e-mails, kontaktpersoner, kalenderbegivenheder og andre data på disse konti."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Sikkerhedsopdatering"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> kræver, at du opdaterer dine sikkerhedsindstillinger."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Kontoen \"<xliff:g id="ACCOUNT">%s</xliff:g>\" kræver opdatering af sikkerhedsindstillingerne."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"Sikkerhedsopdatering kræves"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Kontoen \"<xliff:g id="ACCOUNT">%s</xliff:g>\" kan ikke synkroniseres på grund af sikkerhedskravene."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"Kontoen \"<xliff:g id="ACCOUNT">%s</xliff:g>\" kræver opdatering af sikkerhedsindstillingerne."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"Kontoen \"<xliff:g id="ACCOUNT">%s</xliff:g>\" har skiftet sikkerhedsindstillinger. Ingen brugerhandling er påkrævet."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Sikkerhedsopdatering kræves"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Sikkerhedpolitikker er ændret"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Politikker kan ikke opfyldes"</string>
     <string name="account_security_title" msgid="3511543138560418587">"Enhedssikkerhed"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Serveren <xliff:g id="SERVER">%s</xliff:g> kræver, at du giver den tilladelse til eksternt at kontrollere nogle af Android-enhedens sikkerhedsfunktioner."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Rediger detaljer"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"Pinkoden eller adgangskoden til skærmlåsen er udløbet."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"Skærmlåskoden er udløbet"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Skærmlåskoden er ved at udløbe"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"Du skal snart ændre skærmlåsens pinkode eller adgangskode, ellers vil dataene på <xliff:g id="ACCOUNT">%s</xliff:g> blive slettet. Vil du ændre den nu?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Du skal ændre pinkoden eller adgangskoden til din skærmlås snart, ellers vil data for <xliff:g id="ACCOUNT">%s</xliff:g> vil blive slettet. Vil du ændre dette nu?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"Skærmlåskoden er udløbet"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"Dataene for <xliff:g id="ACCOUNT">%s</xliff:g> slettes på din enhed. Du kan gendanne dem ved at ændre skærmlåsens pinkode eller adgangskode. Vil du ændre den nu?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"Dataene for <xliff:g id="ACCOUNT">%s</xliff:g> er ved at blive slettet fra enheden. Du kan gendanne dem ved at ændre skærmlåsens pinkode eller adgangskode. Vil du ændre dette nu?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Vil du kassere ændringer, som ikke er gemt?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Login mislykkedes"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Brugernavn eller adgangskode for <xliff:g id="ACCOUNT">%s</xliff:g> er forkert. Vil du opdatere dem nu?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"Brugernavn eller adgangskode for <xliff:g id="ACCOUNT">%s</xliff:g> er forkert. Vil du opdatere dem nu?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Standardkonto"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Send e-mail fra denne konto som standard"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Download vedhæftede filer"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Download autom. vedhæftede filer i de seneste beskeder via Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"E-mail-beskeder"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Synkroniseringsinterval, meddelelser osv."</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"Underret i statuslinjen, når der kommer e-mail"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Send en meddelelse ved nye e-mails"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Kontrolfrekvens for indbakke"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Indgående indstillinger"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Brugernavn, adgangskode og indstillinger for indgående server"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Udgående indstillinger"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Brugernavn, adgangskode og indstillinger for udgående server"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Politikker håndhævet"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Ingen"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Ikke-understøttede politikker"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Ingen"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"Forsøg synkronisering"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Tryk her for at synkronisere denne konto"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Kontonavn"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Dit navn"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Signatur"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Hurtige svar"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Rediger tekst, du ofte indsætter, når du skriver e-mails"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Rediger tekst, som du ofte indsætter, når du skriver e-mails"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Vedhæft tekst til beskeder, du sender"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Indstillinger for underretninger"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Dataforbrug"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"Sikkerhedspolitikker"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Rediger hurtigt svar"</string>
     <string name="save_action" msgid="1988862706623227093">"Gem"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Synkroniser kontaktpersoner"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Synkroniser kontaktpersoner til denne konto"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Synkroniser kalender"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Synkroniser kalender for denne konto"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Synkroniser kalender"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Synkroniser begivenhed for konto"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synkroniser e-mails"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synkroniser e-mail for denne konto"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibration"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> resultater fra <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Indstillinger"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"Generelt"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Generelle indstillinger"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"Applikation"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Gå automatisk frem"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Vælg, hvilken skærm der skal vises, når du har slettet en besked"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Skjul afkrydsningsfelter"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"Tryk og holde nede for at vælge på lister over samtaler"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Bekræft før sletning"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Meddelelser"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Bekræft før afsendelse"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Meddelelser"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Gå frem til"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Nyere besked"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Ældre besked"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"Venter på resultater"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Nogle servere kan være langsomme."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Mapper"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Tillad ikke brug af enheden kamera"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Kræv adgangskode for enheden"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"Begræns genbrug af seneste adgangskoder"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"Kræv, at adgangskoder udløber"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"Kræv, at en inaktiv enheds skærm låses"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"Begræns antallet af synkron. kalenderbegivenheder"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"Begræns antallet af synkroniserede e-mails"</string>
+    <string name="quick_1" msgid="3426057697353380951">"Tak!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"Det passer mig fint!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"Jeg læser dette senere og vender tilbage til dig."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Lad os holde et møde for at diskutere dette."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Baggrundssynkronisering for denne konto deaktiveres under roaming."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"Sender svar..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"Ingen meddelelser."</string>
 </resources>
diff --git a/res/values-da/uploader.xml b/res/values-da/uploader.xml
index cc8f0e8..f2a6f1a 100644
--- a/res/values-da/uploader.xml
+++ b/res/values-da/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Skjul detaljer"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Indstillinger"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Uploadet %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Konto"</string>
     <string name="upload" msgid="2615541458361216022">"Upload"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
@@ -105,7 +105,7 @@
     <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Betingelser for upload"</string>
     <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"Billedernes forbindelsesindstillinger bruges i øjeblikket."</string>
     <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Kun billeder via mobilnetværk"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Billeder og videoer via mobilnetværk"</string>
+    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Fotos og videoer via mobilnetværk"</string>
     <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Kun billeder og videoer via Wi-Fi"</string>
     <string name="preference_category_title_about" msgid="3001183168471659844">"Om"</string>
     <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Øjebl. upload-v."</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 96b6a5d..bf41f33 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"E-Mail-Anhänge lesen"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Ermöglicht der App, Ihre E-Mail-Anhänge zu lesen"</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Ermöglicht der App, Ihre E-Mail-Anhänge zu lesen"</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Auf Daten des E-Mail-Anbieters zugreifen"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Ermöglicht der App, auf Ihre E-Mail-Datenbank zuzugreifen, einschließlich erhaltener Nachrichten, gesendeter Nachrichten, Nutzernamen und Passwörtern."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Ermöglicht der App, auf Ihre E-Mail-Datenbank zuzugreifen, einschließlich empfangener und gesendeter Nachrichten, Nutzernamen sowie Passwörtern"</string>
     <string name="app_name" msgid="5815426892327290362">"E-Mail"</string>
     <string name="compose_title" msgid="427986915662706899">"Schreiben"</string>
     <string name="debug_title" msgid="5175710493691536719">"Fehler suchen"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"Fertig"</string>
     <string name="create_action" msgid="3062715563215392251">"Neue erstellen"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"Löschen"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"Keine Kurzantworten"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Keine Kurzantworten"</string>
     <string name="discard_action" msgid="6532206074859505968">"Verwerfen"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"Speichern"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Kurzantwort einfügen"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"Suche"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Kontoeinstellungen"</string>
     <string name="settings_action" msgid="6334807007967459412">"Einstellungen"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"Synchronisierungsoptionen"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Synchronisierungsoptionen"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Als ungelesen markieren"</string>
     <string name="move_action" msgid="3059189775933985898">"Verschieben"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> schrieb:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Zitierten Text einfügen"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Text einfügen"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Sie müssen mindestens einen Empfänger hinzufügen."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"Fügen Sie mindestens einen Empfänger hinzu."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Einige E-Mail-Adressen sind ungültig."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Dateianhang zu groß"</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Kurzantwort einfügen"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Gespeichert"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Stoppen"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Anhang als <xliff:g id="FILENAME">%s</xliff:g> gespeichert."</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Anhang nicht gespeichert"</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Hinweis: Mindestens ein Anhang in Ihrer weitergeleiteten Nachricht wird vor dem Senden heruntergeladen."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"Speichern nicht möglich"</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Mindestens ein Anhang in Ihrer weitergeleiteten Nachricht wird vor dem Senden heruntergeladen."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Nachricht"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Einladen"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Mindestens ein Anhang wurde nicht weitergeleitet."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Anhang nicht weitergeleitet"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"Fehler beim Anmelden in <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"Anmeldung in <xliff:g id="ACCOUNT_NAME">%s</xliff:g> erfolglos"</string>
     <string name="login_failed_title" msgid="7624349996212476176">"Anmeldung nicht möglich"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Älter"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" - "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Kontoeinrichtung"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Exchange-Konto hinzufügen"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Exchange ActiveSync-Konto hinzufügen"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"E-Mail-Konto"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"Sie können die E-Mail-Funktion für die meisten Konten in wenigen Schritten einrichten."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Sie können ein Exchange-Konto in wenigen Schritten einrichten."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Sie können ein Exchange ActiveSync-Konto in wenigen Schritten einrichten."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Sie können Ihr Konto in wenigen Schritten einrichten."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"E-Mail-Adresse"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Passwort"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"E-Mails standardmäßig von diesem Konto senden"</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"E-Mails standardmäßig von diesem Konto senden"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuell einrichten"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Geben Sie eine gültige E-Mail-Adresse und ein gültiges Passwort ein."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Dupliziertes Konto"</string>
@@ -250,9 +246,9 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Einstellungen des Eingangsservers werden überprüft..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Einstellungen des Ausgangsservers werden überprüft..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Kontoeinrichtung"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"Ihr Konto ist nun eingerichtet."</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"Das Konto ist jetzt eingerichtet und die E-Mail ist unterwegs."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Konto benennen (optional)"</string>
-    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Ihr Name (wird bei ausgehenden Nachrichten angezeigt)"</string>
+    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Ihr Name (wird bei ausgehenden E-Mails angezeigt)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Dieses Feld darf nicht leer sein."</string>
     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Kontoeinrichtung"</string>
     <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Kontotyp"</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Einstellungen des Eingangsserver"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nutzername"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Passwort"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3-Server"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"IMAP-Server"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Server"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Sicherheitstyp"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Keine"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP-Server"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Sicherheitstyp"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Anmeldung erforderlich"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Anmeldung erforderlich"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nutzername"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Passwort"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"Kontoeinrichtung"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Alle 15 Minuten"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Alle 30 Minuten"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Stündlich"</string>
-    <string name="account_setup_options_default_label" msgid="8869166381331276697">"E-Mails standardmäßig von diesem Konto senden"</string>
-    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Benachrichtigung bei E-Mail-Eingang"</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Kontakte dieses Kontos synchronisieren"</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Kalender dieses Kontos synchronisieren"</string>
-    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"E-Mails dieses Kontos synchronisieren"</string>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"E-Mails standardmäßig von diesem Konto senden"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Bei neuer E-Mail benachrichtigen"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Kontakte dieses Kontos synchronisieren"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Kalender dieses Kontos synchronisieren"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"E-Mails dieses Kontos synchronisieren"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Anhänge bei WLAN-Verbindung automatisch herunterladen"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Fertigstellen nicht möglich"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Zu synchronisierende Tage"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Ein Monat"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Alle"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Kontostandard verwenden"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Nutzername oder Passwort falsch"</string>
-    <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_auth_message" msgid="426627755590431364">"Nutzername oder Passwort ist falsch."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"Nutzername oder Passwort ist falsch."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Keine sichere Verbindung zum Server möglich"</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Keine sichere Verbindung zum Server möglich."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"Client-Zertifikat ist erforderlich. Verbindung zu einem Server mit Client-Zertifikat herstellen?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"Zertifikat ist ungültig oder nicht aufrufbar."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"Der Server hat einen Fehler zurückgegeben. Bitte überprüfen Sie Ihren Nutzernamen und Ihr Passwort und versuchen Sie es erneut."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"Ein Client-Zertifikat ist erforderlich. Möchten Sie mit einem Client-Zertifikat eine Verbindung zum Server herstellen?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"Das Zertifikat ist ungültig oder nicht aufrufbar."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"Der Server hat einen Fehler zurückgegeben. Bitte überprüfen Sie Ihren Nutzernamen und Ihr Passwort und versuchen Sie es erneut."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"Derzeit kann keine Verbindung zum Server hergestellt werden."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Keine Verbindung zum Server möglich."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS erforderlich aber nicht von Server unterstützt"</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"Warnung: Wenn Sie die Berechtigung der E-Mail-App zur Verwaltung Ihres Geräts deaktivieren, werden alle E-Mail-Konten, die diese Berechtigung benötigen, mit allen zugehörigen E-Mails, Kontakten, Terminen und anderen Daten gelöscht."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Sicherheitsupdate"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> erfordert, dass Sie Ihre Sicherheitseinstellungen aktualisieren."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Das Konto \"<xliff:g id="ACCOUNT">%s</xliff:g>\" erfordert eine Aktualisierung der Sicherheitseinstellungen."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"Sicherheitsupdate erforderlich"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Das Konto \"<xliff:g id="ACCOUNT">%s</xliff:g>\" kann aufgrund von Sicherheitsanforderungen nicht synchronisiert werden."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"Für das Konto \"<xliff:g id="ACCOUNT">%s</xliff:g>\" müssen die Sicherheitseinstellungen aktualisiert werden."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"Die Sicherheitseinstellungen des Kontos \"<xliff:g id="ACCOUNT">%s</xliff:g>\" haben sich geändert. Es sind keine Maßnahmen durch den Nutzer erforderlich."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Sicherheitsupdate erforderlich"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Richtlinien wurden geändert."</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Richtlinien nicht einzuhalten"</string>
     <string name="account_security_title" msgid="3511543138560418587">"Gerätesicherheit"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Der Server <xliff:g id="SERVER">%s</xliff:g> fordert die Erlaubnis zur Remote-Steuerung einiger Sicherheitsfunktionen auf Ihrem Android-Gerät an."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Details bearbeiten"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"Ihre PIN bzw. Ihr Passwort zum Sperren des Bildschirms ist abgelaufen."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"Sperr-Passwort abgelaufen"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Passwort für Bildschirmsperre läuft ab"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"Sie müssen Ihre PIN bzw. Ihr Passwort zum Sperren des Bildschirms bald ändern, sonst werden die Daten für <xliff:g id="ACCOUNT">%s</xliff:g> gelöscht. Jetzt ändern?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Sie müssen Ihre PIN für die Display-Sperre bald ändern, da sonst die Daten für <xliff:g id="ACCOUNT">%s</xliff:g> gelöscht werden. Möchten Sie sie jetzt ändern?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"Sperr-Passwort abgelaufen"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"Die Daten für <xliff:g id="ACCOUNT">%s</xliff:g> werden von Ihrem Gerät gelöscht. Sie können sie wiederherstellen, indem Sie Ihre PIN bzw. Ihr Passwort zum Sperren des Bildschirms ändern. Jetzt ändern?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"Die Daten für <xliff:g id="ACCOUNT">%s</xliff:g> werden von Ihrem Gerät gelöscht. Sie können die Daten wiederherstellen, indem Sie Ihre PIN für die Display-Sperre oder Ihr Passwort ändern. Möchten Sie die PIN oder das Passwort jetzt ändern?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Nicht gespeicherte Änderungen verwerfen?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Anmeldung nicht möglich"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Der Nutzername oder das Passwort für <xliff:g id="ACCOUNT">%s</xliff:g> ist falsch. Jetzt aktualisieren?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"Nutzername oder Kennwort für <xliff:g id="ACCOUNT">%s</xliff:g> ist falsch. Möchten Sie die Daten jetzt ändern?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Standardkonto"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"E-Mails standardmäßig von diesem Konto senden"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Anhänge herunterladen"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Anhänge neuer Nachrichten automatisch über WLAN herunterladen"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"E-Mail-Benachrichtigung"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Synchronisierungshäufigkeit, Benachrichtigungen usw."</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"Bei E-Mail-Eingang Benachrichtigung in der Systemleiste"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Bei neuen E-Mails benachrichtigen"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Häufigkeit des E-Mail-Abrufs"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Eingehende Nachrichten"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Nutzername, Passwort und andere Einstellungen für Eingangsserver"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Ausgehende Nachrichten"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Nutzername, Passwort und andere Einstellungen für Ausgangsserver"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Richtlinien durchgesetzt"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Keine"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Nicht unterstützte Richtlinien"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Keine"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"Synchronisieren"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Hier berühren, um dieses Konto zu synchronisieren"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Kontoname"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Mein Name"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Signatur"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Kurzantworten"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Bearbeiten Sie beim Verfassen von E-Mails oft eingefügten Text."</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Häufig in neue E-Mails eingefügten Text bearbeiten"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Text an ausgehende Nachrichten anhängen"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Benachrichtigungseinstellungen"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Datenverbrauch"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"Sicherheitsrichtlinien"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Kurzantwort bearbeiten"</string>
     <string name="save_action" msgid="1988862706623227093">"Speichern"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Kontakte synchr."</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Kontakte dieses Kontos synchronisieren"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Kalender synchronisieren"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Kalender dieses Kontos synchronisieren"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Kalender synchr"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Termin für dieses Kontos synchronisieren"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"E-Mails synchr."</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"E-Mails dieses Kontos synchronisieren"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibration"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> Ergebnisse von <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Einstellungen"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"Allgemein"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Allgemeine Einstellungen"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"App"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Automatisch fortfahren"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Was soll nach dem Löschen einer Nachricht angezeigt werden?"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Kontrollkästchen ausblenden"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"In Nachrichtenlisten zum Auswählen berühren und halten"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Vor dem Löschen bestätigen"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Nachrichten"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Vor dem Senden bestätigen"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Nachrichten"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Weiter zu"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"neuerer Nachricht"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"älterer Nachricht"</string>
@@ -446,18 +458,18 @@
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Sehr groß"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Allen antworten"</string>
     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"\"Allen antworten\" als Standard für die E-Mail-Beantwortung festlegen"</string>
-    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Anzeige der Bilder anfordern"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Fragen, bevor Bilder angezeigt werden"</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Bilder in E-Mails werden nicht automatisch angezeigt."</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Bilder anzeigen\" gelöscht"</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> von <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Warten auf Synchronisierung"</string>
-    <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Ihre E-Mail wird in Kürze angezeigt."</string>
+    <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Ihre E-Mails werden gleich angezeigt."</string>
     <string name="widget_other_views" msgid="4988574907386539499">"Symbol zum Wechseln berühren."</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"Kombinierter Posteingang"</string>
     <string name="widget_unread" msgid="4404711399009077833">"Ungelesen"</string>
     <string name="widget_starred" msgid="8290352707134011791">"Markiert"</string>
     <string name="widget_loading" msgid="2340962056927255554">"Wird geladen…"</string>
-    <string name="widget_touch_to_configure" msgid="7062039013915225323">"Zum Einrichten berühren."</string>
+    <string name="widget_touch_to_configure" msgid="7062039013915225323">"Zum Einrichten berühren"</string>
     <string name="widget_no_accounts" msgid="2412482205591224408">"Sie haben noch kein E-Mail-Konto eingerichtet."</string>
     <string name="more_than_999" msgid="8704425397397918798">"999+"</string>
     <string name="search_hint" msgid="2200412192574686497">"In E-Mails suchen"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"Warten auf Ergebnisse"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Bei einigen Servern benötigen Sie möglicherweise etwas mehr Geduld."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Ordner"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Verwendung der Kamera nicht zulassen"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Geräte-Passwort erforderlich"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"Einsatz der letzten Passw. beschränken"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"Ablaufen von Passwörtern erforderlich"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"Bildschirmsperre für inaktives Gerät"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"Anzahl synchronisierter Kalendereinträge begrenzen"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"Anzahl synchronisierter E-Mails begrenzen"</string>
+    <string name="quick_1" msgid="3426057697353380951">"Vielen Dank!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"Hört sich gut an!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"Ich lese die Nachricht später und melde mich dann."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Wir können das am besten bei einem Meeting besprechen."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Die Hintergrundsynchronisierung ist für dieses Konto während des Roamings deaktiviert."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"Antwort wird gesendet..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"Keine Nachrichten"</string>
 </resources>
diff --git a/res/values-de/uploader.xml b/res/values-de/uploader.xml
index c8a6f21..3bb1dea 100644
--- a/res/values-de/uploader.xml
+++ b/res/values-de/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Details ausblenden"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Einstellungen"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Hochgeladen: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Konto"</string>
     <string name="upload" msgid="2615541458361216022">"Hochladen"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 713c47c..ab55054 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"Ανάγνωση επισυνάψεων μηνύματος ηλεκτρονικού ταχυδρομείου"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Επιτρέπει σε αυτήν την εφαρμογή την ανάγνωση των επισυνάψεων μηνυμάτων ηλεκτρονικού ταχυδρομείου."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Επιτρέπει στην εφαρμογή την ανάγνωση των συνημμένων ηλεκτρονικού ταχυδρομείου."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Πρόσβαση στα δεδομένα παρόχου ηλεκτρονικού ταχυδρομείου"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Επιτρέπει στην εφαρμογή να έχει πρόσβαση στη βάση δεδομένων του ηλεκτρονικού ταχυδρομείου σας, συμπεριλαμβανομένων των ληφθέντων μηνυμάτων, των απεσταλμένων, των ονομάτων χρηστών και των κωδικών πρόσβασης."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Επιτρέπει στην εφαρμογή την πρόσβαση στη βάση δεδομένων του ηλεκτρονικού ταχυδρομείου σας, συμπεριλαμβανομένων των ληφθέντων μηνυμάτων, των απεσταλμένων, των ονομάτων χρηστών και των κωδικών πρόσβασης."</string>
     <string name="app_name" msgid="5815426892327290362">"Μήνυμα ηλεκτρονικού ταχυδρομείου"</string>
     <string name="compose_title" msgid="427986915662706899">"Σύνταξη"</string>
     <string name="debug_title" msgid="5175710493691536719">"Εντοπισμός σφαλμάτων"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"Τέλος"</string>
     <string name="create_action" msgid="3062715563215392251">"Δημιουργία νέου"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"Διαγραφή"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"Δεν υπάρχουν γρήγορες απαντήσεις"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Δεν υπάρχουν γρήγορες απαντήσεις."</string>
     <string name="discard_action" msgid="6532206074859505968">"Απόρριψη"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"Αποθ. πρόχειρου"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Εισαγωγή γρήγ. απάντησης"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"Αναζήτηση"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Ρυθμίσεις λογαριασμού"</string>
     <string name="settings_action" msgid="6334807007967459412">"Ρυθμίσεις"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"Επιλογές συγχρονισμού"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Επιλογές συγχρονισμού"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Επισήμανση ως μη αναγνωσμένα"</string>
     <string name="move_action" msgid="3059189775933985898">"Μετακίνηση"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ Κοιν./Κρ.κοιν."</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"Ο χρήστης <xliff:g id="SENDER">%s</xliff:g> έγραψε:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Συμπερίληψη του αναφερόμενου κειμένου"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Συμπερίληψη κειμένου"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Πρέπει να προσθέσετε τουλάχιστον έναν παραλήπτη."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"Προσθέστε τουλάχιστον έναν παραλήπτη."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Ορισμένες διευθύνσεις ηλεκτρονικού ταχυδρομείου δεν είναι έγκυρες."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Πολύ μεγάλο αρχείο για επισύναψη."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Εισαγάγετε γρήγορη απάντηση"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Αποθηκεύτ."</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Διακοπή"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Αποθήκευση επισύναψης ως <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Σφάλμα αποθήκευσης επισύναψης."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Σημείωση: Μία ή περισσότερες επισυνάψεις στο προωθημένο μήνυμά σας θα ληφθούν πριν την αποστολή."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"Αδύν. η αποθ. του συνημμένου."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Ένα ή περισσότερα συνημμένα στο προωθημένο μήνυμά σας θα ληφθούν πριν την αποστολή."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Μήνυμα"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Πρόσκληση"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Δεν ήταν δυνατή η προώθηση μίας ή περισσότερων επισυνάψεων."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Η επισύναψη δεν προωθήθηκε"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"Αποτυχία σύνδεσης <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"Η σύνδεση στον λογαριασμό <xliff:g id="ACCOUNT_NAME">%s</xliff:g> δεν ήταν επιτυχής."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"Δεν ήταν δυνατή η σύνδεση"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Παλαιότερα"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Ρύθμιση λογαριασμού"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Προσθήκη λογαριασμού Exchange"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Προσθήκη λογαριασμού Exchange ActiveSync"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"Λογαριασμός ηλεκτρονικού ταχυδρομείου"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"Μπορείτε να δημιουργήσετε ηλεκτρονικό ταχυδρομείο για τους περισσότερους λογαριασμούς σε λίγα μόλις βήματα."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Μπορείτε να δημιουργήσετε έναν λογαριασμό Exchange σε λίγα μόλις βήματα."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Μπορείτε να δημιουργήσετε έναν λογαριασμό Exchange ActiveSync σε λίγα μόλις βήματα."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Μπορείτε να ρυθμίσετε τον λογαριασμό σας σε λίγα μόλις βήματα."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Διεύθυνση ηλεκτρονικού ταχυδρομείου"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Κωδικός πρόσβασης"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Αποστολή μηνυμάτων ηλεκτρονικού ταχυδρομείου από αυτόν τον λογαριασμό από προεπιλογή."</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"Αποστολή μηνυμάτων ηλεκτρονικού ταχυδρομείου από αυτόν τον λογαριασμό από προεπιλογή"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Μη αυτόματη ρύθμιση"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Πληκτρολογήστε μια έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου και έναν έγκυρο κωδικό πρόσβασης."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Διπλότυπος λογαριασμός"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Έλεγχος ρυθμίσεων διακομιστή εισερχομένων..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Έλεγχος ρυθμίσεων διακομιστή εξερχομένων..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Ρύθμιση λογαριασμού"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"Ο λογαριασμός σας ρυθμίστηκε και γίνεται λήψη μηνυμάτων ηλεκτρονικού ταχυδρομείου!"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"Ο λογαριασμός σας ρυθμίστηκε και γίνεται λήψη μηνυμάτων ηλεκτρονικού ταχυδρομείου!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Δώστε σε αυτόν τον λογαριασμό ένα όνομα (προαιρετικό)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Το όνομά σας (προβάλλεται στα εξερχόμενα μηνύματα)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Αυτό το πεδίο δεν μπορεί να είναι κενό."</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Ρυθμίσεις διακομιστή εισερχομένων"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Όνομα χρήστη"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Κωδικός πρόσβασης"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Διακομιστής POP3"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"Διακομιστής IMAP"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Διακομιστής"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Θύρα"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Τύπος ασφάλειας"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Καμία"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Διακομιστής SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Θύρα"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Τύπος ασφάλειας"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Να απαιτείται σύνδεση."</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Να απαιτείται σύνδεση"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Όνομα χρήστη"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Κωδικός πρόσβασης"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"Ρύθμιση λογαριασμού"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Κάθε 15 λεπτά"</string>
     <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_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>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"Αποστολή μηνυμάτων ηλεκτρονικού ταχυδρομείου από αυτόν τον λογαριασμό από προεπιλογή"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Να ειδοποιούμαι κατά τη λήψη μηνύματος ηλεκτρονικού ταχυδρομείου"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Συγχρονισμός επαφών από αυτόν τον λογαριασμό"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Συγχρονισμός ημερολογίου από αυτόν τον λογαριασμό"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Συγχρονισμός ηλεκτρονικού ταχυδρομείου από αυτόν τον λογαριασμό"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Αυτόματη λήψη συνημμένων κατά τη σύνδεση σε δίκτυο Wi-Fi"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Αδυναμία ολοκλήρωσης"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Ημέρες για συγχρονισμό"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Ένας μήνας"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Όλες"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Χρήση των προεπιλογών του λογαριασμού"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Λάθος όνομα χρήστη ή κωδικός πρόσβασης."</string>
-    <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_auth_message" msgid="426627755590431364">"Λάθος όνομα χρήστη ή κωδικός πρόσβασης."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"Το όνομα χρήστη ή ο κωδικός πρόσβασης είναι λάθος."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Δεν είναι δυνατή η ασφαλής σύνδεση με τον διακομιστή."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Δεν είναι δυνατή η ασφαλής σύνδεση με τον διακομιστή."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"Απαιτείται πιστοποιητικό πελάτη. Να γίνει σύνδεση στο διακομιστή με χρήση πιστοποιητικού πελάτη;"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"Το πιστοποιητικό δεν είναι έγκυρο ή δεν είναι δυνατή η πρόσβαση σε αυτό."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"Ο διακομιστής απάντησε με σφάλμα. Ελέγξτε το όνομα χρήστη και τον κωδικό πρόσβασης και δοκιμάστε ξανά."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"Απαιτείται πιστοποιητικό προγράμματος-πελάτη. Θέλετε να συνδεθείτε στο διακομιστή με ένα πιστοποιητικό προγράμματος-πελάτη;"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"Το πιστοποιητικό δεν είναι έγκυρο ή δεν είναι δυνατή η πρόσβαση σε αυτό."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"Ο διακομιστής ανταποκρίθηκε με σφάλμα. Ελέγξτε το όνομα χρήστη και τον κωδικό πρόσβασης και δοκιμάστε ξανά."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"Δεν είναι δυνατή η σύνδεση με τον διακομιστή."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Δεν είναι δυνατή η σύνδεση με τον διακομιστή."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"Το TLS απαιτείται αλλά δεν υποστηρίζεται από τον διακομιστή."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Η απενεργοποίηση της αρμοδιότητας της εφαρμογής ηλεκτρονικού ταχυδρομείου να διαχειρίζεται τη συσκευή σας, θα διαγράψει όλους τους λογαριασμούς ηλεκτρονικού ταχυδρομείου στους οποίους είναι απαραίτητη, καθώς και τα μηνύματα ηλεκτρονικού ταχυδρομείου, τις επαφές, τα συμβάντα ημερολογίου και άλλα δεδομένα."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Ενημέρωση ασφάλειας"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"Ο λογαριασμός <xliff:g id="ACCOUNT">%s</xliff:g> απαιτεί την ενημέρωση των ρυθμίσεων ασφαλείας."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Από το λογαριασμό \"<xliff:g id="ACCOUNT">%s</xliff:g>\" απαιτείται ενημέρωση ρυθμίσεων ασφαλείας."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"Απαιτείται ενημέρωση ασφαλείας"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Δεν είναι δυνατός ο συγχρονισμός του Λογαριασμού \"<xliff:g id="ACCOUNT">%s</xliff:g>\" λόγω απαιτήσεων ασφαλείας."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"Η ενημέρωση των ρυθμίσεων ασφαλείας είναι απαραίτητη για τον λογαριασμό \"<xliff:g id="ACCOUNT">%s</xliff:g>\"."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"Άλλαξαν οι ρυθμίσεις ασφαλείας για τον Λογαριασμό \"<xliff:g id="ACCOUNT">%s</xliff:g>\". Δεν απαιτείται ενέργεια χρήστη."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Απαιτείται ενημέρωση ασφαλείας"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Οι πολιτικές ασφαλείας άλλαξαν"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Δεν είναι δυνατή η συμμόρφωση με τις πολιτικές ασφαλείας"</string>
     <string name="account_security_title" msgid="3511543138560418587">"Ασφάλεια συσκευής"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Ο διακομιστής <xliff:g id="SERVER">%s</xliff:g> χρειάζεται την άδειά σας για να πραγματοποιήσει απομακρυσμένο έλεγχο ορισμένων λειτουργιών ασφαλείας της συσκευής σας Android."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Επεξεργασία λεπτομερειών"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"Το PIN ή ο κωδικός πρόσβασης κλειδώματος οθόνης έχουν λήξει."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"Ο κωδ. κλειδ. οθόνης έληξε"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Λήγει ο κωδικός κλειδώματος οθόνης"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"Πρέπει να αλλάξετε σύντομα το PIN ή τον κωδικό πρόσβασης κλειδώματος οθόνης, διαφορετικά τα δεδομένα του λογαριασμού <xliff:g id="ACCOUNT">%s</xliff:g> θα διαγραφούν. Θέλετε να το αλλάξετε τώρα;"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Θα πρέπει να αλλάξετε σύντομα το PIN ή τον κωδικό πρόσβασης της οθνόνης κλειδώματος, διαφορετικά τα δεδομένα του λογαριασμού <xliff:g id="ACCOUNT">%s</xliff:g> θα διαγραφούν. Θέλετε να το αλλάξετε τώρα;"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"Ο κωδικός κλειδώματος οθόνης έληξε"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"Τα δεδομένα του λογαριασμού <xliff:g id="ACCOUNT">%s</xliff:g> διαγράφονται από τη συσκευή σας. Μπορείτε να τα επαναφέρετε αλλάζοντας το PIN ή τον κωδικό πρόσβασης κλειδώματος οθόνης. Θέλετε να τα αλλάξετε τώρα;"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"Γίνεται διαγραφή των δεδομένων του λογαριασμού <xliff:g id="ACCOUNT">%s</xliff:g> από τη συσκευή σας. Μπορείτε να τα επαναφέρετε αλλάζοντας το PIN ή τον κωδικό πρόσβασης της οθόνης κλειδώματος. Θέλετε να το αλλάξετε τώρα;"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Απόρριψη μη αποθηκευμένων αλλαγών;"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Δεν ήταν δυνατή η σύνδεση"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Το όνομα χρήστη ή ο κωδικός πρόσβασης για τον λογαριασμό <xliff:g id="ACCOUNT">%s</xliff:g> είναι λανθασμένα. Θέλετε να τα ενημερώσετε τώρα;"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"Το όνομα χρήστη ή ο κωδικός πρόσβασης του λογαριασμού <xliff:g id="ACCOUNT">%s</xliff:g> είναι λάθος. Θέλετε να τα ενημερώσετε τώρα;"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Προεπιλεγμένος λογαριασμός"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Αποστολή μηνυμάτων ηλεκτρονικού ταχυδρομείου από αυτόν τον λογαριασμό από προεπιλογή"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Λήψη συνημμένων"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Αυτόματη λήψη συνημμένων πρόσφατων μηνυμάτων μέσω Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Ειδοποιήσεις μηνυμάτων ηλεκτρονικού ταχυδρομείου"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Συχνότητα συγχρονισμού, ειδοποιήσεις, κτλ."</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"Εμφάνιση ειδοποίησης στη γραμμή συστήματος κατά τη λήψη μηνύματος ηλεκτρονικού ταχυδρομείου"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Αποστολή ειδοποίησης κατά τη λήψη μηνύματος ηλεκτρονικού ταχυδρομείου"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Συχνότητα ελέγχου εισερχομένων"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Ρυθμίσεις εισερχομένων"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Όνομα χρήστη, κωδ. πρόσβ. και άλλες ρυθμίσεις διακομιστή εισερχ."</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Ρυθμίσεις εξερχομένων"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Όνομα χρήστη, κωδ. πρόσβ. και άλλες ρυθμίσεις διακομιστή εξερχ."</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Εφαρμογή πολιτικών"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Κ"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Πολιτικές που δεν υποστηρίζονται"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Κανένα"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"Προσπάθεια συγχρονισμού"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Αγγίξτε εδώ για να συγχρονίσετε αυτόν τον λογαριασμό"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Όνομα λογαριασμού"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Το όνομά σας"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Υπογραφή"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Γρήγορες απαντήσεις"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Επεξ. κειμένου που εισάγετε συχνά κατά τη σύνταξη μην. ηλ. ταχ."</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Επεξ. κειμένου που εισάγετε συχνά κατά τη σύνταξη μην. ηλ. ταχ."</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Προσάρτηση κειμένου στα μηνύματα που αποστέλλετε"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Ρυθμίσεις ειδοποιήσεων"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Χρήση δεδομένων"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"Πολιτικές ασφαλείας"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Επεξεργασία γρήγορης απάντησης"</string>
     <string name="save_action" msgid="1988862706623227093">"Αποθήκευση"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Συγχρονισμός επαφών"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Συγχρονισμός επαφών για αυτόν τον λογαριασμό"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Συγχρονισμός Ημερολογίου"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Συγχρονισμός ημερολογίου για αυτόν τον λογαριασμό"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Συγχρονισμός ημερολογίου"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Συγχρον. συμβ. ημερολ. λογαριασμού"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Συγχρονισμός ηλεκτρονικού ταχυδρομείου"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Συγχρονισμός μηνυμάτων ηλεκτρονικού ταχυδρομείου για αυτόν τον λογαριασμό"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Δόνηση"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> αποτελέσματα από <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Ρυθμίσεις"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"Γενικές"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Γενικές ρυθμίσεις"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"Εφαρμογή"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Αυτόματη συνέχιση"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Επιλογή οθόνης που εμφανίζεται μετά τη διαγραφή ενός μηνύματος"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Απόκρυψη πλαισίων ελέγχου"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"Σε λίστες μηνυμάτων, πατήστε παρατεταμένα για να επιλέξετε"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Επιβεβαίωση πριν από τη διαγραφή"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Μηνύματα"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Επιβεβαίωση πριν την αποστολή"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Μηνύματα"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Συνέχιση σε"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Πιο πρόσφατο μήνυμα"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Παλαιότερο μήνυμα"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"Αναμονή για αποτελέσματα"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Ορισμένοι διακομιστές ενδέχεται να χρειαστούν αρκετό χρόνο."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Φάκελοι"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Να μην επιτρ. η χρήση της κάμ. της συσκ."</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Απαιτείται κρυπτογράφηση συσκευής"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"Περιορισμός της χρήσης πρόσφατων κωδικών"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"Απαιτείται η λήξη των κωδικών πρόσβασης"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"Απαιτείται αδρ. συσκ. για κλείδ. οθόνης."</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"Περιορισμός αριθμού συγχρον. συμβάντων ημερολογίου"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"Περιορισμός αριθμού συγχρον. μηνυμ. ηλ. ταχυδρομ."</string>
+    <string name="quick_1" msgid="3426057697353380951">"Ευχαριστούμε!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"Καλή ιδέα!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"Θα το διαβάσω αργότερα και θα επικοινωνήσω μαζί σου."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Ας κανονίσουμε μία συνάντηση για να συζητήσουμε αυτό το θέμα."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Ο συγχρονισμός στο παρασκήνιο για αυτόν το λογαριασμό είναι απενεργοποιημένος κατά την περιαγωγή."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"Αποστολή απάντησης..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"Δεν υπάρχουν μηνύματα."</string>
 </resources>
diff --git a/res/values-el/uploader.xml b/res/values-el/uploader.xml
index 5cc8922..62e6b7a 100644
--- a/res/values-el/uploader.xml
+++ b/res/values-el/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Απόκρυψη λεπτομερειών"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Ρυθμίσεις"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Μεταφορτώθηκαν %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Λογαριασμός"</string>
     <string name="upload" msgid="2615541458361216022">"Μεταφόρτωση"</string>
     <string name="ok" msgid="2516349681897895312">"ΟΚ"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 7ba128b..0ea8508 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"Read email attachments"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Allows this application to read your email attachments."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Allows the app to read your email attachments."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Access email provider data"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Allows this application to access your email database, including received messages, sent messages, usernames and passwords."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Allows the app to access your email database, including received messages, sent messages, usernames and passwords."</string>
     <string name="app_name" msgid="5815426892327290362">"Email"</string>
     <string name="compose_title" msgid="427986915662706899">"Compose"</string>
     <string name="debug_title" msgid="5175710493691536719">"Debug"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"Done"</string>
     <string name="create_action" msgid="3062715563215392251">"Create new"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"Delete"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"No quick responses"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"No quick responses."</string>
     <string name="discard_action" msgid="6532206074859505968">"Discard"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"Save draft"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Insert quick response"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"Search"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Account settings"</string>
     <string name="settings_action" msgid="6334807007967459412">"Settings"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"Sync options"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Sync options"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Mark as unread"</string>
     <string name="move_action" msgid="3059189775933985898">"Move"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> wrote:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Include quoted text"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Include text"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"You must add at least one recipient."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"Add at least one recipient."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Some email addresses are invalid."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"File too large to attach."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Insert quick response"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Saved"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Stop"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Attachment saved as <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Couldn\'t save the attachment."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Note: One or more attachments in your forwarded message will be downloaded prior to sending."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"Couldn\'t save attachment."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"One or more attachments in your forwarded message will be downloaded prior to sending."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Message"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Invite"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Could not forward one or more attachments"</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Attachment not forwarded"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> sign-in failed."</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> sign-in unsuccessful."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"Couldn\'t sign in"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Older"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Account setup"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Add an Exchange account"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Add an Exchange ActiveSync account"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"Email account"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"You can set up email for most accounts in just a few steps."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"You can set up an Exchange account in just a few steps."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"You can set up an Exchange ActiveSync account in just a few steps."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"You can set up your account in just a few steps."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Email address"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Password"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Send email from this account by default."</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"Send emails from this account by default"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manual setup"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Type a valid email address and password."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Duplicate Account"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Checking incoming server settings…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Checking outgoing server settings…"</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Account setup"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"Your account is set up and email is on its way!"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"Your account is set up and emails are on their way!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Give this account a name (optional)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Your name (displayed on outgoing messages)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"This field can\'t be blank."</string>
@@ -261,14 +257,13 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Incoming server settings"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Username"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Password"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3 server"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"IMAP server"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Server"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Security type"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"None"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (Accept all certificates)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
-    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"STARTTLS (accept all certificates)"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"STARTTLS (Accept all certificates)"</string>
     <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"STARTTLS"</string>
     <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Delete email from server"</string>
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Never"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP server"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Security type"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Require sign-in."</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Require sign-in"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Username"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Password"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"Account setup"</string>
@@ -305,29 +300,29 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Every 15 minutes"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Every 30 minutes"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Every hour"</string>
-    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Send email from this account by default."</string>
-    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Notify me when email arrives."</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sync contacts from this account."</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sync calendar from this account."</string>
-    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sync email from this account."</string>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"Send emails from this account by default"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Notify me when emails arrive"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Sync contacts from this account"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Sync calendar from this account"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Sync emails from this account"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Automatically download attachments when connected to Wi-Fi"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Couldn\'t finish"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Days to sync"</string>
     <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automatic"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"One day"</string>
     <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Three days"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"one week"</string>
+    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"One week"</string>
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Two weeks"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"One month"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"All"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Use account\'s default"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Username or password incorrect."</string>
-    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Username or password incorrect."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_dlg_auth_message" msgid="426627755590431364">"Your username or password is incorrect."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"Username or password is incorrect."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Can\'t safely connect to server."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Can\'t safely connect to server."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"Client certificate is required. Connect to server with client certificate?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"Certificate is invalid or inaccessible."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"The server responded with an error. Check your username and password and then try again."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"A client certificate is required. Do you want to connect to the server with a client certificate?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"The certificate is invalid or inaccessible."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"The server responded with an error. Check your username and password, then try again."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"Can\'t connect to server."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Can\'t connect to server."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS required but not supported by server."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"WARNING: Deactivating the Email app\'s authority to administer your device will delete all email accounts that require it, along with their email, contacts, calendar events and other data."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Security update"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> requires you to update your security settings."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Account \"<xliff:g id="ACCOUNT">%s</xliff:g>\" requires security settings update."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"Security update required"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Account \"<xliff:g id="ACCOUNT">%s</xliff:g>\" can\'t be synced due to security requirements."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"Account \"<xliff:g id="ACCOUNT">%s</xliff:g>\" requires a security-settings update."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"Account \"<xliff:g id="ACCOUNT">%s</xliff:g>\" has changed its security settings; no user action is required."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Security update required"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Security policies have changed"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Security policies can\'t be met"</string>
     <string name="account_security_title" msgid="3511543138560418587">"Device Security"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"The server <xliff:g id="SERVER">%s</xliff:g> requires that you allow it to remotely control some security features of your Android device."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Edit details"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"Your lock-screen PIN or password has expired."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"Lock-screen password expired"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Lock-screen password expiring"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"You must change your lock-screen PIN or password soon or the data for <xliff:g id="ACCOUNT">%s</xliff:g> will be erased. Change it now?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"You need to change your lock screen PIN or password soon or the data for <xliff:g id="ACCOUNT">%s</xliff:g> will be erased. Do you want to change it now?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"Lock-screen password expired"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"The data for <xliff:g id="ACCOUNT">%s</xliff:g> is being erased from your device. You can restore it by changing your lock-screen PIN or password. Change it now?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"The data for <xliff:g id="ACCOUNT">%s</xliff:g> is being erased from your device. You can restore it by changing your lock screen PIN or password. Do you want to change it now?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Discard unsaved changes?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Couldn\'t sign in"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"The username or password for <xliff:g id="ACCOUNT">%s</xliff:g> is incorrect. Update them now?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"The username or password for <xliff:g id="ACCOUNT">%s</xliff:g> is incorrect. Do you want to update them now?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Default account"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Send email from this account by default"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Download attachments"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Auto-download attachments to recent messages via Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Email notifications"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Sync frequency, notifications, etc."</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"Notify in System bar when emails arrive"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Send notification when emails arrive"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Inbox check frequency"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Incoming settings"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Username, password and other incoming server settings"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Outgoing settings"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Username, password and other outgoing server settings"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Policies enforced"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"None"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Unsupported policies"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"None"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"Attempt sync"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Touch here to sync this account"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Account name"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Your name"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Signature"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Quick responses"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Edit text that you frequently insert when composing emails"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Edit text that you frequently insert when composing emails"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Append text to messages that you send"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Notification settings"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Data usage"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"Security policies"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Edit quick response"</string>
     <string name="save_action" msgid="1988862706623227093">"Save"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Sync contacts"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sync contacts for this account"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sync Calendar"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Sync calendar for this account"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Sync calendar"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Sync calendar event for this account"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sync Email"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sync email for this account"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrate"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> results from <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Settings"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"General"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"General settings"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"Application"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Auto-advance"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Select which screen to show after you delete a message"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Hide checkboxes"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"In lists of messages, touch and hold to select"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Confirm before deleting"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Messages"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Confirm before sending"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Messages"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Advance to"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Newer message"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Older message"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"Waiting for results"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Some servers may take a long time."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Folders"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Disallow use of the device\'s camera"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Require device password"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"Restrict the reuse of recent passwords"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"Require passwords to expire"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"Require an idle device to lock its screen"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"Limit the number of calendar events synced"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"Limit the number of emails synced"</string>
+    <string name="quick_1" msgid="3426057697353380951">"Thanks!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"Sounds good to me!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"I\'ll read this later and get back to you."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Let\'s set up a meeting to discuss this."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Background sync for this account is disabled while roaming."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"Sending response..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"No messages."</string>
 </resources>
diff --git a/res/values-en-rGB/uploader.xml b/res/values-en-rGB/uploader.xml
index 17bcf92..884d923 100644
--- a/res/values-en-rGB/uploader.xml
+++ b/res/values-en-rGB/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Hide Details"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Settings"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Uploaded %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Account"</string>
     <string name="upload" msgid="2615541458361216022">"Upload"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 69b35ad..87cf7e1 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"Leer archivos adjuntos de correo"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Permite a esta aplicación leer los archivos adjuntos de tus correos electrónicos."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Permite a la aplicación leer los archivos adjuntos de tu correo."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Acceder a los datos del proveedor de correo"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Permite que la aplicación acceda a la base de datos de tu correo, como mensajes recibidos, mensajes enviados, nombres de usuario y contraseñas."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Permite que la aplicación acceda a la base de datos de tu correo, como mensajes recibidos, mensajes enviados, nombres de usuario y contraseñas."</string>
     <string name="app_name" msgid="5815426892327290362">"Correo"</string>
     <string name="compose_title" msgid="427986915662706899">"Redactar"</string>
     <string name="debug_title" msgid="5175710493691536719">"Depurar"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"Finalizado"</string>
     <string name="create_action" msgid="3062715563215392251">"Crear una nueva respuesta rápida"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"Eliminar"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"No hay respuestas rápidas."</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"No hay respuestas rápidas."</string>
     <string name="discard_action" msgid="6532206074859505968">"Descartar"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"Guardar borrador"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Insertar respuesta rápida"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"Buscar"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Configuración de la cuenta"</string>
     <string name="settings_action" msgid="6334807007967459412">"Configuración"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"Opciones de sincronización"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Opciones de sincronización"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Marcar como no leídos"</string>
     <string name="move_action" msgid="3059189775933985898">"Mover"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ CC/CCO"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> escribió:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Incluir el texto citado"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Incluir texto"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Debes agregar al menos un destinatario."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"Agrega al menos un destinatario."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Algunas direcciones de correo no son válidas."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"El archivo es demasiado grande para adjuntarlo."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Insertar respuesta rápida"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Guardado"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Detener"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Archivo adj guardado como <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"No se pudo guardar el archivo adjunto."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Nota: Se descargarán uno o más archivos adjuntos de tu mensaje reenviado antes de enviar."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"Error al guardar el adjunto"</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Se descargarán uno o más archivos adjuntos de tu mensaje reenviado antes de enviar."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Mensaje"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Invitar"</string>
   <plurals name="message_view_show_attachments_action">
@@ -165,7 +165,7 @@
     <string name="message_view_always_show_pictures_button" msgid="6523810929103546865">"Mostrar siempre"</string>
     <string name="message_view_always_show_pictures_prompt" msgid="7685500276479967959">"Mostrar siempre las imágenes de este remitente"</string>
     <string name="message_view_always_show_pictures_confirmation" msgid="6838463134312859448">"Las imágenes de este remitente se mostrarán automáticamente."</string>
-    <string name="message_view_invite_view" msgid="5521032519960111675">"Ver en Calendario"</string>
+    <string name="message_view_invite_view" msgid="5521032519960111675">"Ver en Calendar"</string>
     <string name="message_view_invite_title" msgid="3418949733434713805">"Invitación de calendario"</string>
     <string name="message_view_invite_text" msgid="1212799906603873708">"¿Vas?"</string>
     <string name="message_view_invite_accept" msgid="744546668021679819">" Sí"</string>
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"No se pudieron enviar uno o más adjuntos."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"No se reenvió el archivo adjunto"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"Error al acceder a <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"Acceso a <xliff:g id="ACCOUNT_NAME">%s</xliff:g> sin éxito"</string>
     <string name="login_failed_title" msgid="7624349996212476176">"No se ha podido acceder."</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Antiguos"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Configuración de la cuenta"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Agregar una cuenta de Exchange"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Agregar una cuenta de Exchange ActiveSync"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"Cuenta de correo"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"Puedes configurar el correo de la mayoría de las cuentas en pocos pasos."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Puedes configurar una cuenta de Exchange en solo unos pasos."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Puedes configurar una cuenta de Exchange ActiveSync en pocos pasos."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Puedes configurar tu cuenta en pocos pasos."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Dirección de correo"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Contraseña"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Enviar mensaje de correo desde esta cuenta de forma predeterminada."</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"Enviar correo desde esta cuenta de forma predeterminada"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Configuración manual"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Escribe una dirección de correo y contraseña válidas."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Cuenta duplicada"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Comprobando configuración del servidor entrante…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Comprobando configuración del servidor saliente…"</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Configuración de la cuenta"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"Se ha configurado tu cuenta, ¡y el correo está en camino!"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"Se ha configurado tu cuenta y el correo está en camino."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Asigna un nombre a esta cuenta (opcional)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Tu nombre (mostrado en mensajes salientes)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Este campo no puede estar vacío."</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Configuración del servidor de entrada"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nombre de usuario"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Contraseña"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Servidor POP3"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"Servidor IMAP"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Servidor"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Puerto"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Tipo de seguridad"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Ninguno"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Servidor SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Puerto"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Tipo de seguridad"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Requiere inicio de sesión."</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Requiere acceso"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nombre de usuario"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Contraseña"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"Configuración de la cuenta"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Cada 15 minutos"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Cada 30 minutos"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Cada hora"</string>
-    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Enviar mensaje de correo desde esta cuenta de forma predeterminada."</string>
-    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Notificarme cuando llegue un mensaje de correo."</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sincronizar contactos desde esta cuenta"</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sincroniza el calendario desde esta cuenta"</string>
-    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sincronizar el correo desde esta cuenta"</string>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"Enviar correo desde esta cuenta de forma predeterminada"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Avisarme cuando llegue un correo"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Sincronizar contactos desde esta cuenta"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Sincronizar el calendario desde esta cuenta"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Sincronizar el correo desde esta cuenta"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Descargar los archivos adjuntos automáticamente al conectarte a Wi-Fi"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"No se pudo terminar"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Período de sincronización"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Un mes"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Todos"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Utilizar la configuración predeterminada de la cuenta."</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Nombre de usuario o contraseña incorrecta."</string>
-    <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_auth_message" msgid="426627755590431364">"El nombre de usuario o la contraseña son incorrectos."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"Nombre de usuario o contraseña incorrectos "\n" (<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"No se puede conectar de forma segura al servidor."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"No se puede conectar de forma segura al servidor."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"Se requiere un certificado de cliente. ¿Deseas conectarte al servidor con un certificado de cliente?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"Certificado no válido o inaccesible."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"El servidor ha devuelto un error. Verifica tu nombre de usuario y contraseña e inténtalo de nuevo."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"Se necesita un certificado de cliente. ¿Quieres conectarte al servidor con un certificado de cliente?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"El certificado no es válido o es inaccesible."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"El servidor ha devuelto un error. Verifica tu nombre de usuario y contraseña e inténtalo de nuevo."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"No se puede conectar al servidor."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"No se puede conectar al servidor."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"Se requiere TLS pero el servidor no la admite."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"ADVERTENCIA: si desactivas la autoridad de la aplicación de correo para administrar tu dispositivo, se eliminarán todas las cuentas de correo que la requieran, así como sus mensajes, contactos, eventos de calendario y otros datos."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Actualización de seguridad"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> requiere que actualices tu configuración de seguridad."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"La cuenta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" requiere que se actualice la configuración de seguridad."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"Se requiere actualizar Seguridad"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"No se puede sincronizar la cuenta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" debido a diferentes requisitos de seguridad."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"Debe actualizarse la configuración de seguridad de la cuenta \"<xliff:g id="ACCOUNT">%s</xliff:g>\"."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"Se modificó la configuración de seguridad de la cuenta \"<xliff:g id="ACCOUNT">%s</xliff:g>\". El usuario no debe tomar ninguna medida."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Act. de seguridad requerida"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Políts. seguridad modificadas"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Falta en políts. de seguridad"</string>
     <string name="account_security_title" msgid="3511543138560418587">"Seguridad del dispositivo"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"El servidor <xliff:g id="SERVER">%s</xliff:g> requiere tu permiso para controlar de forma remota algunas funciones de seguridad en tu dispositivo Android."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Editar detalles"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"Tu PIN o contraseña de bloqueo de pantalla expiró."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"La contraseña de bloqueo de pantalla expiró"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"La contraseña de bloqueo de pantalla expiró"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"Debes cambiar su PIN o contraseña de bloqueo de pantalla pronto, o se eliminarán los datos de <xliff:g id="ACCOUNT">%s</xliff:g>. ¿Deseas cambiarla ahora?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Debes cambiar el PIN o la contraseña de la pantalla de bloqueo lo antes posible o se eliminarán los datos de <xliff:g id="ACCOUNT">%s</xliff:g>. ¿Quieres cambiarlos ahora?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"La contraseña de bloqueo de pantalla expiró"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"Los datos de <xliff:g id="ACCOUNT">%s</xliff:g> se eliminarán de su dispositivo. Puedes restaurarlo al cambiar tu PIN o contraseña de bloqueo de pantalla. ¿Deseas cambiarla ahora?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"Los datos de <xliff:g id="ACCOUNT">%s</xliff:g> se eliminarán de su dispositivo. Puedes restaurarlo al cambiar tu PIN o tu contraseña de bloqueo de pantalla. ¿Deseas cambiarlos ahora?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"¿Descartar cambios sin guardar?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"No se pudo acceder"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"El nombre de usuario o la contraseña de <xliff:g id="ACCOUNT">%s</xliff:g>no es correcta. ¿Deseas actualizarlos ahora?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"El nombre de usuario o la contraseña de <xliff:g id="ACCOUNT">%s</xliff:g> son incorrectos. ¿Quieres actualizarlos ahora?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Cuenta predeterminada"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Enviar mensaje de correo desde esta cuenta de forma predeterminada"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Descargar archivos adjuntos"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Descarga automática por Wi-Fi de los adjuntos de msjs. recientes"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Notificaciones de correo"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Frecuencia de sincronización, notificaciones, etc."</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"Notificar en la barra de estado cuando llegue un correo"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Enviar una notificación cuando llegue el correo"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Frecuencia de verificación de bandeja de entrada"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Configuración del servidor entrante"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Nombre de usuario, contraseña y otras configuraciones de servidor de entrada"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Configuración del servidor saliente"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Nombre de usuario, contraseña y otras configuraciones de servidor de salida"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Políticas en vigencia"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Ninguna"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Políticas incompatibles"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Ninguna"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"Sincronizar esta cuenta"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Toca para sincronizar esta cuenta."</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Nombre de la cuenta"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Tu nombre"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Firma"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Respuestas rápidas"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Edita el texto que a menudo insertas en los correos electrónicos que redactas."</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Edita el texto que sueles usar al redactar correos electrónicos."</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Agrega texto a los mensajes que envíes"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Configuración de notificación"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Uso de datos"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"Políticas de seguridad"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Editar respuesta rápida"</string>
     <string name="save_action" msgid="1988862706623227093">"Guardar"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Sincronizar contactos"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sincronizar contactos de esta cuenta"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sincronizar calendario"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Sincronizar el calendario de esta cuenta"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Sincronizar calendario"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Sincr. evento calen. de esta cuenta"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincronizar correo"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronizar el correo de esta cuenta"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrar"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> resultados de <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Configuración"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"General"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Configuración general"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"Aplicación"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Avance automático"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Selecciona la pantalla que se mostrará al eliminar un mensaje."</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Ocultar casillas de verificación"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"En las listas de mensajes, mantén presionado para seleccionar."</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Confirmar antes de eliminar"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Mensajes"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Confirmar antes de enviar"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Mensajes"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Avanzar a"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Mensaje más nuevo"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Mensaje anterior"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"Esperando los resultados..."</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Algunos servidores pueden tardar mucho tiempo."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Carpetas"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"No usar la cámara del dispositivo"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Requerir la contraseña del dispositivo"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"Limitar la reutilización de contraseñas"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"Forzar la caducidad de las contraseñas"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"Bloquear pant. de dispositivo inactivo"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"Limitar eventos del calendario que se sincronizan"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"Limitar los correos que se sincronizan"</string>
+    <string name="quick_1" msgid="3426057697353380951">"¡Gracias!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"Me parece bien."</string>
+    <string name="quick_3" msgid="8061819976353395585">"Lo leeré más adelante y me pondré en contacto contigo."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Vamos a convocar a una reunión para tratar esto."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Se ha inhabilitado la sincronización en segundo plano de esta cuenta en itinerancia."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"Enviando respuesta..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"No hay mensajes."</string>
 </resources>
diff --git a/res/values-es-rUS/uploader.xml b/res/values-es-rUS/uploader.xml
index b3d5839..5dda4d0 100644
--- a/res/values-es-rUS/uploader.xml
+++ b/res/values-es-rUS/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Ocultar detalles"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Configuración"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"%s cargados"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Cuenta"</string>
     <string name="upload" msgid="2615541458361216022">"Cargar"</string>
     <string name="ok" msgid="2516349681897895312">"Aceptar"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 3567f55..82e6b85 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"Leer archivos adjuntos de correos electrónicos"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Permite que la aplicación consulte los archivos adjuntos de los mensajes de correo."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Permite que la aplicación consulte los archivos adjuntos de los correos electrónicos."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Acceder a los datos del proveedor de correo electrónico"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Permite que la aplicación acceda a la base de datos de tu correo electrónico, incluidos los mensajes recibidos, los mensajes enviados, los nombres de usuario y las contraseñas."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Permite que la aplicación acceda a la base de datos de tu correo electrónico, incluidos los mensajes recibidos, los mensajes enviados, los nombres de usuario y las contraseñas."</string>
     <string name="app_name" msgid="5815426892327290362">"Correo"</string>
     <string name="compose_title" msgid="427986915662706899">"Redactar"</string>
     <string name="debug_title" msgid="5175710493691536719">"Depurar"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"Listo"</string>
     <string name="create_action" msgid="3062715563215392251">"Crear nueva"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"Eliminar"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"No hay respuestas rápidas"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"No hay respuestas rápidas."</string>
     <string name="discard_action" msgid="6532206074859505968">"Descartar"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"Guardar borrador"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Usar respuesta rápida"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"Búsqueda"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Ajustes de la cuenta"</string>
     <string name="settings_action" msgid="6334807007967459412">"Ajustes"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"Opciones de sincronización"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Opciones de sincronización"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Marcar como no leído"</string>
     <string name="move_action" msgid="3059189775933985898">"Mover"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ CC/CCO"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> wrote:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Incluir texto citado"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Incluir texto"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Debes especificar, al menos, un destinatario."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"Añade al menos un destinatario."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Algunas direcciones de correo electrónico no son válidas."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"El archivo es demasiado grande para adjuntarlo."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Usar respuesta rápida"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Guardado"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Detener"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Adjunto guardado como <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Error al guardar archivo adjunto"</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Nota: uno o varios de los archivos adjuntos del mensaje reenviado se descargarán antes de enviarse."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"Error al guardar el adjunto"</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Uno o varios de los archivos adjuntos del mensaje reenviado se descargarán antes de enviarse."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Mensaje"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Invitación"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Error al enviar uno o varios archivos adjuntos"</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Archivo adjunto no reenviado"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"Error al iniciar sesión en <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"Error al iniciar sesión en <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
     <string name="login_failed_title" msgid="7624349996212476176">"Error al iniciar sesión"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -232,16 +232,12 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Anterior"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" : "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Configuración de cuenta"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Añadir una cuenta de Exchange"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Añadir una cuenta de Exchange ActiveSync"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"Cuenta de correo electrónico"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"Puedes configurar el correo electrónico para la mayoría de las cuentas en pocos pasos."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Puedes configurar una cuenta de Exchange en pocos pasos."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Puedes configurar una cuenta de Exchange ActiveSync en pocos pasos."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Puedes configurar tu cuenta en pocos pasos."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Dirección de correo electrónico"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Contraseña"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Enviar correo electrónico desde esta cuenta de forma predeterminada"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Conf. manual"</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"Enviar correo desde esta cuenta de forma predeterminada"</string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Config. manual"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Introduce una dirección de correo electrónico y una contraseña válidas."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Cuenta duplicada"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Ya estás usando este nombre de usuario para la cuenta \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
@@ -250,8 +246,8 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Comprobando la configuración del servidor de entrada..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Comprobando la configuración del servidor de salida..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Configuración de cuenta"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"Tu cuenta ya está configurada y en breve verás tu correo"</string>
-    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Asignar un nombre a esta cuenta (opcional)"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"Tu cuenta ya está configurada y en breve verás tu correo."</string>
+    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Asigna un nombre a esta cuenta (opcional)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Tu nombre (aparece en los mensajes enviados)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Este campo no puede estar vacío."</string>
     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Configuración de cuenta"</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Ajustes del servidor de entrada"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nombre de usuario"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Contraseña"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Servidor POP3"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"Servidor IMAP"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Servidor"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Puerto"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Tipo de seguridad"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Ninguno"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Servidor SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Puerto"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Tipo de seguridad"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Acceso obligatorio"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Solicitar inicio de sesión"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nombre de usuario"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Contraseña"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"Configuración de cuenta"</string>
@@ -297,7 +292,7 @@
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID del 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>
-    <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Comprobar si hay mensajes nuevos"</string>
+    <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Comprobar mensajes nuevos"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Nunca"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Comprobación automática"</string>
     <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"Cada 5 minutos"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Cada 15 minutos"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Cada 30 minutos"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Cada hora"</string>
-    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Enviar correo electrónico desde esta cuenta de forma predeterminada"</string>
-    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Notificarme cuando llegue un correo electrónico"</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sincronizar contactos desde esta cuenta"</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sincronizar calendario desde esta cuenta"</string>
-    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sincronizar mensajes de correo procedentes de esta cuenta"</string>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"Enviar correo desde esta cuenta de forma predeterminada"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Notificarme cuando llegue un correo"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Sincronizar contactos de esta cuenta"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Sincronizar calendario de esta cuenta"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Sincronizar correo de esta cuenta"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Descargar adjuntos automáticamente al conectar a una red WiFi"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Error al completar la configuración"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Días para sincronizar"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Un mes"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Todo"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Predeterminada de cuenta"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Nombre de usuario o contraseña incorrecta"</string>
-    <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_auth_message" msgid="426627755590431364">"Nombre de usuario o contraseña incorrectos"</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"Nombre de usuario o contraseña incorrectos"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"No se puede establecer conexión de forma segura con el servidor."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"No se puede establecer conexión de forma segura con el servidor."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"Se requiere un certificado de cliente. ¿Quieres conectarte al servidor con un certificado de cliente?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"El certificado no es válido o no se puede acceder a él."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"El servidor ha devuelto un error. Comprueba tu nombre de usuario y tu contraseña y vuelve a intentarlo."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"Se necesita un certificado de cliente. ¿Quieres conectarte al servidor con un certificado de cliente?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"El certificado no es válido o no se puede acceder a él."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"El servidor ha devuelto un error. Comprueba tu nombre de usuario y tu contraseña y vuelve a intentarlo."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"No se puede establecer conexión con el servidor."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"No se puede establecer conexión con el servidor."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"El protocolo TLS es obligatorio, pero el servidor no lo admite."</string>
@@ -343,50 +338,61 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"ADVERTENCIA: si desactivas el permiso de la aplicación Correo para administrar tu dispositivo, se eliminarán todas las cuentas de esta aplicación que requieran su uso, así como las direcciones de correo electrónico, los contactos, los eventos de calendario y otro tipo de datos."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Actualización de seguridad"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> requiere que actualices la configuración de seguridad."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Es necesario actualizar la configuración de seguridad de la cuenta \"<xliff:g id="ACCOUNT">%s</xliff:g>\"."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"Actualización seguridad necesaria"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Los requisitos de seguridad de la cuenta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" no permiten su sincronización."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"Es necesario actualizar la configuración de seguridad de la cuenta \"<xliff:g id="ACCOUNT">%s</xliff:g>\"."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"Se ha modificado la configuración de seguridad de la cuenta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" (no es necesaria la intervención del usuario)."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Actualización seguridad necesaria"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Políticas de seguridad modificadas"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Error al cumplir políticas seguridad"</string>
     <string name="account_security_title" msgid="3511543138560418587">"Seguridad del dispositivo"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Es necesario que permitas que el servidor <xliff:g id="SERVER">%s</xliff:g> controle de forma remota algunas funciones de seguridad de tu dispositivo Android."</string>
-    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Editar detalles"</string>
+    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Aceptar"</string>
     <string name="password_expire_warning_ticker_fmt" msgid="2459977229180023773">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" requiere que modifiques la contraseña o el PIN de la pantalla de bloqueo."</string>
     <string name="password_expire_warning_content_title" msgid="7174669014074849304">"Contraseña bloqueo pantalla va a caducar"</string>
     <string name="password_expired_ticker" msgid="4230570412974108968">"La contraseña o el PIN de la pantalla de bloqueo ha caducado."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"Contraseña bloqueo caducada"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Contraseña bloqueo pantalla va a caducar"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"Deberás modificar la contraseña o el PIN de la pantalla de bloqueo en breve o se borrarán los datos de <xliff:g id="ACCOUNT">%s</xliff:g>. ¿Quieres cambiarla ahora?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Debes cambiar la contraseña o el PIN de la pantalla de bloqueo lo antes posible para que no se borren los datos de <xliff:g id="ACCOUNT">%s</xliff:g>. ¿Quieres hacerlo ahora?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"Contraseña bloqueo caducada"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"Los datos de <xliff:g id="ACCOUNT">%s</xliff:g> se están borrando del dispositivo. Para restaurarlos, modifica la contraseña o el PIN de la pantalla de bloqueo. ¿Quieres cambiarlos ahora?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"Los datos de <xliff:g id="ACCOUNT">%s</xliff:g> se están borrando del dispositivo. Para restaurarlos, modifica la contraseña o el PIN de la pantalla de bloqueo. ¿Quieres hacerlo ahora?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"¿Quieres descartar los cambios no guardados?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Error al iniciar sesión"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"El nombre de usuario o la contraseña de <xliff:g id="ACCOUNT">%s</xliff:g> son incorrectos. ¿Quieres actualizarlos ahora?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"El nombre de usuario o la contraseña de <xliff:g id="ACCOUNT">%s</xliff:g> son incorrectos. ¿Quieres actualizarlos ahora?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Cuenta predeterminada"</string>
-    <string name="account_settings_default_summary" msgid="1531901438624688482">"Enviar correo electrónico desde esta cuenta de forma predeterminada"</string>
+    <string name="account_settings_default_summary" msgid="1531901438624688482">"Enviar correo desde esta cuenta de forma predeterminada"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Descargar adjuntos"</string>
-    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Descarga automática de adjuntos de mensajes recientes por Wi-Fi"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Descargar automáticamente adjuntos de correos recientes por Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Notificaciones de correo"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Frecuencia de sincronización, notificaciones, etc."</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"Notificar en barra del sistema cuando llegue un correo electrónico"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Comprobar si hay mensajes nuevos"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Enviar notificación cuando llegue un correo electrónico"</string>
+    <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Comprobar mensajes nuevos"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Ajustes de entrada"</string>
-    <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Nombre usuario, contraseña y otros ajustes servidor de entrada"</string>
+    <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Nombre de usuario, contraseña y otros ajustes del servidor de entrada"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Ajustes de salida"</string>
-    <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Nombre usuario, contraseña y otros ajustes servidor de salida"</string>
+    <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Nombre de usuario, contraseña y otros ajustes del servidor de salida"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Políticas aplicadas"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Ninguno"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Políticas no admitidas"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Ninguno"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"Intentar sincronización"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Toca para sincronizar esta cuenta."</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Nombre de cuenta"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Tu nombre"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Firma"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Respuestas rápidas"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Edita texto que suelas usar en mensajes de correo electrónico."</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Texto que sueles usar en tus correos"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Añadir texto al final de los mensajes enviados"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Ajustes de notificaciones"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Uso de datos"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"Políticas de seguridad"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Editar respuesta rápida"</string>
     <string name="save_action" msgid="1988862706623227093">"Guardar"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Sincronizar contactos"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sincronizar contactos de esta cuenta"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sincronizar calendario"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Sincronizar calendario de esta cuenta"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Sincronizar calendario"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Sincronizar eventos de calendario para esta cuenta"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincronizar correo"</string>
-    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronizar mensajes de correo electrónico de esta cuenta"</string>
+    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronizar correo de esta cuenta"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrar"</string>
     <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrar también cuando llegue un mensaje"</string>
     <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Siempre"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> resultados de <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Ajustes"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"General"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Ajustes generales"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"Aplicación"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Avance automático"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Selecciona la pantalla que se mostrará después de eliminar el mensaje"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Ocultar casillas de verificación"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"En las listas de mensajes, mantener pulsado para seleccionar"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Confirmar para eliminar"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Mensajes"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Confirmar para enviar"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Mensajes"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Ir a"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Mensaje más reciente"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Mensaje anterior"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"Esperando resultados"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Algunos servidores pueden tardar mucho tiempo."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Carpetas"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"No permitir usar cámara del dispositivo"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Solicitar contraseña del dispositivo"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"Restringir nuevo uso contraseñas recientes"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"Forzar vencimiento de contraseñas"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"Dispositivo inactivo necesario para bloqueo"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"Limitar número de eventos que se sincronizan"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"Limitar número de correos que se sincronizan"</string>
+    <string name="quick_1" msgid="3426057697353380951">"¡Gracias!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"Me parece bien, ¡gracias!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"Lo leeré más tarde y te enviaré una respuesta."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Vamos a reunirnos para hablar de este tema."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Se ha inhabilitado la sincronización en segundo plano de esta cuenta en itinerancia."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"Enviando respuesta..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"No hay ningún mensaje."</string>
 </resources>
diff --git a/res/values-es/uploader.xml b/res/values-es/uploader.xml
index fb6ff2a..c706c4a 100644
--- a/res/values-es/uploader.xml
+++ b/res/values-es/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Ocultar detalles"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Ajustes"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Subido el: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Cuenta"</string>
     <string name="upload" msgid="2615541458361216022">"Subir"</string>
     <string name="ok" msgid="2516349681897895312">"Aceptar"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 8ba8c19..1e73f88 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"Loe meili manuseid"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Võimaldab sellel rakendusel lugeda teie meilimanuseid."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Võimaldab rakendusel lugeda teie meilisõnumite manuseid."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Juurdepääs e-posti teenusepakkuja andmetele"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Lubab sellel rakendusel juurde pääseda teie e-posti andmebaasile, sh vastuvõetud sõnumitele, saadetud sõnumitele, kasutajanimedele ja paroolidele."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Võimaldab rakendusel pääseda teie meiliandmebaasi, sealhulgas vastuvõetud ja saadetud sõnumite, kasutajanimede ning paroolide juurde."</string>
     <string name="app_name" msgid="5815426892327290362">"E-post"</string>
     <string name="compose_title" msgid="427986915662706899">"Koostamine"</string>
     <string name="debug_title" msgid="5175710493691536719">"Silumine"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"Valmis"</string>
     <string name="create_action" msgid="3062715563215392251">"Loo uus"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"Kustuta"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"Kiireid vastuseid pole"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Kiirvastuseid pole."</string>
     <string name="discard_action" msgid="6532206074859505968">"Loobu"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"Salvesta mustand"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Sisesta kiirvastus"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"Otsing"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Konto seaded"</string>
     <string name="settings_action" msgid="6334807007967459412">"Seaded"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"Sünkroonimisvalikud"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Sünkroonimisvalikud"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Märgi mitteloetuks"</string>
     <string name="move_action" msgid="3059189775933985898">"Teisalda"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ koopia/pimek."</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> kirjutas:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Osundatud teksti lisamine"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Lisa tekst"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Peate lisama vähemalt ühe saaja."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"Lisage vähemalt üks saaja."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Mõned e-posti aadressid on kehtetud."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Fail on manustamiseks liiga suur."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Kiirvastuse sisestamine"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Salvestatud"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Peata"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Manus salvestatakse nimega <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Ei saanud manust salvestada."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Märkus: üks või mitu manust edastatud sõnumis laaditakse enne saatmist alla."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"Manust ei saanud salvestada."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Vähemalt üks edastatava sõnumi manus laaditakse enne saatmist alla."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Sõnum"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Kutsu"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Ühe või mitme manuse edastamine ebaõnnestus."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Manust ei edastatud"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"Kasutaja <xliff:g id="ACCOUNT_NAME">%s</xliff:g> sisselogimine ebaõnnestus."</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"Kontole <xliff:g id="ACCOUNT_NAME">%s</xliff:g> sisselogimine ebaõnnestus."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"Sisselogimine ebaõnnestus"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Vanemad"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Konto seadistamine"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Lisage Exchange\'i konto"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Exchange ActiveSynci konto lisamine"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"Meilikonto"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"Saate enamiku kontode e-posti seadistada vaid mõne sammuga."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Exchange\'i konto saate seadistada vaid mõne sammuga."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Exchange ActiveSynci konto saate seadistada vaid mõne sammuga."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Seadistage oma konto vaid mõne sammuga."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"E-posti aadress"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Parool"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Saada meilid vaikimisi sellelt kontolt."</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"Saada meilid vaikimisi sellelt kontolt"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Seadista käsitsi"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Sisestage kehtiv e-posti aadress ja parool."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Duplikaatkonto"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Sissetuleva serveri seadete kontrollimine ..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Väljuva serveri seadete kontrollimine ..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Konto seadistamine"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"Teie konto on seadistatud ja e-post on loomisel."</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"Teie konto on seadistatud ja meilid on tulekul."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Anna sellele kontole nimi (valikuline)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Teie nimi (kuvatakse väljuvates sõnumites)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"See väli ei tohi tühi olla."</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Sissetuleva serveri seaded"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Kasutajanimi"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Parool"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3-server"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"IMAP-server"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Server"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Turvalisuse tüüp"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Puudub"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP-server"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Turvalisuse tüüp"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Nõua sisselogimist."</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Sisselogimine on nõutav"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Kasutajanimi"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Parool"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"Konto seadistamine"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Iga 15 minuti järel"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Iga 30 minuti järel"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Kord tunnis"</string>
-    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Saada meilid vaikimisi sellelt kontolt."</string>
-    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Teavita mind meili saabumisest."</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sünkrooni selle konto kontaktid."</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sünkrooni selle konto kalender."</string>
-    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sünkrooni selle konto meil."</string>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"Saada meilid vaikimisi sellelt kontolt"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Teavita mind meili saabumisest"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Sünkrooni selle konto kontaktid"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Sünkrooni selle konto kalender"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Sünkrooni selle konto meilid"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Manuste automaatne allalaadimine WiFi-ühenduse olemasolul"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Ei saanud lõpetada"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Päevi sünkroonimiseks"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Üks kuu"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Kõik"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Konto vaikeseade kasutam."</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Kasutajanimi või parool on vale."</string>
-    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Kasutajanimi või parool on vale."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_dlg_auth_message" msgid="426627755590431364">"Kasutajanimi või parool on vale."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"Kasutajanimi või parool on vale."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Serveriga ei saa turvaliselt ühendust."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Serveriga ei saa turvaliselt ühendust."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"Vajalik on kliendi sertifikaat. Kas soovite kliendi sertifikaadiga luua ühenduse serveriga?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"Sertifikaat on kehtetu või juurdepääsmatu."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"Server saatis veateate. Kontrollige kasutajanime ja parooli ning proovige uuesti."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"Kliendi sertifikaat on nõutav. Kas soovite luua ühenduse serveriga kliendi sertifikaadi abil?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"Sertifikaat on kehtetu või juurdepääsmatu."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"Server saatis veateate. Kontrollige kasutajanime ja parooli ning proovige uuesti."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"Serveriga ei saa ühendust."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Serveriga ei saa ühendust."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS on vajalik, kuid server ei toeta seda."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"HOIATUS: meilirakenduse volituse inaktiveerimine seadme haldamiseks kustutab kõik meilikontod, mis seda nõuavad, sh nende meilid, kontaktid, kalendrisündmused ja muud andmed."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Turvavärskendus"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> nõuab, et värskendaksite oma turvaseadeid."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Konto „<xliff:g id="ACCOUNT">%s</xliff:g>” vajab turvaseadete värskendamist."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"Vaja on turvavärskendust"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Kontot „<xliff:g id="ACCOUNT">%s</xliff:g>” ei saa turvanõuete tõttu sünkroonida."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"Konto „<xliff:g id="ACCOUNT">%s</xliff:g>” vajab turvaseadete värskendamist."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"Konto „<xliff:g id="ACCOUNT">%s</xliff:g>” muutis turvaseadeid. Kasutaja ei pea midagi tegema."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Nõutav turvavärskendus"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Turvaeeskirjad on muutunud"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Turbe-eeskirju ei saa täita"</string>
     <string name="account_security_title" msgid="3511543138560418587">"Seadme turvalisus"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Server <xliff:g id="SERVER">%s</xliff:g> nõuab mõnede teie Android-seadme turvafunktsioonide kaugjuhtimise lubamist."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Muuda üksikasju"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"Teie ekraaniluku PIN-kood või parool on aegunud."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"Ekraaniluku parool on aegunud"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Ekraaniluku parool on aegumas"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"Peate ekraaniluku PIN-koodi või parooli varsti muutma või konto <xliff:g id="ACCOUNT">%s</xliff:g> andmed kustutatakse. Kas muuta kohe?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Teil tuleb varsti lukustuskuva PIN-koodi või parooli muuta, vastasel korral kustutatakse konto <xliff:g id="ACCOUNT">%s</xliff:g> andmed. Kas soovite kohe muuta?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"Ekraaniluku parool on aegunud"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"Konto <xliff:g id="ACCOUNT">%s</xliff:g> andmeid kustutatakse seadmest. Taastada saate, muutes ekraaniluku PIN-koodi või parooli. Kas muuda seda kohe?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"Konto <xliff:g id="ACCOUNT">%s</xliff:g> andmed kustutatakse teie seadmest. Taastamiseks muutke oma lukustuskuva PIN-koodi või parooli. Kas soovite kohe muuta?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Kas loobute salvestamata muudatustest?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Sisselogimine ebaõnnestus"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Konto <xliff:g id="ACCOUNT">%s</xliff:g> kasutajanimi või parool on vale. Kas värskendada praegu?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"Konto <xliff:g id="ACCOUNT">%s</xliff:g> kasutajanimi või parool on vale. Kas soovite neid kohe värskendada?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Vaikekonto"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Saada meilid vaikimisi sellelt kontolt"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Manuste allalaadimine"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Hiljutiste sõnumite manuste automaatne allalaadimine WiFi kaudu"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Meiliteatised"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Sünkroonimise sagedus, teatised jne."</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"Teavita süsteemiribal, kui saabub meil"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Saada teatis meili saabumisel"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Postkasti kontrollimise sagedus"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Sissetulevate seaded"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Kasutajanimi, parool ja muud sissetuleva posti serveri seaded"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Väljuvad seaded"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Kasutajanimi, parool ja muud väljamineva posti serveri seaded"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Eeskirjad on jõustatud"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Puudub"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Toeta eeskirjad"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Puudub"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"Proovi sünkroonida"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Konto sünkroonimiseks puudutage siin"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Konto nimi"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Teie nimi"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Allkiri"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Kiirvastused"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Muuda teksti, mida sageli sisestate meilide koostamisel"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Muutke teksti, mida meilide koostamisel sageli sisestate"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Lisa saadetavatele sõnumitele tekst"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Teadistusseaded"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Andmete kasutamine"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"Turvaeeskirjad"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Kiirvastuse muutmine"</string>
     <string name="save_action" msgid="1988862706623227093">"Salvesta"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Sünkrooni kontaktid"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Konto kontaktide sünkroonimine"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sünkrooni kalender"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Konto kalendri sünkroonimine"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Sünkrooni kalender"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Sünkrooni konto kalendri sündmused"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sünkrooni meil"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Konto meili sünkroonimine"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibreering"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> tulemust domeenilt <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Seaded"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"Üldine"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Üldseaded"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"Rakendus"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Automaatne edasiminek"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Valige, millist ekraani pärast sõnumi kustutamist kuvada"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Peida märkeruudud"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"Sõnumite loendis peab valimiseks üksust puudutama ja all hoidma"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Kinnitamine enne kustutamist"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Sõnumid"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Kinnitamine enne saatmist"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Sõnumid"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Edasiminek"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Uuem sõnum"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Vanem sõnum"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"Tulemuste ootamine"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Mõnede serverite vastust tuleb kaua oodata."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Kaustad"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Keela seadme kaamera kasutamine"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Nõua seadme parooli"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"Piira hiljutiste paroolide taaskasutamist"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"Paroolide aegumise nõue"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"Nõua jõudeolekus seadme ekraanilukustust"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"Piirab sünkroonitavate kalendrisündmuste arvu"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"Piirab sünkroonitavate meilide arvu"</string>
+    <string name="quick_1" msgid="3426057697353380951">"Aitäh!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"Mulle sobib!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"Loen seda hiljem ja võtan siis ühendust."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Lepime kokku kohtumise, et seda arutada."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Taustsünkroonimine on sellel kontol rändluse ajal keelatud."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"Vastuse saatmine ..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"Sõnumeid pole."</string>
 </resources>
diff --git a/res/values-et/uploader.xml b/res/values-et/uploader.xml
index a13e319..f42e288 100644
--- a/res/values-et/uploader.xml
+++ b/res/values-et/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Peida üksikasjad"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Seaded"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Üles laaditud %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Konto"</string>
     <string name="upload" msgid="2615541458361216022">"Laadi üles"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index ec176ec..f291c4b 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"خواندن پیوستهای ایمیل"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"به این برنامه اجازه می‌دهد پیوستهای ایمیل شما را بخواند."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"به برنامه اجازه می‌دهد پیوست‌های ایمیل شما را بخواند."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"دسترسی به داده‌های ارائه‌کننده ایمیل"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"به این برنامه کاربردی اجازه می‌دهد به پایگاه داده ایمیل شما، شامل پیام‌های دریافتی، پیام‌های ارسالی، نام‌های کاربری و گذرواژه‌ها دسترسی داشته باشد."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"به برنامه کاربردی اجازه می‌دهد به پایگاه داده ایمیل شما، شامل پیام‌های دریافتی، پیام‌های ارسالی، نام‌های کاربری و گذرواژه‌ها دسترسی داشته باشد."</string>
     <string name="app_name" msgid="5815426892327290362">"ایمیل"</string>
     <string name="compose_title" msgid="427986915662706899">"نگاشتن"</string>
     <string name="debug_title" msgid="5175710493691536719">"رفع خطا"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"انجام شد"</string>
     <string name="create_action" msgid="3062715563215392251">"ایجاد مورد جدید"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"حذف"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"پاسخ سریعی وجود ندارد"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"پاسخ سریعی وجود ندارد."</string>
     <string name="discard_action" msgid="6532206074859505968">"صرفنظر"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"ذخیره پیش نویس"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"درج پاسخ سریع"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"جستجو"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"تنظیمات حساب"</string>
     <string name="settings_action" msgid="6334807007967459412">"تنظیمات"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"گزینه‌های همگام‌سازی"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"گزینه‌های همگام‌سازی"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"علامت گذاری بعنوان خوانده نشده"</string>
     <string name="move_action" msgid="3059189775933985898">"انتقال"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ گیرنده کپی/گیرنده مخفی"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> نوشت:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"شامل نوشتار نقل قول شده"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"شامل متن"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"باید حداقل یک گیرنده اضافه کنید."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"حداقل یک گیرنده اضافه کنید."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"برخی از آدرس های ایمیل نامعتبر هستند."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"فایل خیلی بزرگ است و پیوست نمی شود"</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"درج پاسخ سریع"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"ذخیره شد"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"توقف"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"پیوست به عنوان <xliff:g id="FILENAME">%s</xliff:g> ذخیره شد."</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"نمی‌توان پیوست را ذخیره کرد."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"توجه: یک یا چند پیوست در پیام هدایت شده شما قبل از ارسال دانلود می شود."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"پیوست ذخیره نشد."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"یک یا چند پیوست در پیام هدایت شده شما قبل از ارسال دانلود خواهد شد."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"پیام"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"دعوت کردن"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"یک یا چند پیوست باز ارسال نشد."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"پیوست هدایت نشد"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"ورود به سیستم <xliff:g id="ACCOUNT_NAME">%s</xliff:g> ناموفق بود."</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"ورود به سیستم <xliff:g id="ACCOUNT_NAME">%s</xliff:g> ناموفق بود."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"ورود به سیستم ممکن نیست"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> بایت"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"قدیمی تر"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" -- "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"تنظیم حساب"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"افزودن یک حساب Exchange"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"افزودن یک حساب Exchange ActiveSync"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"حساب ایمیل"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"می‌توانید فقط با انجام چند مرحله، ایمیل را برای اکثر حساب‌ها تنظیم کنید."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"شما می‌توانید فقط با انجام چند مرحله یک حساب Exchange تنظیم کنید."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"می‌توانید فقط با انجام چند مرحله، یک حساب Exchange ActiveSync تنظیم کنید."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"شما می‌توانید حساب خود را فقط در چند مرحله تنظیم کنید."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"آدرس ایمیل"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"رمز ورود"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"ارسال ایمیل از این حساب به صورت پیش فرض."</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"ارسال ایمیل از این حساب به صورت پیش‌فرض"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"تنظیم دستی"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"یک آدرس ایمیل و گذرواژه معتبر تایپ کنید."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"حساب تکراری"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"در حال بررسی تنظیمات سرور ورودی..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"در حال بررسی تنظیمات سرور خروجی..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"تنظیم حساب"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"حساب شما تنظیم شد و ایمیل در راه است!"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"حساب شما تنظیم شد و ایمیل در راه است!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"نامی به این حساب اختصاص دهید (اختیاری)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"نام شما (در پیام های خروجی نمایش داده می شود)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"این قسمت نمی‌تواند خالی باشد."</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"تنظیمات سرور ورودی"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"نام کاربری"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"رمز ورود"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"سرور POP3"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"سرور IMAP"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"سرور"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"درگاه"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"نوع امنیت"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"هیچکدام"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"سرور SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"درگاه"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"نوع امنیت"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"باید به سیستم وارد شوید."</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"ورود به سیستم لازم است"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"نام کاربری"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"رمز ورود"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"تنظیم حساب"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"هر 15 دقیقه"</string>
     <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_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>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"ارسال ایمیل از این حساب به صورت پیش‌فرض"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"ورود ایمیل به من اعلان شود"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"همگام سازی مخاطبین از این حساب"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"همگام‌سازی تقویم از این حساب"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"همگام‌سازی ایمیل از این حساب"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"دانلود خودکار پیوست ها هنگام اتصال به Wi-Fi"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"پایان نیافت"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"روزهای همگام‌سازی"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"یک ماه"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"همه"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"استفاده از پیش فرض حساب"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"نام کاربری یا رمز ورود نادرست است."</string>
-    <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_auth_message" msgid="426627755590431364">"نام کاربری یا گذرواژه شما اشتباه است."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"نام کاربری یا گذرواژه نادرست است."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"اتصال امن به سرور امکان‌پذیر نیست."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"اتصال امن به سرور امکان‌پذیر نیست."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"گواهی سرویس‌ گیرنده مورد نیاز است. اتصال به سرور با گواهی سرویس‌ گیرنده؟"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"گواهینامه نامعتبر است و یا غیر قابل‌دسترسی است."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"سرور با یک خطا پاسخ داد. لطفاً نام کاربری و گذرواژه خود را بررسی کرده و دوباره امتحان کنید."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"به گواهینامه کلاینت نیاز دارد. آیا می‌خواهید با گواهینامه کلاینت به سرور متصل شوید؟"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"گواهینامه نامعتبر است و یا غیرقابل دسترس است."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"سرور با یک خطا پاسخ داد. نام کاربری و گذرواژه خود را بررسی کرده و دوباره امتحان کنید."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"اتصال به سرور امکان‌پذیر نیست."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"اتصال به سرور امکان‌پذیر نیست."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS لازم است اما توسط سرور پشتیبانی نمی شود."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"اخطار: غیرفعال کردن اختیار برنامه ایمیل برای سرپرستی دستگاه شما، همه حساب‌های ایمیلی که به آن احتیاج دارند، به همراه ایمیل، مخاطبین، رویدادهای تقویم و سایر داده‌های آنها را حذف می‌کند."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"به‌روزرسانی امنیتی"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> از شما می‌خواهد تنظیمات امنیتی خود را به‌روزرسانی کنید."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"تنظیمات امنیتی حساب \"<xliff:g id="ACCOUNT">%s</xliff:g>\" باید به روزرسانی شود."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"به روزرسانی امنیتی لازم است"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"به دلایل امنیتی، امکان همگام‌سازی حساب \"<xliff:g id="ACCOUNT">%s</xliff:g>\" وجود ندارد."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"تنظیمات امنیتی حساب \"<xliff:g id="ACCOUNT">%s</xliff:g>\" باید به‌روزرسانی شود."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"حساب \"<xliff:g id="ACCOUNT">%s</xliff:g>\" تنظیمات امنیتی خود را تغییر داده است؛ نیازی به انجام هیچ کاری از طرف کاربر نیست."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"به‌روزرسانی امنیتی لازم است"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"خط‌مشی‌های امنیتی تغییر کرده‌اند"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"از خط‌مشی‌های امنیتی تبعیت نمی‌شود"</string>
     <string name="account_security_title" msgid="3511543138560418587">"امنیت دستگاه"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"سرور <xliff:g id="SERVER">%s</xliff:g> از شما می خواهد که به آن اجازه دهید برخی از ویژگی های امنیتی دستگاه Android شما را از راه دور کنترل کند."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"ویرایش جزئیات"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"کد پین یا رمز ورود قفل صفحه منقضی شده است."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"رمز ورود قفل صفحه منقضی شده است"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"رمز ورود قفل صفحه در حال انقضا"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"شما باید به زودی کد پین یا رمز ورود قفل صفحه را تغییر دهید، در غیر این صورت داده های <xliff:g id="ACCOUNT">%s</xliff:g> پاک می شود. اکنون تغییر می دهید؟"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"باید پین قفل صفحه یا گذرواژه خود را سریع تغییر دهید، در غیر اینصورت داده‌های <xliff:g id="ACCOUNT">%s</xliff:g> پاک خواهد شد . آیا می‌خواهید اکنون آن‌ را تغییر دهید؟"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"رمز ورود قفل صفحه منقضی شده است"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"داده های <xliff:g id="ACCOUNT">%s</xliff:g> از دستگاه شما حذف می شوند. می توانید با تغییر کد پین یا رمز ورود صفحه قفل خود آنها را بازیابی کنید. اکنون آنرا تغییر می دهید؟"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"داده‌های <xliff:g id="ACCOUNT">%s</xliff:g> درحال پاک شدن از دستگاه شما است. با تغییر دادن پین صفحه قفل یا گذرواژه خود می‌توانید آنها را بازگردانید. آیا می‌خواهید هم اکنون آن‌ را تغییر دهید؟"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"از تغییرات ذخیره نشده صرفنظر شود؟"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"ورود به سیستم ممکن نیست"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"نام کاربری یا رمز ورود <xliff:g id="ACCOUNT">%s</xliff:g> نادرست است. اکنون آنها را به روزرسانی می کنید؟"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"نام کاربری یا گذرواژه <xliff:g id="ACCOUNT">%s</xliff:g> نادرست است. آیا می‌خواهید هم اکنون آنها را به‌روز کنید؟"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"حساب پیش فرض"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"ارسال ایمیل از این حساب به صورت پیش فرض"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"دانلود پیوست‌ها"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"دانلود خودکار پیوست‌ها به پیامهای اخیر از طریق Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"اعلان های ایمیل"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"تکرار همگام سازی، اعلان ها، موارد دیگر"</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"ورود ایمیل در نوار سیستم اعلام شود"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"ارسال اعلان هنگام ورود ایمیل"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"دفعات بررسی صندوق دریافت"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"تنظیمات ورودی"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"نام کاربری، رمز ورود و سایر تنظیمات سرور ورودی"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"تنظیمات خروجی"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"نام کاربری، رمز ورود و سایر تنظیمات سرور خروجی"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"خط‌مشی‌های اعمال شده"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"هیچکدام"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"خط مشی‌های پشتیبانی نشده"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"هیچکدام"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"تلاش برای همگام‌سازی"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"برای همگام‌سازی این حساب اینجا را لمس کنید"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"نام حساب"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"نام شما"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"امضا"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"پاسخ‌های سریع"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"متنی را که غالباً هنگام نوشتن ایمیل ها درج می کنید، ویرایش کنید"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"ویرایش متنی که غالباً هنگام نوشتن ایمیل درج می‌کنید"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"افزودن متن به پیام هایی که ارسال می کنید"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"تنظیمات اعلان"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"مصرف داده"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"خط‌مشی‌های امنیتی"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"ویرایش پاسخ سریع"</string>
     <string name="save_action" msgid="1988862706623227093">"ذخیره"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"همگام سازی مخاطبین"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"همگام سازی مخاطبین برای این حساب"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"همگام سازی تقویم"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"همگام سازی تقویم برای این حساب"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"همگام سازی تقویم"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"همگام‌‌سازی رویداد تقویم برای این حساب"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"همگام‌سازی ایمیل"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"همگام سازی ایمیل برای این حساب"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"لرزش"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> نتیجه از <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"تنظیمات"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"عمومی"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"تنظیمات کلی"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"برنامه کاربردی"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"پیشرفته خودکار"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"انتخاب کنید بعد از حذف یک پیام، چه صفحه‌ای نشان داده شود"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"پنهان کردن کادرهای تأیید"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"در لیست پیام‌ها، برای انتخاب کردن، لمس کرده و نگهدارید"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"تأیید قبل از حذف"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"پیام‌ها"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"تأیید قبل از ارسال"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"پیام‌ها"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"پیشروی به"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"پیام جدیدتر"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"پیام قدیمی تر"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"در انتظار نتایج"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"در بعضی از سرورها ممکن است زمان طولانی شود."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"پوشه ها"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"استفاده از دوربین دستگاه مجاز نیست"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"گذرواژه دستگاه لازم است"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"استفاده مجدد از گذرواژه‌های اخیر محدود است"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"گذرواژه‌ها باید منقضی شوند"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"برای قفل کردن صفحه خود یک دستگاه آماده به کار لازم است"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"محدود کردن تعداد رویدادهای همگام‌سازی شده تقویم"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"محدود کردن تعداد ایمیل‌های همگام‌سازی شده"</string>
+    <string name="quick_1" msgid="3426057697353380951">"متشکریم!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"به نظرم خوب است!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"بعداً این را میخوانم و به شما اطلاع میدهم."</string>
+    <string name="quick_4" msgid="3988974084396883051">"بیایید یک جلسه تشکیل بدهیم و درباره آن گفتگو کنیم."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"هنگام رومینگ، همگام‌سازی پس‌زمینه برای این حساب غیرفعال است."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"در حال ارسال پاسخ…"</string>
+    <string name="no_conversations" msgid="5559527390337162819">"پیامی موجود نیست."</string>
 </resources>
diff --git a/res/values-fa/uploader.xml b/res/values-fa/uploader.xml
index f4657da..2fdb77e 100644
--- a/res/values-fa/uploader.xml
+++ b/res/values-fa/uploader.xml
@@ -30,7 +30,7 @@
     <!-- String.format failed for translation -->
     <!-- no translation found for format_date_uploaded (803752037646090928) -->
     <skip />
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"حساب"</string>
     <string name="upload" msgid="2615541458361216022">"آپلود"</string>
     <string name="ok" msgid="2516349681897895312">"تأیید"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 8688190..9afe48f 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"Lue sähköpostiliitteitä"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Antaa sovelluksen lukea sähköpostiliitteitä."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Antaa sovelluksen lukea sähköpostiliitteitä."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Käytä sähköpostintarjoajan tietoja"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Antaa sovelluksen käyttää sähköpostitietokantaasi, mukaan lukien vastaanotettuja viestejä, lähetettyjä viestejä, käyttäjänimiä ja salasanoja."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Antaa sovelluksen käyttää sähköpostitietokantaasi, mukaan lukien vastaanotetut viestit, lähetetyt viestit, käyttäjänimet ja salasanat."</string>
     <string name="app_name" msgid="5815426892327290362">"Sähköposti"</string>
     <string name="compose_title" msgid="427986915662706899">"Viestin kirjoitus"</string>
     <string name="debug_title" msgid="5175710493691536719">"Virheenjäljitys"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"Valmis"</string>
     <string name="create_action" msgid="3062715563215392251">"Luo uusi"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"Poista"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"Ei pikavastauksia"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Ei pikavastauksia."</string>
     <string name="discard_action" msgid="6532206074859505968">"Hylkää"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"Tallenna luonnos"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Lisää pikavastaus"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"Haku"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Tilin asetukset"</string>
     <string name="settings_action" msgid="6334807007967459412">"Asetukset"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"Synkronointiasetukset"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Synkronointiasetukset"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Merkitse lukemattomaksi"</string>
     <string name="move_action" msgid="3059189775933985898">"Siirrä"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ Kopio/piilok."</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> kirjoitti:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Lisää lainattu teksti"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Liitä teksti mukaan"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Vähintään yksi vastaanottaja on lisättävä."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"Lisää vähintään yksi vastaanottaja."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Kaikki sähköpostiosoitteet eivät kelpaa."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Tiedosto on liian suuri liitettäväksi."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Lisää pikavastaus"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Tallennettu"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Lopeta"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Liite tallennettu nimellä <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Liitettä ei voitu tallentaa."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Huomaa: vähintään yksi edelleen lähetettävän viestisi liitteistä ladataan ennen lähettämistä."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"Liitetied. tall. epäonnistui."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Vähintään yksi edelleen lähetettävän viestisi liitteistä ladataan ennen lähettämistä."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Viesti"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Kutsu"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Vähintään yhden liitteen edelleenlähettäminen epäonnistui."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Liitettä ei lähetetty edelleen"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"Kirjautuminen tiliin <xliff:g id="ACCOUNT_NAME">%s</xliff:g> epäonnistui."</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"Kirjautuminen tiliin <xliff:g id="ACCOUNT_NAME">%s</xliff:g> epäonnistui."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"Kirjautuminen ei onnistu"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> t"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Vanhemmat"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" – "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Tilin asetukset"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Lisää Exchange-tili"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Lisää Exchange ActiveSync -tili"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"Sähköpostitili"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"Voit määrittää useimpien sähköpostitilien asetukset helposti."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Voit määrittää Exchange-tilin asetukset helposti."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Voit määrittää Exchange ActiveSync -tilin asetukset helposti."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Tilisi asetuksien määrittäminen käy helposti muutaman vaiheen kautta."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Sähköpostiosoite"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Salasana"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Lähetä sähköposti oletuksena tältä tililtä."</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"Lähetä sähköposti oletuksena tältä tililtä"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuaalinen määritys"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Anna kelvollinen sähköpostiosoite ja salasana."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Päällekkäiset tilit"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Tarkistetaan saapuvan postin palvelimen asetuksia…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Tarkistetaan lähtevän postin palvelimen asetuksia…"</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Tilin asetukset"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"Tili on määritetty ja sähköposteja noudetaan."</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"Tili on määritetty ja sähköposteja noudetaan."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Anna tilille nimi (valinnainen)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Oma nimi (näytetään lähtevissä viesteissä)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Kenttä ei voi olla tyhjä."</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Saapuvan postin palvelimen asetukset"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Käyttäjänimi"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Salasana"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3-palvelin"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"IMAP-palvelin"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Palvelin"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Portti"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Suojaustyyppi"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Ei mitään"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP-palvelin"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Portti"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Suojaustyyppi"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Edellytä kirjautumista."</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Vaadi kirjautuminen"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Käyttäjänimi"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Salasana"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"Tilin asetukset"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"15 minuutin välein"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"30 minuutin välein"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Tunnin välein"</string>
-    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Lähetä sähköposti oletuksena tältä tililtä."</string>
-    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Ilmoita saapuvasta sähköpostista."</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Synkronoi tämän tilin yhteystiedot."</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Synkronoi tämän tilin kalenteri."</string>
-    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Synkronoi tämän tilin lähetetyt sähköpostit."</string>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"Lähetä sähköposti oletuksena tältä tililtä"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Ilmoita saapuvasta sähköpostista"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Synkronoi tämän tilin yhteystiedot"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Synkronoi tämän tilin kalenteri"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Synkronoi tämän tilin sähköpostit"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Lataa liitteet automaattisesti wifi-yhteyden ollessa käytössä."</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Ei onnistunut"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Synkronoitavien päivien määrä"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Yksi kuukausi"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Kaikki"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Käytä tilin oletusta"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Virheellinen käyttäjänimi tai salasana."</string>
-    <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_auth_message" msgid="426627755590431364">"Käyttäjänimi tai salasana on virheellinen."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"Käyttäjänimi tai salasana on virheellinen."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Palvelimeen ei voi muodostaa suojattua yhteyttä."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Palvelimeen ei voi muodostaa suojattua yhteyttä."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"Asiakasvarmenne vaaditaan. Yhdistetäänkö asiakasvarmenteelliseen palvelimeen?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"Varmenne ei kelpaa tai ole käytettävissä."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"Palvelin lähetti virheilmoituksen. Tarkista käyttäjänimesi ja salasanasi ja yritä uudelleen."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"Asiakasvarmenne vaaditaan. Haluatko yhdistää palvelimeen asiakasvarmenteen avulla?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"Varmenne ei kelpaa tai ole käytettävissä."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"Palvelin lähetti virheilmoituksen. Tarkista käyttäjänimesi ja salasanasi ja yritä uudelleen."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"Palvelimeen ei voi muodostaa yhteyttä."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Palvelimeen ei voi muodostaa yhteyttä."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS vaaditaan, mutta palvelin ei tue sitä."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"VAROITUS: jos poistat sähköpostisovellukselta oikeuden hallinnoida laitettasi, myös kaikki sovellukseen liittyvät sähköpostitilit sekä niiden sähköpostit, yhteystiedot, kalenteritapahtumat ja muut tiedot poistetaan."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Tietoturvapäivitys"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> pyytää sinua päivittämään suojausasetuksesi."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Tili \"<xliff:g id="ACCOUNT">%s</xliff:g>\" edellyttää, että suojausasetukset päivitetään."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"Suojauspäivitys tarvitaan"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Tiliä <xliff:g id="ACCOUNT">%s</xliff:g> ei voi synkronoida suojausvaatimusten vuoksi."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"Tili \"<xliff:g id="ACCOUNT">%s</xliff:g>\" edellyttää, että suojausasetukset päivitetään."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"Tili \"<xliff:g id="ACCOUNT">%s</xliff:g>\" muutti suojausasetuksiaan. Käyttäjältä ei vaadita toimia."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Suojauspäivitys tarvitaan"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Suojauskäytännöt muuttuneet"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Ei vastaa suojauskäytäntöjä"</string>
     <string name="account_security_title" msgid="3511543138560418587">"Laitteen suojaus"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Palvelin <xliff:g id="SERVER">%s</xliff:g> vaatii, että sen sallitaan hallita joitakin Android-laitteen suojaustoiminnoista."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Muokkaa tietoja"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"Ruudunlukituksen PIN-koodi tai salasana on vanhentunut."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"Ruudunlukituksen salasana vanhentunut"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Ruudunlukituksen salasana vanhentuu pian"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"Ruudunlukituksen PIN-koodi tai salasana tulee vaihtaa pian, tai tilin <xliff:g id="ACCOUNT">%s</xliff:g> tiedot poistetaan. Vaihdetaanko koodi nyt?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Ruudunlukituksen PIN-koodi tai salasana tulee vaihtaa pian, tai tilin <xliff:g id="ACCOUNT">%s</xliff:g> tiedot poistetaan. Haluatko vaihtaa koodin nyt?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"Ruudunlukituksen salasana vanhentunut"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"Tilin <xliff:g id="ACCOUNT">%s</xliff:g> tietoja poistetaan laitteeltasi. Voit palauttaa tilin vaihtamalla ruudunlukituksen PIN-koodin tai salasanan. Vaihdetaanko koodi nyt?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"Tilin <xliff:g id="ACCOUNT">%s</xliff:g> tietoja poistetaan laitteeltasi. Voit palauttaa tilin vaihtamalla ruudunlukituksen PIN-koodin tai salasanan. Haluatko vaihtaa koodin nyt?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Hylätäänkö tallentamattomat muutokset?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Kirjautuminen ei onnistu."</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Tilin <xliff:g id="ACCOUNT">%s</xliff:g> käyttäjänimi tai salasana on virheellinen. Päivitetäänkö?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"Tilin <xliff:g id="ACCOUNT">%s</xliff:g> käyttäjänimi tai salasana on virheellinen. Haluatko päivittää ne nyt?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Oletustili"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Lähetä sähköposti oletuksena tältä tililtä"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Lataa liitetiedostoja"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Lataa viimeaikaisten viestien liitteet wifi-yhteyden kautta."</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Sähköposti-ilmoitukset"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Synkronoinnin tiheys, ilmoitukset jne."</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"Ilmoita tilarivissä, kun sähköpostiviesti saapuu"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Lähetä ilmoitus, kun sähköpostiviesti saapuu"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Uusien viestien tarkistustiheys"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Saapuvan postin asetukset"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Käyttäjänimi, salasana ja muut tulevat palvelimen asetukset"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Lähtevän postin asetukset"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Käyttäjänimi, salasana ja muut lähtevät palvelimen asetukset"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Käytännöt otettu käyttöön"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Ei mitään"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Käytäntöjä ei tueta"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Ei mitään"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"Yritä synkronointia"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Synkronoi tili koskettamalla tätä"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Tilin nimi"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Oma nimi"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Allekirjoitus"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Pikavastaukset"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Muokkaa tekstiä, jota lisäät usein sähköpostiviesteihin"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Muokkaa tekstiä, jota lisäät usein sähköpostiviesteihin"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Liitä lähettämiisi viesteihin teksti"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Ilmoitusasetukset"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Tiedonsiirto"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"Suojauskäytännöt"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Muokkaa pikavastausta"</string>
     <string name="save_action" msgid="1988862706623227093">"Tallenna"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Synkronoi yhteystiedot"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Synkronoi tämän tilin yhteystiedot"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Synkronoi Kalenteri"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Synkronoi tämän tilin kalenteri"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Synkronoi kalenteri"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Synkronoi tilin kalenteritapahtuma"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synkronoi sähköposti"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synkronoi tämän tilin sähköpostit"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Värinä"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> tulosta osoitteella <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Asetukset"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"Yleiset"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Yleiset asetukset"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"Sovellus"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Automaattinen siirtyminen"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Valitse, mikä ruutu näytetään viestin poistamisen jälkeen"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Piilota valintaruudut"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"Valitse viesti luettelosta koskettamalla pitkään."</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Vahvista ennen poistamista"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Viestit"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Vahvista ennen lähettämistä"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Viestit"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Siirry ruutuun"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Uudempi viesti"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Vanhempi viesti"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"Odotetaan tuloksia"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Joidenkin palvelimien vastaus voi kestää kauan."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Kansiot"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Älä salli laitteen kameran käyttöä"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Vaadi laitteen salasana"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"Rajoita viim. salasanojen uud.käyttöä"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"Vaadi salasanojen vanhenemista"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"Käyttämättömän laitteen lukittava ruutu"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"Rajoita synkronoitavien kalenteritap. lukumäärää"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"Rajoita synkronoitavien sähköpostien lukumäärää"</string>
+    <string name="quick_1" msgid="3426057697353380951">"Kiitos!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"Kuulostaa hyvältä!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"Luen tämän myöhemmin ja palaan asiaan."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Järjestetään tapaaminen ja keskustellaan asiasta."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Tämän tilin taustasynkronointi on pois käytöstä roaming-tilassa."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"Lähetetään vastaus..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"Ei viestejä."</string>
 </resources>
diff --git a/res/values-fi/uploader.xml b/res/values-fi/uploader.xml
index 8ca406f..1705717 100644
--- a/res/values-fi/uploader.xml
+++ b/res/values-fi/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Piilota tiedot"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Asetukset"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Ladattu %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Tili"</string>
     <string name="upload" msgid="2615541458361216022">"Lataa"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index d6c4e94..d5ae8a1 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"Lire les pièces jointes"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Permet à cette application de lire les pièces jointes aux e-mails."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Permet à l\'application de lire les pièces jointes aux e-mails."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Accéder aux données du fournisseur de messagerie"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Permet à cette application d\'accéder à votre base de données de messagerie, y compris aux messages reçus et envoyés, aux noms d\'utilisateur et aux mots de passe."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Permet à l\'application d\'accéder à la base de données de votre messagerie, y compris aux messages reçus et envoyés, aux noms d\'utilisateur et aux mots de passe."</string>
     <string name="app_name" msgid="5815426892327290362">"E-mail"</string>
     <string name="compose_title" msgid="427986915662706899">"Nouveau message"</string>
     <string name="debug_title" msgid="5175710493691536719">"Débogage"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"OK"</string>
     <string name="create_action" msgid="3062715563215392251">"Créer"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"Supprimer"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"Aucune réponse rapide"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Aucune réponse rapide"</string>
     <string name="discard_action" msgid="6532206074859505968">"Supprimer"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"Enregistrer"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Insérer la réponse rapide"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"Rechercher"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Paramètres du compte"</string>
     <string name="settings_action" msgid="6334807007967459412">"Paramètres"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"Options de synchronisation"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Options de synchronisation"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Marquer comme non lu"</string>
     <string name="move_action" msgid="3059189775933985898">"Déplacer"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Cci"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> a écrit :"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Inclure le texte des messages précédents"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Inclure le texte"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Vous devez ajouter au moins un destinataire."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"Ajoutez au moins un destinataire."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Certaines adresses e-mail sont incorrectes."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Impossible de joindre le fichier, car il est trop volumineux."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Insérer une réponse rapide"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Enregistré"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Arrêter"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"PJ enregistrée sous <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Impossible enreg. pièce jointe."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Remarque : Une ou plusieurs pièces jointes du message que vous transférez vont être téléchargées avant l\'envoi."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"Impossible enreg. pièce jointe."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Une ou plusieurs pièces jointes au message que vous transférez vont être téléchargées avant l\'envoi."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Message"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Inviter"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Impossible de transférer une ou plusieurs pièces jointes."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Pièce jointe non transférée"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"Échec de la connexion au compte <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"Échec de la connexion au compte <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"Impossible de se connecter"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> O"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Précédents"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Configurer un compte"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Ajouter un compte Exchange"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Ajouter un compte Exchange ActiveSync"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"Compte de messagerie"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"Vous pouvez configurer une messagerie pour la plupart des comptes en quelques étapes seulement."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Vous pouvez configurer un compte Exchange en quelques étapes seulement."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Vous pouvez configurer un compte Exchange ActiveSync en quelques étapes seulement."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Vous pouvez configurer votre compte en quelques étapes seulement."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Adresse e-mail"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Mot de passe"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Par défaut, envoyer les e-mails avec ce compte"</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"Par défaut, envoyer les e-mails avec ce compte"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Configuration manuelle"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Saisissez une adresse e-mail et un mot de passe corrects."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Dupliquer le compte"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Vérification des paramètres de serveur entrant…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Vérification des paramètres de serveur sortant…"</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Configuration du compte"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"Votre compte est configuré et votre messagerie a été activée !"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"Votre compte est configuré et votre messagerie est activée !"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Nom du compte (facultatif)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Votre nom (affiché sur les messages sortants)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Ce champ est obligatoire."</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Paramètres du serveur entrant"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nom d\'utilisateur"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Mot de passe"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Serveur POP3"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"Serveur IMAP"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Serveur"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Type de sécurité"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Aucun"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Serveur SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Type de sécurité"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Connexion obligatoire."</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Exiger une connexion"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nom d\'utilisateur"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Mot de passe"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"Configuration du compte"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Toutes les 15 minutes"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Toutes les 30 minutes"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Toutes les heures"</string>
-    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Par défaut, envoyer les e-mails avec ce compte"</string>
-    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Afficher une notification lors de la réception d\'un e-mail"</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Synchroniser les contacts issus de ce compte"</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Synchroniser l\'agenda à partir de ce compte"</string>
-    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Synchroniser les e-mails à partir de ce compte"</string>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"Par défaut, envoyer les e-mails avec ce compte"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"M\'avertir lors de la réception d\'un e-mail"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Synchroniser les contacts de ce compte"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Synchroniser l\'agenda de ce compte"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Synchroniser les e-mails de ce compte"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Télécharger automatiquement les pièces jointes une fois connecté au Wi-Fi"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Impossible de terminer"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Jours à synchroniser"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Un mois"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Tous"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Utiliser paramètres défaut"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Nom d\'utilisateur ou mot de passe incorrect."</string>
-    <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_auth_message" msgid="426627755590431364">"Nom d\'utilisateur ou mot de passe incorrect."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"Le nom d\'utilisateur ou le mot de passe est incorrect."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Impossible d\'établir une connexion sécurisée avec le serveur."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Impossible d\'établir une connexion sécurisée avec le serveur."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"Certificat client requis. Voulez-vous vous connecter au serveur avec le certificat client ?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"Le certificat n\'est pas valide ou est inaccessible."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"Erreur du serveur. Veuillez vérifier votre nom d\'utilisateur et votre mot de passe, puis réessayer."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"Certificat client requis. Voulez-vous vous connecter au serveur avec un certificat client ?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"Le certificat est invalide ou inaccessible."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"Erreur du serveur. Veuillez vérifier votre nom d\'utilisateur et votre mot de passe, puis réessayer."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"Impossible de se connecter au serveur."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Impossible de se connecter au serveur."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"Protocole TLS requis mais non pris en charge par le serveur."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"AVERTISSEMENT : Si vous désactivez la gestion de votre appareil par l\'application E-mail, tous les comptes de messagerie qui y sont associés seront supprimés, de même que leurs données (e-mails, contacts, événements d\'agenda, etc.)."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Mise à jour de sécurité"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> nécessite la mise à jour de vos paramètres de sécurité."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Le compte \"<xliff:g id="ACCOUNT">%s</xliff:g>\" nécessite une mise à jour de ses paramètres de sécurité."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"Mise à jour de sécurité requise"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Impossible de synchroniser le compte <xliff:g id="ACCOUNT">%s</xliff:g> en raison des exigences de sécurité."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"Les paramètres de sécurité du compte \"<xliff:g id="ACCOUNT">%s</xliff:g>\" doivent être mis à jour."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"Les paramètres de sécurité du compte \"<xliff:g id="ACCOUNT">%s</xliff:g>\" ont été modifiés. Aucune action de votre part n\'est requise."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Mise à jour de sécurité requise"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Règles de sécurité modifiées"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Imposs. appliquer règles sécu"</string>
     <string name="account_security_title" msgid="3511543138560418587">"Sécurité de l\'appareil"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Vous devez autoriser le serveur <xliff:g id="SERVER">%s</xliff:g> à contrôler à distance certaines fonctionnalités de sécurité de votre mobile Android."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Modifier les infos"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"Le code PIN ou le mot de passe de verrouillage de votre écran a expiré."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"Mot de passe verrou. expiré"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Expiration mot de passe de verrouillage"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"Vous devrez bientôt modifier le code PIN ou le mot de passe de verrouillage de votre écran, faute de quoi les données du compte <xliff:g id="ACCOUNT">%s</xliff:g> seront effacées. Modifier maintenant ?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Vous allez bientôt devoir modifier le code PIN ou le mot de passe de verrouillage de l\'écran, faute de quoi les données de <xliff:g id="ACCOUNT">%s</xliff:g> vont être effacées. Voulez-vous le modifier maintenant ?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"Le mot de passe de verrouillage de votre écran a expiré."</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"Les données du compte <xliff:g id="ACCOUNT">%s</xliff:g> sont en cours d\'effacement de votre appareil. Vous pouvez les restaurer en modifiant le code PIN ou le mot de passe de verrouillage de votre écran. Le modifier maintenant ?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"Les données de <xliff:g id="ACCOUNT">%s</xliff:g> sont en cours d\'effacement de votre appareil. Vous pouvez les restaurer en modifiant le code PIN ou le mot de passe de verrouillage de l\'écran. Voulez-vous le modifier maintenant ?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Annuler les modifications non enregistrées ?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Impossible de se connecter."</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Le nom d\'utilisateur ou le mot de passe du compte <xliff:g id="ACCOUNT">%s</xliff:g> est incorrect. Mettre à jour maintenant ?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"Le nom d\'utilisateur ou le mot de passe de <xliff:g id="ACCOUNT">%s</xliff:g> est incorrect. Voulez-vous les mettre à jour maintenant ?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Compte par défaut"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Par défaut, envoyer les e-mails avec ce compte"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Télécharger les pièces jointes"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Téléch. auto des pièces jointes aux messages récents via Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Notifications"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Fréquence de synchronisation, notifications, etc."</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"Afficher une notification dans la barre système à la réception d\'e-mails"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Envoyer une notification en cas de nouvel e-mail"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Fréquence de consultation de la boîte de réception"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Paramètres de réception"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Nom d\'utilisateur, mot de passe et autres param. serveur entrant"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Paramètres d\'envoi"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Nom d\'utilisateur, mot de passe et autres param. serveur sortant"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Règles appliquées"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Aucun"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Règles non compatibles"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Aucun"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"Synchroniser (tentative)"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Appuyer ici pour synchroniser ce compte"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Nom du compte"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Votre nom"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Signature"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Réponses rapides"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Modifier texte fréquemment inséré lors de la rédaction d\'e-mails"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Modifier texte fréquemment inséré lors de la rédaction d\'e-mails"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Ajouter un texte aux messages envoyés"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Paramètres de notification"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Consommation des données"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"Règles de sécurité"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Modifier une réponse rapide"</string>
     <string name="save_action" msgid="1988862706623227093">"Enregistrer"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Synchroniser les contacts"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Synchroniser les contacts pour ce compte"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Synchroniser l\'agenda"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Synchroniser l\'agenda pour ce compte"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Synchroniser l\'agenda"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Synchro événement agenda pour ce compte"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synchr. messagerie"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synchroniser les e-mails pour ce compte"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibreur"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> résultats de <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Paramètres"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"Paramètres généraux"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Paramètres généraux"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"Application"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Avancer automatiquement"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Sélectionner écran à afficher après la suppression d\'un message"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Masquer les cases à cocher"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"Dans les listes de messages, maintenir enfoncé pour sélectionner"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Confirmer avant suppression"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Messages"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Confirmer avant envoi"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Messages"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Afficher"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Message suivant"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Message précédent"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"En attente des résultats..."</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Cette opération peut prendre du temps avec certains serveurs."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Dossiers"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Interdire utilisation de l\'appareil photo"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Exiger un mot de passe pour l\'appareil"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"Restreindre réutil. mots de passe récents"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"Exiger l\'expiration des mots de passe"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"Exiger verrouillage appareils inactifs"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"Limiter nombre d\'événements d\'agenda synchronisés"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"Limiter le nombre d\'e-mails synchronisés"</string>
+    <string name="quick_1" msgid="3426057697353380951">"Merci !"</string>
+    <string name="quick_2" msgid="4188036352885736617">"Cela me convient."</string>
+    <string name="quick_3" msgid="8061819976353395585">"Je lirai cela plus tard, et je vous recontacterai."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Organisons une réunion pour en discuter."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"La synchronisation en arrière-plan pour ce compte est désactivée en itinérance."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"Envoi de la réponse en cours..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"Aucun message"</string>
 </resources>
diff --git a/res/values-fr/uploader.xml b/res/values-fr/uploader.xml
index 42de0bc..f3e16a1 100644
--- a/res/values-fr/uploader.xml
+++ b/res/values-fr/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Masquer les détails"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Paramètres"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Transféré le %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Compte"</string>
     <string name="upload" msgid="2615541458361216022">"Transférer"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index f087b11..3abaf1c 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"ईमेल अनुलग्‍नक पढ़ें"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"इस एप्‍लिकेशन को आपके ईमेल अनुलग्‍नक पढ़ने देता है."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"एप्लिकेशन को आपके ईमेल अनुलग्नक पढ़ने देता है."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"ईमेल प्रदाता के डेटा तक पहुंचें"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"इस एप्‍लिकेशन को प्राप्‍त संदेशों, भेजे गए संदेशों, उपयोगकर्ता नाम और पासवर्ड सहित आपके ईमेल डेटाबेस में पहुंच देता है."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"इस एप्‍लिकेशन को प्राप्‍त संदेशों, भेजे गए संदेशों, उपयोगकर्ता नाम और पासवर्ड सहित आपके ईमेल डेटाबेस में पहुंच देता है."</string>
     <string name="app_name" msgid="5815426892327290362">"ईमेल"</string>
     <string name="compose_title" msgid="427986915662706899">"लिखें"</string>
     <string name="debug_title" msgid="5175710493691536719">"डीबग करें"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"पूर्ण"</string>
     <string name="create_action" msgid="3062715563215392251">"नया बनाएं"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"हटाएं"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"कोई त्वरित प्रतिसाद नहीं"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"कोई त्वरित प्रतिसाद नहीं."</string>
     <string name="discard_action" msgid="6532206074859505968">"छोड़ें"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"ड्राफ़्ट सहेजें"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"त्वरित प्रतिसाद शामिल करें"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"खोज"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"खाता सेटिंग"</string>
     <string name="settings_action" msgid="6334807007967459412">"सेटिंग"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"समन्वयन विकल्‍प"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"समन्वयन विकल्‍प"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"बिना पढ़ी के रूप में चिह्नित करें"</string>
     <string name="move_action" msgid="3059189775933985898">"ले जाएं"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"Cc/Bcc जोड़ें"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> ने लिखा:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"उद्धरित पाठ शामिल करें"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"पाठ शामिल करें"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"आपको कम से कम एक प्राप्तकर्ता जोड़ना चाहिए."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"कम से कम एक प्राप्तकर्ता जोड़ें."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"कुछ ईमेल पते अमान्‍य हैं."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"अनुलग्न करने के लिए फ़ाइल बहु‍त बड़ी है."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"त्वरित प्रतिसाद सम्मिलित करें"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"सहेजा गया"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"रोकें"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"अनुलग्‍नक को <xliff:g id="FILENAME">%s</xliff:g> के रूप में सहेजा गया है."</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"अनुलग्‍नक सहेजा नहीं जा सका."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"ध्यान दें: आपके द्वारा अग्रेषित संदेश में एक या एक से अधिक अनुलग्‍नक भेजने से पहले डाउनलोड किए जाएंगे."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"अनुलग्‍नक सहेजा नहीं जा सका."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"आपके द्वारा अग्रेषित संदेश को भेजने से पहले उसके एक या अधिक अनुलग्‍नक डाउनलोड किए जाएंगे."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"संदेश"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"आमंत्रित करें"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"एक या अधिक अनुलग्‍नक अग्रेषित नहीं किए जा सके."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"अनुलग्‍नक अग्रेषित नहीं किया गया"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> साइन इन विफल."</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> में साइन इन करना विफल रहा."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"साइन इन नहीं हो सका"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"इससे पुराना"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"खाता सेटअप"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Exchange खाता जोडें"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Exchange ActiveSync खाता जोडें"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"ईमेल खाता"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"आप बस कुछ ही चरणों में अधिकांश खातों के लिए ईमेल सेट कर सकते हैं."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"आप बस कुछ ही चरणों में Exchange खाता सेट कर सकते हैं."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"आप बस कुछ ही चरणों में Exchange ActiveSync खाता सेट कर सकते हैं."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"आप बस कुछ ही चरणों में अपना खाता सेट कर सकते हैं."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"ईमेल पता"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"पासवर्ड"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"डिफ़ॉल्‍ट रूप से इस खाते से ईमेल भेजें."</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"डिफ़ॉल्‍ट रूप से, इस खाते से ईमेल भेजें"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"मैन्‍युअल सेटअप"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"कोई मान्‍य ईमेल पता और पासवर्ड लिखें."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"डुप्‍लिकेट खाता"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"इनकमिंग सर्वर सेटिंग जांच रहा है…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"आउटगोइंग सर्वर सेटिंग जांच रहा है…"</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"खाता सेटअप"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"आपका खाता सेट हो गया है, और शीघ्र ही ईमेल मिलने वाला है!"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"आपका खाता सेट हो गया है और शीघ्र ही ईमेल मिलने वाला है!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"इस खाते को कोई नाम दें (वैकल्पिक)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"आपका नाम (आउटगोइंग संदेशों में प्रदर्शित)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"यह फ़ील्ड रिक्त नहीं हो सकती."</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"इनकमिंग सर्वर सेटिंग"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"उपयोगकर्ता नाम"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"पासवर्ड"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP सर्वर"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"IMAP सर्वर"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"सर्वर"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"पोर्ट"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"सुरक्षा प्रकार"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"कोई नहीं"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP सर्वर"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"पोर्ट"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"सुरक्षा प्रकार"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"साइन-इन की आवश्‍यकता है."</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"साइन इन आवश्यक"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"उपयोगकर्ता नाम"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"पासवर्ड"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"खाता सेटअप"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"प्रत्‍येक 15 मिनट"</string>
     <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_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>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"डिफ़ॉल्‍ट रूप से, इस खाते से ईमेल भेजें"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"ईमेल आने पर मुझे सूचित करें"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"संपर्कों को इस खाते से समन्ववित करें"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"इस खाते से कैलेंडर समन्‍वयित करें"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"इस खाते से ईमेल समन्वयित करें"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Wi-Fi से कनेक्‍ट होने पर अनुलग्‍नकों को स्‍वचालित रूप से डाउनलोड करें"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"पूरा नहीं हो सका"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"समन्वयन के लिए दिन:"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"एक माह"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"सभी"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"खाते के डिफ़ॉल्ट का उपयोग करें"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"उपयोगकर्तानाम या पासवर्ड गलत है."</string>
-    <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_auth_message" msgid="426627755590431364">"उपयोगकर्ता नाम या पासवर्ड गलत है."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"उपयोगकर्ता नाम या पासवर्ड गलत है."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"सर्वर से सुरक्षित रूप से कनेक्‍ट नहीं हो सकता."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"सर्वर से सुरक्षित रूप से कनेक्‍ट नहीं हो सकता."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"क्‍लाइंट प्रमाणपत्र आवश्‍यक है. क्‍लाइंट प्रमाणपत्र वाले सर्वर से कनेक्‍ट करें?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"प्रमाणपत्र अमान्‍य है या उस पर पहुंचा नहीं जा सकता."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"सर्वर ने एक त्रुटि के साथ प्रतिसाद दिया. अपना उपयोगकर्ता नाम और पासवर्ड जांचें फिर पुन: प्रयास करें."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"एक क्लाइंट प्रमाणपत्र की आवश्यकता है. क्या आप क्लाइंट प्रमाणपत्र के साथ सर्वर से कनेक्ट होना चाहते हैं?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"प्रमाणपत्र अमान्‍य है या उस पर पहुंचा नहीं जा सकता."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"सर्वर ने एक त्रुटि के साथ प्रतिसाद दिया. अपना उपयोगकर्ता नाम और पासवर्ड जांचें फिर पुन: प्रयास करें."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"सर्वर से कनेक्‍ट नहीं हो सकता."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"सर्वर से कनेक्‍ट नहीं कर सकता."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS आवश्‍यक है लेकिन सर्वर द्वारा समर्थित नहीं है."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"चेतावनी: आपके उपकरण को प्रबंधित करने के लिए ईमेल एप्‍लिकेशन का प्राधिकार निष्क्रिय कर देने से उसके लिए आवश्यक सभी ईमेल खाते, उनके ईमेल, संपर्क, कैलेंडर ईवेंट, और अन्‍य डेटा सहित, हटा दिए जाएंगे."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"सुरक्षा अपडेट"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"आपको <xliff:g id="ACCOUNT">%s</xliff:g> के लिए अपनी सुरक्षा सेटिंग अपडेट करने की आवश्यकता है."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"खाते \"<xliff:g id="ACCOUNT">%s</xliff:g>\"  को सुरक्षा सेटिंग अपडेट की आवश्‍यकता है."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"सुरक्षा अपडेट आवश्यक"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"सुरक्षा आवश्‍यकताओं के कारण खाता \"<xliff:g id="ACCOUNT">%s</xliff:g>\" समन्‍वयित नहीं किया जा सकता."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"खाते \"<xliff:g id="ACCOUNT">%s</xliff:g>\" को सुरक्षा सेटिंग अपडेट की आवश्‍यकता है."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" खाते ने अपनी सुरक्षा सेटिंग बदल दी है; किसी उपयोगकर्ता कार्यवाही की आवश्‍यकता नहीं."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"सुरक्षा अपडेट आवश्यक"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"सुरक्षा नीतियां बदल दी गई हैं"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"सुरक्षा नीतियां पूरी नहीं हो सकतीं"</string>
     <string name="account_security_title" msgid="3511543138560418587">"उपकरण सुरक्षा"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"सर्वर <xliff:g id="SERVER">%s</xliff:g> के लिए यह आवश्‍यक है कि आप उसे अपने Android उपकरण की कुछ सुरक्षा सुविधाओं को दूरस्थ रूप से नियंत्रित करने दें."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"विवरण संपादित करें"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"आपकी स्‍क्रीन लॉक करें पिन या पासवर्ड की समय-सीमा समाप्त हो गई है."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"स्‍क्रीन लॉक करें पासवर्ड की समय-सीमा समाप्त"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"स्‍क्रीन लॉक करें पासवर्ड समाप्त होने वाला है"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"आपको जल्‍द ही अपनी स्‍क्रीन लॉक करें पिन या पासवर्ड बदल लेना चाहिए, अन्यथा <xliff:g id="ACCOUNT">%s</xliff:g> का डेटा मिटा दिया जाएगा. इसे अभी बदलें?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"आपको शीघ्र ही अपना लॉक स्क्रीन पिन या पासवर्ड को बदलना होगा, अन्यथा <xliff:g id="ACCOUNT">%s</xliff:g> का डेटा मिट जाएगा. क्या आप इसे अभी बदलना चाहते हैं?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"स्‍क्रीन लॉक करें पासवर्ड की समय-सीमा समाप्त हो गई है"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"<xliff:g id="ACCOUNT">%s</xliff:g> का डेटा आपके उपकरण से मिटाया जा रहा है. आप अपनी स्‍क्रीन लॉक करें पिन या पासवर्ड को बदलकर उसे पुनर्स्थापित कर सकते हैं. इसे अभी बदलें?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"<xliff:g id="ACCOUNT">%s</xliff:g> का डेटा आपके उपकरण से मिटाया जा रहा है. आप इसे अपने लॉक स्क्रीन पिन या पासवर्ड बदलकर पुनर्स्थापित कर सकते हैं. क्या आप इसे अभी बदलना चाहते हैं?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"न सहेजे गए परिवर्तनों को छोड़ें?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"साइन इन नहीं हो सका"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"<xliff:g id="ACCOUNT">%s</xliff:g> का उपयोगकर्ता नाम या पासवर्ड गलत है. उन्‍हें अभी अपडेट करें?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"<xliff:g id="ACCOUNT">%s</xliff:g> का उपयोगकर्ता नाम या पासवर्ड गलत है. क्या आप उन्हें अभी अपडेट करना चाहते हैं?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"डिफ़ॉल्‍ट खाता"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"डिफ़ॉल्‍ट रूप से, इस खाते से ईमेल भेजें"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"अनुलग्नकों को डाउनलोड करें"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"WiFi के माध्यम से हाल के संदेशों के अनुलग्नक स्वत: डाउनलोड करें"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"ईमेल सूचनाएं"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"आवृत्ति, सूचनाएं आदि सिंक करें."</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"ईमेल आने पर सिस्‍टम बार में सूचित करें"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"ईमेल आने पर सूचना भेजें"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"इनबॉक्‍स देखने की आवृत्ति"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"इनकमिंग सेटिंग"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"उपयोगकर्ता नाम, पासवर्ड, और अन्‍य इनकमिंग सर्वर सेटिंग"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"आउटगोइंग सेटिंग"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"उपयोगकर्ता नाम, पासवर्ड, और अन्‍य आउटगोइंग सर्वर सेटिंग"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"नीतियां लागू की गईं"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"कोई नहीं"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"असमर्थित नीतियां"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"कोई नहीं"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"समन्‍वयन का प्रयास करें"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"इस खाते को समन्वयित करने के लिए यहां स्पर्श करें"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"खाता नाम"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"आपका नाम"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"हस्ताक्षर"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"त्वरित प्रतिसाद"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"वह पाठ संपादित करें जिसे आप अक्सर ईमेल लिखते समय शामिल करते हैं"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"वह पाठ संपादित करें जिसे आप अक्सर ईमेल लिखते समय शामिल करते हैं"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"आपके भेजे जाने वाले संदेशों में पाठ संशोधित करें"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"सूचना सेटिंग"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"डेटा उपयोग"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"सुरक्षा नीतियां"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"त्वरित प्रतिसाद संपादित करें"</string>
     <string name="save_action" msgid="1988862706623227093">"सहेजें"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"संपर्कों को सिंक करें"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"इस खाते के लिए संपर्क सिंक करें"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"कैलेंडर सिंक करें"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"इस खाते के लिए कैलेंडर सिंक करें"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"कैलेंडर सिंक करें"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"इस खाता हेतु कैलें. इवेंट समन्व. करें"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"ईमेल समन्‍वयित करें"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"इस खाते के लिए ईमेल सिंक करें"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"कंपन"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="DOMAIN">%2$s</xliff:g> से <xliff:g id="RESULTS">%1$d</xliff:g> परिणाम"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"सेटिंग"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"सामान्य"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"सामान्य सेटिंग"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"एप्लिकेशन"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"स्वत: आगे"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"संदेश हटाने के बाद दिखाई जाने वाली स्‍क्रीन चुनें"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"चेकबॉक्‍स छुपाएं"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"संदेशों की सूचियों में, चयन करने के लिए स्‍पर्श करके रखें"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"हटाने से पहले पुष्‍टि करें"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"संदेश"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"भेजने से पहले पुष्‍टि करें"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"संदेश"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"इससे आगे"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"नया संदेश"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"पुराना संदेश"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"परिणामों की प्रतीक्षा कर रहा है"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"कुछ सर्वर को अधिक समय लग सकता है."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"फ़ोल्‍डर"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"उपकरण के कैमरे के उपयोग की अनुमति न दें"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"उपकरण पासवर्ड आवश्‍यक"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"हाल के पासवर्ड का पुन: उपयोग प्रतिबं. करें"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"पासवर्ड के लिए समय सीमा समाप्ति आवश्यक"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"स्क्रीन लॉक के लिए निष्क्रिय उपकरण चाहिए"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"समन्‍वयित कैलेंडर ईवेंट की संख्‍या सीमित करें"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"समन्‍वयित ईमेल की संख्‍या सीमित करें"</string>
+    <string name="quick_1" msgid="3426057697353380951">"धन्यवाद!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"मुझे अच्छा लगता है!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"मैं इसे बाद में पढ़ूंगा/पढ़ूगी और आपसे संपर्क करूंगा/करूंगी."</string>
+    <string name="quick_4" msgid="3988974084396883051">"आइए इस पर चर्चा करने के लिए कोई मीटिंग सेट करें."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"रोमिंग के दौरान इस खाते के लिए पृष्ठभूमि समन्‍वयन अक्षम है."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"प्रत्‍युत्तर भेज रहा है..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"कोई संदेश नहीं."</string>
 </resources>
diff --git a/res/values-hi/uploader.xml b/res/values-hi/uploader.xml
index b06101a..ba69c85 100644
--- a/res/values-hi/uploader.xml
+++ b/res/values-hi/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"विवरण छुपाएं"</string>
     <string name="menu_settings" msgid="5088116127086866634">"सेटिंग"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"अपलोड किया गया %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"खाता"</string>
     <string name="upload" msgid="2615541458361216022">"अपलोड करें"</string>
     <string name="ok" msgid="2516349681897895312">"ठीक"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index f791a8e..15230b7 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"Čitanje privitaka e-pošte"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Aplikaciji omogućuje čitanje privitaka vaše e-pošte."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Omogućuje aplikaciji da čita vaše privitke e-pošte."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Pristup podacima o davatelju usluge e-pošte"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Aplikaciji omogućuje pristup bazi podataka vaše e-pošte, uključujući primljene poruke, poslane poruke, korisnička imena i zaporke."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Aplikaciji omogućuje pristup podatkovnoj bazi vaše e-pošte, uključujući primljene poruke, poslane poruke, korisnička imena i zaporke."</string>
     <string name="app_name" msgid="5815426892327290362">"E-pošta"</string>
     <string name="compose_title" msgid="427986915662706899">"Stvori novu poruku"</string>
     <string name="debug_title" msgid="5175710493691536719">"Otklanjanje pogrešaka"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"Gotovo"</string>
     <string name="create_action" msgid="3062715563215392251">"Izradi novi"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"Izbriši"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"Nema brzih odgovora"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Nema brzih odgovora."</string>
     <string name="discard_action" msgid="6532206074859505968">"Odbaci"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"Spremanje skice"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Umetni brzi odgovor"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"Pretraži"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Postavke računa"</string>
     <string name="settings_action" msgid="6334807007967459412">"Postavke"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"Opcije sinkronizacije"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Opcije sinkronizacije"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Označi kao nepročitano"</string>
     <string name="move_action" msgid="3059189775933985898">"Premjesti"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ Kop/skr.kop."</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> je napisao:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Obuhvati citirani tekst"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Uključi tekst"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Morate dodati barem jednog primatelja."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"Dodajte barem jednog primatelja."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Neke adrese e-pošte nisu važeće."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Datoteka je prevelika za privitak."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Umetanje brzog odgovora"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Spremljeno"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Zaustavi"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Privitak spremljen kao <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Spremanje privitka neuspješno."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Bilješka: Jedan ili više privitaka u vašoj proslijeđenoj poruci preuzet će se prije slanja."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"Privitak nije moguće spremiti."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Jedan ili više privitaka u proslijeđenoj poruci preuzet će se prije slanja."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Poruka"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Pozovi"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Jedan ili više privitaka nije bilo moguće proslijediti."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Privitak nije proslijeđen"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"Neuspješna prijava na račun <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"Prijava računa <xliff:g id="ACCOUNT_NAME">%s</xliff:g> neuspješna."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"Neuspjela prijava"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Starije"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" – "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Postavljanje računa"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Dodaj Exchange račun"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Dodaj Exchange ActiveSync račun"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"Račun e-pošte"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"E-poštu za većinu računa možete postaviti u samo nekoliko koraka."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Možete postaviti korisnički račun sustava Exchange u samo nekoliko koraka."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Račun sustava Exchange ActiveSync možete postaviti u samo nekoliko koraka."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Možete postaviti svoj korisnički račun u samo nekoliko koraka."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Adresa e-pošte"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Zaporka"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Šalji e-poštu s ovog računa prema zadanim postavkama."</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"Šalji e-poštu s ovog računa prema zadanim postavkama"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Ručno postavljanje"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Upišite važeću adresu e-pošte i zaporku."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Dvostruki račun"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Provjeravanje postavki dolaznog poslužitelja..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Provjeravanje postavki izlaznog poslužitelja..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Postavljanje računa"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"Vaš je račun postavljen, a e-pošta stiže!"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"Vaš je račun postavljen, a e-pošta stiže!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Dodijelite ovom računu naziv (opcionalno)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Vaše ime (prikazano u izlaznim porukama)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Ovo polje ne može biti prazno."</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Postavke dolaznog poslužitelja"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Korisničko ime"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Zaporka"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3 poslužitelj"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"IMAP poslužitelj"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Poslužitelj"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Vrsta sigurnosti"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Ništa"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP poslužitelj"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Vrsta sigurnosti"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Zahtijevajte prijavu."</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Potrebna je prijava"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Korisničko ime"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Zaporka"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"Postavljanje računa"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Svakih 15 minuta"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Svakih 30 minuta"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Svaki sati"</string>
-    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Šalji e-poštu s ovog računa prema zadanim postavkama."</string>
-    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Obavijesti me kad stigne e-pošta."</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sinkroniziraj i kontakte s ovog računa."</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sinkroniziraj kalendar s ovog računa"</string>
-    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sink. e-poštu za ovaj račun."</string>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"Šalji e-poštu s ovog računa prema zadanim postavkama"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Obavijesti me kad stigne e-pošta"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Sinkroniziraj kontakte s ovog računa."</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Sinkroniziraj kalendar s ovog računa"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Sinkroniziraj e-poštu s ovog računa"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Automatski preuzmi privitke za vrijeme povezanosti s Wi-Fi mrežom"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Završavanje nije bilo moguće"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Dani za sinkronizaciju"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Jedan mjesec"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Sve"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Upotrijebi zadanu postavku računa"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Korisničko ime ili zaporka nisu točni."</string>
-    <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_auth_message" msgid="426627755590431364">"Korisničko ime ili zaporka nisu ispravni."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"Neispravno korisničko ime ili zaporka."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Sigurno povezivanje s poslužiteljem nije moguće."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Sigurno povezivanje s poslužiteljem nije moguće."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"Potreban certifikat klijenta. Spojiti se na poslužitelj s certifikatom klijenta?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"Certifikat je nevažeći ili nedostupan."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"Poslužitelj je odgovorio pogreškom. Provjerite korisničko ime i zaporku i pokušajte ponovo."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"Potrebna je klijentska potvrda. Želite li se povezati s poslužiteljem s klijentskom potvrdom?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"Potvrda je neispravna ili nedostupna."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"Poslužitelj je odgovorio s pogreškom. Provjerite korisničko ime i zaporku i pokušajte ponovo."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"Povezivanje s poslužiteljem nije moguće."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Povezivanje s poslužiteljem nije moguće."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS je obavezan, ali ga poslužitelj ne podržava."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"UPOZORENJE: Deaktivacijom ovlasti aplikacije E-pošta za upravljanje uređajem izbrisat će se svi računi e-pošte koji traže tu ovlast, kao i e-pošta, kontakti, događaji kalendara i drugi podaci."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Sigurnosno ažuriranje"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"Račun <xliff:g id="ACCOUNT">%s</xliff:g> zahtijeva da ažurirate svoje sigurnosne postavke."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Račun \"<xliff:g id="ACCOUNT">%s</xliff:g>\" zahtijeva ažuriranje sigurnosnih postavki."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"Potrebno sigurnosno ažuriranje"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Račun \"<xliff:g id="ACCOUNT">%s</xliff:g>\" nije moguće sinkronizirati zbog sigurnosnih zahtjeva."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"Račun \"<xliff:g id="ACCOUNT">%s</xliff:g>\" zahtijeva ažuriranje sigurnosnih postavki."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"Račun \"<xliff:g id="ACCOUNT">%s</xliff:g>\" promijenio je sigurnosne postavke, korisnik ne mora poduzimati ništa."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Potrebno sigurnosno ažuriranje"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Promjena sigurnosnih pravila"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Nemoguće ispuniti sig. pravila"</string>
     <string name="account_security_title" msgid="3511543138560418587">"Sigurnost uređaja"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Poslužitelj <xliff:g id="SERVER">%s</xliff:g> zahtijeva da mu omogućite daljinsko upravljanje nekim sigurnosnim značajkama vašeg Android uređaja."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Uredi pojedinosti"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"PIN ili zaporka za zaključavanje zaslona istekli su."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"Istekla zap. za zaklj. zasl."</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Istječe zaporka za zaključavanje zaslona"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"Uskoro morate promijeniti PIN ili zaporku za zaključavanje zaslona jer će inače podaci računa <xliff:g id="ACCOUNT">%s</xliff:g> biti izbrisani. Promijeniti sada?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Uskoro morate promijeniti svoj ​​PIN ili zaporku za zaključavanje zaslona ili će biti izbrisani podaci za račun <xliff:g id="ACCOUNT">%s</xliff:g>. Želite li to promijeniti sada?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"Istekla zap. za zaklj. zasl."</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"Brišu se podaci računa <xliff:g id="ACCOUNT">%s</xliff:g> s vašeg uređaja. Oporaviti ih možete promjenom PIN-a ili zaporke za zaključavanje zaslona. Promijeniti sada?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"Podaci za račun <xliff:g id="ACCOUNT">%s</xliff:g> brišu se s vašeg uređaja. Možete ih vratiti promjenom PIN-a ili zaporke za zaključavanje. Želite li to promijeniti sada?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Odbaciti nespremljene promjene?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Neuspjela prijava"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Korisničko ime ili zaporka za <xliff:g id="ACCOUNT">%s</xliff:g> nisu točni. Ažurirati sada?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"Netočno je korisničko ime ili zaporka za račun <xliff:g id="ACCOUNT">%s</xliff:g>. Želite li to ažurirati sada?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Zadani račun"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Šalji e-poštu s ovog računa prema zadanim postavkama"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Preuzimanje privitaka"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Automatsko preuzimanje privitaka uz nedavne poruke WiFi mrežom"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Obavijesti e-pošte"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Učestalost sinkronizacije, obavijesti itd."</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"Obavijesti u traci sustava kad stigne e-pošta"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Pošalji obavijest kada stigne e-pošta"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Učestalost provjeravanja e-pošte"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Dolazne postavke"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Korisničko ime, zaporka i ostale postavke dolaznog poslužitelja"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Odlazne postavke"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Korisničko ime, zaporka i ostale postavke odlaznog poslužitelja"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Pravila provedena"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Ništa"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Nepodržana pravila"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Ništa"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"Pokušaj sinkronizaciju"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Dodirnite ovdje za sinkronizaciju tog računa"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Naziv računa"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Vaše ime"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Potpis"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Brzi odgovori"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Uređivanje teksta koji često umećete prilikom pisanja e-pošte"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Uredite tekst koji često umećete prilikom pisanja e-pošte"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Dodajte tekst porukama koje šaljete"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Postavke obavijesti"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Potrošnja podataka"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"Sigurnosna pravila"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Uredi brzi odgovor"</string>
     <string name="save_action" msgid="1988862706623227093">"Spremi"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Sinkroniziraj kontakte"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sink. kontakata za ovaj račun"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sink. Kalendar"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Sink. kalendara za ovaj račun"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Sinkroniziraj kalendar"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Sink. kal. dog. za ovaj račun"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sink. e-pošte"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sink. e-pošte za ovaj račun"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibracija"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> rezultata sa <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Postavke"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"Općenito"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Opće postavke"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"Aplikacija"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Automatski prijeđi na sljedeće"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Odaberite zaslon za prikazivanje nakon brisanja poruke"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Sakrij potvrdne okvire"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"Na popisima poruka dodirnite i držite da biste odabrali"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Potvrdite prije brisanja"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Poruke"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Potvrdite prije slanja"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Poruke"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Prijeđi na"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Novije poruke"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Starije poruke"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"Čekaju se rezultati"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Nekim poslužiteljima može trebati više vremena."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Mape"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Onemogući upotrebu fotoaparata uređaja"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Zahtijevaj zaporku uređaja"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"Ograniči ponovnu upotrebu novijih zapor."</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"Zahtijevaj istek zaporke"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"Zahtijevaj zaključ. zaslona u mirovanju"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"Ograniči broj sinkroniziranih događaja kalendara"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"Ograniči broj sinkroniziranih poruka e-pošte"</string>
+    <string name="quick_1" msgid="3426057697353380951">"Hvala!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"Izvrsno!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"Pročitat ću to kasnije i javiti vam se."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Hajdemo dogovoriti sastanak na kojem ćemo raspraviti o tome."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Pozadinska sinkronizacija za ovaj račun onemogućena je u roamingu."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"Slanje odgovora..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"Nema poruka."</string>
 </resources>
diff --git a/res/values-hr/uploader.xml b/res/values-hr/uploader.xml
index e84da77..124e7f1 100644
--- a/res/values-hr/uploader.xml
+++ b/res/values-hr/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Sakrij pojedinosti"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Postavke"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Preneseno %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Račun"</string>
     <string name="upload" msgid="2615541458361216022">"Šalji"</string>
     <string name="ok" msgid="2516349681897895312">"U redu"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 7d128b3..1eee011 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"E-mail mellékletek olvasása"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Lehetővé teszi az alkalmazás számára az e-mail mellékletek olvasását."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Lehetővé teszi az alkalmazás számára az e-mailek mellékleteinek olvasását."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Hozzáférés az e-mail szolgáltató adataihoz"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Lehetővé teszi, hogy az alkalmazás hozzáférjen az e-mail adatbázishoz, beleértve a fogadott és elküldött üzeneteket, a felhasználóneveket és a jelszavakat."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Lehetővé teszi az alkalmazás számára az e-mail adatbázisához, így a fogadott és elküldött üzenetekhez, a felhasználónevekhez és jelszavakhoz való hozzáférést."</string>
     <string name="app_name" msgid="5815426892327290362">"E-mail"</string>
     <string name="compose_title" msgid="427986915662706899">"Levélírás"</string>
     <string name="debug_title" msgid="5175710493691536719">"Hibakeresés"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"Kész"</string>
     <string name="create_action" msgid="3062715563215392251">"Új létrehozása"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"Törlés"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"Nincsenek gyors válaszok"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Nincsenek gyors válaszok."</string>
     <string name="discard_action" msgid="6532206074859505968">"Elvetés"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"Piszkozatmentés"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Gyors válasz beilleszt."</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"Keresés"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Fiókbeállítások"</string>
     <string name="settings_action" msgid="6334807007967459412">"Beállítások"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"Szinkronizálási beállítások"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Szinkronizálási beállítások"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Megjelölés olvasatlanként"</string>
     <string name="move_action" msgid="3059189775933985898">"Áthelyezés"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ Másolatmezők"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> a következőt írta:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Idézett szöveg beillesztése"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Szöveggel együtt"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Legalább egy résztvevőt hozzá kell adnia."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"Vegyen fel legalább egy címzettet."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Egyes e-mail címek érvénytelenek."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"A csatolni kívánt fájl túl nagy."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Gyors válasz beillesztése"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Elmentve"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Leállítás"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Melléklet elmentve: <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Nem sikerült a melléklet mentése."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Megjegyzés: a továbbított üzenet egy vagy több melléklete letöltésre kerül a küldés előtt."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"A melléklet mentése nem sikerült."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Küldés előtt továbbított üzenete egy vagy több melléklete letöltődik."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Üzenet"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Meghívás"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Egy vagy több melléklet nem továbbítható."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"A melléklet nincs továbbítva"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> bejelentkezése sikertelen volt."</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"A(z) <xliff:g id="ACCOUNT_NAME">%s</xliff:g> fiókba való bejelentkezés sikertelen."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"Sikertelen bejelentkezés"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Régebbiek"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Fiók beállítása"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Exchange-fiók hozzáadása"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Exchange ActiveSync-fiók hozzáadása"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"E-mail fiók"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"A legtöbb fiókhoz pár lépésben beállíthat egy e-mail címet."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Mindössze pár lépésben létrehozhat egy Exchange-fiókot."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Mindössze néhány lépésben létrehozhat egy Exchange ActiveSync-fiókot."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Mindössze néhány lépésben létrehozhatja fiókját."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"E-mail cím"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Jelszó"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"E-mailek küldése ebből a fiókból alapértelmezés szerint."</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"E-mail küldése ebből a fiókból alapértelmezés szerint"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuális beállítás"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Írjon be egy érvényes e-mail címet és jelszót."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Már létező fiók"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Bejövő üzeneteket kezelő szerver beállításainak ellenőrzése..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Kimenő üzeneteket kezelő szerver beállításainak ellenőrzése..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Fiók beállítása"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"A fiók beállítása befejeződött, a levelezőprogram készen áll az e-mailek fogadására."</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"A fiók beállítása befejeződött, az e-mailek úton vannak."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Fiók elnevezése (opcionális)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Az Ön neve (a kimenő üzenetekben való megjelenítéshez)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Ez a mező nem lehet üres."</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Bejövő üzenetek szerverének beállításai"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Felhasználónév"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Jelszó"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3-szerver"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"IMAP-szerver"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Szerver"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Biztonság típusa"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Nincs"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP-szerver"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Biztonság típusa"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Bejelentkezés szükséges."</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Bejelentkezés szükséges"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Felhasználónév"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Jelszó"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"Fiók beállítása"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"15 percenként"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"30 percenként"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Óránként"</string>
-    <string name="account_setup_options_default_label" msgid="8869166381331276697">"E-mail küldése ebből a fiókból alapértelmezés szerint"</string>
-    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Értesítés megjelenítése e-mail érkezésekor"</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Névjegyek szinkronizálása ebben a fiókban."</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Naptár szinkronizálása ebben a fiókban."</string>
-    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Az e-mailek szinkronizálása ebből a fiókból."</string>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"E-mail küldése ebből a fiókból alapértelmezés szerint"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Értesítés megjelenítése e-mail érkezésekor"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Névjegyek szinkronizálása ebből a fiókból"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Naptár szinkronizálása ebből a fiókból"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Az e-mailek szinkronizálása ebből a fiókból"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Mellékletek automatikus letöltése Wi-Fi-kapcsolatnál"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Nem sikerült befejezni"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Szinkronizálási időtartam"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Egy hónap"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Összes"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Alapbeállítás használata"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Helytelen felhasználónév vagy jelszó."</string>
-    <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_auth_message" msgid="426627755590431364">"Helytelen felhasználónév vagy jelszó."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"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="3836152264696108805">"Nem lehet biztonságos kapcsolatot létesíteni a szerverrel."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Nem lehet biztonságos kapcsolatot létesíteni a szerverrel."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"Ü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="7245835883180762722">"Az igazolás érvénytelen vagy elérhetetlen."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"A szerver hibaüzenettel válaszolt. Ellenőrizze felhasználónevét és jelszavát, majd próbálja újra."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"Klienstanúsítvány szükséges. Szeretne klienstanúsítvánnyal rendelkező szerverhez csatlakozni?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"A tanúsítvány érvénytelen vagy elérhetetlen."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"A szerver hibaüzenettel válaszolt. Ellenőrizze felhasználónevét és jelszavát, majd próbálja újra."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"Nem lehet kapcsolatot létesíteni a szerverrel."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Nem lehet kapcsolódni a szerverhez."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS szükséges, de a szerver nem támogatja."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"FIGYELMEZTETÉS: ha kikapcsolja az E-mail alkalmazás azon jogosultságát, hogy felügyelje az eszközt, akkor törli az összes olyan e-mail fiókot, amelyhez szükség van az alkalmazásra; a fiókokkal együtt pedig törli az e-maileket, a névjegyeket, a naptári eseményeket és más adatokat is."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Biztonsági frissítés"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> a biztonsági beállítások frissítését igényli."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Frissíteni kell a(z) \"<xliff:g id="ACCOUNT">%s</xliff:g>\" fiók biztonsági beállításait."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"Biztonsági frissítés szükséges"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"A(z) \"<xliff:g id="ACCOUNT">%s</xliff:g>\" fiókot a biztonsági követelmények miatt nem lehet szinkronizálni."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"Frissíteni kell a(z) \"<xliff:g id="ACCOUNT">%s</xliff:g>\" fiók biztonsági beállításait."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"A(z) \"<xliff:g id="ACCOUNT">%s</xliff:g>\" nevű fiók módosította a biztonsági beállításokat, nem szükséges felhasználói beavatkozás."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Biztonsági frissítés szükséges"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"A rendszabályok megváltoztak"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"A biztonsági házirend nem tartható be"</string>
     <string name="account_security_title" msgid="3511543138560418587">"Eszközbiztonság"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"A(z) <xliff:g id="SERVER">%s</xliff:g> szerver engedélyt kér arra, hogy távolról vezérelhesse az Android-eszköz egyes biztonsági funkcióit."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Részletek szerkesztése"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"A képernyőzár PIN kódja vagy jelszava lejárt."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"Képernyőzár jelszava lejárt"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Képernyőzár jelszava hamarosan lejár"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"Hamarosan módosítani kell a képernyőzár PIN kódját vagy jelszavát, különben <xliff:g id="ACCOUNT">%s</xliff:g> adatait törli a készülék. Módosítja most?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Hamarosan módosítania kell a képernyőzár PIN-kódját vagy jelszavát, különben a(z) <xliff:g id="ACCOUNT">%s</xliff:g> fiók adatai törlődnek. Módosítja most?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"Képernyőzár jelszava lejárt"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"<xliff:g id="ACCOUNT">%s</xliff:g> adatai törlésre kerülnek a készülékről. Visszaállíthatja a képernyőzár PIN kódjának vagy jelszavának módosításával. Módosítja most?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"<xliff:g id="ACCOUNT">%s</xliff:g> adatai törlésre kerülnek a készülékről. Visszaállíthatja a képernyőzár PIN-kódjának vagy jelszavának módosításával. Módosítja most?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Elveti a nem mentett módosításokat?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Sikertelen bejelentkezés"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"<xliff:g id="ACCOUNT">%s</xliff:g> felhasználóneve vagy jelszava helytelen. Frissíti most?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"A(z) <xliff:g id="ACCOUNT">%s</xliff:g> fiókhoz tartozó felhasználónév és jelszó helytelen. Szeretné frissíteni őket most?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Alapértelmezett fiók"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"E-mail küldése ebből a fiókból alapértelmezés szerint"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Mellékletek letöltése"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Mellékletek automatikus letöltése az üzenetekbe Wi-Fin keresztül"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"E-mail értesítések"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Szinkronizálási gyakoriság, értesítések stb."</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"Értesítés megjelenítése a Rendszersávon e-mailek érkezése esetén"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"E-mail érkezése esetén értesítés küldése"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Beérkező levelek ellenőrzésének gyakorisága"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Bejövő üzenetek beállításai"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Felhasználónév, jelszó és a beérkező szerver egyéb beállításai"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Kimenő üzenetek beállításai"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Felhasználónév, jelszó és a kimenő szerver beállításai"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Kényszerített rendszabályok"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Nincs"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Nem támogatott rendszabályok"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Nincs"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"Szinkronizálás megkísérlése"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"A fiók szinkronizálásához érintse meg itt"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Fióknév"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Az Ön neve"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Aláírás"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Gyors válaszok"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"E-mail íráskor gyakran beillesztett szöveg szerkesztése"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"E-mail írásakor gyakran beillesztett szöveg szerkesztése"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Szöveg hozzáfűzése az elküldendő üzenetekhez"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Értesítési beállítások"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Adathasználat"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"Biztonsági rendszabályok"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Gyors válasz szerkesztése"</string>
     <string name="save_action" msgid="1988862706623227093">"Mentés"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Névjegyek szinkronizálása"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"A fiók névjegyeinek szinkronizálása"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Naptár szinkr."</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"A fiók naptárának szinkronizálása"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Naptár szinkronizálása"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"A fiók naptárának szinkronizálása"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"E-mail szinkroniz."</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"A fiók e-mailjeinek szinkronizálása"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Rezgés"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> találat a(z) <xliff:g id="DOMAIN">%2$s</xliff:g> domainből"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Beállítások"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"Általános"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Általános beállítások"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"Alkalmazás"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Automatikus lépegetés"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Válassza ki, melyik képernyő jelenjen meg üzenet törlése után"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Jelölőnégyzetek elrejtése"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"Kiválasztáshoz érintse meg, és tartsa lenyomva az üzenetlistában"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Megerősítés kérése törlés előtt"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Üzenetek"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Megerősítés kérése küldés előtt"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Üzenetek"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Továbblépés ide:"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Újabb üzenet"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Régebbi üzenet"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"Várakozás a találatokra"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Egyes szervereknek több időre van szükségük."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Mappák"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"A kamera használatának tiltása"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Eszközjelszó kötelező"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"Előző jelszavak kizárása"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"A jelszavak kötelezően lejárnak"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"Képernyőzároláshoz szükséges nyugalmi idő"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"Szinkronizált naptáresemények számának korlátozása"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"Szinkronizált e-mailek számának korlátozása"</string>
+    <string name="quick_1" msgid="3426057697353380951">"Köszönjük!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"Jól hangzik!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"Később elolvasom és visszatérünk rá."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Szervezzünk egy találkozót a dolog megvitatására."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"A fiók háttérben zajló szinkronizálása le van tiltva barangolás közben."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"Válasz küldése..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"Nincsenek üzenetek."</string>
 </resources>
diff --git a/res/values-hu/uploader.xml b/res/values-hu/uploader.xml
index 2560959..480cddb 100644
--- a/res/values-hu/uploader.xml
+++ b/res/values-hu/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Részletek elrejtése"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Beállítások"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"%s feltöltve"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Fiók"</string>
     <string name="upload" msgid="2615541458361216022">"Feltöltés"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 83324bb..d2f7f29 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"Baca lampiran email"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Mengizinkan aplikasi membaca lampiran email Anda."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Memungkinkan apl membaca lampiran email Anda."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Akses data penyedia email"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Mengizinkan aplikasi ini mengakses basis data email Anda, termasuk pesan yang diterima, pesan yang dikirim, nama pengguna, dan sandi."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Mengizinkan apl mengakses basis data email Anda, termasuk pesan yang diterima, pesan yang dikirim, nama pengguna, dan sandi."</string>
     <string name="app_name" msgid="5815426892327290362">"Email"</string>
     <string name="compose_title" msgid="427986915662706899">"Tulis"</string>
     <string name="debug_title" msgid="5175710493691536719">"Debug"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"Selesai"</string>
     <string name="create_action" msgid="3062715563215392251">"Buat baru"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"Hapus"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"Tidak ada tanggapan cepat"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Tidak ada tanggapan cepat."</string>
     <string name="discard_action" msgid="6532206074859505968">"Buang"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"Simpan draf"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Masukkan tanggapan cepat"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"Telusuri"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Setelan akun"</string>
     <string name="settings_action" msgid="6334807007967459412">"Setelan"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"Opsi sinkronisasi"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Opsi sinkronisasi"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Tandai belum dibaca"</string>
     <string name="move_action" msgid="3059189775933985898">"Pindahkan"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n" <xliff:g id="SENDER">%s</xliff:g> menulis:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Sertakan kutipan teks"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Sertakan teks"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Anda harus menambahkan setidaknya satu penerima."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"Tambahkan setidaknya satu penerima."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Beberapa alamat email tidak valid."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"File terlalu besar untuk dilampirkan."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Masukkan tanggapan cepat"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Disimpan"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Hentikan"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Lampiran disimpan sebagai <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Tak dapat menyimpan lampiran."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Catatan: Satu atau beberapa lampiran dalam pesan yang diteruskan akan diunduh sebelum dikirim."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"Tak dapat menyimpan lampiran."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Satu atau beberapa lampiran dalam pesan yang diteruskan akan diunduh sebelum dikirim."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Pesan"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Undang"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Tidak dapat meneruskan satu lampiran atau lebih."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Lampiran tidak diteruskan"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"Gagal masuk <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"Gagal masuk <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"Tidak dapat masuk"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Lawas"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Penyiapan akun"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Tambah akun Exchange"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Tambahkan akun Exchange ActiveSync"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"Akun email"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"Anda dapat menyiapkan email untuk kebanyakan akun hanya dalam beberapa langkah."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Anda dapat menyiapkan akun Exchange hanya dalam beberapa langkah."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Anda dapat menyiapkan akun Exchange ActiveSync hanya dalam beberapa langkah."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Anda dapat menyiapkan akun hanya dalam beberapa langkah."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Alamat email"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Sandi"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Kirim email dari akun ini secara default."</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"Kirim email dari akun ini secara default"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Penyiapan manual"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Ketik alamat email dan sandi yang valid."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Akun rangkap"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Memeriksa setelan server masuk…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Memeriksa setelan server keluar…"</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Penyiapan akun"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"Akun Anda sudah siap, dan email akan segera tiba!"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"Akun Anda sudah siap dan email akan segera tiba!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Beri nama akun ini (opsional)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Nama (yang ditampilkan pada pesan keluar)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Bidang ini tidak boleh kosong."</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Setelan server masuk"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nama Pengguna"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Sandi"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Server POP3"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"Server IMAP"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Server"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Jenis keamanan"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Tak Satu Pun"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Server SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Jenis keamanan"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Harus masuk"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Harus masuk"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nama Pengguna"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Sandi"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"Penyiapan akun"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Setiap 15 menit"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Setiap 30 menit"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Setiap jam"</string>
-    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Kirim email dari akun ini secara default."</string>
-    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Beri tahu saya ketika email tiba."</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sinkronkan kontak dari akun ini."</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sinkronkan kalender dari akun ini."</string>
-    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sinkronkan email dari akun ini."</string>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"Kirim email dari akun ini secara default"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Beri tahu saya ketika email tiba"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Sinkronkan kontak dari akun ini"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Sinkronkan kalender dari akun ini"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Sinkronkan email dari akun ini"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Unduh lampiran secara otomatis ketika tersambung dengan Wi-Fi"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Tidak dapat menyelesaikan"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Hari yang disinkronkan"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Satu bulan"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Semua"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Gunakan default akun"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Nama pengguna atau sandi salah."</string>
-    <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_auth_message" msgid="426627755590431364">"Nama pengguna atau sandi salah."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"Nama pengguna atau sandi salah."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Tidak dapat tersambung ke server dengan aman."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Tidak dapat tersambung ke server dengan aman."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"Sertifikat klien diwajibkan. Sambungkan ke server dengan sertifikat klien?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"Sertifikat tidak valid atau tidak dapat diakses."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"Server merespons dengan kesalahan. Periksa nama pengguna dan sandi Anda lalu coba lagi."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"Diperlukan sertifikat klien. Apakah Anda ingin menyambung ke server dengan sertifikat klien?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"Sertifikat tidak valid atau tidak dapat diakses."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"Server menanggapi dengan kesalahan. Periksa nama pengguna dan sandi, lalu coba lagi."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"Tidak dapat tersambung ke server."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Tidak dapat menyambung ke server."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS diperlukan, tetapi tidak didukung oleh server."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"PERINGATAN: Menonaktifkan otoritas apl Email untuk mengatur perangkat Anda akan menghapus semua akun email yang memerlukannya, beserta email, kontak, acara kalender, dan data lainnya."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Pembaruan keamanan"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> mengharuskan Anda memperbarui setelan keamanan."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Akun \"<xliff:g id="ACCOUNT">%s</xliff:g>\" memerlukan pembaruan setelan keamanan."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"Pembaruan keamanan diperlukan"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Akun \"<xliff:g id="ACCOUNT">%s</xliff:g>\" tidak dapat disinkronkan karena persyaratan keamanan."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"Akun \"<xliff:g id="ACCOUNT">%s</xliff:g>\" memerlukan pembaruan setelan keamanan."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"Akun \"<xliff:g id="ACCOUNT">%s</xliff:g>\" mengubah setelan keamanannya, tidak diperlukan tindakan pengguna."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Diperlukan pembaruan keamanan"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Kebijakan keamanan tlh diubah"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Kbijakan keamanan tak terpnuhi"</string>
     <string name="account_security_title" msgid="3511543138560418587">"Keamanan perangkat"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Server <xliff:g id="SERVER">%s</xliff:g> meminta Anda mengizinkannya mengontrol beberapa fitur keamanan perangkat Android dari jarak jauh."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Edit detail"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"PIN atau sandi pengunci layar Anda kedaluwarsa."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"Sandi pengunci layar kedaluwarsa"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Sandi pengunci layar akan kedaluwarsa"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"Anda harus mengganti PIN atau sandi pengunci layar segera, atau data untuk<xliff:g id="ACCOUNT">%s</xliff:g> akan dihapus. Ganti sekarang?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Anda perlu segera mengganti PIN atau sandi pengunci layar. Bila tidak, data untuk <xliff:g id="ACCOUNT">%s</xliff:g> akan dihapus. Ganti sekarang?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"Sandi pengunci layar kedaluwarsa"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"Data untuk <xliff:g id="ACCOUNT">%s</xliff:g> sedang dihapus dari perangkat Anda. Anda dapat memulihkannya dengan mengganti PIN atau sandi pengunci layar. Ganti sekarang?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"Data untuk <xliff:g id="ACCOUNT">%s</xliff:g> sedang dihapus dari perangkat. Anda dapat memulihkannya dengan mengganti PIN atau sandi pengunci layar. Ganti sekarang?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Buang perubahan yang tidak tersimpan?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Tidak dapat masuk"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Nama pengguna atau sandi untuk <xliff:g id="ACCOUNT">%s</xliff:g> salah. Mutakhirkan keduanya sekarang?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"Nama pengguna atau sandi untuk <xliff:g id="ACCOUNT">%s</xliff:g> salah. Perbarui sekarang?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Akun default"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Kirim email dari akun ini secara default"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Unduh lampiran"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Unduh-otomatis lampiran pada pesan terbaru melalui WiFi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Pemberitahuan email"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Sinkronkan frekuensi, pemberitahuan, dll."</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"Beri tahukan dalam bilah Sistem ketika email tiba"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Mengirimkan pemberitahuan bila email tiba"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Frekuensi pemeriksaan kotak masuk"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Setelan masuk"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Nama pengguna, sandi, dan setelan server masuk lainnya"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Setelan keluar"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Nama pengguna, sandi, dan setelan server keluar lainnya"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Kebijakan diberlakukan"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Tidak ada"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Kebijakan tidak didukung"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Tidak ada"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"Coba sinkronisasi"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Sentuh di sini untuk menyinkronkan akun ini"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Nama akun"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Nama Anda"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Tanda tangan"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Tanggapan cepat"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Edit teks yang sering Anda masukkan ketika membuat email"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Edit teks yang sering Anda masukkan ketika menulis email"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Menambahkan teks ke pesan yang Anda kirim"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Setelan pemberitahuan"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Penggunaan data"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"Kebijakan keamanan"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Edit tanggapan cepat"</string>
     <string name="save_action" msgid="1988862706623227093">"Simpan"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Sinkronkan kontak"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sinkronkan kontak untuk akun ini"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sinkronkan Kalender"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Sinkronkan kalender untuk akun ini"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Sinkronkan kalender"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Snkronkan acr kalender utk akun ini"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sinkronkan email"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sinkronkan email untuk akun ini"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Getar"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> hasil dari <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Setelan"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"Umum"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Setelan umum"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"Aplikasi"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Maju otomatis"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Pilih layar mana yang akan ditampilkan stlh Anda menghapus pesan"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Sembunyikan kotak centang"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"Pada daftar pesan, sentuh terus untuk memilih"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Konfirmasi sebelum menghapus"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Pesan"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Konfirmasi sebelum mengirim"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Pesan"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Majukan ke"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Pesan lebih anyar"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Pesan lawas"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"Menunggu hasil"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Beberapa server mungkin membutuhkan waktu yang lama."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Folder"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Tolak penggunaan kamera perangkat"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Memerlukan sandi perangkat"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"Batasi penggunaan ulang sandi terkini"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"Mewajibkan sandi dapat kedaluwarsa"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"Mnghrskan prgkt nganggur utk mngunci lyr"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"Batasi jumlah acara kalender yang disinkronkan"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"Batasi jumlah email yang disinkronkan"</string>
+    <string name="quick_1" msgid="3426057697353380951">"Terima kasih!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"Menurut saya itu bagus!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"Saya akan membaca ini nanti dan mengabari Anda."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Mari kita adakan pertemuan untuk membahas masalah ini."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Sinkronisasi latar belakang untuk akun ini dinonaktifkan saat roaming."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"Mengirim tanggapan..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"Tidak ada pesan."</string>
 </resources>
diff --git a/res/values-in/uploader.xml b/res/values-in/uploader.xml
index fa9c3be..6784903 100644
--- a/res/values-in/uploader.xml
+++ b/res/values-in/uploader.xml
@@ -19,23 +19,23 @@
     <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"mencoba ulang dalam %s"</string>
     <string name="summary_menu_show_pending" msgid="658361192495996">"Tampilkan Unggahan yang Tertunda"</string>
     <string name="summary_menu_show_finished" msgid="8544099132633066086">"Tampilkan Unggahan yang Sudah Selesai"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"Lihat Secara Daring"</string>
+    <string name="menu_view_online" msgid="6546633605818509942">"Lihat Secara Online"</string>
     <string name="menu_show_pending_items" msgid="8798191388238604213">"Tampilkan Unggahan yang Tertunda"</string>
     <string name="menu_hide_pending_items" msgid="9216079748638469160">"Sembunyikan Unggahan yang Tertunda"</string>
     <string name="menu_show_completed_items" msgid="4380487776635859783">"Tampilkan Detail"</string>
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Sembunyikan Detail"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Setelan"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Diunggah %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Akun"</string>
     <string name="upload" msgid="2615541458361216022">"Unggah"</string>
-    <string name="ok" msgid="2516349681897895312">"OK"</string>
+    <string name="ok" msgid="2516349681897895312">"Oke"</string>
     <string name="cancel" msgid="1207103189404543868">"Batal"</string>
     <string name="uploading_to" msgid="3986362895940069510">"Mengunggah ke "<b>"%s"</b></string>
     <string name="uploading_for" msgid="1735961974624867111">" untuk "<b>"%s"</b></string>
     <string name="destination_format" msgid="7472552212462849956">"%1$s \"%2$s\""</string>
     <string name="toast_intent_error" msgid="6164928822619692280">"Inisiasi unggahan gagal."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"Berkas tidak tersedia."</string>
+    <string name="toast_file_error" msgid="1315722681020841350">"File tidak tersedia."</string>
     <string name="account_error" msgid="1904775271866104941">"Gagal mengambil informasi akun."</string>
     <string name="toast_failed_auth" msgid="2196450105656960566">"Terjadi masalah saat masuk ke akun Anda."</string>
     <string name="upload_state_queued" msgid="3990598443227105526"></string>
@@ -57,10 +57,10 @@
     <string name="retry_in_2min" msgid="5845688527405283031">"2 menit"</string>
     <string name="retry_in_5min" msgid="3153220715959570358">"5 menit"</string>
     <string name="retry_no_data" msgid="630347885498641534">"Tidak ada sambungan data"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"Kuota diska akun habis"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"Berkas tidak ditemukan"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"Galat layanan"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"Galat jaringan"</string>
+    <string name="account_out_of_quota" msgid="1849612079678906607">"Kuota disk akun habis"</string>
+    <string name="completed_no_file" msgid="6719715000947601844">"File tidak ditemukan"</string>
+    <string name="failed_bad_response" msgid="8357723053952213242">"Kesalahan layanan"</string>
+    <string name="failed_network_error" msgid="2531660472217573602">"Kesalahan jaringan"</string>
     <string name="failed_server_auth" msgid="2428208784689362254">"Autentikasi gagal"</string>
     <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Unggahan yang tertunda [%d]"</string>
     <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Unggahan yang selesai [%d]"</string>
@@ -80,8 +80,8 @@
     <string name="notify_resolved" msgid="8111194870485485674">"Unggahan selesai"</string>
     <string name="notify_paused" msgid="3999817913227671338">"Unggahan dijeda"</string>
     <string name="notify_activation_reminder" msgid="1639234651193843030">"Unggah Sekejap belum diaktifkan"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"Berkas berukuran besar akan diunggah melalui sambungan WiFi saja."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Memindai berkas..."</string>
+    <string name="dialog_first_wifi" msgid="4318047428346248089">"File berukuran besar akan diunggah melalui sambungan WiFi saja."</string>
+    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Memindai file..."</string>
     <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"Menyiapkan <xliff:g id="PHOTOCOUNT">%1$d</xliff:g> foto dan <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> video untuk diunggah..."</string>
     <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"Tidak ada foto/video tambahan yang perlu diunggah."</string>
     <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"Terjadi masalah saat berkomunikasi dengan server. Coba lagi nanti."</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 8e0d67c..1a4956a 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"Lettura allegati email"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Consente all\'applicazione di leggere i tuoi allegati email."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Consente all\'applicazione di leggere gli allegati email."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Accesso ai dati del provider di posta"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Consente a questa applicazione di accedere al database della tua posta, inclusi i messaggi ricevuti e inviati, i nomi utente e le password."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Consente all\'applicazione di accedere al database della tua posta, inclusi i messaggi ricevuti e inviati, i nomi utente e le password."</string>
     <string name="app_name" msgid="5815426892327290362">"Email"</string>
     <string name="compose_title" msgid="427986915662706899">"Scrivi"</string>
     <string name="debug_title" msgid="5175710493691536719">"Debug"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"Fine"</string>
     <string name="create_action" msgid="3062715563215392251">"Crea nuova"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"Elimina"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"Nessuna risposta rapida"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Nessuna risposta rapida."</string>
     <string name="discard_action" msgid="6532206074859505968">"Elimina"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"Salva bozza"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Inserisci risposta rapida"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"Ricerca"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Impostazioni account"</string>
     <string name="settings_action" msgid="6334807007967459412">"Impostazioni"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"Opzioni di sincronizzazione"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Opzioni di sincronizzazione"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Segna come da leggere"</string>
     <string name="move_action" msgid="3059189775933985898">"Sposta"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Ccn"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> ha scritto:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Includi testo citato"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Includi testo"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Devi aggiungere almeno un destinatario."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"Aggiungi almeno un destinatario."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Alcuni indirizzi email non sono validi."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"File troppo grande. Impossibile allegarlo."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Inserisci risposta rapida"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Salvato"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Interrompi"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Allegato salvato come <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Impossibile salvare allegato."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Nota. Prima dell\'invio verranno scaricati uno o più allegati del messaggio inoltrato."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"Impossibile salvare allegato."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Prima dell\'invio verranno scaricati uno o più allegati del messaggio inoltrato."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Messaggio"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Invito"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Impossibile inoltrare uno o più allegati."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Allegato non inoltrato"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"Accesso a <xliff:g id="ACCOUNT_NAME">%s</xliff:g> non riuscito."</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"Accesso a <xliff:g id="ACCOUNT_NAME">%s</xliff:g> non riuscito."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"Accesso non riuscito"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Meno recenti"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" - "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Impostazione account"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Aggiungi un account Exchange"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Aggiungi un account Exchange ActiveSync"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"Account email"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"Puoi configurare la posta elettronica per la maggior parte degli account con pochi passaggi."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Puoi configurare un account Exchange con pochi passaggi."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Puoi configurare un account Exchange ActiveSync con pochi passaggi."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Puoi configurare il tuo account in pochi passaggi."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Indirizzo email"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Password"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Invia email da questo account per impostazione predefinita."</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"Invia email da questo account per impostazione predefinita"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Config. manuale"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Digita un indirizzo email e una password validi."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Account duplicato"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Verifica impostazioni server della posta in arrivo..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Verifica impostazioni server posta in uscita…"</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Impostazione account"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"Il tuo account è stato impostato e l\'email sarà presto disponibile."</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"Il tuo account è stato impostato e l\'email sarà presto disponibile."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Assegna un nome all\'account (facoltativo)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Il tuo nome (visualizzato nei messaggi in uscita)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Questo campo non può essere vuoto."</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Impostazioni server Posta in arrivo"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nome utente"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Password"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Server POP3"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"Server IMAP"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Server"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Porta"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Tipo di sicurezza"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Nessuna"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Server SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Porta"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Tipo di sicurezza"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Richiedi accesso"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Richiedi accesso"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nome utente"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Password"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"Impostazione account"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Ogni 15 minuti"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Ogni 30 minuti"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Ogni ora"</string>
-    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Invia email da questo account per impostazione predefinita."</string>
-    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Avvisami all\'arrivo di email."</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sincronizza contatti da questo account."</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sincronizza il calendario da questo account."</string>
-    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sincronizza le email da questo account."</string>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"Invia email da questo account per impostazione predefinita"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Avvisami all\'arrivo di email"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Sincronizza contatti di questo account"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Sincronizza calendario di questo account"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Sincronizza email di questo account"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Scarica allegati automaticamente quando connesso a Wi-Fi"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Impossibile completare"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Giorni da sincronizzare"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Un mese"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Tutto"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Usa imp. predefinite account"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Nome utente o password errata."</string>
-    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nome utente o password errata."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_dlg_auth_message" msgid="426627755590431364">"Password o nome utente errato."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"Password o nome utente errato."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Impossibile connettersi in modo sicuro al server."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Impossibile connettersi in modo sicuro al server."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"Certificato client richiesto. Connettersi al server con certificato client?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"Certificato non valido o non accessibile."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"Il server ha risposto con un errore. Controlla nome utente e password e riprova."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"È necessario un certificato client. Vuoi connetterti al server con un certificato client?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"Certificato non valido o non accessibile."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"Il server ha risposto con un errore. Controlla nome utente e password e riprova."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"Impossibile connettersi al server."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Impossibile connettersi al server."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS richiesto ma non supportato dal server."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"AVVISO. La disattivazione dell\'autorità dell\'applicazione Email per l\'amministrazione del dispositivo comporterà l\'eliminazione di tutti gli account email che la richiedono, compresi i relativi messaggi email, contatti, eventi di calendario e altri dati."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Aggiornamento sicurezza"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> richiede l\'aggiornamento delle impostazioni di sicurezza."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"È richiesto l\'aggiornamento delle impostazioni di sicurezza per l\'account \"<xliff:g id="ACCOUNT">%s</xliff:g>\"."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"Aggiornamento sicurezza richiesto"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"L\'account \"<xliff:g id="ACCOUNT">%s</xliff:g>\" non può essere sincronizzato a causa di requisiti di sicurezza."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"È richiesto l\'aggiornamento delle impostazioni di sicurezza per l\'account \"<xliff:g id="ACCOUNT">%s</xliff:g>\"."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"Impostazioni di sicurezza dell\'account \"<xliff:g id="ACCOUNT">%s</xliff:g>\" modificate; nessun intervento richiesto."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Aggiornamento sicurezza richiesto"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Criteri di sicurezza modificati"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Criteri sicurezza non rispettab."</string>
     <string name="account_security_title" msgid="3511543138560418587">"Sicurezza dispositivo"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Il server <xliff:g id="SERVER">%s</xliff:g> richiede che tu consenta il controllo remoto di alcune funzionalità di sicurezza del tuo dispositivo Android."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Modifica dettagli"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"Il PIN o la password di blocco dello schermo sono scaduti."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"Password blocco schermo scaduta"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Password blocco schermo in scadenza"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"Devi modificare il PIN o la password di blocco dello schermo a breve altrimenti i dati relativi a <xliff:g id="ACCOUNT">%s</xliff:g> verranno cancellati. Apportare la modifica ora?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Appena possibile devi cambiare il PIN o la password di blocco dello schermo; in caso contrario i dati di <xliff:g id="ACCOUNT">%s</xliff:g> verranno cancellati. Vuoi apportare la modifica ora?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"Password blocco schermo scaduta"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"I dati relativi a <xliff:g id="ACCOUNT">%s</xliff:g> stanno per essere cancellati dal dispositivo. È possibile ripristinarli modificando il PIN o la password di blocco dello schermo. Apportare la modifica ora?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"I dati relativi a <xliff:g id="ACCOUNT">%s</xliff:g> stanno per essere cancellati dal dispositivo. È possibile ripristinarli modificando il PIN o la password di blocco dello schermo. Vuoi apportare la modifica ora?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Ignorare le modifiche non salvate?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Impossibile accedere"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Il nome utente o la password per <xliff:g id="ACCOUNT">%s</xliff:g> non sono corretti. Aggiornarli ora?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"Password o nome utente di <xliff:g id="ACCOUNT">%s</xliff:g> errato. Vuoi aggiornarli ora?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Account predefinito"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Invia email da questo account per impostazione predefinita"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Scarica allegati"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Scarica automaticamente allegati messaggi recenti tramite Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Notifiche email"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Frequenza sincronizzazione, notifiche e altro."</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"Notifica sulla barra di sistema l\'arrivo di email"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Invia notifica all\'arrivo di email"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Frequenza di controllo Posta in arrivo"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Impost. posta in arrivo"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Nome utente, password e altre impostazioni server in entrata"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Impost. posta in uscita"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Nome utente, password e altre impostazioni server in uscita"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Criteri applicati"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Nessuna"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Criteri non supportati"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Nessuna"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"Tentativo di sincronizzazione"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Tocca qui per sincronizzare l\'account"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Nome account"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Nome"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Firma"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Risposte rapide"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Modifica il testo che inserisci spesso quando componi le email"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Modifica il testo che inserisci spesso quando scrivi email"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Aggiungi testo ai messaggi inviati"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Impostazioni notifiche"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Utilizzo dati"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"Criteri di sicurezza"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Modifica risposta rapida"</string>
     <string name="save_action" msgid="1988862706623227093">"Salva"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Sincronizza contatti"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sincronizza i contatti per questo account"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sincronizza calendario"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Sincronizza il calendario per questo account"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Sincronizza calendario"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Sincron. evento calendario account"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincronizza email"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronizza le email per questo account"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrazione"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> risultati da <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Impostazioni"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"Generali"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Impostazioni generali"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"Applicazione"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Avanzamento automatico"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Seleziona schermata da visualizzare dopo eliminazione messaggio"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Nascondi caselle di controllo"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"Negli elenchi di messaggi, tocca e tieni premuto per selezionare"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Conferma prima di eliminare"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Messaggi"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Conferma prima di inviare"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Messaggi"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Passa a"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Messaggio successivo"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Messaggio precedente"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"In attesa dei risultati"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Alcuni server possono richiedere molto tempo."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Cartelle"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Non consentire uso fotocamera dispositivo"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Richiedi password dispositivo"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"Limita riutilizzo password recenti"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"Richiedi scadenza password"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"Richiedi dispos. inattivo per blocco schermo"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"Limita numero di eventi calendario sincronizzati"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"Limita numero di email sincronizzate"</string>
+    <string name="quick_1" msgid="3426057697353380951">"Grazie."</string>
+    <string name="quick_2" msgid="4188036352885736617">"Per me va bene."</string>
+    <string name="quick_3" msgid="8061819976353395585">"Lo leggerò più tardi e ti farò sapere."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Organizziamo una riunione per discuterne."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Sincronizzazione dello sfondo per questo account disattivata durante il roaming."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"Invio risposta in corso..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"Nessun messaggio."</string>
 </resources>
diff --git a/res/values-it/uploader.xml b/res/values-it/uploader.xml
index e1fa61b..7441ef0 100644
--- a/res/values-it/uploader.xml
+++ b/res/values-it/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Nascondi dettagli"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Impostazioni"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Data caricamento: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Account"</string>
     <string name="upload" msgid="2615541458361216022">"Carica"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 83ecfd1..d2727bf 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"קרא קבצים מצורפים לדוא\"ל"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"מאפשר ליישום זה לקרוא את הקבצים המצורפים להודעות הדוא\"ל שלך."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"מאפשר ליישום לקרוא את הקבצים המצורפים לדוא\"ל."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"גש לנתוני ספק הדוא\"ל"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"מאפשר ליישום זה לגשת למסד הנתונים של הדוא\"ל שלך, כולל להודעות שהתקבלו, להודעות שנשלחו, לשמות משתמש ולסיסמאות."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"מאפשר ליישום לגשת למסד הנתונים של הדוא\"ל שלך, כולל להודעות שהתקבלו, להודעות שנשלחו, לשמות משתמש ולסיסמאות."</string>
     <string name="app_name" msgid="5815426892327290362">"דוא\"ל"</string>
     <string name="compose_title" msgid="427986915662706899">"חבר הודעה"</string>
     <string name="debug_title" msgid="5175710493691536719">"ניקוי באגים"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"סיום"</string>
     <string name="create_action" msgid="3062715563215392251">"צור חדש"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"מחק"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"אין תגובות מהירות"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"אין תגובות מהירות."</string>
     <string name="discard_action" msgid="6532206074859505968">"מחק"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"שמור טיוטה"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"הוסף תגובה מהירה"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"חפש"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"הגדרות חשבון"</string>
     <string name="settings_action" msgid="6334807007967459412">"הגדרות"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"אפשרויות סינכרון"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"אפשרויות סנכרון"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"סמן כלא נקרא"</string>
     <string name="move_action" msgid="3059189775933985898">"העבר"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ עותק/עותק מוסתר"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> כתב:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"כלול טקסט מצוטט"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"כלול טקסט"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"עליך להוסיף נמען אחד לפחות."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"הוסף לפחות נמען אחד."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"חלק מכתובות הדוא\"ל אינן חוקיות."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"הקובץ גדול מדי ולא ניתן לצרף אותו."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"הוסף תגובה מהירה"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"נשמר"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"עצור"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"קובץ מצורף נשמר בשם <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"לא ניתן לשמור את הקובץ המצורף."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"הערה: המערכת תוריד קובץ מצורף אחד או יותר בהודעה שהעברת לפני השליחה."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"לא ניתן לשמור את הקובץ המצורף."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"המערכת תוריד קובץ מצורף אחד או יותר בהודעה שהעברת לפני השליחה."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"הודעה"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"הזמן"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"לא ניתן להעביר קובץ מצורף אחד או יותר."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"הקובץ המצורף לא הועבר"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"הכניסה ל-<xliff:g id="ACCOUNT_NAME">%s</xliff:g> נכשלה."</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"הכניסה ל-<xliff:g id="ACCOUNT_NAME">%s</xliff:g> נכשלה."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"לא ניתן היה להיכנס"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"‎<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"ישן יותר"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"הגדרת חשבון"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"הוספת חשבון Exchange"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"הוסף חשבון Exchange ActiveSync"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"חשבון דוא\"ל"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"תוכל להגדיר דוא\"ל עבור רוב החשבונות במספר פעולות פשוטות."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"ניתן להגדיר חשבון Exchange במספר פעולות פשוטות."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"תוכל להגדיר חשבון Exchange ActiveSync במספר פעולות פשוטות."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"ניתן להגדיר את החשבון במספר פעולות פשוטות."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"כתובת דוא\"ל"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"סיסמה"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"שלח דוא\"ל מחשבון זה כברירת מחדל."</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"שלח דוא\"ל מחשבון זה כברירת מחדל"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"הגדרה ידנית"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"הקלד כתובת דוא\"ל וסיסמה חוקיות."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"חשבון משוכפל"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"בודק הגדרות שרת דואר נכנס..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"בודק הגדרות שרת דואר יוצא..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"הגדרת חשבון"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"החשבון שלך הוגדר והדוא\"ל בדרך!"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"החשבון שלך הוגדר והדוא\"ל בדרך!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"תן שם לחשבון זה (אופציונלי)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"שמך (מוצג בהודעות יוצאות)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"שדה זה לא יכול להיות ריק."</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"הגדרות שרת דואר נכנס"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"שם משתמש"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"סיסמה"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"שרת POP3"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"שרת IMAP"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"שרת"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"יציאה"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"סוג אבטחה"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"ללא"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"שרת SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"יציאה"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"סוג אבטחה"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"דרוש כניסה."</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"דרושה כניסה"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"שם משתמש"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"סיסמה"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"הגדרת חשבון"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"כל 15 דקות"</string>
     <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_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>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"שלח דוא\"ל מחשבון זה כברירת מחדל"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"הודע לי כשמגיע דוא\"ל"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"סנכרן אנשי קשר מחשבון זה"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"סנכרן את לוח השנה מחשבון זה"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"סנכרן דוא\"ל מחשבון זה"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"הורד קבצים מצורפים באופן אוטומטי כאשר יש חיבור ל-Wi-Fi"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"לא ניתן להשלים את הפעולה"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"ימים לסינכרון"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"חודש אחד"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"הכל"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"השתמש בברירת המחדל של החשבון"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"שם המשתמש או הסיסמה שגויים."</string>
-    <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_auth_message" msgid="426627755590431364">"שם המשתמש או הסיסמה שגויים."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"שם המשתמש או הסיסמה שגויים. "\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"לא ניתן להתחבר לשרת באופן בטוח."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"לא ניתן להתחבר לשרת באופן בטוח."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"נדרש אישור לקוח. להתחבר לשרת עם אישור לקוח?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"האישור אינו חוקי או שלא ניתן לגשת אליו."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"השרת הגיב עם שגיאה. בדוק את שם המשתמש והסיסמה ונסה שוב."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"דרוש אישרו לקוח. האם אתה רוצה להתחבר לשרת עם אישור לקוח?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"האישור אינו חוקי או שלא ניתן לגשת אליו."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"השרת הגיב עם שגיאה. בדוק את שם המשתמש והסיסמה ונסה שוב."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"לא ניתן להתחבר לשרת."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"לא ניתן להתחבר לשרת."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS נדרש אך אינו נתמך בשרת."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"אזהרה: השבתת ההרשאה של יישום הדוא\"ל לטפל במכשיר תגרום למחיקת כל חשבונות הדוא\"ל שמחייבים הרשאה זו, כולל הודעות הדוא\"ל, אנשי הקשר, האירועים בלוח השנה ונתונים אחרים."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"עדכון אבטחה"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> מחייב עדכון של הגדרות האבטחה שלך."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"החשבון \"<xliff:g id="ACCOUNT">%s</xliff:g>\" דורש עדכון של הגדרות אבטחה."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"נדרש עדכון אבטחה"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"לא ניתן לסנכרן את החשבון \"<xliff:g id="ACCOUNT">%s</xliff:g>\" עקב דרישות אבטחה."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"החשבון \"<xliff:g id="ACCOUNT">%s</xliff:g>\" דורש עדכון של הגדרות אבטחה."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"חשבון \"<xliff:g id="ACCOUNT">%s</xliff:g>\" שינה את הגדרות האבטחה שלו; לא נדרשת כל פעולה מצד המשתמש."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"נדרש עדכון אבטחה"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"מדיניות האבטחה השתנתה"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"לא ניתן לקיים את הוראות מדיניות האבטחה"</string>
     <string name="account_security_title" msgid="3511543138560418587">"אבטחת המכשיר"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"השרת <xliff:g id="SERVER">%s</xliff:g> דורש שתאפשר לו שליטה מרחוק על תכונות אבטחה מסוימות במכשיר ה-Android שלך."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"ערוך פרטים"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"פג תוקף ה-PIN או הסיסמה של נעילת המסך שלך."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"פג תוקף הסיסמה של נעילת המסך"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"תוקף הסיסמה של נעילת המסך עומד לפוג"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"עליך לשנות את ה-PIN או הסיסמה של נעילת המסך בקרוב, אחרת הנתונים של <xliff:g id="ACCOUNT">%s</xliff:g> יימחקו. לשנות זאת כעת?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"עליך לשנות את ה-PIN או הסיסמה המשמשים לנעילת מסך, אחרת הנתונים של <xliff:g id="ACCOUNT">%s</xliff:g> יימחקו. האם ברצונך להשנות כעת?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"פג תוקף הסיסמה של נעילת המסך"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"הנתונים עבור <xliff:g id="ACCOUNT">%s</xliff:g> נמחקים מהמכשיר שלך. תוכל לשחזר אותם על ידי שינוי ה-PIN או הסיסמה של נעילת המסך. לשנות זאת כעת?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"הנתונים עבור <xliff:g id="ACCOUNT">%s</xliff:g> נמחקים מהמכשיר שלך. תוכל לשחזר אותם על ידי שינוי ה-PIN או הסיסמה של נעילת המסך. האם ברצונך לשנות כעת?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"למחוק שינויים שלא נשמרו?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"לא ניתן להיכנס"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"שם המשתמש או הסיסמה עבור <xliff:g id="ACCOUNT">%s</xliff:g> שגויים. לעדכן אותם כעת?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"שם המשתמש או הסיסמה עבור <xliff:g id="ACCOUNT">%s</xliff:g> שגוי. האם ברצונך לעדכן כעת?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"חשבון ברירת מחדל"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"שלח דוא\"ל מחשבון זה כברירת מחדל"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"הורד קבצים מצורפים"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"הורד באופן אוטומטי קבצים מצורפים להודעות שהתקבלו לאחרונה באמצעות WiFi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"התראות דוא\"ל"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"תדירות סינכרון, התראות וכדומה"</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"הצג הודעה בשורת המערכת כאשר מגיע דוא\"ל"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"שלח הודעה כשמגיע דוא\"ל"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"תדירות בדיקה של דואר נכנס"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"הגדרות דואר נכנס"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"שם משתמש, סיסמה והגדרות אחרות של שרת דואר נכנס"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"הגדרות דואר יוצא"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"שם משתמש, סיסמה והגדרות אחרות של שרת דואר יוצא"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"מדיניות שנאכפה"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"ללא"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"מדיניות לא נתמכת"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"ללא"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"נסה לסנכרן"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"גע כאן כדי לסנכרן חשבון זה"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"שם חשבון"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"השם שלך"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"חתימה"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"תגובות מהירות"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"ערוך טקסט שאתה מוסיף לעתים קרובות בזמן כתיבת הודעות דוא\"ל"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"ערוך טקסט שאתה מוסיף לעתים קרובות בזמן כתיבת דוא\"ל"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"צרף טקסט להודעות שאתה שולח"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"הגדרות התראה"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"שימוש בנתונים"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"מדיניות אבטחה"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"ערוך תגובה מהירה"</string>
     <string name="save_action" msgid="1988862706623227093">"שמור"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"סנכרן אנשי קשר"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"סנכרן אנשי קשר בחשבון זה"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"סנכרן יומן"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"סנכרן יומן בחשבון זה"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"סנכרן יומן"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"סינכרון אירוע לוח שנה עבור חשבון זה"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"סנכרן דוא\"ל"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"סנכרן דוא\"ל בחשבון זה"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"רטט"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> תוצאות מ-<xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"הגדרות"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"כללי"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"הגדרות כלליות"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"יישום"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"התקדמות אוטומטית"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"בחר איזה מסך יוצג לאחר מחיקת הודעה"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"הסתר תיבות סימון"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"ברשימות של הודעות, גע והחזק כדי לבחור"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"אשר לפני מחיקה"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"הודעות"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"אשר לפני שליחה"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"הודעות"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"התקדם אל"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"הודעה חדשה יותר"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"הודעה ישנה יותר"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"ממתין לתוצאות"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"שרתים מסוימים עשויים לדרוש זמן רב."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"תיקיות"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"אל תאפשר שימוש במצלמה של המכשיר"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"נדרשת סיסמת מכשיר"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"הגבל את השימוש החוזר בסיסמאות אחרונות"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"נדרשת תפוגת סיסמאות"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"כפה נעילת מסך של מכשיר לא פעיל"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"הגבל את מספר אירועי לוח השנה המסונכרנים"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"הגבל את מספר פריטי הדוא\"ל המסונכרנים"</string>
+    <string name="quick_1" msgid="3426057697353380951">"תודה!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"נשמע לי טוב!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"אקרא את זה מאוחר יותר ואחזור אליך."</string>
+    <string name="quick_4" msgid="3988974084396883051">"בוא נקבע פגישה כדי לדון בנושא זה."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"סינכרון ברקע של חשבון זה מושבת בזמן נדידה."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"שולח תגובה..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"אין הודעות."</string>
 </resources>
diff --git a/res/values-iw/uploader.xml b/res/values-iw/uploader.xml
index 712280b..4d34fdf 100644
--- a/res/values-iw/uploader.xml
+++ b/res/values-iw/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"הסתר פרטים"</string>
     <string name="menu_settings" msgid="5088116127086866634">"הגדרות"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"הועלה בתאריך %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"חשבון"</string>
     <string name="upload" msgid="2615541458361216022">"העלה"</string>
     <string name="ok" msgid="2516349681897895312">"אישור"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 4484762..8a89f8a 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"メール添付ファイルの読み取り"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"メールの添付ファイルの読み取りをこのアプリケーションに許可します。"</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"メールの添付ファイルの読み取りをこのアプリに許可します。"</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"メールプロバイダのデータへのアクセス"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"このアプリケーションにメールデータベース(送受信したメッセージ、ユーザー名、パスワードを含む)へのアクセスを許可します。"</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"このアプリにメールデータベース(送受信したメッセージ、ユーザー名、パスワードを含む)へのアクセスを許可します。"</string>
     <string name="app_name" msgid="5815426892327290362">"メール"</string>
     <string name="compose_title" msgid="427986915662706899">"作成"</string>
     <string name="debug_title" msgid="5175710493691536719">"デバッグ"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"完了"</string>
     <string name="create_action" msgid="3062715563215392251">"新規作成"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"削除"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"クイック返信がありません"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"クイック返信がありません。"</string>
     <string name="discard_action" msgid="6532206074859505968">"破棄"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"下書きを保存"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"クイック返信を挿入"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"検索"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"アカウントの設定"</string>
     <string name="settings_action" msgid="6334807007967459412">"設定"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"同期オプション"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"同期オプション"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"未読にする"</string>
     <string name="move_action" msgid="3059189775933985898">"移動"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"Cc/Bccを追加"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g>: "\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"元のメッセージを挿入"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"元のメールを入れる"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"宛先を入力してください。"</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"宛先を入力してください。"</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"無効なメールアドレスがあります。"</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"添付ファイルが大きすぎます。"</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"クイック返信の挿入"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"保存済み"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"停止"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"添付ファイル<xliff:g id="FILENAME">%s</xliff:g>を保存しました。"</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"添付ファイルを保存できません。"</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"注: 送信前に転送メッセージの添付ファイルがダウンロードされます。"</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"添付ファイルを保存できませんでした。"</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"送信前に転送メッセージの添付ファイルがダウンロードされます。"</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"メッセージ"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"招待"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"添付ファイルを転送できませんでした。"</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"添付ファイルを転送できません"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g>でログインできませんでした。"</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g>でログインできませんでした。"</string>
     <string name="login_failed_title" msgid="7624349996212476176">"ログインできませんでした"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"前"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"アカウント設定"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Exchangeアカウントを追加"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Exchange ActiveSyncアカウントを追加"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"メールアカウント"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"ほとんどのアカウントのメールのセットアップは簡単な操作で完了します。"</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Exchangeアカウントのセットアップは簡単な操作で完了します。"</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Exchange ActiveSyncアカウントのセットアップは簡単な操作で完了します。"</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"アカウントのセットアップは簡単な操作で完了します。"</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"メールアドレス"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"パスワード"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"いつもこのアカウントでメールを送信"</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"常にこのアカウントでメールを送信"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"手動セットアップ"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"有効なメールアドレスとパスワードを入力してください。"</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"重複するアカウント"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"受信サーバーの設定を確認中..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"送信サーバーの設定を確認中..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"アカウント設定"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"アカウントの設定が完了しました。"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"アカウントの設定が完了しました。"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"このアカウントに名前を付ける (省略可):"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"あなたの名前(送信メールに表示されます)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"このフィールドは必須です。"</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"受信サーバーの設定"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"ユーザー名"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"パスワード"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3サーバー"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"IMAPサーバー"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"サーバー"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"ポート"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"セキュリティの種類"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"なし"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTPサーバー"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"ポート"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"セキュリティの種類"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"ログインが必要"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"ログインが必要"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"ユーザー名"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"パスワード"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"アカウント設定"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"15分毎"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"30分毎"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"1時間毎"</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_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>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"常にこのアカウントでメールを送信"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"メールの着信を知らせる"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"このアカウントから連絡先を同期"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"このアカウントからカレンダーを同期"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"このアカウントからメールを同期"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Wi-Fiへの接続時に添付ファイルを自動的にダウンロードする"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"完了できませんでした"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"同期する日数"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"1か月"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"すべて"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"アカウントのデフォルトを使用"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"ユーザー名かパスワードが間違っています。"</string>
-    <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_auth_message" msgid="426627755590431364">"ユーザー名またはパスワードが正しくありません。"</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"ユーザー名かパスワードが間違っています。"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"サーバーへの安全な接続を確立できません。"</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"サーバーへの安全な接続を確立できません。"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"クライアント証明書が必要です。クライアント証明書を使用してサーバーに接続しますか?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"証明書が無効か、証明書にアクセスできません。"</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"サーバーからエラーが返されました。ユーザー名とパスワードを確認してもう一度お試しください。"</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"クライアント証明書が必要です。クライアント証明書を使用してサーバーに接続しますか?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"証明書が無効か、証明書にアクセスできません。"</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"サーバーからエラーが返されました。ユーザー名とパスワードを確認してもう一度お試しください。"</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"サーバーに接続できません。"</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"サーバーに接続できません。"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLSが必要ですがサーバーが対応していません。"</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"警告: メールアプリの端末管理権限を無効にすると、権限を必要とするすべてのメールアカウントが削除されます。また、そのアカウントのメール、連絡先、カレンダーの予定などのデータも削除されます。"</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"セキュリティの更新"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g>のセキュリティ設定を更新する必要があります。"</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"アカウント「<xliff:g id="ACCOUNT">%s</xliff:g>」でセキュリティ設定の更新が必要です。"</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"セキュリティの更新が必要です"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"アカウント「<xliff:g id="ACCOUNT">%s</xliff:g>」はセキュリティ要件により同期できません。"</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"アカウント「<xliff:g id="ACCOUNT">%s</xliff:g>」でセキュリティ設定の更新が必要です。"</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"アカウント「<xliff:g id="ACCOUNT">%s</xliff:g>」がセキュリティ設定を変更しました。ユーザーの操作は不要です。"</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"セキュリティの更新が必要です"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"ポリシーが変更されました"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"ポリシーを満たすことができません"</string>
     <string name="account_security_title" msgid="3511543138560418587">"端末のセキュリティ"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Android搭載携帯のセキュリティ機能の一部に対するリモートコントロールをサーバー<xliff:g id="SERVER">%s</xliff:g>に許可する必要があります。"</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"設定を編集"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"ロック解除PINまたはパスワードの有効期限が切れました。"</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"ロック解除パスワードが期限切れ"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"ロック解除パスワードの有効期限が間近です"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"ロック解除PINまたはパスワードを変更しないと、まもなく「<xliff:g id="ACCOUNT">%s</xliff:g>」のデータが消去されます。今すぐ変更しますか?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"ロック解除PINまたはパスワードを変更しないと、まもなく<xliff:g id="ACCOUNT">%s</xliff:g>のデータが消去されます。今すぐ変更しますか?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"ロック解除パスワードが期限切れです"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"<xliff:g id="ACCOUNT">%s</xliff:g>のデータが端末から消去されます。ロック解除PINまたはパスワードを変更するとデータを元に戻すことができます。今すぐ変更しますか?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"<xliff:g id="ACCOUNT">%s</xliff:g>のデータが端末から消去されます。ロック解除PINまたはパスワードを変更するとデータを元に戻すことができます。今すぐ変更しますか?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"保存されていない変更を破棄しますか?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"ログインできませんでした"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"<xliff:g id="ACCOUNT">%s</xliff:g>のユーザー名またはパスワードが正しくありません。今すぐ更新しますか?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"<xliff:g id="ACCOUNT">%s</xliff:g>のユーザー名またはパスワードが正しくありません。今すぐ更新しますか?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"優先アカウントにする"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"いつもこのアカウントでメールを送信"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"添付ファイルのダウンロード"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Wi-Fi接続時に最近のメールの添付ファイルを自動的にダウンロード"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"メール着信通知"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"同期頻度、通知、その他"</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"メール受信: システムバーで通知"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"メールの着信時に通知を送信"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"受信トレイの確認頻度"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"受信設定"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"ユーザー名、パスワードなど受信サーバーを設定する"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"送信設定"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"ユーザー名、パスワードなど送信サーバーを設定する"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"適用済みポリシー"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"なし"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"未対応ポリシー"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"なし"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"同期する"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"アカウントを同期するにはこちらをタップします"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"アカウント名"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"名前"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"署名"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"クイック返信"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"メールの作成時に頻繁に挿入する文章を編集する"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"メールの作成時に頻繁に挿入する文章を編集する"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"送信メッセージに署名を付ける"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"通知設定"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"データ使用"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"セキュリティポリシー"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"クイック返信の編集"</string>
     <string name="save_action" msgid="1988862706623227093">"保存"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"連絡先を同期"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"このアカウントの連絡先を同期"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"カレンダーを同期"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"このアカウントのカレンダーを同期"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"カレンダーを同期"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"このアカウントのカレンダーの予定を同期"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"メールを同期する"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"このアカウントのメールを同期"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"バイブレーション"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="DOMAIN">%2$s</xliff:g>からの結果: <xliff:g id="RESULTS">%1$d</xliff:g>件"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"設定"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"全般"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"全般設定"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"アプリケーション"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"自動表示"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"メッセージを削除した後に表示する画面を選択します"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"チェックボックスを表示しない"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"メッセージリストで押し続けて選択する"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"削除前に確認する"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"メッセージ"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"送信前に確認する"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"メッセージ"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"表示する画面:"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"新しいメッセージ"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"古いメッセージ"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"結果を待機中"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"サーバーによって時間がかかる場合があります。"</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"フォルダ"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"端末のカメラの使用を許可しない"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"端末のパスワードを必須とする"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"最近使用したパスワードの再使用を制限する"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"パスワードの有効期限を設定する"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"画面ロック前のアイドル時間を設定する"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"同期するカレンダーの予定の数を制限する"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"同期するメールの数を制限する"</string>
+    <string name="quick_1" msgid="3426057697353380951">"ありがとうございます。"</string>
+    <string name="quick_2" msgid="4188036352885736617">"良いと思います。"</string>
+    <string name="quick_3" msgid="8061819976353395585">"確認して折り返し連絡します。"</string>
+    <string name="quick_4" msgid="3988974084396883051">"この件についてミーティングを行いませんか。"</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"このアカウントのバックグラウンドでの同期は、ローミング中は無効です。"</string>
+    <string name="confirm_response" msgid="5747902757569543165">"出欠状況を送信しています..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"メッセージはありません。"</string>
 </resources>
diff --git a/res/values-ja/uploader.xml b/res/values-ja/uploader.xml
index c3d7ec4..bcd33ca 100644
--- a/res/values-ja/uploader.xml
+++ b/res/values-ja/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"詳細を表示しない"</string>
     <string name="menu_settings" msgid="5088116127086866634">"設定"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"アップロード済み: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"アカウント"</string>
     <string name="upload" msgid="2615541458361216022">"アップロード"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 52383ae..8303cfb 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"이메일 첨부파일 읽기"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"애플리케이션이 이메일 첨부파일을 읽도록 허용합니다."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"앱이 이메일 첨부파일을 읽도록 허용합니다."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"이메일 제공업체 데이터 액세스"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"애플리케이션이 받은 메일, 보낸 메일, 사용자 이름 및 비밀번호를 포함하는 이메일 데이터베이스에 액세스하도록 합니다."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"앱이 받은 메일, 보낸 메일, 사용자 이름 및 비밀번호를 포함하는 이메일 데이터베이스에 액세스하도록 허용합니다."</string>
     <string name="app_name" msgid="5815426892327290362">"이메일"</string>
     <string name="compose_title" msgid="427986915662706899">"편지쓰기"</string>
     <string name="debug_title" msgid="5175710493691536719">"디버그"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"완료"</string>
     <string name="create_action" msgid="3062715563215392251">"새로 만들기"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"삭제"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"빠른 응답이 없습니다."</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"빠른 응답이 없습니다."</string>
     <string name="discard_action" msgid="6532206074859505968">"삭제"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"임시보관함에 저장"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"빠른 응답 삽입"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"검색"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"계정 설정"</string>
     <string name="settings_action" msgid="6334807007967459412">"설정"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"동기화 옵션"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"동기화 옵션"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"읽지않음으로 표시"</string>
     <string name="move_action" msgid="3059189775933985898">"이동"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"참조/숨은참조 추가"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g>님이 작성:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"받은메일 포함"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"받은메일 포함"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"받는 사람을 한 명 이상 추가해야 합니다."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"받는 사람을 한 명 이상 추가하세요."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"일부 이메일 주소가 올바르지 않습니다."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"파일이 너무 커서 첨부할 수 없습니다."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"빠른 응답 삽입"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"저장됨"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"중지"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"첨부파일을 <xliff:g id="FILENAME">%s</xliff:g>(으)로 저장했습니다."</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"첨부파일을 저장할 수 없습니다."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"참고: 메일을 전달하기 전에 첨부파일을 다운로드합니다."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"첨부파일을 저장하지 못했습니다."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"전달된 메일에 하나 이상의 첨부파일을 다운로드한 다음 전송합니다."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"메일"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"초대"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"하나 이상의 첨부파일을 전달하지 못했습니다."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"첨부파일을 전달하지 못했습니다."</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g>에 로그인하지 못했습니다."</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g>에 로그인하지 못했습니다."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"로그인하지 못했습니다."</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"이전"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"계정 설정"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Exchange 계정 추가"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Exchange ActiveSync 계정 추가"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"이메일 계정"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"대부분의 계정에 대해 간단하게 이메일을 설정할 수 있습니다."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Exchange 계정을 간단하게 설정할 수 있습니다."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Exchange ActiveSync 계정을 간단하게 설정할 수 있습니다."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"간단하게 계정을 설정할 수 있습니다."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"이메일 주소"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"비밀번호"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"기본적으로 이 계정에서 이메일 전송"</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"이 계정에서 이메일 보냄(기본값)"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"수동 설정"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"올바른 이메일 주소와 비밀번호를 입력하세요."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"중복 계정"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"받는 서버 설정 확인 중..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"발신 서버 설정 확인 중..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"계정 설정"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"계정이 설정되었으며 이메일을 사용할 수 있습니다."</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"계정이 설정되었으며 이메일을 사용할 수 있습니다."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"계정 이름 지정(선택사항)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"이름(메일에 표시)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"이 입력란은 비워 둘 수 없습니다."</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"수신 서버 설정"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"사용자 이름"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"비밀번호"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3 서버"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"IMAP 서버"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"서버"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"포트"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"보안 유형"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"없음"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP 서버"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"포트"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"보안 유형"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"로그인 필요"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"로그인 필요"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"사용자 이름"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"비밀번호"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"계정 설정"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"15분마다"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"30분마다"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"1시간마다"</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_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>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"이 계정에서 이메일 보냄(기본값)"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"이메일이 오면 알림"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"이 계정에서 연락처 동기화"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"이 계정에서 캘린더 동기화"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"이 계정에서 이메일 동기화"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Wi-Fi에 연결되면 자동으로 첨부파일 다운로드"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"완료할 수 없음"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"동기화할 일 수"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"1달"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"전체"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"계정 기본값 사용"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"사용자 이름 또는 비밀번호가 잘못되었습니다."</string>
-    <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_auth_message" msgid="426627755590431364">"사용자 이름 또는 비밀번호가 잘못되었습니다."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"사용자 이름 또는 비밀번호가 잘못되었습니다."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"서버에 안전하게 연결할 수 없습니다."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"서버에 안전하게 연결할 수 없습니다."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"클라이언트 인증서가 필요합니다. 클라이언트 인증서로 서버에 연결하시겠습니까?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"인증서가 잘못되었거나 액세스할 수 없습니다."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"서버에서 오류를 발견했습니다. 사용자 이름과 비밀번호를 확인한 다음 다시 시도해 주세요."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"클라이언트 인증서가 필요합니다. 클라이언트 인증서로 서버에 연결하시겠습니까?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"인증서가 잘못되었거나 액세스할 수 없습니다."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"서버에서 오류를 발견했습니다. 사용자 이름과 비밀번호를 확인한 다음 다시 시도해 주세요."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"서버에 연결할 수 없습니다."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"서버에 연결할 수 없습니다."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS가 필요하지만 서버에서 지원하지 않습니다."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"경고: 이메일 앱의 기기 관리 권한을 비활성화하면 관련된 모든 이메일 계정 및 이메일, 주소록, 캘린더 일정 및 기타 데이터가 모두 삭제됩니다."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"보안 업데이트"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g>의 보안 설정을 업데이트해야 합니다."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"\'<xliff:g id="ACCOUNT">%s</xliff:g>\' 계정을 사용하려면 보안 설정을 업데이트해야 합니다."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"보안 업데이트가 필요합니다."</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"\'<xliff:g id="ACCOUNT">%s</xliff:g>\' 계정이 보안 요구사항으로 인해 동기화될 수 없습니다."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"\'<xliff:g id="ACCOUNT">%s</xliff:g>\' 계정의 보안 설정을 업데이트해야 합니다."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"\'<xliff:g id="ACCOUNT">%s</xliff:g>\' 계정의 보안 설정이 변경되었습니다. 사용자의 조치는 필요하지 않습니다."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"보안 업데이트 필요"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"보안 정책 변경됨"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"보안 정책을 준수할 수 없음"</string>
     <string name="account_security_title" msgid="3511543138560418587">"기기 보안"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"<xliff:g id="SERVER">%s</xliff:g> 서버가 Android 기기의 몇 가지 보안 기능을 원격으로 제어할 수 있도록 해야 합니다."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"세부정보 수정"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"화면 잠금 PIN 또는 비밀번호가 만료되었습니다."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"화면 잠금 비밀번호가 만료되었습니다."</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"화면 잠금 비밀번호가 곧 만료될 예정입니다."</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"곧 화면 잠금 PIN 또는 비밀번호를 변경해야 하며, 변경하지 않으면 <xliff:g id="ACCOUNT">%s</xliff:g>의 데이터가 지워집니다. 지금 변경하시겠습니까?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"곧 화면 잠금 PIN 또는 비밀번호를 변경해야 하며, 변경하지 않으면 <xliff:g id="ACCOUNT">%s</xliff:g>의 데이터가 지워집니다. 지금 변경하시겠습니까?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"화면 잠금 비밀번호가 만료되었습니다."</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"<xliff:g id="ACCOUNT">%s</xliff:g>의 데이터가 기기에서 지워졌습니다. 화면 잠금 PIN 또는 비밀번호를 변경하면 데이터를 복구할 수 있습니다. 지금 변경하시겠습니까?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"<xliff:g id="ACCOUNT">%s</xliff:g>의 데이터가 기기에서 지워졌습니다. 화면 잠금 PIN 또는 비밀번호를 변경하면 데이터를 복구할 수 있습니다. 지금 변경하시겠습니까?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"저장되지 않은 변경사항을 삭제하시겠습니까?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"로그인하지 못했습니다."</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"<xliff:g id="ACCOUNT">%s</xliff:g>의 사용자 이름 또는 비밀번호가 잘못되었습니다. 지금 업데이트하시겠습니까?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"<xliff:g id="ACCOUNT">%s</xliff:g>의 사용자 이름 또는 비밀번호가 잘못되었습니다. 지금 업데이트하시겠습니까?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"기본 계정"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"기본적으로 이 계정에서 이메일 전송"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"첨부파일 다운로드"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Wi-Fi를 통해 최근 메일의 첨부파일을 자동으로 다운로드합니다."</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"이메일 알림"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"빈도 및 알림 등을 동기화합니다."</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"이메일이 오면 시스템 바에서 알림"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"이메일이 오면 알림을 보냄"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"받은편지함 확인 빈도"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"수신 설정"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"사용자 이름, 비밀번호 및 기타 받는 서버 설정"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"발신 설정"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"사용자 이름, 비밀번호 및 기타 보내는 서버 설정"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"적용 정책"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"선택 안함"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"지원되지 않는 정책"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"선택 안함"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"동기화 시도"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"이 계정을 동기화하려면 여기를 터치하세요."</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"계정 이름"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"이름"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"서명"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"빠른 응답"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"이메일을 작성할 때 자주 사용하는 텍스트 수정"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"이메일을 작성할 때 자주 사용하는 텍스트 수정"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"보내는 메일에 텍스트 첨부"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"알림 설정"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"데이터 사용"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"보안 정책"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"빠른 응답 수정"</string>
     <string name="save_action" msgid="1988862706623227093">"저장"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"연락처 동기화"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"이 계정의 주소록을 동기화합니다."</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"캘린더 동기화"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"이 계정의 캘린더를 동기화합니다."</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"캘린더 동기화"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"이 계정의 캘린더 일정을 동기화합니다."</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"이메일 동기화"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"이 계정의 이메일을 동기화합니다."</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"진동"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="DOMAIN">%2$s</xliff:g>의 검색결과 <xliff:g id="RESULTS">%1$d</xliff:g>개"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"설정"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"일반"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"일반 설정"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"애플리케이션"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"자동 진행"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"메일을 삭제한 다음 표시할 화면 선택"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"확인란 숨기기"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"메일 목록에서 길게 눌러 선택"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"삭제하기 전에 확인"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"메일"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"보내기 전에 확인"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"메일"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"이동"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"다음 메일"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"이전 메일"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"결과를 기다리는 중"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"일부 서버는 시간이 오래 걸릴 수 있습니다."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"폴더"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"기기 카메라 사용 허용 안함"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"기기 비밀번호 필요"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"최근 사용한 비밀번호 재사용 제한"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"비밀번호 만료 필요"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"유휴 상태인 기기 화면 잠금 필요"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"동기화된 캘린더 일정의 개수 제한"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"동기화된 이메일의 개수 제한"</string>
+    <string name="quick_1" msgid="3426057697353380951">"감사합니다."</string>
+    <string name="quick_2" msgid="4188036352885736617">"좋습니다."</string>
+    <string name="quick_3" msgid="8061819976353395585">"나중에 읽어보고 연락 드리겠습니다."</string>
+    <string name="quick_4" msgid="3988974084396883051">"회의에서 얘기해 봅시다."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"계정 백그라운드 동기화가 로밍하는 동안 사용 중지됩니다."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"응답을 보내는 중..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"메시지가 없습니다."</string>
 </resources>
diff --git a/res/values-ko/uploader.xml b/res/values-ko/uploader.xml
index adbc79f..64dec28 100644
--- a/res/values-ko/uploader.xml
+++ b/res/values-ko/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"세부정보 숨기기"</string>
     <string name="menu_settings" msgid="5088116127086866634">"설정"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"업로드 날짜: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"계정"</string>
     <string name="upload" msgid="2615541458361216022">"업로드"</string>
     <string name="ok" msgid="2516349681897895312">"확인"</string>
diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml
index d4fb81f..deb62c9 100644
--- a/res/values-land/styles.xml
+++ b/res/values-land/styles.xml
@@ -23,23 +23,6 @@
         <item name="android:ellipsize">end</item>
     </style>
 
-    <style name="action_bar_spinner_primary_text">
-        <item name="android:includeFontPadding">false</item>
-        <item name="android:textSize">14sp</item>
-        <item name="android:textColor">@color/text_primary_color</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:ellipsize">end</item>
-    </style>
-
-    <style name="action_bar_spinner_secondary_text">
-        <item name="android:includeFontPadding">false</item>
-        <item name="android:textSize">12sp</item>
-        <item name="android:textColor">@color/text_secondary_color</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:ellipsize">end</item>
-        <item name="android:layout_marginTop">-2dip</item>
-    </style>
-
     <style name="message_view_action_buttons" parent="android:Widget.Holo.Button.Borderless">
         <item name="android:layout_width">32dip</item>
         <item name="android:layout_height">24dip</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index e97eab5..cb741bc 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"Skaityti el. laiškų priedus"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Leidžiama šiai programai skaityti el. laiškų priedus."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Leidžiama programai skaityti el. laiškų priedus."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Pasiekti el. pašto paslaugų teikėjo duomenis"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Leidžiama šiai programai pasiekti el. pašto duomenis, įskaitant gautus, išsiųstus pranešimus, naudotojų vardus ir slaptažodžius."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Leidžiama šiai programai pasiekti el. pašto duomenis, įskaitant gautus, išsiųstus pranešimus, naudotojų vardus ir slaptažodžius."</string>
     <string name="app_name" msgid="5815426892327290362">"El. paštas"</string>
     <string name="compose_title" msgid="427986915662706899">"Sukurti"</string>
     <string name="debug_title" msgid="5175710493691536719">"Derinti"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"Atlikta"</string>
     <string name="create_action" msgid="3062715563215392251">"Sukurti naują"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"Ištrinti"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"Nėra greitų atsakymų"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Nėra greitų atsakymų."</string>
     <string name="discard_action" msgid="6532206074859505968">"Atmesti"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"Išsaug. juodraš."</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Įterpti greitą atsaką"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"Ieškoti"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Paskyros nustatymai"</string>
     <string name="settings_action" msgid="6334807007967459412">"Nustatymai"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"Sinchronizavimo parinktys"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Sinchronizavimo parinktys"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Pažymėti kaip neskaitytą"</string>
     <string name="move_action" msgid="3059189775933985898">"Perkelti"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ kop. / nemat. kop."</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> rašė:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Įtraukti cituojamą tekstą"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Įtraukti tekstą"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Turite pridėti bent vieną gavėją."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"Pridėkite bent vieną gavėją."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Kai kurie el. pašto adresai neteisingi."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Failas per didelis, kad būtų pridėtas."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Įterpti greitą atsaką"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Išsaugota"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Sustabdyti"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Priedas išsaugotas kaip <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Nepavyko išsaugoti priedo."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Pastaba: prieš siunčiant bus atsisiųstas mažiausiai vienas priedas persiųstame pranešime."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"Nepavyko išsaugoti priedo."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Prieš siunčiant persiųstame pranešime bus atsisiųstas mažiausiai vienas priedas."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Pranešimas"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Pakviesti"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Nepavyko persiųsti mažiausiai vieno priedo."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Priedas nepersiųstas"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"Įvyko prisijungimo prie „<xliff:g id="ACCOUNT_NAME">%s</xliff:g>“ klaida."</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"Nepavyko prisijungti prie <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"Nepavyko prisijungti"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Senesnis"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" – "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Paskyros sąranka"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Pridėti „Exchange“ paskyrą"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Pridėti „Exchange ActiveSync“ paskyrą"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"El. pašto paskyra"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"Daugelyje paskyrų galite nustatyti el. paštą atlikę vos kelis veiksmus."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Galite nustatyti „Exchange“ paskyrą atlikę vos kelis veiksmus."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Galite nustatyti „Exchange ActiveSync“ paskyrą atlikę vos kelis veiksmus."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Galite nustatyti paskyrą atlikę vos kelis veiksmus."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"El. pašto adresas"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Slaptažodis"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Pagal numatytuosius nustatymus siųsti el. laišką iš šios paskyros."</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"Pagal numatytuosius nustatymus siųsti el. laišką iš šios paskyros"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Neaut. nustat."</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Įveskite galiojantį el. pašto adresą ir slaptažodį."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Kopijuoti paskyrą"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Tikrinami gaunamų laiškų serverio nustatymai..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Tikrinami siunčiamo serverio nustatymai..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Paskyros sąranka"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"Paskyra nustatyta ir išsiųstas el. laiškas!"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"Paskyra nustatyta, el. laiškas išsiųstas!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Suteikti šiai paskyrai pavadinimą (pasirenkama)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Jūsų vardas ir pavardė (pateikiami siunčiamuose pranešimuose)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Šis laukas negali būti tuščias."</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Gaunamų laiškų serverio nustatymai"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Naudotojo vardas"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Slaptažodis"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3 serveris"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"IMAP serveris"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Serveris"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Prievadas"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Saugos tipas"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Nėra"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP serveris"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Prievadas"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Saugos tipas"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Reikalauti prisijungti."</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Reikalauti prisijungti"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Naudotojo vardas"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Slaptažodis"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"Paskyros sąranka"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Kas 15 min."</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Kas 30 min."</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Kas valandą"</string>
-    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Pagal numatytuosius nustatymus siųsti el. laišką iš šios paskyros."</string>
-    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Pranešti man, kai gausiu el. laišką."</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sinchronizuoti šios paskyros adresatus."</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sinchronizuoti šios paskyros kalendorių."</string>
-    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sinchronizuoti el. paštą iš šios paskyros."</string>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"Pagal numatytuosius nustatymus siųsti el. laišką iš šios paskyros"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Pranešti, kai gausiu el. laišką"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Sinchronizuoti šios paskyros kontaktus"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Sinchronizuoti šios paskyros kalendorių"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Sinchronizuoti šios paskyros el. paštą"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Automatiškai atsisiųsti priedus, kai prisijungiama prie „Wi-Fi“"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Nepavyko užbaigti"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Sinchronizuojamų dienų skaičius"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Vienas mėnuo"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Visas"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Naudoti num. pask. nust."</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Neteisingas naudotojo vardas ar slaptažodis."</string>
-    <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_auth_message" msgid="426627755590431364">"Neteisingas naudotojo vardas ar slaptažodis."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"Neteisingas naudotojo vardas ar slaptažodis."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Nepavyksta saugiai prisijungti prie serverio."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Nepavyksta saugiai prisijungti prie serverio."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"Reikia kliento sertifikato. Prisijungti prie serverio naudojant kliento sertifikatą?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"Sertifikatas negalioja arba nepasiekiamas."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"Serveris atsakė pateikdamas klaidą. Patikrinkite naudotojo vardą bei slaptažodį ir bandykite dar kartą."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"Reikalingas kliento sertifikatas. Ar norite prie serverio prisijungti naudodami kliento sertifikatą?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"Sertifikatas netinkamas ar nepasiekiamas."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"Serveris atsakė pateikdamas klaidą. Patikrinkite naudotojo vardą bei slaptažodį ir bandykite dar kartą."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"Nepavyksta prisijungti prie serverio."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Negalima prisijungti prie serverio."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"Reikalingas TLS, bet jo nepalaiko serveris."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"ĮSPĖJIMAS: išaktyvinus el. pašto programos leidimą administruoti įrenginį, bus ištrintos visos el. pašto paskyros, kurioms jis reikalingas, įskaitant el. laiškus, kontaktus, kalendoriaus įvykius ir kitus duomenis."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Saugos naujinys"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"„<xliff:g id="ACCOUNT">%s</xliff:g>“ reikia atnaujinti saugos nustatymus."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Reikalingas paskyros „<xliff:g id="ACCOUNT">%s</xliff:g>“ saugos nustatymų atnaujinimas."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"Būtina atnaujinti saugumą"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Paskyros „<xliff:g id="ACCOUNT">%s</xliff:g>“ negalima sinchronizuoti dėl saugos reikalavimų."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"Reikalingas „<xliff:g id="ACCOUNT">%s</xliff:g>“ paskyros saugos nustatymų atnaujinimas."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"Pasikeitė paskyros „<xliff:g id="ACCOUNT">%s</xliff:g>“ saugos nustatymai. Nereikia imtis jokių veiksmų."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Reikalingas saugos atnaujinimas"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Pakeista saugos politika"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Neįman. atitikti saugos polit."</string>
     <string name="account_security_title" msgid="3511543138560418587">"Įrenginio sauga"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Serveris „<xliff:g id="SERVER">%s</xliff:g>“ reikalauja leisti jam nuotoliniu būdu valdyti kai kurias „Android“ įrenginio saugos funkcijas."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Redaguoti išsamią informaciją"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"Baigėsi ekrano užrakto PIN kodo ar slaptažodžio galiojimo laikas."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"Baig. ekr. užr. slapt. galioj. laikas"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Baigiasi ekr. užr. slapt. galioj. laikas"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"Būtina greitai pakeisti ekrano užrakto PIN kodą ar slaptažodį, nes bus ištrinti „<xliff:g id="ACCOUNT">%s</xliff:g>“ duomenys. Pakeisti dabar?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Būtinai reikia greitu metu pakeisti ekrano užrakinimo PIN kodą ar slaptažodį, nes bus ištrinti „<xliff:g id="ACCOUNT">%s</xliff:g>“ duomenys. Ar norite jį pakeisti dabar?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"Baig. ekr. užr. slapt. galioj. laikas"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"Iš jūsų įrenginio ištrinami „<xliff:g id="ACCOUNT">%s</xliff:g>“ duomenys. Atkurti juos galite pakeisdami ekrano užrakto PIN kodą ar slaptažodį. Pakeisti dabar?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"Iš įrenginio ištrinami „<xliff:g id="ACCOUNT">%s</xliff:g>“ duomenys. Galite juos atkurti pakeisdami ekrano užrakinimo PIN kodą ar slaptažodį. Ar norite pakeisti jį dabar?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Atmesti neišsaugotus pakeitimus?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Nepavyko prisijungti"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"„<xliff:g id="ACCOUNT">%s</xliff:g>“ naudotojo vardas ar slaptažodis neteisingas. Atnaujinti juos dabar?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"Neteisingas „<xliff:g id="ACCOUNT">%s</xliff:g>“ naudotojo vardas ar slaptažodis. Ar norite atnaujinti juos dabar?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Numatytoji paskyra"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Pagal numatytuosius nustatymus siųsti el. laišką iš šios paskyros"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Atsisiųsti priedus"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Automatiškai atsis. naujausių pranešimų priedai per „Wi-Fi“"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"El. pašto pranešimai"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Sinchronizavimo dažnumas, pranešimai ir kt."</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"Kai atsiunčiamas el. laiškas, pranešti sistemos juostoje"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Siųsti pranešimą, kai gaunamas el. laiškas"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Gautųjų tikrinimo dažnumas"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Gaunamų laiškų nustatymai"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Naudotojo vardas, slaptažodis ir kiti gavimo serverio nustatymai"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Siunčiamų laiškų nustatymai"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Naudotojo vardas, slaptažodis ir kiti siuntimo serv. nustatymai"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Vykdoma politika"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Nėra"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Nepalaikoma politika"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Nėra"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"Bandyti sinchronizuoti"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Jei norite sinchronizuoti šią paskyrą, palieskite čia"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Paskyros pavadinimas"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Jūsų vardas ir pavardė"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Parašas"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Greiti atsakai"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Redaguokite tekstą, kurį dažnai įterpiate kurdami el. laiškus"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Redaguokite tekstą, kurį dažnai įterpiate kurdami el. laišką"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Priskirti tekstą prie siunčiamų pranešimų"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Įspėjimų nustatymai"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Duomenų naudojimas"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"Saugos politika"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Redaguoti greitą atsaką"</string>
     <string name="save_action" msgid="1988862706623227093">"Išsaugoti"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Sinchronizuoti adresatus"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sinchron. šios paskyros kontaktus"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sinchron. Kalendorių"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Sinchron. šios paskyros kalendorių"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Sinchronizuoti kalendorių"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Sinchron. šios paskyros kalendorių"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sinchron. el. paštą"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sinchron. šios paskyros el. paštą"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibruoti"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> rezultatai (-ų) iš <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Nustatymai"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"Bendra"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Bendrieji nustatymai"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"Programa"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Automatinis perėjimas"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Pasirinkite, kurį ekraną rodyti ištrynus pranešimą"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Slėpti žymimuosius laukelius"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"Jei norite pasirinkti, pranešimų sąraš. palieskite ir laikykite"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Patvirtinti prieš ištrinant"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Pranešimai"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Patvirtinti prieš siunčiant"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Pranešimai"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Pereiti į"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Naujesnis pranešimas"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Senesnis pranešimas"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"Laukiama rezultatų"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Kai kurie serveriai gali ilgai užtrukti."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Aplankai"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Neleisti naudoti įrenginio fotoaparato"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Reikalauti įrenginio slaptažodžio"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"Riboti naujausių slapt. pakart. panaud."</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"Reikalauti slaptaž. galiojimo pabaigos"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"Užrakinti ekraną nenaudojant įrenginio"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"Riboti sinchron. kalendoriaus įvykių skaičių"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"Riboti sinchronizuojamų el. laiškų skaičių"</string>
+    <string name="quick_1" msgid="3426057697353380951">"Ačiū!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"Skamba gerai!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"Perskaitysiu vėliau ir jums atsakysiu."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Aptarkime tai susitikę."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Foninis šios paskyros sinchronizavimas neleidžiamas perduodant duomenis tarptinkliniu ryšiu."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"Siunčiamas atsakymas..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"Pranešimų nėra."</string>
 </resources>
diff --git a/res/values-lt/uploader.xml b/res/values-lt/uploader.xml
index d1a65c6..281fd8c 100644
--- a/res/values-lt/uploader.xml
+++ b/res/values-lt/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Slėpti išsamią informaciją"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Nustatymai"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Įkelta %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Paskyra"</string>
     <string name="upload" msgid="2615541458361216022">"Įkelti"</string>
     <string name="ok" msgid="2516349681897895312">"Gerai"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 10985e5..bc6b9b9 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"Lasīt e-pasta ziņojumu pielikumus"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Nodrošina šai lietojumprogrammai lasīšanas piekļuvi e-pasta ziņojumu pielikumiem."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Ļauj lietotnei lasīt e-pasta ziņojumu pielikumus."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Piekļūt e-pasta pakalpojumu sniedzēja datiem"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Ļauj lietojumprogrammai piekļūt jūsu e-pasta datu bāzei, tostarp saņemtajiem ziņojumiem, nosūtītajiem ziņojumiem, lietotājvārdiem un parolēm."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Ļauj lietotnei piekļūt jūsu e-pasta datu bāzei, tostarp saņemtajiem ziņojumiem, nosūtītajiem ziņojumiem, lietotājvārdiem un parolēm."</string>
     <string name="app_name" msgid="5815426892327290362">"E-pasts"</string>
     <string name="compose_title" msgid="427986915662706899">"E-pasta ziņojuma rakstīšana"</string>
     <string name="debug_title" msgid="5175710493691536719">"Atkļūdot"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"Gatavs"</string>
     <string name="create_action" msgid="3062715563215392251">"Izveidot jaunu"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"Dzēst"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"Nav ātro atbilžu."</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Nav ātro atbilžu."</string>
     <string name="discard_action" msgid="6532206074859505968">"Atmest"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"Saglabāt melnr."</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Ievietot ātro atbildi"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"Meklēt"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Konta iestatījumi"</string>
     <string name="settings_action" msgid="6334807007967459412">"Iestatījumi"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"Sinhronizācijas opcijas"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Sinhronizācijas opcijas"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Atzīmēt kā nelasītu"</string>
     <string name="move_action" msgid="3059189775933985898">"Pārvietot"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ Kopija/d. kop."</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> rakstīja:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Citēta teksta iekļaušana"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Iekļaut tekstu"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Jāpievieno vismaz viens adresāts."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"Pievienojiet vismaz vienu adresātu."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Dažas e-pasta adreses nav derīgas."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Failu nevar pievienot, jo tas ir pārāk liels."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Ātrās atbildes ievietošana"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Saglabāts"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Apturēt"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Pielikums saglabāts kā <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Nevarēja saglabāt pielikumu."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Piezīme. Viens vai vairāki pārsūtītā ziņojuma pielikumi pirms sūtīšanas tiks lejupielādēti."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"Nevarēja saglabāt pielikumu."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Viens vai vairāki pārsūtītā ziņojuma pielikumi pirms sūtīšanas tiks lejupielādēti."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Ziņojums"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Uzaicināt"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Nevarēja pārsūtīt vienu vai vairākus pielikumus."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Pielikums netika nosūtīts."</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"Neizdevās pierakstīties kontā <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"Neizdevās pierakstīties kontā <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"Nevarēja pierakstīties"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -232,16 +232,12 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Vecāki"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Konta iestatīšana"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Exchange konta pievienošana"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Pievienot Exchange ActiveSync kontu"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"E-pasta konts"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"E-pasts atbalsts lielāko daļu populārāko pasta klientu."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Varat iestatīt Exchange kontu, veicot tikai dažas darbības."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Varat iestatīt Exchange ActiveSync kontu, veicot tikai dažas darbības."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Varat iestatīt savu kontu, veicot tikai dažas darbības."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"E-pasta adrese"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Parole"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Pēc noklusējuma sūtīt e-pastu no šī konta."</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuāla iestatīšana"</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"Pēc noklusējuma sūtīt e-pasta ziņojumus no šī konta"</string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuāla iest."</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Ierakstiet derīgu e-pasta adresi un paroli."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Dublikāta konts"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Jūs jau izmantojat šo lietotājvārdu kontam <xliff:g id="DUPLICATE">%s</xliff:g>."</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Notiek servera ienākošo datu iestatījumu pārbaude..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Notiek servera izejošo datu iestatījumu pārbaude…"</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Konta iestatīšana"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"Jūsu konts ir iestatīts, un ir nosūtīts e-pasta ziņojums."</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"Jūsu konts ir izveidots, un ir nosūtīts e-pasta ziņojums."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Ievadiet konta nosaukumu (neobligāti)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Jūsu vārds (attēlots izejošajos ziņojumos)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Šis lauks nedrīkst būt tukšs."</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Ienākošā servera iestatījumi"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Lietotājvārds"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Parole"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3 serveris"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"IMAP serveris"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Serveris"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Ports"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Drošības veids"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Nav"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP serveris"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Ports"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Drošības veids"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Pieprasīt pierakstīšanos."</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Pieprasīt pierakstīšanos"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Lietotājvārds"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Parole"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"Konta iestatīšana"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Ik pēc 15 minūtēm"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Ik pēc 30 minūtēm"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Ik pēc stundas"</string>
-    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Pēc noklusējuma sūtīt e-pastu no šī konta."</string>
-    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Paziņot man, kad tiek saņemts jauns e-pasta ziņojums."</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sinhronizēt kontaktpersonas no šī konta."</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sinhronizēt šī konta kalendāru."</string>
-    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Šī konta e-pasta sinhronizācija."</string>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"Pēc noklusējuma sūtīt e-pasta ziņojumus no šī konta"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Paziņot man, kad tiek saņemts jauns e-pasta ziņojums"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Sinhronizēt šī konta kontaktpersonas"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Sinhronizēt šī konta kalendāru"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Sinhronizēt šī konta e-pastu"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Automātiski lejupielādēt pielikumus, kad ir izveidots WiFi savienojums"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Nevarēja pabeigt"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Sinhronizējamās dienas"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Viens mēnesis"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Visi"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Izmantot konta noklusēj."</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Lietotājvārds vai parole nav pareiza."</string>
-    <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_auth_message" msgid="426627755590431364">"Nepareizs lietotājvārds vai parole."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"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="3836152264696108805">"Nevar izveidot drošu savienojumu ar serveri."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Nevar izveidot drošu savienojumu ar serveri."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"Ir nepieciešams klienta sertifikāts. Vai izveidot savienojumu ar serveri, izmantojot klienta sertifikātu?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"Sertifikāts nav derīgs vai nav pieejams."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"Serveris atgrieza kļūdu. Pārbaudiet lietotājvārdu un paroli un pēc tam mēģiniet vēlreiz."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"Ir nepieciešams klienta sertifikāts. Vai vēlaties izveidot savienojumu ar serveri, izmantojot klienta sertifikātu?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"Sertifikāts nav derīgs vai nav pieejams."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"Serveris atgrieza kļūdu. Pārbaudiet lietotājvārdu un paroli un pēc tam mēģiniet vēlreiz."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"Nevar izveidot savienojumu ar serveri."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Nevar izveidot savienojumu ar serveri."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"Protokols TLS ir obligāts, taču serveris to neatbalsta."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"BRĪDINĀJUMS: deaktivizējot lietotnes E-pasts tiesības administrēt jūsu ierīci, tiks dzēsti visi e-pasta konti, kuriem šī funkcionalitāte ir nepieciešama, kā arī šo kontu e-pasta ziņojumi, kontaktpersonas, kalendāra pasākumi un citi dati."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Drošības atjauninājums"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"Kontam <xliff:g id="ACCOUNT">%s</xliff:g> ir jāatjaunina drošības iestatījumi."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Kontā “<xliff:g id="ACCOUNT">%s</xliff:g>” nepieciešams atjaunināt drošības iestatījumus."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"Nepiecieš. droš. atjauninājums"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Kontu <xliff:g id="ACCOUNT">%s</xliff:g> nevar sinhronizēt drošības prasību dēļ."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"Kontā <xliff:g id="ACCOUNT">%s</xliff:g> ir jāatjaunina drošības iestatījumi."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"Kontā <xliff:g id="ACCOUNT">%s</xliff:g> ir mainīti drošības iestatījumi; lietotājam nav jāveic nekādas darbības."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Nepieciešams drošības atjaun."</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Droš. politikas ir mainītas."</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Netiek ievērota droš. politika"</string>
     <string name="account_security_title" msgid="3511543138560418587">"Ierīces drošība"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Serveris <xliff:g id="SERVER">%s</xliff:g> pieprasa, lai jūs tam atļautu attālināti vadīt dažas jūsu Android ierīces drošības funkcijas."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Rediģēt datus"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"Ekrāna bloķēšanas PIN vai paroles derīguma termiņš ir beidzies."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"Ekr. bloķ. paroles term. b."</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Ekr. bloķ. paroles term. tuvojas beigām"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"Jums drīzumā ir jāmaina ekrāna bloķēšanas PIN vai parole, pretējā gadījumā konta <xliff:g id="ACCOUNT">%s</xliff:g> dati tiks dzēsti. Vai mainīt tūlīt?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Jums drīzumā ir jāmaina ekrāna bloķēšanas PIN vai parole, citādi konta <xliff:g id="ACCOUNT">%s</xliff:g> dati tiks dzēsti. Vai vēlaties to mainīt tūlīt?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"Ekrāna bloķēš. paroles termiņa beigas"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"Konta <xliff:g id="ACCOUNT">%s</xliff:g> dati tiek dzēsti no šīs ierīces. Varat tos atjaunot, nomainot ekrāna bloķēšanas PIN vai paroli. Vai mainīt tūlīt?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"Konta <xliff:g id="ACCOUNT">%s</xliff:g> dati tiek dzēsti no šīs ierīces. Tos var atjaunot, nomainot ekrāna bloķēšanas PIN vai paroli. Vai vēlaties to mainīt tūlīt?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Vai atmest nesaglabātās izmaiņas?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Nevarēja pierakstīties"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Konta <xliff:g id="ACCOUNT">%s</xliff:g> lietotājvārds un parole nav pareizi. Vai atjaunināt tos tūlīt?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"Konta <xliff:g id="ACCOUNT">%s</xliff:g> lietotājvārds vai parole nav pareiza. Vai vēlaties tos atjaunināt tūlīt?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Noklusējuma konts"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Pēc noklusējuma sūtīt e-pasta ziņojumus no šī konta"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Lejupielādēt pielikumus"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Automātiski lejupielādēt jaunāko ziņojumu pielikumus Wi-Fi tīklā"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"E-pasta paziņojumi"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Sinhronizācijas biežums, paziņojumi u.c."</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"Rādīt paziņojumu statusa joslā, kad tiek saņemts e-pasta ziņojums"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Nosūtīt paziņojumu, kad tiek saņemts e-pasta ziņojums"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Iesūtnes pārbaudes biežums"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Ienākošo datu iestatījumi"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Lietotājvārds, parole u.c. ienākošā pasta servera iestatījumi"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Izejošo datu iestatījumi"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Lietotājvārds, parole un citi izejošā pasta servera iestatījumi"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Īstenotās politikas"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Nav"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Neatbalstītas politikas"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Nav"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"Sinhronizēt"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Pieskarties šeit, lai sinhronizētu šo kontu"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Konta nosaukums"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Jūsu vārds"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Paraksts"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Ātrās atbildes"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Rediģējiet tekstu, kuru bieži ievietojat e-pasta ziņojumos."</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Rediģēt tekstu, kuru bieži ievietojat e-pasta ziņojumos"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Pievienot tekstu nosūtītajiem ziņojumiem"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Paziņojumu iestatījumi"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Datu lietojums"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"Drošības politikas"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Ātrās atbildes rediģēšana"</string>
     <string name="save_action" msgid="1988862706623227093">"Saglabāt"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Sinhronizēt kontaktpersonas"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sinhron. kontaktpersonas šim kontam"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sinhron. kalendāru"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Sinhronizēt kalendāru šim kontam"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Sinhronizēt kalendāru"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Sinhr. šī konta kalendāra notikumus"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sinhronizēt e-pastu"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sinhronizēt e-pastu šim kontam"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrozvans"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> rezultāti no domēna <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Iestatījumi"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"Vispārīgi"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Vispārīgi iestatījumi"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"Lietojumprogramma"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Automātiski pāriet"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Izvēlieties pēc ziņojuma dzēšanas parādāmo ekrānu"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Slēpt izvēles rūtiņas"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"Ziņoj. sarakstos pieskarieties un turiet nospiestu, lai atlasītu"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Apstiprināt pirms dzēšanas"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Ziņojumi"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Apstiprināt pirms sūtīšanas"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Ziņojumi"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Pāriet uz"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Jauns ziņojums"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Vecāki ziņojumi"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"Tiek gaidīti rezultāti"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Dažu serveru darbība var aizņemt ilgu laiku."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Mapes"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Neatļaut ierīces kameras izmantošanu"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Pieprasīt ierīces paroli"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"Ierobežot jaunāko paroļu atkārt. izmant."</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"Pieprasīt paroļu derīguma term. beigas"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"Bloķēt ierīc. ekr., kad tā ir dīkstāvē"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"Ierobežot sinhronizēto kalendāra notikumu skaitu"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"Ierobežot sinhronizēto e-pasta ziņojumu skaitu"</string>
+    <string name="quick_1" msgid="3426057697353380951">"Paldies!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"Esmu ar mieru!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"Vēlāk izlasīšu šo ziņojumu un atbildēšu."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Norunāsim tikšanos, lai to pārrunātu."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Viesabonēšanas laikā fona sinhronizācija šajā kontā ir atspējota."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"Notiek atbildes sūtīšana..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"Nav ziņojumu."</string>
 </resources>
diff --git a/res/values-lv/uploader.xml b/res/values-lv/uploader.xml
index d333de6..82b74df 100644
--- a/res/values-lv/uploader.xml
+++ b/res/values-lv/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Slēpt informāciju"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Iestatījumi"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Augšupielādēts: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Konts"</string>
     <string name="upload" msgid="2615541458361216022">"Augšupielādēt"</string>
     <string name="ok" msgid="2516349681897895312">"Labi"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 96f65f0..33ab41a 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"Baca lampiran e-mel"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Membenarkan aplikasi ini membaca lampiran e-mel anda."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Membenarkan apl membaca lampiran e-mel anda."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Akses data pembekal e-mel"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Membenarkan aplikasi ini mengakses pangkalan data e-mel anda, termasuk mesej diterima, mesej dihantar, nama pengguna dan kata laluan."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Membenarkan apl ini mengakses pangkalan data e-mel anda, termasuk mesej diterima, mesej dihantar, nama pengguna dan kata laluan."</string>
     <string name="app_name" msgid="5815426892327290362">"E-mel"</string>
     <string name="compose_title" msgid="427986915662706899">"Karang"</string>
     <string name="debug_title" msgid="5175710493691536719">"Nyahpepijat"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"Selesai"</string>
     <string name="create_action" msgid="3062715563215392251">"Buat baru"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"Padam"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"Tiada tindak balas cepat"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Tiada tindak balas cepat."</string>
     <string name="discard_action" msgid="6532206074859505968">"Buang"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"Simpan draf"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Sisipkan respons pantas"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"Carian"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Tetapan akaun"</string>
     <string name="settings_action" msgid="6334807007967459412">"Tetapan"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"Pilihan segerak"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Pilihan segerak"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Tandakan belum dibaca"</string>
     <string name="move_action" msgid="3059189775933985898">"Alih"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ Sk/Skt"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> menulis:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Sertakan teks petikan"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Sertakan teks"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Anda mesti menambah sekurang-kurangnya satu penerima."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"Tambahkan sekurang-kurangnya satu penerima."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Sesetengah alamat e-mel tidak sah."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Fail terlalu besar untuk dilampirkan."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Sisipkan respons pantas"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Disimpan"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Berhenti"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Lampiran disimpan sbg <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Tidak dapat menyimpan lampiran."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Nota: Satu atau lebih lampiran dalam mesej anda yang dikirim semula akan dimuat turun sebelum dihantar."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"Tidak dapat menyimpan lampiran."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Satu atau lebih lampiran dalam mesej anda yang dikirim semula akan dimuat turun sebelum dihantar."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Mesej"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Jemput"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Tidak boleh mengirim semula satu atau lebih lampiran."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Lampiran tidak dikirim semula"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"Log masuk <xliff:g id="ACCOUNT_NAME">%s</xliff:g> gagal."</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> log masuk gagal."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"Tidak dapat melog masuk"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Lebih lama"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Persediaan akaun"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Tambah akaun Exchange"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Tambah akaun Exchange ActiveSync"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"Akaun e-mel"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"Anda boleh membuat e-mel untuk kebanyakan akaun dalam hanya beberapa langkah."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Anda boleh membuat akaun Exchange dalam hanya beberapa langkah."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Anda boleh membuat akaun Exchange ActiveSync dalam hanya beberapa langkah."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Anda boleh membuat akaun anda dalam hanya beberapa langkah."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Alamat e-mel"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Kata laluan"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Hantarkan e-mel dari akaun ini secara lalainya."</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"Hantar e-mel daripada akaun ini secara lalai"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Persediaan manual"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Taipkan alamat e-mel dan kata laluan yang sah."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Akaun pendua"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Menyemak tetapan pelayan masuk..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Menyemak tetapan pelayan keluar..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Persediaan akaun"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"Akaun anda sudah disediakan dan e-mel akan muncul sebentar lagi!"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"Akaun anda sudah disediakan dan e-mel akan muncul sebentar lagi!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Namakan akaun ini (pilihan)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Nama anda (dipaparkan pada mesej keluar)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Medan ini tidak boleh kosong."</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Tetapan pelayan masuk"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nama pengguna"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Kata laluan"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Pelayan POP3"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"Pelayan IMAP"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Pelayan"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Jenis keselamatan"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Tiada"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Pelayan SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Jenis keselamatan"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Memerlukan log masuk."</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Memerlukan log masuk"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nama pengguna"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Kata laluan"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"Persediaan akaun"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Setiap 15 minit"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Setiap 30 minit"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Setiap jam"</string>
-    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Hantar e-mel dari akaun ini secara lalainya."</string>
-    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Beritahu saya apabila e-mel diterima."</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Segerakkan kenalan daripada akaun ini."</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Segerakkan kalendar dari akaun ini."</string>
-    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Segerakkan e-mel dari akaun ini."</string>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"Hantar e-mel daripada akaun ini secara lalai"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Beritahu saya apabila e-mel diterima"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Segerakkan kenalan daripada akaun ini"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Segerakkan kalendar dari akaun ini."</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Segerakkan e-mel dari akaun ini"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Muat turun lampiran secara automatik apabila disambungkan kepada Wi-Fi"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Tidak boleh diselesaikan"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Hari untuk disegerakkan"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Satu bulan"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Semua"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Gunakan lalai akaun"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Nama pengguna atau kata laluan salah."</string>
-    <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_auth_message" msgid="426627755590431364">"Nama pengguna atau kata laluan salah."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"Nama pengguna atau kata laluan salah. "\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Tidak boleh menyambung ke pelayan dengan selamat."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Tidak dapat menyambung ke pelayan dengan selamat."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"Sijil klien diperlukan. Sambung ke pelayan dengan sijil klien?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"Sijil adalah tidak sah atau tidak boleh diakses."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"Pelayan memberi maklum balas dengan ralat. Semak nama pengguna dan kata laluan anda, kemudian cuba lagi."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"Sijil klien diperlukan. Adakah anda mahu menyambung ke pelayan dengan sijil klien?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"Sijil itu adalah tidak sah atau tidak boleh diakses."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"Pelayan memberi maklum balas dengan ralat. Semak nama pengguna dan kata laluan anda, kemudian cuba lagi."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"Tidak dapat menyambung ke pelayan."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Tidak dapat menyambung ke pelayan."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS diperlukan tetapi tidak disokong oleh pelayan."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"AMARAN: Menyahaktifkan autoriti aplikasi E-mel untuk mentadbir peranti anda akan memadamkan semua akaun e-mel yang memerlukannya, bersama-sama dengan e-mel, kenalan, acara kalendar dan datanya yang lain."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Kemas kini keselamatan"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> memerlukan anda untuk mengemas kini tetapan keselamatan anda."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Akaun \"<xliff:g id="ACCOUNT">%s</xliff:g>\" memerlukan kemas kini tetapan keselamatan."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"Kemas kini keselamtn diperlukn"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Akaun \"<xliff:g id="ACCOUNT">%s</xliff:g>\" tidak dapat disegerakkan kerana keperluan keselamatan."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"Akaun \"<xliff:g id="ACCOUNT">%s</xliff:g>\" memerlukan kemas kini tetapan keselamatan."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"Akaun \"<xliff:g id="ACCOUNT">%s</xliff:g>\" telah mengubah tetapan keselamatannya, tidak tindakan pengguna diperlukan."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Kemas kini keselamatan diperlukan"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Dasar keselamatan telah berubah"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Dasar keselamatan tidak dapat dipenuhi"</string>
     <string name="account_security_title" msgid="3511543138560418587">"Keselamatan peranti"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Pelayan <xliff:g id="SERVER">%s</xliff:g> menghendaki anda membenarkannya mengawal beberapa ciri keselamatan peranti Android anda secara jauh."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Edit butiran"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"PIN kunci skrin atau kata laluan anda telah tamat tempoh."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"K/lln knci skrn tlh tmt tmph"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Kata laluan kunci skrin akn tmt tempoh"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"Anda harus menukar PIN kunci skrin atau kata laluan anda secepat mungkin atau data untuk <xliff:g id="ACCOUNT">%s</xliff:g> akan dipadamkan. Tukar sekarang?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Anda perlu menukar PIN atau kata laluan kunci skrin anda, atau data untuk <xliff:g id="ACCOUNT">%s</xliff:g> akan dipadamkan. Adakah anda mahu menukarnya sekarang?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"Kata laluan kunci skrin telah tmt tempoh"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"Data untuk <xliff:g id="ACCOUNT">%s</xliff:g> sedang dipadamkan dari peranti anda. Anda boleh memulihkannya dengan menukar PIN kunci skrin atau kata laluan anda. Tukar sekarang?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"Data untuk <xliff:g id="ACCOUNT">%s</xliff:g> sedang dipadamkan dari peranti anda. Anda boleh memulihkannya dengan menukar PIN atau kata laluan kunci skrin anda. Adakah anda ingin menukarnya sekarang?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Buang perubahan yang belum disimpan?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Tidak dapat melog masuk"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Nama pengguna atau kata laluan untuk <xliff:g id="ACCOUNT">%s</xliff:g> tidak betul. Kemas kininya sekarang?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"Nama pengguna atau kata laluan untuk <xliff:g id="ACCOUNT">%s</xliff:g> adalah tidak betul. Adakah anda mahu mengemaskininya sekarang?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Akaun lalai"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Hantar e-mel daripada akaun ini secara lalainya"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Muat turun lampiran"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Auto muat turun lampiran ke mesej terbaharu melalui Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Pemberitahuan e-mel"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Kekerapan penyegerakan, pemberitahuan, dsb."</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"Beritahu dalam bar Sistem apabila e-mel diterima"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Hantar pemberitahuan apabila e-mel tiba"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Kekerapan semak peti masuk"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Tetapan masuk"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Nama pengguna, kata laluan dan tetapan pelayan masuk yang lain"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Tetapan keluar"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Nama pengguna, kata laluan dan tetapan pelayan keluar yang lain"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Dasar yang dikuatkuasakan"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Tiada"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Dasar tidak disokong"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Tiada"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"Cuba segerak"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Sentuh di sini untuk menyegerakkan akaun ini"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Nama akaun"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Nama anda"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Tandatangan"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Respons pantas"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Edit teks yang anda kerap sisipkan semasa mengarang e-mel"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Edit teks yang anda kerap sisipkan semasa mengarang e-mel"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Lampirkan teks pada mesej yang anda hantarkan"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Tetapan pemberitahuan"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Penggunaan data"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"Dasar keselamatan"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Edit respons pantas"</string>
     <string name="save_action" msgid="1988862706623227093">"Simpan"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Segerakkan kenalan"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Segerakkan kenalan untuk akaun ini"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Segerak Kalendar"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Segerakkan kalendar untuk akaun ini"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Segerakkan kalendar"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Segerakkan acara kalendar untuk akaun ini"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Segerakkan e-mel"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Segerakkan e-mel untuk akaun ini"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Getar"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> hasil dari <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Tetapan"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"Umum"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Tetapan umum"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"Aplikasi"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Auto mara"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Pilih skrin mana mahu ditunjukkan selepas anda memadamkan mesej"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Sembunyikan kotak semak"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"Dalam senarai mesej, sentuh dan tahan untuk memilih"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Sahkan sebelum memadam"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Mesej"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Sahkan sebelum menghantar"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Mesej"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Mara ke"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Mesej lebih baru"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Mesej lebih lama"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"Menunggu hasil"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Sesetengah pelayan mungkin mengambil masa yang lama."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Folder"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Jgn benarkan penggunaan kamera peranti"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Perlukan kata laluan peranti"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"Hadkan penggunaan semula kata laluan terbaru"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"Memerlukan kata laluan untuk tamat"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"Perlukan peranti yang melahu mengunci skrinnya"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"Hadkan bilangan peristiwa kalendar yang disegerakkan"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"Hadkan bilangan e-mel yang disegerakkan"</string>
+    <string name="quick_1" msgid="3426057697353380951">"Terima kasih!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"Saya setuju saja!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"Saya akan baca ini nanti dan hubungi anda semula."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Mari adakan mesyuarat untuk membincangkannya."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Segerakkan latar belakang untuk akaun ini dilumpuhkan semasa perayauan."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"Menghantar jawapan..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"Tiada mesej."</string>
 </resources>
diff --git a/res/values-ms/uploader.xml b/res/values-ms/uploader.xml
index 1b760de..3d1ce5d 100644
--- a/res/values-ms/uploader.xml
+++ b/res/values-ms/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Sembunyikan Butiran"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Tetapan"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Dimuat naik %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Akaun"</string>
     <string name="upload" msgid="2615541458361216022">"Muat naik"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 4a3aa51..8cc57b2 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"Les e-postvedlegg"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Gir appen tilgang til å lese e-postvedleggene dine."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Lar appen lese e-postvedleggene dine."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Få tilgang til data om e-postleverandør"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Gir appen tilgang til e-postdatabasen, inklusivt mottatte og sendte meldinger samt brukernavn og passord."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Gir appen tilgang til e-postdatabasen, herunder mottatte meldinger, sendte meldinger, brukernavn og passord."</string>
     <string name="app_name" msgid="5815426892327290362">"E-post"</string>
     <string name="compose_title" msgid="427986915662706899">"Skriv e-post"</string>
     <string name="debug_title" msgid="5175710493691536719">"Debug"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"Ferdig"</string>
     <string name="create_action" msgid="3062715563215392251">"Opprett ny"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"Slett"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"Ingen raske svar"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Ingen hurtigsvar."</string>
     <string name="discard_action" msgid="6532206074859505968">"Forkast"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"Lagre utkast"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Sett inn hurtigsvar"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"Søk"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Kontoinnstillinger"</string>
     <string name="settings_action" msgid="6334807007967459412">"Innstillinger"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"Synkroniseringsalternativer"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Synkroniseringsalternativer"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Merk som ulest"</string>
     <string name="move_action" msgid="3059189775933985898">"Flytt"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ kopi/blindkopi"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g>:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Inkluder sitert tekst"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Inkluder tekst"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Du må legge til minst én mottager."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"Legg til minst én mottaker."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Noen e-postadresser er ugyldige."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Filen er for stor til å bli lagt ved."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Sett inn hurtigsvar"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Lagret"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Stopp"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Vedlegget lagret som <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Kan ikke lagre vedlegget."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Merk: Ett eller flere vedlegg i den videresendte meldingen lastes ned før sending."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"Vedlegget kunne ikke lagres."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Ett eller flere vedlegg i den videresendte e-posten blir lastet ned før du sender."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Melding"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Inviter"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Kunne ikke videresende ett eller flere vedlegg."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Vedlegget ble ikke videresendt"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"Pålogging til <xliff:g id="ACCOUNT_NAME">%s</xliff:g> mislyktes."</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"Pålogging til <xliff:g id="ACCOUNT_NAME">%s</xliff:g> mislyktes."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"Kunne ikke logge på"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Eldre"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" – "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Konfigurering av konto"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Legg til en Exchange-konto"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Legg til en Exchange ActiveSync-konto"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"E-postkonto"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"Du kan konfigurere e-post for de fleste kontoer i bare noen få trinn."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Du kan konfigurere en Exchange-konto i løpet av bare noen få trinn."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Du kan konfigurere en Exchange ActiveSync-konto i løpet av bare noen få trinn."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Du kan konfigurere kontoen din i noen få trinn."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"E-postadresse"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Passord"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Bruk denne kontoen som standard for utgående e-post."</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"Send e-post fra denne kontoen som standard"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuelt oppsett"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Angi gyldig e-postadresse og passord."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Duplisert konto"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Sjekker tjenerinnstillinger for inngående e-post…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Sjekker tjenerinnstillinger for utgående e-post…"</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Konfigurering av konto"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"Kontoen din er konfigurert, og e-post er på vei!"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"Kontoen din er konfigurert, og e-post er på vei."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Gi denne kontoen et navn (valgfritt)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Navnet ditt (vises i utgående meldinger)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Dette feltet må fylles ut."</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Tjenerinnstillinger for innkommende e-postmelding"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Brukernavn"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Passord"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3-tjener"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"IMAP-tjener"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Tjener"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Sikkerhetstype"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Ingen"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP-tjener"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Sikkerhetstype"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Krev pålogging."</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Krev pålogging"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Brukernavn"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Passord"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"Konfigurering av konto"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Hvert 15. minutt"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Hvert 30. minutt"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Hver time"</string>
-    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Bruk denne kontoen som standard for utgående e-post."</string>
-    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Varsle når det kommer e-post."</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Synkroniser kontakter fra denne kontoen."</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Synkroniser kalendere fra denne kontoen."</string>
-    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Synkroniser e-postmeldinger fra denne kontoen."</string>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"Send e-post fra denne kontoen som standard"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Gi meg beskjed når jeg mottar e-postmeldinger"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Synkroniser kontakter fra denne kontoen"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Synkroniser kalender fra denne kontoen"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Synkroniser e-postmeldinger fra denne kontoen"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Last ned vedlegg automatisk når tilkoblet til trådløst nettverk"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Kunne ikke fullføre"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Antall dager å synkronisere"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Én måned"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Alle"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Bruk kontostandard"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Feil brukernavn eller passord."</string>
-    <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_auth_message" msgid="426627755590431364">"Brukernavnet eller passordet er feil."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"Brukernavnet eller passordet er feil."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Kan ikke koble til tjeneren på en sikker måte."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Kan ikke koble til tjeneren på en sikker måte."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"Klientsertifikat er nødvendig. Vil du koble til tjener med klientsertifikat?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"Sertifikatet er ugyldig eller utilgjengelig."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"Tjeneren svarte med en feil. Kontroller brukernavn og passord og prøv på nytt."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"Et klientsertifikat er påkrevd. Vil du koble til tjeneren med et klientsertifikat?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"Sertifikatet er ugyldig eller utilgjengelig."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"Tjeneren svarte med en feil. Kontroller brukernavn og passord, og prøv på nytt."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"Kan ikke koble til tjeneren."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Kan ikke koble til tjeneren."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS påkrevd, men tjeneren støtter det ikke."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"ADVARSEL: Hvis du deaktiverer e-postappens rett til å administrere enheten, slettes alle e-postkontoene som krever appen sammen med e-poster, kontakter, kalenderaktiviteter og andre data."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Sikkerhetsoppdatering"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> krever at du oppdaterer sikkerhetsinnstillingene."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Kontoen «<xliff:g id="ACCOUNT">%s</xliff:g>» krever oppdatering av sikkerhetsinnstillingene."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"Sikkerhetsoppdatering påkrevd"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Kontoen <xliff:g id="ACCOUNT">%s</xliff:g> kan ikke synkroniseres på grunn av sikkerhetskrav."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"Kontoen «<xliff:g id="ACCOUNT">%s</xliff:g>» krever oppdatering av sikkerhetsinnstillingene."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"Kontoen «<xliff:g id="ACCOUNT">%s</xliff:g>» har endret sikkerhetsinnstillinger. Du trenger ikke å foreta deg noe."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Sikkerhetsoppdatering påkrevd"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Sikkerh.retn.linjer er endret"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Sikkerhetsretningslinjene kan ikke følges"</string>
     <string name="account_security_title" msgid="3511543138560418587">"Enhetssikkerhet"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Tjeneren <xliff:g id="SERVER">%s</xliff:g> krever at den kan kontrollere noen av sikkerhetsfunksjonene på Android-enheten utenfra."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Rediger detaljer"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"Personlig kode eller passord for skjermlås er utløpt."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"Passord for skjermlås utløpt"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Passord for skjermlås utløper"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"Du må endre personlig kode eller passord for skjermlås snart, ellers slettes dataene for <xliff:g id="ACCOUNT">%s</xliff:g>. Vil du endre det nå?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Du må endre PIN-koden eller passordet for skjermlåsen snart, hvis ikke blir dataene for <xliff:g id="ACCOUNT">%s</xliff:g> slettet. Vil du endre dette nå?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"Passord for skjermlås utløpt"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"Dataene for <xliff:g id="ACCOUNT">%s</xliff:g> slettes fra enheten. Du kan gjenopprette dataene ved å endre personlig kode eller passord for skjermlåsing. Vil du endre dette nå?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"Dataene for <xliff:g id="ACCOUNT">%s</xliff:g> slettes fra enheten. Du kan gjenopprette dem ved å endre PIN-kode eller passord til skjermlåsen. Vil du endre det nå?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Vil du forkaste endringer som ikke er lagret?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Kunne ikke logge på"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Brukernavn eller passord for <xliff:g id="ACCOUNT">%s</xliff:g> er feil. Vil du oppdatere nå?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"Brukernavnet eller passordet til <xliff:g id="ACCOUNT">%s</xliff:g> er feil. Vil du oppdatere dette nå?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Standardkonto"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Bruk denne kontoen som standard for utgående e-post."</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Nedlasting av vedlegg"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Last ned vedlegg fra nye e-poster automatisk via Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Varsling om e-post"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Synkroniseringsfrekvens, varslinger m.m."</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"Gi beskjed i systemfeltet når nye e-postmeldinger kommer"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Gi meg beskjed når jeg mottar e-post"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Frekvens for kontroll av innboks"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Inngående innstillinger"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Brukernavn, passord og andre innstillinger for innkommende tjener"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Utgående innstillinger"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Brukernavn, passord og andre innstillinger for utgående tjener"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Retningslinjer som håndheves"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Ingen"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Retningslinjer som ikke støttes"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Ingen"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"Forsøk synkronisering"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Trykk her for å synkronisere denne kontoen"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Kontonavn"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Ditt navn"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Underskrift"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Hurtigsvar"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Rediger tekst som du ofte setter inn når du skriver e-poster"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Rediger tekst som du ofte skriver inn når du skriver e-post"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Legg til tekst i e-postmeldinger"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Innstillinger for varsling"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Databruk"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"Sikkerhetsretningslinjer"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Rediger hurtigsvar"</string>
     <string name="save_action" msgid="1988862706623227093">"Lagre"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Synkroniser kontakter"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Synkroniser kontakter fra denne kontoen"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Synkroniser kalender"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Synkroniser kalender fra denne kontoen"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Synkroniser kalender"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Synkroniser kalenderarrangement for denne kontoen"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synkroniser e-post"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synkroniser e-postmeldinger fra denne kontoen"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrering"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> resultater fra <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Innstillinger"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"Generelt"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Generelle innstillinger"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"App"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Autoflytting"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Velg hvilken skjerm som skal vises når du sletter en melding"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Skjul avmerkingsruter"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"Trykk og hold nede for å merke i e-postlister"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Bekreft før sletting"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"E-poster"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Bekreft før sending"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"E-poster"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Gå til"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Nyere melding"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Eldre melding"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"Venter på resultater"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Noen tjenere kan ta lang tid."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Mapper"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Ikke tillat bruk av enhetens kamera"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Krev enhetspassord"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"Begrens gjenbruk av nylige passord"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"Krev at passord utløper"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"Krev at skjerm låses på inaktive enheter"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"Begrens antallet synkroniserte kalenderhendelser"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"Begrens antallet synkroniserte e-poster"</string>
+    <string name="quick_1" msgid="3426057697353380951">"Takk!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"Det høres bra ut!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"Jeg skal lese dette senere og ta kontakt."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Jeg foreslår at vi avtaler et møte for å diskutere dette."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Bakgrunnssynkronisering for denne kontoen er deaktivert under streifing."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"Sender svar ..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"Ingen e-poster."</string>
 </resources>
diff --git a/res/values-nb/uploader.xml b/res/values-nb/uploader.xml
index 0846aff..0f154f6 100644
--- a/res/values-nb/uploader.xml
+++ b/res/values-nb/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Skjul detaljer"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Innstillinger"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Lastet opp %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Konto"</string>
     <string name="upload" msgid="2615541458361216022">"Last opp"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index a8a48d4..8f25497 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"E-mailbijlagen lezen"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Staat deze app toe uw e-mailbijlagen te lezen."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Hiermee kan de app uw e-mailbijlagen lezen."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Gegevens e-mailprovider openen"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Hiermee geeft u deze app toegang tot uw e-maildatabase, inclusief ontvangen berichten, verzonden berichten, gebruikersnamen en wachtwoorden."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Hiermee geeft u deze app toegang tot uw e-maildatabase, inclusief ontvangen berichten, verzonden berichten, gebruikersnamen en wachtwoorden."</string>
     <string name="app_name" msgid="5815426892327290362">"E-mail"</string>
     <string name="compose_title" msgid="427986915662706899">"Opstellen"</string>
     <string name="debug_title" msgid="5175710493691536719">"Foutopsporing"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"Gereed"</string>
     <string name="create_action" msgid="3062715563215392251">"Nieuwe maken"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"Verwijderen"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"Geen snelle reacties"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Geen snelle reacties."</string>
     <string name="discard_action" msgid="6532206074859505968">"Weggooien"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"Concept opslaan"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Snelle reactie invoegen"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"Zoeken"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Accountinstellingen"</string>
     <string name="settings_action" msgid="6334807007967459412">"Instellingen"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"Synchronisatieopties"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Synchronisatieopties"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Markeren als ongelezen"</string>
     <string name="move_action" msgid="3059189775933985898">"Verpl."</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g>schreef:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Tekst uit oorspronkelijk bericht weergeven"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Tekst opnemen"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"U moet minstens één ontvanger toevoegen."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"Voeg ten minste één ontvanger toe."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Sommige e-mailadressen zijn ongeldig."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Bestand is te groot om bij te voegen."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Snelle reactie invoegen"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Opgeslagen"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Stoppen"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Bijlage opgeslagen als <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Kan de bijlage niet opslaan."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Opmerking: een of meer bijlagen in uw doorgestuurde bericht worden gedownload voordat het bericht wordt verzonden."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"Kan bijlage niet opslaan."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Een of meer bijlagen in uw doorgestuurde bericht worden gedownload voordat het bericht wordt verzonden."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Bericht"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Uitnodigen"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Kan een of meer bijlagen niet doorsturen."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Bijlage niet doorgestuurd"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g>: aanmelden mislukt."</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g>: aanmelden mislukt."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"Kan niet aanmelden"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Ouder"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Accountinstellingen"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Een Exchange-account toevoegen"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Een Exchange ActiveSync-account toevoegen"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"E-mailaccount"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"U kunt e-mail voor de meeste accounts in slechts enkele stappen instellen."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"U kunt een Exchange-account in slechts enkele stappen instellen."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"U kunt een Exchange ActiveSync-account in slechts enkele stappen instellen."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"U kunt uw account in slechts enkele stappen instellen."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"E-mailadres"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Wachtwoord"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"E-mail standaard vanaf dit account verzenden"</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"E-mail standaard vanaf dit account verzenden"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Handmatig instellen"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Typ een geldig e-mailadres en wachtwoord."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Dubbel account"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Serverinstellingen inkomende e-mail controleren..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Serverinstellingen uitgaande e-mail controleren..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Accountinstellingen"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"Uw account is ingesteld en er is e-mail onderweg."</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"Uw account is ingesteld en er is e-mail onderweg."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Geef dit account een naam (optioneel)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Uw naam (wordt weergegeven in uitgaande berichten)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Dit veld mag niet leeg zijn."</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Instellingen voor de inkomende server"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Gebruikersnaam"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Wachtwoord"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3-server"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"IMAP-server"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Server"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Poort"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Beveiligingstype"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Geen"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP-server"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Poort"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Beveiligingstype"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Aanmelden vereist"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Aanmelding vereisen"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Gebruikersnaam"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Wachtwoord"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"Accountinstellingen"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Elke 15 minuten"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Elke 30 minuten"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Elk uur"</string>
-    <string name="account_setup_options_default_label" msgid="8869166381331276697">"E-mail standaard vanaf dit account verzenden"</string>
-    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Stuur me een melding wanneer er e-mail binnenkomt."</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Contacten van dit account synchroniseren."</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Agenda van dit account synchroniseren."</string>
-    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"E-mail voor dit account synchroniseren."</string>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"E-mail standaard vanaf dit account verzenden"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Stuur me een melding wanneer er e-mail binnenkomt"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Contacten van dit account synchroniseren"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Agenda van dit account synchroniseren"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"E-mail van dit account synchroniseren"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Bijlagen automatisch downloaden indien verbonden met Wi-Fi"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Is niet voltooid"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Dagen om te synchroniseren"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Eén maand"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Alles"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Accountstandaard gebruiken"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Gebruikersnaam of wachtwoord is onjuist."</string>
-    <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_auth_message" msgid="426627755590431364">"Gebruikersnaam of wachtwoord is onjuist."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"Gebruikersnaam of wachtwoord is onjuist. "\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Kan geen veilige verbinding met de server tot stand brengen."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Kan geen veilige verbinding met de server tot stand brengen."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"Clientcertificaat is vereist. Met clientcertificaat verbinding maken met de server?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"Certificaat is ongeldig of niet toegankelijk."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"De server heeft een fout geretourneerd. Controleer uw gebruikersnaam en wachtwoord en probeer het opnieuw."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"Er is een client-certificaat vereist. Wilt u verbinding maken met de server met een client-certificaat?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"Het certificaat is ongeldig of niet toegankelijk."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"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="4942810054116129684">"Kan geen verbinding maken met de server."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Kan geen verbinding maken met de server."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS is vereist maar wordt niet ondersteund door de server."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"WAARSCHUWING: als u de rechten van de app E-mail voor het beheren van uw apparaat uitschakelt, worden alle e-mailaccounts verwijderd waarvoor deze rechten vereist zijn, samen met de bijbehorende e-mails, contacten, agenda-afspraken en andere gegevens."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Beveiligingsupdate"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"Voor <xliff:g id="ACCOUNT">%s</xliff:g> moet u uw beveiligingsinstellingen bijwerken."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Account \'<xliff:g id="ACCOUNT">%s</xliff:g>\' vereist een update van de beveiligingsinstellingen."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"Beveiligingsupdate vereist"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Account \'<xliff:g id="ACCOUNT">%s</xliff:g>\' kan niet worden gesynchroniseerd wegens beveiligingsvereisten."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"Account \'<xliff:g id="ACCOUNT">%s</xliff:g>\' vereist een update van de beveiligingsinstellingen."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"De beveiligingsinstellingen van het account \'<xliff:g id="ACCOUNT">%s</xliff:g>\' zijn gewijzigd, er is geen gebruikersactie vereist."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Beveiligingsupdate vereist"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Beveiligingsbeleid gewijzigd"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Beveil.-beleid niet voldaan"</string>
     <string name="account_security_title" msgid="3511543138560418587">"Apparaatbeveiliging"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"De server <xliff:g id="SERVER">%s</xliff:g> vereist dat u de server toestemming geeft bepaalde beveiligingsfuncties van uw Android-apparaat extern te bedienen."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Details bewerken"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"Uw PIN-code of wachtwoord voor schermvergrendeling is verlopen."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"Wachtw. schermvergr. verlopen"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Wachtw. schermvergr. bijna verlopen"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"U moet uw PIN-code of wachtwoord voor schermvergrendeling binnenkort wijzigen, anders worden de gegevens voor <xliff:g id="ACCOUNT">%s</xliff:g> gewist. Nu wijzigen?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"U moet uw pincode of wachtwoord voor schermvergrendeling snel wijzigen, of de gegevens voor <xliff:g id="ACCOUNT">%s</xliff:g> worden gewist. Wilt u dit nu wijzigen?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"Wachtwoord schermvergrendeling verlopen"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"De gegevens voor <xliff:g id="ACCOUNT">%s</xliff:g> worden gewist op uw apparaat. U kunt het account herstellen door uw PIN-code of wachtwoord voor schermvergrendeling te wijzigen. Nu wijzigen?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"De gegevens voor <xliff:g id="ACCOUNT">%s</xliff:g> worden gewist op uw apparaat. U kunt het account herstellen door uw pincode of wachtwoord voor schermvergrendeling te wijzigen. Nu wijzigen?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Niet-opgeslagen wijzigingen annuleren?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Kan niet aanmelden"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"De gebruikersnaam of het wachtwoord voor <xliff:g id="ACCOUNT">%s</xliff:g> is onjuist. Nu bijwerken?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"De gebruikersnaam of het wachtwoord voor <xliff:g id="ACCOUNT">%s</xliff:g> is onjuist. Wilt u deze nu bijwerken?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Standaardaccount"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"E-mail standaard vanaf dit account verzenden"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Bijlagen downloaden"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Bijlagen van recente berichten automatisch downloaden via wifi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Meldingen via e-mail"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Synchronisatiefrequentie, meldingen, enzovoort"</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"Melding in de systeembalk wanneer er e-mail binnenkomt"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Melding sturen wanneer e-mail binnenkomt"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Controlefrequentie inbox"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Instellingen inkomende e-mail"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Gebruikersnaam, wachtwoord en andere inst. voor inkomende server"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Instellingen uitgaande e-mail"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Gebruikersnaam, wachtwoord en andere inst. voor uitgaande server"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Afgedwongen beleid"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Geen"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Niet-ondersteund beleid"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Geen"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"Poging tot synchroniseren"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Raak dit aan om dit account te synchroniseren"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Accountnaam"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Uw naam"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Handtekening"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Snelle reacties"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Tekst bewerken die u vaak invoegt wanneer u e-mails opstelt"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Tekst bewerken die u vaak invoegt wanneer u e-mails opstelt"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Tekst toevoegen aan berichten die u verzendt"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Instellingen voor meldingen"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Gegevensgebruik"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"Beveiligingsbeleid"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Snelle reactie bewerken"</string>
     <string name="save_action" msgid="1988862706623227093">"Opslaan"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Contacten synchroniseren"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Contacten voor dit account synchroniseren"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Agenda synchroniseren"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Agenda voor dit account synchroniseren"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Agenda synchroniseren"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Agenda-afspraak voor dit account synchroniseren"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"E-mail synch."</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"E-mail voor dit account synchroniseren"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Trillen"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> resultaten van <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Instellingen"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"Algemeen"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Algemene instellingen"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"App"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Automatisch doorgaan"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Het scherm selecteren dat wordt getoond na het verw. van bericht"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Selectievakjes verbergen"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"Blijven aanraken in lijsten met berichten om te selecteren"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Bevestigen vóór verwijderen"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Berichten"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Bevestigen vóór verzenden"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Berichten"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Doorgaan naar"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Nieuwer bericht"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Ouder bericht"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"Wachten op resultaten"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Het duurt soms langer voordat servers reageren."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Mappen"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Gebruik van apparaatcamera niet toestaan"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Apparaatwachtwoord vereisen"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"Hergebruik recente wachtwoorden beperken"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"Vereisen dat wachtwoord verloopt"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"Inactief apparaat vergrendelt scherm"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"Aantal gesynchroniseerde agenda-afspraken beperken"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"Aantal gesynchroniseerde e-mails beperken"</string>
+    <string name="quick_1" msgid="3426057697353380951">"Hartelijk dank!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"Dat lijkt me prima."</string>
+    <string name="quick_3" msgid="8061819976353395585">"Ik zal dit later lezen en kom er dan op terug."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Laten we een afspraak maken om dit te bespreken."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Achtergrondsynchronisatie voor dit account is uitgeschakeld tijdens roaming."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"Reactie verzenden..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"Geen berichten."</string>
 </resources>
diff --git a/res/values-nl/uploader.xml b/res/values-nl/uploader.xml
index f2d6c82..451f05e 100644
--- a/res/values-nl/uploader.xml
+++ b/res/values-nl/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Details verbergen"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Instellingen"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Geüpload op %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Account"</string>
     <string name="upload" msgid="2615541458361216022">"Uploaden"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 79e5e91..443ebcf 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"Odczyt załączników do e-maili"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Zezwala aplikacji na odczyt załączników do e-maili."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Pozwala aplikacji na odczyt załączników do e-maili."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Dostęp do danych dostawcy poczty e-mail"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Zezwala aplikacji na dostęp do bazy danych poczty e-mail, w tym odebranych i wysłanych wiadomości, nazw użytkowników oraz haseł."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Zezwala aplikacji na dostęp do bazy danych e-maili, w tym odebranych i wysłanych wiadomości, nazw użytkowników oraz haseł."</string>
     <string name="app_name" msgid="5815426892327290362">"Poczta"</string>
     <string name="compose_title" msgid="427986915662706899">"Utwórz"</string>
     <string name="debug_title" msgid="5175710493691536719">"Debuguj"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"Gotowe"</string>
     <string name="create_action" msgid="3062715563215392251">"Utwórz nową"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"Usuń"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"Brak szybkich odpowiedzi"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Brak szybkich odpowiedzi"</string>
     <string name="discard_action" msgid="6532206074859505968">"Odrzuć"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"Zapisz wersję roboczą"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Wstaw szybką odpowiedź"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"Szukaj"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Ustawienia konta"</string>
     <string name="settings_action" msgid="6334807007967459412">"Ustawienia"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"Opcje synchronizacji"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Opcje synchronizacji"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Oznacz jako nieprzeczytane"</string>
     <string name="move_action" msgid="3059189775933985898">"Przenieś"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ DW/UDW"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> napisał(a):"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Dołącz cytowany tekst"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Dołącz tekst"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Musisz dodać co najmniej jednego adresata."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"Dodaj co najmniej jednego adresata."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Niektóre adresy e-mail są nieprawidłowe."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Plik jest zbyt duży do załączenia."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Wstaw szybką odpowiedź"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Zapisany"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Zatrzymaj"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Załącznik zapisany jako <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Nie można zapisać załącznika."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Uwaga: co najmniej jeden załącznik w przekazywanej wiadomości zostanie pobrany przed wysłaniem."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"Nie można zapisać załącznika."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Co najmniej jeden załącznik w przekazywanej wiadomości zostanie pobrany przed wysłaniem."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Wiadomość"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Zaproś"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Co najmniej jednego załącznika nie można przekazać dalej."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Nie przekazano załącznika"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"Nie udało się zalogować na konto <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"Nie udało się zalogować na konto <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"Nie można się zalogować"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Starsze"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" – "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Konfiguracja konta"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Dodaj konto Exchange"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Dodaj konto Exchange ActiveSync"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"Konto e-mail"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"Możesz skonfigurować pocztę e-mail dla większości kont w zaledwie kilku krokach."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Możesz skonfigurować konto Exchange w zaledwie kilku krokach."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Możesz skonfigurować konto Exchange ActiveSync w zaledwie kilku krokach."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Swoje konto możesz skonfigurować w zaledwie kilku krokach."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Adres e-mail"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Hasło"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Domyślnie wysyłaj wiadomości e-mail z tego konta"</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"Domyślnie wysyłaj e-maile z tego konta."</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Konfig. ręczna"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Wpisz prawidłowy adres e-mail i hasło."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Zduplikowane konto"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Sprawdzanie ustawień serwera poczty przychodzącej…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Sprawdzanie ustawień serwera poczty wychodzącej…"</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Konfiguracja konta"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"Konto zostało skonfigurowane, a wiadomości e-mail są w drodze!"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"Konto zostało skonfigurowane, a e-maile są w drodze."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Nazwa konta (opcjonalnie)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Twoja nazwa (wyświetlana w wiadomościach wychodzących)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"To pole nie może być puste."</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Ustawienia serwera poczty przychodzącej"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nazwa użytkownika"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Hasło"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Serwer POP3"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"Serwer IMAP"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Serwer"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Typ zabezpieczeń"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Brak"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Serwer SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Typ zabezpieczeń"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Wymagaj zalogowania się."</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Wymagaj logowania."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nazwa użytkownika"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Hasło"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"Konfiguracja konta"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Co 15 minut"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Co 30 minut"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Co godzinę"</string>
-    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Domyślnie wysyłaj wiadomości e-mail z tego konta"</string>
-    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Powiadom mnie o odebranej poczcie e-mail."</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Synchronizuj kontakty na tym koncie"</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Synchronizuj kalendarz na tym koncie"</string>
-    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Synchronizuj wiadomości e-mail z tego konta"</string>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"Domyślnie wysyłaj wiadomości e-mail z tego konta."</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Powiadom mnie o odebranych e-mailach."</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Synchronizuj kontakty na tym koncie."</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Synchronizuj kalendarz na tym koncie."</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Synchronizuj e-maile z tego konta."</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Automatycznie pobieraj załączniki, gdy połączono z siecią Wi-Fi"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Nie można zakończyć"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Dni do synchronizacji"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Jeden miesiąc"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Wszystkie"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Użyj wartości domyślnej konta"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Nieprawidłowa nazwa użytkownika lub hasło."</string>
-    <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_auth_message" msgid="426627755590431364">"Nieprawidłowa nazwa użytkownika lub hasło"</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"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="3836152264696108805">"Nie można bezpiecznie połączyć się z serwerem."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Nie można bezpiecznie połączyć się z serwerem."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"Wymagany jest certyfikat klienta. Połączyć z serwerem przy jego użyciu?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"Certyfikat jest nieważny lub niedostępny."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"Serwer zgłosił błąd. Sprawdź nazwę użytkownika i hasło, a następnie spróbuj ponownie."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"Certyfikat klienta jest wymagany. Czy chcesz się połączyć z serwerem za pomocą certyfikatu klienta?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"Certyfikat jest nieważny lub niedostępny."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"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="4942810054116129684">"Nie można połączyć się z serwerem."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Nie można połączyć się z serwerem."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"Wymagane połączenie TLS nie jest obsługiwane przez serwer."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"OSTRZEŻENIE: cofnięcie Poczcie uprawnień do administrowania urządzeniem spowoduje usunięcie wszystkich kont e-mail, które ich wymagają, wraz z wiadomościami, kontaktami, wydarzeniami w kalendarzu i innymi danymi."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Aktualizacja zabezpieczeń"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"Konto <xliff:g id="ACCOUNT">%s</xliff:g> wymaga aktualizacji ustawień zabezpieczeń."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Konto „<xliff:g id="ACCOUNT">%s</xliff:g>” wymaga aktualizacji ustawień zabezpieczeń."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"Wymagana aktualizacja zabezp."</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Nie można zsynchronizować konta „<xliff:g id="ACCOUNT">%s</xliff:g>” ze względu na wymogi bezpieczeństwa."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"Konto „<xliff:g id="ACCOUNT">%s</xliff:g>” wymaga aktualizacji ustawień zabezpieczeń."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"Ustawienia zabezpieczeń konta „<xliff:g id="ACCOUNT">%s</xliff:g>” uległy zmianie. Nie jest wymagane podejmowanie działań przez użytkownika."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Wymagana aktualizacja zabezp."</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Zasady bezpieczeństwa uległy zmianie"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Nie można spełnić zasad bezp."</string>
     <string name="account_security_title" msgid="3511543138560418587">"Zabezpieczenia urządzenia"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Serwer <xliff:g id="SERVER">%s</xliff:g> wymaga udzielenia zezwolenia na zdalną kontrolę niektórych funkcji zabezpieczeń tego urządzenia z systemem Android."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Edytuj szczegóły"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"Kod PIN lub hasło ekranu blokady wygasły."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"Hasło ekranu blokady wygasło"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Hasło ekranu blokady wkrótce wygaśnie"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"Należy wkrótce zmienić kod PIN lub hasło ekranu blokady, albo dane konta <xliff:g id="ACCOUNT">%s</xliff:g> zostaną wymazane. Zmienić teraz?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Musisz wkrótce zmienić PIN lub hasło ekranu blokady. W przeciwnym razie dane konta <xliff:g id="ACCOUNT">%s</xliff:g> zostaną usunięte. Zmienić je teraz?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"Hasło ekranu blokady wygasło"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"Trwa wymazywanie z urządzenia danych konta <xliff:g id="ACCOUNT">%s</xliff:g>. Można je przywrócić, zmieniając kod PIN lub hasło ekranu blokady. Zmienić je teraz?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"Trwa wymazywanie z urządzenia danych konta <xliff:g id="ACCOUNT">%s</xliff:g>. Można je przywrócić, zmieniając PIN lub hasło ekranu blokady. Zmienić je teraz?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Odrzucić niezapisane zmiany?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Nie można się zalogować"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Nazwa użytkownika lub hasło dla konta <xliff:g id="ACCOUNT">%s</xliff:g> są niepoprawne. Zaktualizować je teraz?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"Nazwa użytkownika lub hasło dla konta <xliff:g id="ACCOUNT">%s</xliff:g> są nieprawidłowe. Chcesz je poprawić?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Domyślne konto"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Domyślnie wysyłaj wiadomości e-mail z tego konta"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Pobieraj załączniki"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Automatycznie pobieraj załączniki najnowszych wiadomości przez Wi-Fi."</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Powiadomienia e-mail"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Częstotliwość synchronizacji, powiadomienia itd."</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"Powiadamiaj na pasku systemu o otrzymaniu wiadomości e-mail"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Wyślij powiadomienie, gdy przychodzi e-mail."</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Sprawdzaj pocztę"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Poczta przychodząca"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Użytkownik, hasło i inne ustawienia serwera poczty przychodzącej"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Poczta wychodząca"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Użytkownik, hasło i inne ustawienia serwera poczty wychodzącej"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Egzekwowane zasady"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Brak"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Nieobsługiwane zasady"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Brak"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"Próba synchronizacji"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Dotknij tutaj, aby zsynchronizować to konto."</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Nazwa konta"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Imię i nazwisko"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Podpis"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Szybkie odpowiedzi"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Edytuj tekst, który często wstawiasz do wiadomości e-mail."</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Edytuj tekst, który często wstawiasz do e-maili."</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Dołącz tekst do wysyłanych wiadomości"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Ustawienia powiadomień"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Wykorzystanie transmisji danych"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"Zasady bezpieczeństwa"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Edytuj szybką odpowiedź"</string>
     <string name="save_action" msgid="1988862706623227093">"Zapisz"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Synchronizuj kontakty"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Synchronizuj kontakty dla tego konta"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Synchronizuj kalendarz"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Synchronizuj kalendarz dla tego konta"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Synchronizuj kalendarz"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Synch. kalendarz dla tego konta."</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synchronizuj e-maile"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synchronizuj wiadomości e-mail dla tego konta"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Wibracje"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"Liczba wyników: <xliff:g id="RESULTS">%1$d</xliff:g> z <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Ustawienia"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"Ogólne"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Ustawienia ogólne"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"Aplikacja"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Automatyczne przechodzenie"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Wybierz ekran, który ma być pokazywany po usunięciu wiadomości."</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Ukryj pola wyboru"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"Dotknij i przytrzymaj, by wybrać pozycję na liście wiadomości"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Potwierdź usuwanie"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Wiadomości"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Potwierdź wysyłanie"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Wiadomości"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Przejdź do"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Nowsza wiadomość"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Starsza wiadomość"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"Oczekiwanie na wyniki"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Niektóre serwery mogą zwracać wyniki po dłuższym czasie."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Foldery"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Nie zezwalaj na używanie aparatu"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Wymagaj hasła do urządzenia"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"Nie zezwalaj na używanie poprzednich haseł"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"Wymagaj, by hasła miały datę ważności"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"Wymagaj blokowania ekranu nieużywanych urz."</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"Ogranicz liczbę synchronizowanych wydarzeń z kalendarza"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"Ogranicz liczbę synchronizowanych e-maili"</string>
+    <string name="quick_1" msgid="3426057697353380951">"Dziękuję."</string>
+    <string name="quick_2" msgid="4188036352885736617">"Brzmi dobrze."</string>
+    <string name="quick_3" msgid="8061819976353395585">"Przeczytam to później i skontaktuję się."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Spotkajmy się, aby to omówić."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Synchronizacja w tle z tym kontem jest podczas roamingu wyłączona."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"Wysyłanie odpowiedzi..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"Brak wiadomości."</string>
 </resources>
diff --git a/res/values-pl/uploader.xml b/res/values-pl/uploader.xml
index c409683..5c7a8ee 100644
--- a/res/values-pl/uploader.xml
+++ b/res/values-pl/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Ukryj szczegóły"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Ustawienia"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Przesłano: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Konto"</string>
     <string name="upload" msgid="2615541458361216022">"Prześlij"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 5df6f33..fc14a01 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"Ler anexos de e-mail"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Permite que esta aplicação leia os seus anexos de e-mail."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Permite à aplicação ler os anexos de e-mail."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Aceder a dados do fornecedor de e-mail"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Permite que esta aplicação aceda à base de dados do e-mail, incluindo às mensagens recebidas, mensagens enviadas, nomes de utilizadores e palavras-passe."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Permite que a aplicação aceda à base de dados do e-mail, incluindo às mensagens recebidas, mensagens enviadas, nomes de utilizadores e palavras-passe."</string>
     <string name="app_name" msgid="5815426892327290362">"E-mail"</string>
     <string name="compose_title" msgid="427986915662706899">"Redigir"</string>
     <string name="debug_title" msgid="5175710493691536719">"Depuração"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"Concluído"</string>
     <string name="create_action" msgid="3062715563215392251">"Criar nova"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"Eliminar"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"Sem respostas rápidas"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Sem respostas rápidas."</string>
     <string name="discard_action" msgid="6532206074859505968">"Rejeitar"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"Guardar rascunho"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Inserir resposta rápida"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"Pesquisar"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Definições da conta"</string>
     <string name="settings_action" msgid="6334807007967459412">"Configurações"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"Opções de sincronização"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Opções de sincronização"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Marcar como não lida"</string>
     <string name="move_action" msgid="3059189775933985898">"Mover"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> escreveu:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Incluir texto citado"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Incluir texto"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Tem de adicionar pelo menos um destinatário."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"Adicione, pelo menos, um destinatário."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Alguns endereços de e-mail são inválidos."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Ficheiro demasiado grande para anexar."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Inserir resposta rápida"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Guardado"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Parar"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Anexo guardado como <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Impossível guardar anexo."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Nota: um ou mais anexos da mensagem que encaminhou serão transferidos antes do envio."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"Não foi possível guardar o anexo."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Um ou mais anexos da mensagem que encaminhou serão transferidos antes do envio."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Mensagem"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Convidar"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Não foi possível encaminhar um ou mais anexos."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"O anexo não foi encaminhado"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"Falha no início de sessão de <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"Início de sessão de <xliff:g id="ACCOUNT_NAME">%s</xliff:g> sem êxito."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"Impossível iniciar sessão"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Mais antigas"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Configuração da conta"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Adicionar uma conta do Exchange"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Adicionar uma conta do Exchange ActiveSync"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"Conta de e-mail"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"Pode configurar o e-mail para a maioria das contas em apenas alguns passos."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"É possível configurar uma conta do Exchange em apenas alguns passos."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Pode configurar uma conta Exchange ActiveSync em apenas alguns passos."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"É possível configurar a sua conta em apenas alguns passos."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Endereço de e-mail"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Palavra-passe"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Enviar e-mail a partir desta conta por predefinição."</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"Enviar e-mail a partir desta conta por predefinição"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Configuração manual"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Introduza um endereço de e-mail e palavra-passe válidos."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Conta duplicada"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"A verificar definições do servidor de recepção..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"A verificar definições do servidor de envio..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Configuração da conta"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"A sua conta está configurada e o e-mail vai a caminho!"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"A sua conta está configurada e o e-mail vai a caminho!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Dar um nome a esta conta (opcional)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"O seu nome (apresentado nas mensagens enviadas)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Este campo não pode estar em branco."</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Definições do servidor de recepção"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nome de utilizador"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Palavra-passe"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Servidor POP3"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"Servidor IMAP"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Servidor"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Porta"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Tipo de segurança"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Nenhuma"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Servidor SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Porta"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Tipo de segurança"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Solicitar início de sessão."</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Requerer início de sessão"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nome de utilizador"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Palavra-passe"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"Configuração da conta"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"De 15 em 15 minutos"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"De 30 em 30 minutos"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"De hora em hora"</string>
-    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Enviar e-mail a partir desta conta por predefinição."</string>
-    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Notificar-me quando chega e-mail."</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sincronizar contactos a partir desta conta."</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sincronizar o calendário a partir desta conta."</string>
-    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sincronizar e-mail a partir desta conta."</string>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"Enviar e-mail a partir desta conta por predefinição"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Receber notificação de e-mails novos"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Sincronizar contactos a partir desta conta."</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Sincronizar o calendário a partir desta conta."</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Sincronizar e-mail a partir desta conta."</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Transferir automaticamente anexos quando ligado a uma rede Wi-Fi"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Não foi possível concluir"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Dias para sincronização"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Um mês"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Todas"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Utilizar predef. da conta"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Nome de utilizador ou palavra passe incorrectos."</string>
-    <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_auth_message" msgid="426627755590431364">"O nome de utilizador ou a palavra-passe estão incorretos."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"O nome de utilizador ou a palavra-passe estão incorretos."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Não é possível ligar ao servidor em segurança."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Não é possível ligar ao servidor em segurança."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"Certificado de cliente necessário. Ligar ao servidor com o certificado de cliente?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"Certificado inválido ou inacessível."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"O servidor respondeu com um erro. Verifique o nome de utilizador e a palavra-passe e tente novamente."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"É necessário um certificado de cliente. Pretende ligar ao servidor com um certificado de cliente?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"O certificado é inválido ou inacessível."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"O servidor respondeu com um erro. Verifique o nome de utilizador e a palavra-passe e tente novamente."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"Não é possível ligar ao servidor."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Não é possível ligar ao servidor."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS necessário mas não suportado pelo servidor."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"AVISO: a desativação da autorização da aplicação E-mail para administrar o aparelho eliminará todas as contas de e-mail que necessitam desta, juntamente com o respetivo e-mail, contactos, eventos de agenda e outros dados."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Atualização de segurança"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> requer a atualização das definições de segurança."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"A conta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" requer a actualização das definições de segurança."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"É necessária uma atualização da segurança"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Não é possível sincronizar a conta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" devido a requisitos de segurança."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"A conta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" requer a atualização das definições de segurança."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"A conta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" alterou as definições de segurança; não é necessária qualquer ação do utilizador."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Necessária atualiz. segurança"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Políticas segurança alteradas"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Impossível cumprir polít. seg."</string>
     <string name="account_security_title" msgid="3511543138560418587">"Segurança do dispositivo"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"O servidor <xliff:g id="SERVER">%s</xliff:g> requer permissão para controlar remotamente algumas das funcionalidades de segurança do aparelho Android."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Editar detalhes"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"O seu PIN ou palavra-passe de bloqueio do ecrã expirou."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"A palavra-passe de bloq. do ecrã expirou"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Palavra-passe de bloq. do ecrã a expirar"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"Tem de alterar em breve o PIN ou palavra-passe de bloqueio do ecrã ou os dados para <xliff:g id="ACCOUNT">%s</xliff:g> serão apagados. Quer alterar agora?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Tem de alterar o PIN ou a palavra-passe de bloqueio do ecrã ou os dados de <xliff:g id="ACCOUNT">%s</xliff:g> serão apagados. Pretende alterar agora?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"A palavra-passe de bloq. do ecrã expirou"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"Os dados para <xliff:g id="ACCOUNT">%s</xliff:g> estão a ser apagados do seu aparelho. Pode restaurá-los alterando o PIN ou palavra-passe de bloqueio do ecrã. Alterar agora?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"Os dados de <xliff:g id="ACCOUNT">%s</xliff:g> estão a ser apagados do aparelho. Pode restaurá-los alterando o PIN ou a palavra-passe de bloqueio do ecrã. Pretende alterar agora?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Rejeitar alterações não guardadas?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Não foi possível iniciar sessão."</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"O nome de utilizador ou palavra-passe para <xliff:g id="ACCOUNT">%s</xliff:g> estão incorretos. Quer atualizá-los agora?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"O nome de utilizador ou a palavra-passe para <xliff:g id="ACCOUNT">%s</xliff:g> estão incorretos. Pretende atualizá-los agora?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Conta predefinida"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Enviar e-mail a partir desta conta por predefinição"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Transferir anexos"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Transferir automaticamente anexos de mensagens recentes p/ Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Notificações de e-mail"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Frequência da sincronização, notificações, etc."</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"Notificar na barra de sistema quando chegar e-mail"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Enviar notificação quando chegar um e-mail"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Frequência de verificação de caixa de entrada"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Definições de recepção"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Nome de utiliz., palavra-passe e outras def. do serv. de receção"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Definições de envio"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Nome de utiliz., palavra-passe e outras def. do serv. de envio"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Políticas aplicadas"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Nenhum"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Políticas não suportadas"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Nenhum"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"Tentar sincronizar"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Toque aqui para sincronizar esta conta"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Nome da conta"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"O seu nome"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Assinatura"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Respostas rápidas"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Editar o texto que insere frequentemente ao compor e-mails"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Editar o texto que insere frequentemente ao compor e-mails"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Acrescente texto às mensagens que enviar"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Definições de notificação"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Utilização de dados"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"Políticas de segurança"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Editar resposta rápida"</string>
     <string name="save_action" msgid="1988862706623227093">"Guardar"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Sincronizar contactos"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sincronizar contactos para esta conta"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sincronizar agenda"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Sincronizar a agenda para esta conta"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Sincronizar calendário"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Sinc. evento do cal. p. esta conta"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincronizar e-mail"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronizar e-mail para esta conta"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrar"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> resultados de <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Configurações"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"Geral"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Definições gerais"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"Aplicação"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Avanço automático"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Selecionar o ecrã a apresentar após eliminar uma mensagem"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Ocultar caixas de verificação"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"Em listas de mensagens, toque sem largar para selecionar"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Confirmar antes de eliminar"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Mensagens"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Confirmar antes de enviar"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Mensagens"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Avançar para"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Mensagem mais recente"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Mensagem mais antiga"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"A aguardar resultados"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Alguns servidores podem demorar algum tempo."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Pastas"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Não perm. utilização câmara do aparelho"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Solicitar palavra-passe do aparelho"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"Limitar reutilização pal.-passe recentes"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"Solicitar validade das palavras-passe"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"Necessário apar. inat. para bloq. ecrã"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"Limitar n.º de eventos de calendário sincronizados"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"Limitar n.º  de e-mails sincronizados"</string>
+    <string name="quick_1" msgid="3426057697353380951">"Obrigado!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"Parece-me bem!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"Vou ler isto mais tarde e voltarei a contactá-lo."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Vamos marcar uma reunião para discutir isso."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"A sincronização em segundo plano desta conta está desativada quando está em roaming."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"A enviar a resposta..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"Não tem mensagens."</string>
 </resources>
diff --git a/res/values-pt-rPT/uploader.xml b/res/values-pt-rPT/uploader.xml
index fe226aa..8421814 100644
--- a/res/values-pt-rPT/uploader.xml
+++ b/res/values-pt-rPT/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Ocultar Detalhes"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Configurações"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Carregados: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Conta"</string>
     <string name="upload" msgid="2615541458361216022">"fazer upload"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index faa774c..e53c76a 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"Ler os anexos do e-mail"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Permite que este aplicativo leia os anexos do seu e-mail."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Permite que o aplicativo leia seus anexos de e-mail."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Acessar dados do provedor de e-mail"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Permite que este aplicativo acesse o banco de dados do e-mail, incluindo mensagens recebidas e enviadas, nomes de usuário e senhas."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Permite que o aplicativo acesse o banco de dados de seu e-mail, incluindo mensagens recebidas e enviadas, nomes de usuário e senhas."</string>
     <string name="app_name" msgid="5815426892327290362">"E-mail"</string>
     <string name="compose_title" msgid="427986915662706899">"Escrever"</string>
     <string name="debug_title" msgid="5175710493691536719">"Depurar"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"Concluído"</string>
     <string name="create_action" msgid="3062715563215392251">"Criar nova"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"Excluir"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"Sem respostas rápidas"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Nenhuma resposta rápida."</string>
     <string name="discard_action" msgid="6532206074859505968">"Descartar"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"Salvar rascunho"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Inserir resposta rápida"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"Pesquisa"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Configurações da conta"</string>
     <string name="settings_action" msgid="6334807007967459412">"Configurações"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"Opções de sincronização"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Opções de sincronização"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Marcar como não lida"</string>
     <string name="move_action" msgid="3059189775933985898">"Mover"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Cco"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> escreveu:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Incluir texto das mensagens anteriores"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Incluir texto"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Você deve adicionar pelo menos um destinatário."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"Adicione pelo menos um destinatário."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Alguns endereços de e-mail são inválidos."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Arquivo muito grande para ser anexado."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Inserir resposta rápida"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Salvo"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Parar"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Anexo salvo como <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Não é possível salvar o anexo."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Obs.: um ou mais anexos de sua mensagem encaminhada serão carregados antes do envio."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"Não foi possível salvar anexo."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Um ou mais anexos de sua mensagem encaminhada serão transferidos antes do envio."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Mensagem"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Convidar"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Não foi possível encaminhar todos os anexos."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Anexo não encaminhado"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"Falha no login de <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"Falha no login de <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"Não foi possível fazer login"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> b"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Mais antigos"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Configuração da conta"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Adicionar uma conta do Exchange"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Adicionar uma conta do Exchange ActiveSync"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"Conta de e-mail"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"É possível configurar o e-mail para a maioria das contas em apenas algumas etapas."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"É possível configurar uma conta do Exchange em apenas algumas etapas."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"É possível configurar uma conta do Exchange ActiveSync em apenas algumas etapas."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"É possível configurar uma conta em apenas algumas etapas."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Endereço de e-mail"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Senha"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Enviar e-mail desta conta por padrão."</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"Enviar e-mail desta conta por padrão"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Configuração manual"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Digite um endereço de e-mail e senha válidos."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Conta duplicada"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Verificando as configurações de entrada do servidor..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Verificando as configurações de saída do servidor..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Configuração da conta"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"Sua conta está configurada e o e-mail está a caminho!"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"Sua conta está configurada e o e-mail está a caminho!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Dar nome a esta conta (opcional)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Seu nome (exibido nas mensagens enviadas)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Este campo não pode ficar em branco."</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Configurações de entrada do servidor"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nome de usuário"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Senha"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Servidor POP3"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"Servidor IMAP"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Servidor"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Porta"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Tipo de segurança"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Nenhum"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Servidor SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Porta"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Tipo de segurança"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Requer login."</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Exigir login"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nome de usuário"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Senha"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"Configuração da conta"</string>
@@ -305,12 +300,12 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"A cada 15 minutos"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"A cada 30 minutos"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"De hora em hora"</string>
-    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Enviar e-mail desta conta por padrão."</string>
-    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Receber notificação quando chegar um e-mail"</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sincronizar contatos desta conta."</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sincronizar agenda desta conta."</string>
-    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sincronizar e-mail desta conta."</string>
-    <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Fazer download de anexos automaticamente ao conectar ao Wi-Fi"</string>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"Enviar e-mail desta conta por padrão"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Receber notificação quando um e-mail chegar"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Sincronizar contatos desta conta"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Sincronizar agenda desta conta"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Sincronizar e-mail desta conta."</string>
+    <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Fazer o download de anexos automaticamente ao conectar ao Wi-Fi"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Não foi possível concluir"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Dias para sincronizar"</string>
     <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automático"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Um mês"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Todos"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Usar padrão da conta"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Nome de usuário ou senha incorretos."</string>
-    <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_auth_message" msgid="426627755590431364">"Nome de usuário ou senha incorretos."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"Nome de usuário ou senha estão incorretos."\n" (<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Não é possível se conectar ao servidor com segurança."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Não é possível se conectar ao servidor com segurança."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"O certificado do cliente é necessário. Conectar-se ao servidor com o certificado do cliente?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"O certificado é inválido ou inacessível."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"O servidor respondeu com um erro. Verifique seu nome de usuário e senha e tente novamente."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"É necessário um certificado de cliente. Deseja se conectar ao servidor com um certificado de cliente?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"O certificado é inválido ou inacessível."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"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="4942810054116129684">"Não é possível se conectar ao servidor."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Não é possível se conectar ao servidor."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS solicitado, mas não suportado pelo servidor."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"AVISO: ao desativar a autoridade do aplicativo de e-mail para administrar seu dispositivo, todas as contas de e-mail vinculadas serão excluídas, assim como e-mails, contatos, eventos da agenda e outros dados."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Atualização de segurança"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> solicita que você atualize suas configurações de segurança."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"A conta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" requer a atualização das configurações de segurança."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"Necessária atualização de segurança"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"A conta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" não pode ser sincronizada devido a solicitações de segurança."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"A conta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" exige a atualização das configurações de segurança."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"As configurações de segurança da conta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" foram alteradas. Nenhuma ação do usuário é necessária."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Necessária atualiz. segurança"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Polít. segurança alteradas"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Polít. de seg. não podem ser cumpridas"</string>
     <string name="account_security_title" msgid="3511543138560418587">"Segurança do dispositivo"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"O servidor <xliff:g id="SERVER">%s</xliff:g> requer a permissão de controle remoto de alguns recursos de segurança do seu dispositivo Android."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Editar detalhes"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"Sua senha ou PIN da tela de bloqueio expirou."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"Senha da tela de bloqueio expirada"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Senha da tela de bloqueio expirando"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"É necessário alterar sua senha ou PIN da tela de bloqueio, senão os dados de <xliff:g id="ACCOUNT">%s</xliff:g> serão apagados. Alterar agora?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"É necessário alterar o PIN ou a senha de sua tela de bloqueio logo, ou os dados da <xliff:g id="ACCOUNT">%s</xliff:g> serão apagados. Deseja mudar isso agora?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"Senha da tela de bloqueio expirada"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"Os dados de <xliff:g id="ACCOUNT">%s</xliff:g> estão sendo apagados de seu dispositivo. Você pode restaurá-los alterando sua senha ou PIN da tela de bloqueio. Alterar agora?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"Os dados da <xliff:g id="ACCOUNT">%s</xliff:g> estão sendo apagados de seu dispositivo. Você pode restaurá-los alterando o PIN ou a senha de sua tela de bloqueio. Deseja mudar isso agora?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Descartar as alterações não salvas?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Não foi possível fazer login"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"O nome de usuário ou a senha de <xliff:g id="ACCOUNT">%s</xliff:g> estão incorretos. Atualizar agora?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"O nome de usuário ou senha da <xliff:g id="ACCOUNT">%s</xliff:g> está incorreto. Deseja atualizar agora?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Conta padrão"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Enviar e-mail desta conta por padrão"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Fazer download dos anexos"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Fazer download automát. dos anexos de mens. recentes via Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Notificações de e-mail"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Frequência de sincronização, notificações etc."</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"Notificar sobre chegada de e-mails na barra de sistema"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Enviar notificação quando chegarem e-mails"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Frequência de verificação da caixa de entrada"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Configurações recebidas"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Nome de usuário, senha e outras configurações do servidor de entrada"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Configurações enviadas"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Nome de usuário, senha e outras configurações do servidor de saída"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Políticas aplicadas"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Nenhuma"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Políticas não suportadas"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Nenhuma"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"Tentativa de sincronização"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Toque aqui para sincronizar esta conta"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Nome da conta"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Seu nome"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Assinatura"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Respostas rápidas"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Edite o texto que você costuma inserir ao compor e-mails"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Edite o texto que você costuma inserir ao compor e-mails"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Acrescentar texto às mensagens que você envia"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Configurações de notificação"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Uso de dados"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"Políticas de segurança"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Editar resposta rápida"</string>
     <string name="save_action" msgid="1988862706623227093">"Salvar"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Sincronizar contatos"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sincronizar contatos para esta conta"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sincronizar agenda"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Sincronizar agenda para esta conta"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Sincronizar agenda"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Sinc. evento agenda p/ esta conta"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincronizar e-mail"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronizar e-mail para esta conta"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrar"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> resultados de <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Configurações"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"Geral"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Configurações gerais"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"Aplicativo"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Avanço automático"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Selecione qual tela mostrar após a exclusão de uma mensagem"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Ocultar caixas de seleção"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"Nas listas de mensagens, a mantenha pressionada para selecionar"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Confirmar antes de excluir"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Mensagens"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Confirmar antes de enviar"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Mensagens"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Avançar até"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Mensagem mais recente"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Mensagem antiga"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"Aguardando resultados"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Alguns servidores podem levar um longo tempo."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Pastas"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Desativar o uso da câmera do dispositivo"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Exigir senha para o dispositivo"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"Restringir reutiliz. de senhas recentes"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"Exigir que as senhas expirem"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"Exigir dispositivo inativo p/ bloq. tela"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"Limitar número de eventos de agenda sincronizados"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"Limitar número de e-mails sincronizados"</string>
+    <string name="quick_1" msgid="3426057697353380951">"Obrigado!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"Parece uma boa ideia!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"Lerei isso mais tarde e darei uma resposta a você."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Podemos marcar uma reunião para discutir isso."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"A sincronização em segundo plano para essa conta é desativada durante o roaming."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"Enviando resposta..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"Nenhuma mensagem."</string>
 </resources>
diff --git a/res/values-pt/uploader.xml b/res/values-pt/uploader.xml
index bf9b379..f236164 100644
--- a/res/values-pt/uploader.xml
+++ b/res/values-pt/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Ocultar detalhes"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Configurações"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Enviado %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Conta"</string>
     <string name="upload" msgid="2615541458361216022">"Enviar"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 6327cd1..ce54963 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -18,11 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- no translation found for permission_read_attachment_label (9208086010625033590) -->
     <skip />
-    <!-- no translation found for permission_read_attachment_desc (6592948507403743153) -->
+    <!-- no translation found for permission_read_attachment_desc (3394721085306308972) -->
     <skip />
     <!-- no translation found for permission_access_provider_label (378256653525377586) -->
     <skip />
-    <!-- no translation found for permission_access_provider_desc (2221907862438022705) -->
+    <!-- no translation found for permission_access_provider_desc (6296566558584670348) -->
     <skip />
     <string name="app_name" msgid="5815426892327290362">"E-mail"</string>
     <string name="compose_title" msgid="427986915662706899">"Nov messadi"</string>
@@ -44,7 +44,7 @@
     <skip />
     <!-- no translation found for delete_quick_response_action (3076922270182841978) -->
     <skip />
-    <!-- no translation found for quick_responses_empty_view (1693308598242828422) -->
+    <!-- no translation found for quick_responses_empty_view (3960050972306132367) -->
     <skip />
     <string name="discard_action" msgid="6532206074859505968">"Sbittar"</string>
     <!-- no translation found for save_draft_action (6413714270991417223) -->
@@ -62,7 +62,7 @@
     <string name="account_settings_action" msgid="4494079183315085171">"Parameters dal conto"</string>
     <!-- no translation found for settings_action (6334807007967459412) -->
     <skip />
-    <!-- no translation found for mailbox_settings_action (8008375875310554776) -->
+    <!-- no translation found for menu_folder_options (2871906096248843471) -->
     <skip />
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Marcar sco nunlegì"</string>
     <!-- no translation found for move_action (3059189775933985898) -->
@@ -177,7 +177,8 @@
     <skip />
     <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
     <skip />
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Vus stuais agiuntar almain in destinatur."</string>
+    <!-- no translation found for message_compose_error_no_recipients (140299472517968199) -->
+    <skip />
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Tschertas adressas dad e-mail èn nuncorrectas."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"L\'agiunta è memia gronda."</string>
     <!-- no translation found for message_compose_insert_quick_response_list_title (5314107302508728189) -->
@@ -206,9 +207,10 @@
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Fermar"</string>
     <!-- no translation found for message_view_status_attachment_saved (8878790392556284868) -->
     <skip />
-    <!-- no translation found for message_view_status_attachment_not_saved (2433097334272991035) -->
+    <!-- no translation found for message_view_status_attachment_not_saved (4013475734255421939) -->
     <skip />
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Remartga: Ina u pliras agiuntas en Voss messadi renvià vegn(an) telechargiada(s) avant la spediziun."</string>
+    <!-- no translation found for message_view_attachment_background_load (7906875687519445185) -->
+    <skip />
     <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
     <skip />
     <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
@@ -287,7 +289,7 @@
     <skip />
     <!-- no translation found for forward_download_failed_title (6139701848515572511) -->
     <skip />
-    <!-- no translation found for login_failed_ticker (5749227022559285302) -->
+    <!-- no translation found for login_failed_ticker (2169365211566829350) -->
     <skip />
     <!-- no translation found for login_failed_title (7624349996212476176) -->
     <skip />
@@ -315,21 +317,16 @@
     <skip />
     <!-- no translation found for account_setup_basics_title (3578333196594678422) -->
     <skip />
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Agiuntar in conto Exchange"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Agiuntar in conto Exchange ActiveSync"</string>
     <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
     <skip />
-    <!-- no translation found for accounts_welcome (1491126253077950685) -->
-    <skip />
-    <!-- no translation found for accounts_welcome_exchange (4432917203403596617) -->
-    <skip />
-    <!-- no translation found for accounts_welcome_exchange_alternate (1319376442032224845) -->
+    <!-- no translation found for accounts_welcome (8337750045270269649) -->
     <skip />
     <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
     <skip />
     <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
     <skip />
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Trametter ils e-mails tenor standard cun quest conto"</string>
+    <!-- no translation found for account_setup_basics_default_label (8896222991837026736) -->
+    <skip />
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Configuraziun manuala"</string>
     <!-- no translation found for account_setup_username_password_toast (3968270274727947460) -->
     <skip />
@@ -344,7 +341,7 @@
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Ils parameters dil server da sortida vegnan controllads…"</string>
     <!-- no translation found for account_setup_names_title (8483517350241119291) -->
     <skip />
-    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <!-- no translation found for account_setup_names_headline (914858472109729140) -->
     <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Dar in num al conto (facultativ)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Voss num (vegn mussà en messadis che sortan)"</string>
@@ -361,8 +358,8 @@
     <skip />
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Num d\'utilisader"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Pled-clav"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Server POP3"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"Server IMAP"</string>
+    <!-- no translation found for account_setup_incoming_server_label (1480342966630002638) -->
+    <skip />
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Tip da segirezza"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Nagin"</string>
@@ -386,7 +383,8 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Server SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Tip da segirezza"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Annunzia obligatorica"</string>
+    <!-- no translation found for account_setup_outgoing_require_login_label (7779484127897397562) -->
+    <skip />
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Num d\'utilisader"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Pled-clav"</string>
     <!-- no translation found for account_setup_exchange_title (396004732514751781) -->
@@ -421,11 +419,16 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Mintga 15 minutas"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Mintga 30 minutas"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Mintga ura"</string>
-    <string name="account_setup_options_default_label" msgid="8869166381331276697">"\"Trametter ils e-mails da quest conto, tenor standard.\""</string>
-    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Mussar in avis cura ch\'in e-mail arriva"</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sincronisar ils contacts da quest conto"</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sincronisar il chalender da quest conto"</string>
-    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sincronisar ils e-mails da quest conto."</string>
+    <!-- no translation found for account_setup_options_default_label (2617227194283720914) -->
+    <skip />
+    <!-- no translation found for account_setup_options_notify_label (7046146571560728829) -->
+    <skip />
+    <!-- no translation found for account_setup_options_sync_contacts_label (276492345599531778) -->
+    <skip />
+    <!-- no translation found for account_setup_options_sync_calendar_label (3222151135467189411) -->
+    <skip />
+    <!-- no translation found for account_setup_options_sync_email_label (8585177128405004068) -->
+    <skip />
     <!-- no translation found for account_setup_options_background_attachments_label (5247749298276451846) -->
     <skip />
     <!-- no translation found for account_setup_failed_dlg_title (9083263347962940552) -->
@@ -443,17 +446,19 @@
     <skip />
     <!-- no translation found for account_setup_options_mail_window_default (8321351926520165832) -->
     <skip />
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Num d\'utilisader u pled-clav nuncorrect."</string>
-    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Num d\'utilisader u pled-clav nuncorrect."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <!-- no translation found for account_setup_failed_dlg_auth_message (426627755590431364) -->
+    <skip />
+    <!-- no translation found for account_setup_failed_dlg_auth_message_fmt (737111956772240007) -->
+    <skip />
     <!-- no translation found for account_setup_failed_dlg_certificate_message (3836152264696108805) -->
     <skip />
     <!-- no translation found for account_setup_failed_dlg_certificate_message_fmt (2121921642915593041) -->
     <skip />
-    <!-- no translation found for account_setup_failed_certificate_required (1280569002588325367) -->
+    <!-- no translation found for account_setup_failed_certificate_required (2689944595775206006) -->
     <skip />
-    <!-- no translation found for account_setup_failed_certificate_inaccessible (7245835883180762722) -->
+    <!-- no translation found for account_setup_failed_certificate_inaccessible (3563840279690749547) -->
     <skip />
-    <!-- no translation found for account_setup_failed_check_credentials_message (222908719765968691) -->
+    <!-- no translation found for account_setup_failed_check_credentials_message (6531658092540248067) -->
     <skip />
     <!-- no translation found for account_setup_failed_dlg_server_message (4942810054116129684) -->
     <skip />
@@ -483,8 +488,17 @@
     <skip />
     <!-- no translation found for account_security_dialog_content_fmt (8843806143923278214) -->
     <skip />
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Il conto «<xliff:g id="ACCOUNT">%s</xliff:g>» basegna ina actualisaziun dals parameters da segirezza."</string>
-    <!-- no translation found for security_notification_content_title (3352841884304076235) -->
+    <!-- no translation found for security_unsupported_ticker_fmt (5166579214529283975) -->
+    <skip />
+    <!-- no translation found for security_needed_ticker_fmt (2120499087897133665) -->
+    <skip />
+    <!-- no translation found for security_changed_ticker_fmt (2609435447352755285) -->
+    <skip />
+    <!-- no translation found for security_notification_content_update_title (2429762903228690154) -->
+    <skip />
+    <!-- no translation found for security_notification_content_change_title (443490921895642130) -->
+    <skip />
+    <!-- no translation found for security_notification_content_unsupported_title (7315219208043169233) -->
     <skip />
     <!-- no translation found for account_security_title (3511543138560418587) -->
     <skip />
@@ -501,17 +515,17 @@
     <skip />
     <!-- no translation found for password_expire_warning_dialog_title (1687074175399798189) -->
     <skip />
-    <!-- no translation found for password_expire_warning_dialog_content_fmt (4595246020880351045) -->
+    <!-- no translation found for password_expire_warning_dialog_content_fmt (4293446611405084436) -->
     <skip />
     <!-- no translation found for password_expired_dialog_title (2186547998125938084) -->
     <skip />
-    <!-- no translation found for password_expired_dialog_content_fmt (5982207349002500211) -->
+    <!-- no translation found for password_expired_dialog_content_fmt (6538210092073931079) -->
     <skip />
     <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
     <skip />
     <!-- no translation found for account_settings_login_dialog_title (4024422579146302775) -->
     <skip />
-    <!-- no translation found for account_settings_login_dialog_content_fmt (3492735234999710234) -->
+    <!-- no translation found for account_settings_login_dialog_content_fmt (8849649646111167377) -->
     <skip />
     <string name="account_settings_default_label" msgid="3575963379680943640">"Conto predefinì"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Trametter ils e-mails tenor standard cun quest conto"</string>
@@ -521,7 +535,7 @@
     <skip />
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Avis ad e-mails"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"\"Frequenza da sincronisaziun, avis, etc.\""</string>
-    <!-- no translation found for account_settings_notify_summary (6301122709602752038) -->
+    <!-- no translation found for account_settings_notify_summary (8134339460923068254) -->
     <skip />
     <!-- no translation found for account_settings_mail_check_frequency_label (8271462919214560616) -->
     <skip />
@@ -531,25 +545,40 @@
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Parameters da sortida"</string>
     <!-- no translation found for account_settings_outgoing_summary (3572093624332724311) -->
     <skip />
+    <!-- no translation found for account_settings_enforced_label (7429582254433588882) -->
+    <skip />
+    <!-- no translation found for account_settings_enforced_summary (8140860420440447771) -->
+    <skip />
+    <!-- no translation found for account_settings_unsupported_label (1954091071454235577) -->
+    <skip />
+    <!-- no translation found for account_settings_unsupported_summary (2107633813351863608) -->
+    <skip />
+    <!-- no translation found for account_settings_retry_label (1104680719299842829) -->
+    <skip />
+    <!-- no translation found for account_settings_retry_summary (2703599639846201913) -->
+    <skip />
     <string name="account_settings_description_label" msgid="8894815221204511715">"Num dal conto"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Voss num"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Signatura"</string>
     <!-- no translation found for account_settings_edit_quick_responses_label (3106019627675996480) -->
     <skip />
-    <!-- no translation found for account_settings_edit_quick_responses_summary (5284435342418252369) -->
+    <!-- no translation found for account_settings_edit_quick_responses_summary (8056686122888722591) -->
     <skip />
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Agiuntar in text als messadis che sortan"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Parameters dad avis"</string>
     <!-- no translation found for account_settings_data_usage (6669107430575866736) -->
     <skip />
+    <!-- no translation found for account_settings_policies (6292833636418641840) -->
+    <skip />
     <!-- no translation found for edit_quick_response_dialog (4322494050816995390) -->
     <skip />
     <!-- no translation found for save_action (1988862706623227093) -->
     <skip />
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Sincronisar ils contacts"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sincronisar ils contacts per quest conto"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sincronisar il chalender"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Sincronisar il chalender per quest conto"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Sincronisar il chalender"</string>
+    <!-- no translation found for account_settings_sync_calendar_summary (7606340353079301703) -->
+    <skip />
     <!-- no translation found for account_settings_sync_email_enable (3754115565685222477) -->
     <skip />
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronisar ils e-mails per quest conto"</string>
@@ -603,7 +632,7 @@
   </plurals>
     <!-- no translation found for settings_activity_title (5185915603716333904) -->
     <skip />
-    <!-- no translation found for header_label_general_preferences (9204600297009680176) -->
+    <!-- no translation found for header_label_general_preferences (8243724566056800991) -->
     <skip />
     <!-- no translation found for category_general_preferences (2742423840964045801) -->
     <skip />
@@ -611,6 +640,18 @@
     <skip />
     <!-- no translation found for general_preference_auto_advance_summary (6483439980032715119) -->
     <skip />
+    <!-- no translation found for general_preference_hide_checkboxes_label (2054599123778503930) -->
+    <skip />
+    <!-- no translation found for general_preference_hide_checkboxes_summary (141341137898712712) -->
+    <skip />
+    <!-- no translation found for general_preference_confirm_delete_label (1863245465244241907) -->
+    <skip />
+    <!-- no translation found for general_preference_confirm_delete_summary (6710240861010766643) -->
+    <skip />
+    <!-- no translation found for general_preference_confirm_send_label (4548277349553989930) -->
+    <skip />
+    <!-- no translation found for general_preference_confirm_send_summary (2695471027185506093) -->
+    <skip />
     <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
     <skip />
     <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
@@ -684,6 +725,32 @@
     <skip />
     <!-- no translation found for action_bar_mailbox_list_title (7484457755531286333) -->
     <skip />
+    <!-- no translation found for policy_dont_allow_camera (5744573062306937302) -->
+    <skip />
+    <!-- no translation found for policy_require_password (7177274900480984702) -->
+    <skip />
+    <!-- no translation found for policy_password_history (5743544498302303181) -->
+    <skip />
+    <!-- no translation found for policy_password_expiration (1248123255253649199) -->
+    <skip />
+    <!-- no translation found for policy_screen_timeout (414869965358468080) -->
+    <skip />
+    <!-- no translation found for policy_calendar_age (627405158087482302) -->
+    <skip />
+    <!-- no translation found for policy_email_age (7144148367145424963) -->
+    <skip />
+    <!-- no translation found for quick_1 (3426057697353380951) -->
+    <skip />
+    <!-- no translation found for quick_2 (4188036352885736617) -->
+    <skip />
+    <!-- no translation found for quick_3 (8061819976353395585) -->
+    <skip />
+    <!-- no translation found for quick_4 (3988974084396883051) -->
+    <skip />
     <!-- no translation found for require_manual_sync_message (7777357288642785955) -->
     <skip />
+    <!-- no translation found for confirm_response (5747902757569543165) -->
+    <skip />
+    <!-- no translation found for no_conversations (5559527390337162819) -->
+    <skip />
 </resources>
diff --git a/res/values-rm/uploader.xml b/res/values-rm/uploader.xml
index 1faf9ef..1f6568e 100644
--- a/res/values-rm/uploader.xml
+++ b/res/values-rm/uploader.xml
@@ -49,7 +49,7 @@
     <skip />
     <!-- no translation found for format_date_uploaded (803752037646090928) -->
     <skip />
-    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <!-- no translation found for format_progress_percent (4347398038122210157) -->
     <skip />
     <!-- no translation found for account (5199161365824352613) -->
     <skip />
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index dafedab..1184495 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"Citiţi ataşamentele e-mailurilor"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Permite aplicaţiei citirea ataşamentelor de e-mail."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Permite aplicaţiei citirea ataşamentelor de e-mail."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Accesaţi datele furnizorului de e-mail"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Permite acestei aplicaţii accesul la baza de date a adresei de e-mail, incluzând mesajele primite, mesajele trimise, numele de utilizatori şi parolele."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Permite aplicaţiei să acceseze baza de date a adresei de e-mail, incluzând mesajele primite, mesajele trimise, numele de utilizator şi parolele."</string>
     <string name="app_name" msgid="5815426892327290362">"E-mail"</string>
     <string name="compose_title" msgid="427986915662706899">"Scrieţi"</string>
     <string name="debug_title" msgid="5175710493691536719">"Remediaţi erorile"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"Terminat"</string>
     <string name="create_action" msgid="3062715563215392251">"Creaţi unul nou"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"Ştergeţi"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"Nu există răspunsuri rapide"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Nu există răspunsuri rapide."</string>
     <string name="discard_action" msgid="6532206074859505968">"Renunţaţi"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"Salvaţi m. nef."</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Introd. un răspuns rapid"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"Căutaţi"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Setările contului"</string>
     <string name="settings_action" msgid="6334807007967459412">"Setări"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"Opţiuni de sincronizare"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Opţiuni de sincronizare"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Marcaţi drept necitit"</string>
     <string name="move_action" msgid="3059189775933985898">"Mutaţi"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> a scris:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Includeţi textul citat"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Includeţi textul"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Trebuie să adăugaţi cel puţin un destinatar."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"Adăugaţi cel puţin un destinatar."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Unele adrese de e-mail sunt nevalide."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Fişierul este prea mare pentru a fi ataşat."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Introduceţi un răspuns rapid"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Salvat"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Opriţi"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Ataşament salvat ca <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Nu s-a salvat ataşamentul."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Notă: unul sau mai multe ataşamente din mesajul dvs. redirecţionat vor fi descărcate înainte de a fi trimise."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"Ataşamentul nu s-a salvat."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Unul sau mai multe ataşamente din mesajul dvs. redirecţionat vor fi descărcate înainte de a fi trimise."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Mesaj"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Invitaţi"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Nu se pot redirecţiona unul sau mai multe ataşamente."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Ataşamentul nu a fost trimis"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"Conectare eşuată la <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"Conectare eşuată pentru <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"Nu s-a putut conecta"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> O"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Mai vechi"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" – "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Configurare cont"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Adăugaţi un cont Exchange"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Adăugaţi un cont Exchange ActiveSync"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"Cont de e-mail"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"Puteţi configura e-mailul pentru cele mai multe conturi, urmând doar câţiva paşi."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Puteţi să configuraţi un cont Exchange urmând doar câţiva paşi."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Puteţi să configuraţi un cont Exchange ActiveSync urmând doar câţiva paşi."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Puteţi configura contul dvs. în doar câţiva paşi."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Adresă de e-mail"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Parolă"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Trimiteţi e-mailuri din acest cont în mod prestabilit."</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"Trimiteţi e-mailuri de pe acest cont în mod prestabilit"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Configurare manuală"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Introduceţi o adresă de e-mail şi o parolă valide."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Cont duplicat"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Se verifică setările pentru serverul mesajelor de intrare..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Se verifică setările serverului de mesaje de ieşire..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Configurare cont"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"Contul este configurat, iar e-mailul funcţionează corect!"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"Contul este configurat, iar e-mailul funcţionează corect!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Daţi un nume acestui cont (opţional)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Numele dvs. (afişat în mesajele de trimitere)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Acest câmp nu poate rămâne necompletat."</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Setări pentru serverul de mesaje de intrare"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nume de utilizator"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Parolă"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Server POP3"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"Server IMAP"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Server"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Tipul de securitate"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Niciunul"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Server SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Tipul de securitate"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Solicitaţi conectarea."</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Necesită conectare"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nume de utilizator"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Parolă"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"Configurare cont"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"La fiecare 15 minute"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"La fiecare 30 de minute"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"La fiecare oră"</string>
-    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Trimiteţi e-mailuri din acest cont"</string>
-    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Doresc să primesc notificare la primirea de e-mailuri."</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Doresc sincronizarea agendei acestui cont."</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sincronizaţi calendarul acestui cont."</string>
-    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sincron. e-mail din acest cont."</string>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"Trimiteţi e-mailuri de pe acest cont în mod prestabilit"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Doresc să fiu notificat(ă) la primirea de e-mailuri"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Doresc sincronizarea agendei acestui cont"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Doresc sincronizarea calendarului acestui cont"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Doresc sincronizarea mesajelor de e-mail din acest cont"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Doresc să se descarce automat ataşamentele când sunt conectat(ă) la Wi-Fi"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Nu s-a putut finaliza"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Zile pentru sincronizare"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"O lună"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Toate"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Setări prestabilite cont"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Nume de utilizator sau parolă incorectă."</string>
-    <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_auth_message" msgid="426627755590431364">"Numele de utilizator sau parola sunt incorecte."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"Numele de utilizator sau parola sunt incorecte."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Nu se poate conecta în siguranţă la server."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Nu se poate conecta în siguranţă la server."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"Este necesar un certificat de client. Vă conectaţi la server cu un certificat de client?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"Certificat nevalid sau inaccesibil."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"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_certificate_required" msgid="2689944595775206006">"Este necesar un certificat de client. Doriţi să vă conectaţi la server cu un certificat de client?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"Certificat nevalid sau inaccesibil."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"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="4942810054116129684">"Nu se poate conecta la server."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Nu se poate conecta la server."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS solicitat, dar neacceptat de către server."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"AVERTISMENT: dacă dezactivaţi autoritatea aplicaţiei E-mail de administrare a dispozitivului dvs. se şterg toate conturile de e-mail care au nevoie de aceasta, împreună cu e-mailurile, agenda, evenimentele din calendar şi alte date pe care aceste conturi le conţin."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Actualizare de securitate"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> vă solicită actualizarea setărilor dvs. de securitate."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Contul „<xliff:g id="ACCOUNT">%s</xliff:g>” necesită actualizarea setărilor de securitate."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"Actual. de securitate necesară"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Contul „<xliff:g id="ACCOUNT">%s</xliff:g>” nu poate fi sincronizat din cauza cerinţelor de securitate."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"Contul „<xliff:g id="ACCOUNT">%s</xliff:g>” necesită actualizarea setărilor de securitate."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"Contul „<xliff:g id="ACCOUNT">%s</xliff:g>” şi-a schimbat setările de securitate. Nu este necesară nicio acţiune din partea utilizatorului."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Actualizare de securitate obligatorie"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Pol. securitate s-au schimbat"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Politici securitate nerespect."</string>
     <string name="account_security_title" msgid="3511543138560418587">"Securitatea dispozitivului"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Serverul <xliff:g id="SERVER">%s</xliff:g> vă solicită permisiunea de a controla de la distanţă unele caracteristici de securitate ale dispozitivului dvs. Android."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Modificaţi detaliile"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"Codul PIN sau parola de blocare a ecranului a expirat."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"Parolă bloc. ecran. expirată"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Parola de blocare ecran expiră în curând"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"Este necesar să modificaţi în curând codul PIN sau parola de blocare a ecranului. În caz contrar, datele pentru <xliff:g id="ACCOUNT">%s</xliff:g> vor fi şterse. Modificaţi acum?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Este necesar să modificaţi curând codul PIN sau parola ecranului de blocare; în caz contrar datele pentru <xliff:g id="ACCOUNT">%s</xliff:g> vor fi şterse. Modificaţi acum?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"Parola de blocare ecran expirată"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"Datele pentru <xliff:g id="ACCOUNT">%s</xliff:g> sunt şterse de pe dispozitiv, dar le puteţi restabili modificând codul PIN sau parola de blocare a ecranului. Modificaţi acum?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"Datele pentru <xliff:g id="ACCOUNT">%s</xliff:g> sunt şterse de pe dispozitiv, dar le puteţi restabili modificând codul PIN sau parola de blocare a ecranului. Modificaţi acum?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Renunţaţi la modificările nesalvate?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Nu s-a putut conecta"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Numele de utilizator sau parola pentru <xliff:g id="ACCOUNT">%s</xliff:g> este incorectă. Le actualizaţi acum?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"Numele de utilizator sau parola pentru <xliff:g id="ACCOUNT">%s</xliff:g> sunt incorecte. Doriţi să le actualizaţi acum?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Cont prestabilit"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Trimiteţi e-mailuri de pe acest cont în mod prestabilit"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Descărcaţi ataşamentele"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Descărcaţi în mod automat prin Wi-Fi ataşam. mesaj. recente"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Notificările de e-mail"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Frecvenţa sincronizării, notificări etc."</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"Doresc să fiu notificat(ă) în bara de sistem la primirea e-mailurilor"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Trimiteţi notificare la primire e-mail"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Frecvenţa verificării mesajelor primite"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Setări pentru mesajele primite"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Nume utilizator, parolă şi alte setări pt. serverul de primire"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Setări pentru mesajele de trimitere"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Nume utilizator, parolă şi alte setări pt. server de trimitere"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Politicile puse în aplicare"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Niciunul"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Politici neacceptate"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Niciunul"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"Încercaţi sincronizarea"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Atingeţi aici pentru a sincroniza acest cont"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Numele contului"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Numele dvs."</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Semnătura"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Răspunsuri rapide"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Editaţi textul introdus frecvent când scrieţi e-mailuri"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Editaţi textul introdus frecvent când scrieţi e-mailuri"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Adăugaţi text la mesajele trimise"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Setări pentru notificări"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Utilizarea datelor"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"Politici de securitate"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Editaţi răspunsul rapid"</string>
     <string name="save_action" msgid="1988862706623227093">"Salvaţi"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Sincronizaţi persoanele din agendă"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sincron. agenda pt. acest cont"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sincron. Calendar"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Sincron. calendarul pt. acest cont"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Sincronizaţi calendarul"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Sincron. evenim. calendar pt. cont"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincroniz. e-mailul"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincron. e-mail pt. acest cont"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrare"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> (de) rezultate din <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Setări"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"Generale"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Setări generale"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"Aplicaţie"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Înaintare automată"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Alegeţi ce ecran se afişează după ştergerea unui mesaj"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Ascundeţi casetele de validare"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"În listele de mesaje, atingeţi şi ţineţi apăsat pentru a selecta"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Confirmaţi înainte de a şterge"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Mesaje"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Confirmaţi înainte de a trimite"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Mesaje"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Înaintaţi la"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Mesaje mai noi"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Mesaj mai vechi"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"Se aşteaptă rezultatele"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Pentru unele servere poate fi necesar un interval mare de timp."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Dosare"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Nu permiteţi utilizarea camerei foto"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Solicitaţi parola dispozitivului"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"Limitaţi reutilizarea parolelor recente"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"Solicitaţi expirarea parolelor"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"Disp. inactiv necesar pt. blocare ecran"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"Limitare număr evenimente de calendar sincronizate"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"Limitare număr de e-mailuri sincronizate"</string>
+    <string name="quick_1" msgid="3426057697353380951">"Vă mulţumim!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"Sună bine!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"Voi citi mai târziu acest mesaj şi vă voi contacta."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Să stabilim o întâlnire pentru a discuta această acţiune."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Sincronizarea în fundal pentru acest cont este dezactivată în roaming."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"Se trimite răspunsul..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"Niciun mesaj."</string>
 </resources>
diff --git a/res/values-ro/uploader.xml b/res/values-ro/uploader.xml
index b06fe41..a3af219 100644
--- a/res/values-ro/uploader.xml
+++ b/res/values-ro/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Ascundeţi detaliile"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Setări"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Încărcat pe %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Cont"</string>
     <string name="upload" msgid="2615541458361216022">"Încărcaţi"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 3fb8387..8de2bae 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -16,10 +16,10 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="permission_read_attachment_label" msgid="9208086010625033590">"Открывать прикрепленные файлы"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Приложение получит доступ к прикрепленным файлам в сообщениях эл. почты."</string>
+    <string name="permission_read_attachment_label" msgid="9208086010625033590">"Просмотр пересылаемых файлов"</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Приложение получит доступ к прикрепленным файлам в сообщениях электронной почты."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Доступ к данным сервиса эл. почты"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Приложение получит доступ к базе данных программы электронной почты, которая включает полученные и отправленные письма, имена пользователей и пароли."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Приложение получит доступ к базе данных электронной почты, которая содержит полученные и отправленные сообщения, имена пользователей и пароли."</string>
     <string name="app_name" msgid="5815426892327290362">"Email"</string>
     <string name="compose_title" msgid="427986915662706899">"Новое сообщение"</string>
     <string name="debug_title" msgid="5175710493691536719">"Выполнить отладку"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"Готово"</string>
     <string name="create_action" msgid="3062715563215392251">"Создать"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"Удалить"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"Нет шаблонов SMS-ответов"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Нет шаблонов"</string>
     <string name="discard_action" msgid="6532206074859505968">"Отменить"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"Сохранить черновик"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Вставить быстрый ответ"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"Поиск"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Настройки аккаунта"</string>
     <string name="settings_action" msgid="6334807007967459412">"Настройки"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"Параметры синхронизации"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Параметры синхронизации"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Отметить как непрочитанное"</string>
     <string name="move_action" msgid="3059189775933985898">"Переместить"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"Добавить копию"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"Пользователь <xliff:g id="SENDER">%s</xliff:g> писал:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Включить цитируемый текст"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Включить исходный текст в ответ"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Добавьте хотя бы одного получателя."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"Укажите получателя."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Некоторые адреса электронной почты являются недопустимыми."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Файл имеет слишком большой размер и не может быть приложен."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Вставка быстрого ответа"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Сохранено"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Стоп"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Вложение сохранено как <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Файл не сохранен."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Примечание. Несколько прикрепленных файлов в переадресованном сообщении будут загружены перед отправкой."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"Файл не сохранен."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Один или несколько прикрепленных файлов в пересылаемом сообщении будут загружены перед отправкой."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Сообщение"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Пригласить"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Сбой при пересылке прикрепленных файлов."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Не удалось переслать вложение"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"Ошибка авторизации <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"Ошибка при входе в аккаунт <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"Вход не выполнен"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> Б"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"След."</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" – "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Настройка аккаунта"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Добавить аккаунт Exchange"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Добавить аккаунт Exchange ActiveSync"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"Ярлык Email"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"Email поддерживает большинство популярных почтовых служб."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Настроить аккаунт Exchange очень просто."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Настроить аккаунт Exchange ActiveSync очень просто."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Настроить свой аккаунт очень просто."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Адрес электронной почты"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Пароль"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Сделать аккаунтом электронной почты по умолчанию для отправки сообщений."</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"По умолчанию отправлять письма с этого адреса"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Вручную"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Введите действительный адрес электронной почты и пароль."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Копировать аккаунт"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Проверка настроек сервера входящих сообщений..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Проверка настроек сервера исходящих сообщений..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Настройка аккаунта"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"Ваш аккаунт настроен, ждите сообщений!"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"Аккаунт добавлен!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Присвойте этому аккаунту название (по желанию)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Ваше имя (показывается в исходящих сообщениях)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Это поле должно быть заполнено."</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Настройки сервера входящих сообщений"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Имя пользователя"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Пароль"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Сервер POP3"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"Сервер IMAP"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Сервер"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Порт"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Тип безопасности"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Нет"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Сервер SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Порт"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Тип безопасности"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Требовать входа в аккаунт."</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Выполнять вход в систему"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Имя пользователя"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Пароль"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"Настройка аккаунта"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Каждые 15 минут"</string>
     <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_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>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"По умолчанию отправлять письма с этого адреса"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Показывать уведомление при получении новых писем"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Синхронизировать контакты из этого аккаунта"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Синхронизировать календарь из этого аккаунта"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Синхронизировать электронную почту из этого аккаунта"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Автоматически загружать прикрепленные файлы при подключении к Wi-Fi"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Настройка не закончена"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Период синхронизации"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Один месяц"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Все"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Параметры по умолчанию"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Неверное имя пользователя или пароль."</string>
-    <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_auth_message" msgid="426627755590431364">"Неверное имя пользователя или пароль."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"Неверное имя пользователя или пароль."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Не удалось установить защищенное подключение к серверу."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Не удалось установить защищенное подключение к серверу."\n"<xliff:g id="ERROR">%s</xliff:g>"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"Необходим сертификат клиента. Подключиться к серверу?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"Сертификат недействителен или недоступен."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"Ошибка сервера. Проверьте имя пользователя и пароль и повторите попытку."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"Требуется сертификат клиента. Подключиться к серверу с таким сертификатом?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"Сертификат недействителен или недоступен."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"Ошибка сервера. Проверьте имя пользователя и пароль и повторите попытку."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"Не удалось подключиться к серверу."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Не удалось подключиться к серверу."\n"<xliff:g id="ERROR">%s</xliff:g>"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS не поддерживается сервером."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"ВНИМАНИЕ! Отключение прав на администрирование вашего устройства для приложения Email приведет к удалению всех аккаунтов электронной почты, которые используют эти права. Кроме того, будут удалены все письма, контакты, календари и другие данные, связанные с этими аккаунтами."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Обновления безопасности"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"Для аккаунта <xliff:g id="ACCOUNT">%s</xliff:g> требуется обновить настройки безопасности."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Аккаунт \"<xliff:g id="ACCOUNT">%s</xliff:g>\" требует обновления настроек безопасности."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"Обновите систему безопасности"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Настройки безопасности не позволяют синхронизировать аккаунт <xliff:g id="ACCOUNT">%s</xliff:g>."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"В аккаунте <xliff:g id="ACCOUNT">%s</xliff:g> требуется обновить настройки безопасности."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"В аккаунте <xliff:g id="ACCOUNT">%s</xliff:g> обновлены настройки безопасности. Ничего делать не нужно."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Обновите систему безопасности"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Политики безопасности изменены"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Политики не выполнены"</string>
     <string name="account_security_title" msgid="3511543138560418587">"Безопасность устройства"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Серверу <xliff:g id="SERVER">%s</xliff:g> требуется разрешение на удаленное управление некоторыми функциями безопасности устройства Android."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Изменить сведения"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"Срок действия вашего PIN-кода или пароля блокировки экрана истек."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"Пароль блок. экрана устарел"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Истекает срок действия пароля"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"Вам следует в ближайшее время изменить PIN-код или пароль блокировки экрана, иначе данные аккаунта <xliff:g id="ACCOUNT">%s</xliff:g> будут удалены. Изменить сейчас?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Скоро вам потребуется изменить PIN-код или пароль для блокировки экрана, иначе данные аккаунта <xliff:g id="ACCOUNT">%s</xliff:g> будут удалены. Изменить PIN-код или пароль сейчас?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"Пароль блокировки экрана устарел"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"Данные аккаунта <xliff:g id="ACCOUNT">%s</xliff:g> удаляются с вашего устройства. Вы можете восстановить их, изменив свой PIN-код или пароль блокировки экрана. Изменить его сейчас?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"Данные аккаунта <xliff:g id="ACCOUNT">%s</xliff:g> удаляются с устройства. Вы можете восстановить их, изменив свой PIN-код или пароль блокировки экрана. Сделать это сейчас?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Отменить несохраненные изменения?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Не удалось войти в аккаунт."</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Неверное имя пользователя или пароль аккаунта <xliff:g id="ACCOUNT">%s</xliff:g>. Обновить их сейчас?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"Неверное имя пользователя или пароль для доступа в аккаунт <xliff:g id="ACCOUNT">%s</xliff:g>. Изменить их?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Аккаунт по умолчанию"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Сделать аккаунтом электронной почты по умолчанию для отправки сообщений"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Загружать прикрепленные файлы"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Автоматически загружать файлы из новых сообщений через Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Уведомления электронной почты"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Частота синхронизации, уведомления и другие настройки"</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"При получении почты показывать оповещение в строке состояния системы"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Показывать уведомление при получении новых писем"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Частота проверки папки \"Входящие\""</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Настройки входящих сообщений"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Имя пользователя, пароль и др. настройки сервера входящей почты"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Настройки исходящих сообщений"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Имя пользователя, пароль и др. настройки сервера исходящей почты"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Политики применены"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Нет"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Неподдерживаемые политики"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Нет"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"Синхронизировать"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Нажмите, чтобы синхронизировать данные"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Название аккаунта"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Ваше имя"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Подпись"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Быстрые ответы"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Изменить текст, который часто используется в ваших письмах"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Использовать шаблоны для стандартных ответов"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Добавлять текст к отправляемым сообщениям"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Настройки уведомлений"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Использование данных"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"Политики безопасности"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Изменить быстрый ответ"</string>
     <string name="save_action" msgid="1988862706623227093">"Сохранить"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Синхронизировать контакты"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Синхронизировать контакты этого аккаунта"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Синхронизировать календарь"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Синхронизировать календарь этого аккаунта"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Синхронизировать календарь"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Синхронизация мероприятий"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Синхр. почту"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Синхронизировать почту этого аккаунта"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Вибросигнал"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"Кол-во результатов: <xliff:g id="RESULTS">%1$d</xliff:g> с <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Настройки"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"Общие"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Общие настройки"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"Приложение"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Автопереход"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Выберите экран для отображения после удаления цепочки писем"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Скрыть флажки"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"Чтобы выбрать сообщение в списке, нажмите и удерживайте его."</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Подтверждать удаление"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Сообщения"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Подтверждать отправку"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Сообщения"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Переходить к"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Предыдущему сообщению"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Следующему сообщению"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"Ожидание результатов"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Ожидание ответа от сервера может занять много времени."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Папки"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Запрещать использовать камеру"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Запрашивать пароль для разблокировки"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"Запрещать использовать прежние пароли"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"Ограничивать время действия паролей"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"Блокировать экран при простое"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"Ограничить число синхр. событий календаря"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"Ограничить число синхр. сообщений эл. почты"</string>
+    <string name="quick_1" msgid="3426057697353380951">"Спасибо!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"Отличная идея!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"Я отвечу позже."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Это нужно обсудить при встрече."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Для этого аккаунта отключена фоновая синхронизация в роуминге."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"Отправка ответа…"</string>
+    <string name="no_conversations" msgid="5559527390337162819">"Писем нет."</string>
 </resources>
diff --git a/res/values-ru/uploader.xml b/res/values-ru/uploader.xml
index 08dbd9e..247ac01 100644
--- a/res/values-ru/uploader.xml
+++ b/res/values-ru/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Скрыть подробности"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Настройки"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Загружено %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Аккаунт"</string>
     <string name="upload" msgid="2615541458361216022">"Загрузить"</string>
     <string name="ok" msgid="2516349681897895312">"ОК"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 0d62114..5f18150 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"Čítať e-mailové prílohy"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Umožňuje tejto aplikácii čítať prílohy vašich e-mailov."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Povoľuje aplikácii čítať prílohy vašich e-mailov."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Prístup k údajom poskytovateľa e-mailu"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Povoľuje tejto aplikácii prístup do databázy e-mailu, vrátane prijatých a odoslaných správ, používateľských mien a hesiel."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Povoľuje aplikácii prístup do databázy e-mailu vrátane prijatých a odoslaných správ, používateľských mien a hesiel."</string>
     <string name="app_name" msgid="5815426892327290362">"Email"</string>
     <string name="compose_title" msgid="427986915662706899">"Napísať správu"</string>
     <string name="debug_title" msgid="5175710493691536719">"Ladiť"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"Hotovo"</string>
     <string name="create_action" msgid="3062715563215392251">"Vytvoriť novú"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"Odstrániť"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"Žiadne rýchle odpovede"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Žiadne rýchle odpovede."</string>
     <string name="discard_action" msgid="6532206074859505968">"Zahodiť"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"Uložiť koncept"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Vložiť rýchlu odpoveď"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"Hľadať"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Nastavenia účtu"</string>
     <string name="settings_action" msgid="6334807007967459412">"Nastavenia"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"Možnosti synchronizácie"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Možnosti synchronizácie"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Označiť ako neprečítané"</string>
     <string name="move_action" msgid="3059189775933985898">"Presunúť"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+Kópia/skr.kópia"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g>napísal/a:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Zahrnúť citovaný text"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Zahrnúť text"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Musíte pridať aspoň jedného príjemcu."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"Pridajte aspoň jedného príjemcu."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Niektoré e-mailové adresy sú neplatné."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Súbor nie je možné priložiť, pretože je príliš veľký."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Vložiť rýchlu odpoveď"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Uložené"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Zastaviť"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Príloha uložená ako <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Prílohu sa nepodarilo uložiť."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Poznámka: Pred odoslaním sa prevezme jedna alebo viac príloh zo správy posielanej ďalej."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"Prílohu sa nepodarilo uložiť."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Pred odoslaním sa prevezme jedna alebo viacero príloh zo správy posielanej ďalej."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Správa"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Pozvať"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Nepodarilo sa poslať ďalej jednu alebo viac príloh."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Príloha nebola poslaná ďalej"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"Prihlásenie do účtu <xliff:g id="ACCOUNT_NAME">%s</xliff:g> zlyhalo."</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"Prihlásenie do účtu <xliff:g id="ACCOUNT_NAME">%s</xliff:g> zlyhalo."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"Prihlásenie sa nepodarilo"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Staršie"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Nastavenie účtu"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Pridať účet Exchange"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Pridať účet Exchange ActiveSync"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"E-mailový účet"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"Väčšinu e-mailových účtov môžete nastaviť pomocou niekoľkých jednoduchých krokov."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Účet služby Exchange môžete nastaviť pomocou niekoľkých krokov."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Účet služby Exchange ActiveSync môžete nastaviť pomocou niekoľkých krokov."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Účet si môžete nastaviť pomocou niekoľkých krokov."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"E-mailová adresa"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Heslo"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"V predvolenom nastavení odosielať e-maily z tohto účtu."</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"V predvolenom nastavení odosielať e-maily z tohto účtu"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Ručné nastavenie"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Zadajte platnú e-mailovú adresu a heslo."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Duplikovať účet"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Kontrola nastavení servera prichádzajúcej pošty…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Kontrola nastavení servera odchádzajúcej pošty…"</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Nastavenie účtu"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"Váš účet je nastavený, e-mail je na ceste!"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"Váš účet je nastavený a e-mail je na ceste!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Pomenovať tento účet (nepovinné)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Vaše meno (zobrazované na odchádzajúcich správach)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Toto pole nesmie byť prázdne."</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Nastavenia servera prichádzajúcej pošty"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Používateľské meno"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Heslo"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Server POP3"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"Server IMAP"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Server"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Typ zabezpečenia"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Žiadne"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Server SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Typ zabezpečenia"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Požadovať prihlásenie"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Vyžadovať prihlásenie"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Používateľské meno"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Heslo"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"Nastavenie účtu"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Každých 15 minút"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Každých 30 minút"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Každú hodinu"</string>
-    <string name="account_setup_options_default_label" msgid="8869166381331276697">"V predvolenom nastavení odosielať e-maily z tohto účtu."</string>
-    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Upozorniť ma na príchod e-mailu"</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Synchronizovať kontakty z tohto účtu."</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Synchronizovať kalendár z tohto účtu."</string>
-    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Synchronizovať e-mail z tohto účtu."</string>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"V predvolenom nastavení odosielať e-maily z tohto účtu"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Upozorniť ma na príchod e-mailu"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Synchronizovať kontakty z tohto účtu"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Synchronizovať kalendár z tohto účtu"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Synchronizovať e-mail z tohto účtu"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Automaticky preberať prílohy počas pripojenia k sieti Wi-Fi"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Nepodarilo sa dokončiť"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Počet dní na synchronizáciu"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Jeden mesiac"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Všetky"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Použiť predv. nast. účtu"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Používateľské meno alebo heslo nie je správne."</string>
-    <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_auth_message" msgid="426627755590431364">"Používateľské meno alebo heslo je nesprávne."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"Používateľské meno alebo heslo je nesprávne."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Nepodarilo sa bezpečne pripojiť k serveru."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Nepodarilo sa bezpečne pripojiť k serveru."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"Vyžaduje sa certifikát klienta. Pripojiť sa k serveru pomocou certifikátu klienta?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"Certifikát je neplatný alebo neprístupný."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"Server odpovedal s chybou. Skontrolujte používateľské meno a heslo a skúste to znova."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"Vyžaduje sa certifikát klienta. Chcete sa pripojiť k serveru pomocou certifikátu klienta?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"Certifikát je neplatný alebo neprístupný."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"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="4942810054116129684">"Nepodarilo sa pripojiť k serveru."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Nepodarilo sa pripojiť k serveru."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"Vyžaduje sa služba TLS, ale server ju nepodporuje."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"UPOZORNENIE: Ak deaktivujete oprávnenie aplikácie E-mail spravovať toto zariadenie, budú odstránené všetky účty aplikácie E-mail, ktoré toto oprávnenie vyžadujú. Spoločne s týmito účtami budú odstránené aj všetky ich e-maily, kontakty, udalosti kalendára a ďalšie údaje."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Bezpečnostná aktualizácia"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"Účet <xliff:g id="ACCOUNT">%s</xliff:g> vyžaduje, aby ste zmenili nastavenia zabezpečenia."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Účet <xliff:g id="ACCOUNT">%s</xliff:g> požaduje aktualizáciu nastavení zabezpečenia."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"Vyžaduje sa bezpečnostná akt."</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Účet „<xliff:g id="ACCOUNT">%s</xliff:g>“ sa nedá synchronizovať z dôvodu požiadaviek zabezpečenia."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"Účet „<xliff:g id="ACCOUNT">%s</xliff:g>“ vyžaduje aktualizáciu nastavení zabezpečenia."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"Účet „<xliff:g id="ACCOUNT">%s</xliff:g>“ zmenil svoje nastavenia zabezpečenia. Od používateľa sa nevyžaduje žiadna akcia."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Vyžaduje sa bezp. aktualizácia"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Pravidlá zabezp. sa zmenili"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Prav. zabezp. sa nedajú splniť"</string>
     <string name="account_security_title" msgid="3511543138560418587">"Zabezpečenie zariadenia"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Server <xliff:g id="SERVER">%s</xliff:g> vyžaduje povolenie, aby mohol vzdialene ovládať niektoré funkcie zabezpečenia vášho zariadenia so systémom Android."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Upraviť podrobnosti"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"Platnosť kódu PIN alebo hesla na uzamknutie obrazovky vypršala."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"Heslo na uzamknutie vypršalo"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Heslo na uzamknutie obr. čoskoro vyprší"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"Čoskoro musíte zmeniť kód PIN alebo heslo na uzamknutie obrazovky, inak budú údaje účtu <xliff:g id="ACCOUNT">%s</xliff:g> vymazané. Chcete ho zmeniť teraz?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Váš kód PIN alebo heslo na uzamknutie obrazovky musíte čoskoro zmeniť, ináč budú údaje účtu <xliff:g id="ACCOUNT">%s</xliff:g> vymazané. Chcete ho zmeniť teraz?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"Heslo na uzamknutie obrazovky vypršalo"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"V zariadení prebieha vymazanie údajov účtu <xliff:g id="ACCOUNT">%s</xliff:g>. Môžete ich obnoviť zmenou kódu PIN alebo hesla na uzamknutie obrazovky. Chcete to zmeniť teraz?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"V zariadení prebieha vymazanie údajov účtu <xliff:g id="ACCOUNT">%s</xliff:g>. Môžete ich obnoviť zmenou kódu PIN alebo hesla na uzamknutie obrazovky. Chcete to zmeniť teraz?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Zahodiť neuložené zmeny?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Prihlásenie sa nepodarilo"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Používateľské meno alebo heslo pre účet <xliff:g id="ACCOUNT">%s</xliff:g> je nesprávne. Chcete ich aktualizovať?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"Používateľské meno alebo heslo pre účet <xliff:g id="ACCOUNT">%s</xliff:g> je nesprávne. Chcete ich aktualizovať?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Predvolený účet"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"V predvolenom nastavení odosielať e-maily z tohto účtu"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Preberať všetky prílohy"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Automaticky preberať prílohy najnovších správ prostredníctvom siete Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"E-mailové upozornenia"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Frekvencia synchronizácie, oznámení atď."</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"Zobraziť upozornenie na príchod e-mailu v systémovom paneli"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Poslať upozornenie na príchod e-mailu"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Frekvencia kontroly doručenej pošty"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Nastavenia prichádzajúcej pošty"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Používateľské meno, heslo a ďalšie nastavenia servera (prich.)"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Nastavenia odchádzajúcej pošty"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Používateľské meno, heslo a ďalšie nastavenia servera (odchádz.)"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Vynútené pravidlá"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Žiadne"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Nepodporované pravidlá"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Žiadne"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"Synchronizovať"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Ak chcete tento účet synchronizovať, dotknite sa tu"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Názov účtu"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Vaše meno"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Podpis"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Rýchle odpovede"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Upraviť text, ktorý často vkladáte pri písaní e-mailov."</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Upraviť text, ktorý často vkladáte pri písaní e-mailu"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Text pripojiť k odosielaným správam"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Nastavenia upozornení"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Spotreba dát"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"Pravidlá zabezpečenia"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Upraviť rýchlu odpoveď"</string>
     <string name="save_action" msgid="1988862706623227093">"Uložiť"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Synchronizovať kontakty"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Synchr. kontakty pre tento účet."</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Synchr. kalendár"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Synchr. kalendár pre tento účet"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Synchronizovať kalendár"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Synchr. udalosť kalendára pre účet"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synchroniz. e-mail"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synchr. e-mail pre tento účet"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrovať"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"Počet výsledkov z webu <xliff:g id="DOMAIN">%2$s</xliff:g>: <xliff:g id="RESULTS">%1$d</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Nastavenia"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"Všeobecné"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Všeobecné nastavenia"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"Aplikácia"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Automatický prechod"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Zvoľte obrazovku, ktorá sa zobrazí po odstránení správy"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Skryť začiarkavacie políčka"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"V zozname správ urobte výber dotknutím sa a podržaním"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Pred odstránením potvrdiť"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Správy"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Pred odoslaním potvrdiť"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Správy"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Pokračovať do"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Novšia správa"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Staršia správa"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"Čakanie na výsledky"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Niektorým serverom môže tento proces trvať dlho."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Priečinky"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Zakázať použitie fotoaparátu zariadenia"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Vyžadovať heslo zariadenia"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"Obmedziť opak. použitie nedávnych hesiel"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"Vyžadovať časovo obmedz. platnosť hesiel"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"Uzamk. obrazovky nečinného zariadenia"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"Obmedziť počet synchroniz. udalostí kalendára"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"Obmedziť počet synchronizovaných e-mailov"</string>
+    <string name="quick_1" msgid="3426057697353380951">"Ďakujeme!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"To znie dobre!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"Prečítam si to neskôr a dám vám vedieť."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Dohodnime si schôdzku a prediskutujme to."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Synchronizácia na pozadí je pre tento účet v roamingu zakázaná."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"Prebieha odosielanie odpovede..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"Žiadne správy."</string>
 </resources>
diff --git a/res/values-sk/uploader.xml b/res/values-sk/uploader.xml
index ffbdfd6..a12915a 100644
--- a/res/values-sk/uploader.xml
+++ b/res/values-sk/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Skryť podrobnosti"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Nastavenia"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Odovzdané: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Účet"</string>
     <string name="upload" msgid="2615541458361216022">"Odovzdať"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 79fe3a6..a093a00 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"Branje e-poštnih prilog"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Programu omogoča branje e-poštnih prilog."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Dovoli temu programu branje e-poštnih prilog."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Dostop do podatkov e-poštnega ponudnika"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Temu programu omogoča dostop do vaše e-poštne podatkovne zbirke, vključno s prejetimi in poslanimi sporočili, uporabniškimi imeni in gesli."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Programu omogoča dostop do vaše e-poštne zbirke podatkov, vključno s prejetimi in poslanimi sporočili, uporabniškimi imeni in gesli."</string>
     <string name="app_name" msgid="5815426892327290362">"E-pošta"</string>
     <string name="compose_title" msgid="427986915662706899">"Novo"</string>
     <string name="debug_title" msgid="5175710493691536719">"Odpravljanje napak"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"Dokončano"</string>
     <string name="create_action" msgid="3062715563215392251">"Ustvari nov"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"Izbriši"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"Ni hitrih odzivov"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Ni hitrih odzivov."</string>
     <string name="discard_action" msgid="6532206074859505968">"Zavrzi"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"Shrani osnutek"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Vstavi hiter odgovor"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"Iskanje"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Nastavitve računa"</string>
     <string name="settings_action" msgid="6334807007967459412">"Nastavitve"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"Možnosti sinhronizacije"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Možnosti sinhronizacije"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Označi kot neprebrano"</string>
     <string name="move_action" msgid="3059189775933985898">"Premakni"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ Kp/Skp"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> je napisal:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Vključite citirano besedilo"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Vključi besedilo"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Dodati morate vsaj enega prejemnika."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"Dodajte vsaj enega prejemnika."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Nekateri e-poštni naslovi niso veljavni."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Datoteke ni mogoče pripeti, ker je prevelika."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Vstavi hiter odgovor"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Shranjeno"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Ustavi"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Priloga je shranjena kot <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Priloge ni bilo mogoče shraniti."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Opomba: Ena ali več prilog v posredovanem sporočilu bo pred pošiljanjem prenesena iz strežnika."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"Priloge ni mogoče shraniti."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Ena ali več prilog v posredovanem sporočilu bo pred pošiljanjem prenesena iz strežnika."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Sporočilo"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Povabi"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Ene ali več prilog ni bilo mogoče posredovati."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Priloga ni bila posredovana"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"Prijava v račun <xliff:g id="ACCOUNT_NAME">%s</xliff:g> ni uspela."</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"Prijava v <xliff:g id="ACCOUNT_NAME">%s</xliff:g> ni uspela."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"Prijava ni uspela"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Starejše"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" – "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Nastavitev računa"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Dodaj račun Exchange"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Dodaj račun Exchange ActiveSync"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"E-poštni račun"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"E-pošto lahko za večino računov nastavite z le nekaj koraki."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Račun za Exchange lahko nastavite v nekaj korakih."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Za nastavitev računa za Exchange ActiveSync je potrebno le nekaj korakov."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Račun lahko ustvarite v nekaj korakih."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"E-poštni naslov"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Geslo"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Privzeto pošiljaj e-pošto iz tega računa"</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"Privzeto pošiljaj e-pošto iz tega računa"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Ročna nastavitev"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Vnesite veljaven e-poštni naslov in geslo."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Podvojeni račun"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Preverjanje nastavitev strežnika za dohodno pošto..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Preverjanje nastavitev strežnika za odhodno pošto..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Nastavitev računa"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"Vaš račun je nastavljen, e-pošta je na poti."</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"Vaš račun je pripravljen in e-pošta je poslana."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Poimenujte račun (neobvezno)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Vaše ime (prikazano v odhodnih sporočilih)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"To polje ne sme biti prazno."</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Nastavitve strežnika za dohodno pošto"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Uporabniško ime"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Geslo"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Strežnik POP3"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"Strežnik IMAP"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Strežnik"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Vrata"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Vrsta varnosti"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Brez"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Strežnik SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Vrata"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Vrsta varnosti"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Potrebna je prijava."</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Zahtevaj prijavo"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Uporabniško ime"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Geslo"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"Nastavitev računa"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Vsakih 15 minut"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Vsakih 30 minut"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Vsako uro"</string>
-    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Privzeto pošiljaj e-pošto iz tega računa"</string>
-    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Obvesti me, ko prispe e-pošta"</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sinhroniziraj stike iz tega računa."</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sinhroniziraj koledar iz tega računa"</string>
-    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sinhroniziraj e-pošto iz tega računa"</string>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"Privzeto pošiljaj e-pošto iz tega računa"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Obvesti me o novi e-pošti"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Sinhroniziraj stike iz tega računa"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Sinhroniziraj koledar iz tega računa"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Sinhroniziraj e-pošto iz tega računa"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Samodejni prenos prilog, ko je na voljo povezava Wi-Fi"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Ni mogoče končati"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Dnevi za sinhronizacijo"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"En mesec"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Vse"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Uporabi privzeto v računu"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Nepravilno uporabniško ime ali geslo."</string>
-    <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_auth_message" msgid="426627755590431364">"Uporabniško ime ali geslo ni pravilno."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"Uporabniško ime ali geslo ni pravilno."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"S strežnikom se ni mogoče varno povezati."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"S strežnikom se ni bilo mogoče varno povezati."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"Potrebujete potrdilo odjemalca. Želite povezavo s strežnikom vzpostaviti s potrdilom odjemalca?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"Potrdilo je neveljavno ali nedostopno."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"Strežnik je odgovoril z napako. Preverite uporabniško ime in geslo in poskusite znova."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"Potrebno je potrdilo odjemalca. Ali se želite povezati s strežnikom s potrdilom odjemalca?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"Potrdilo ni veljavno ali na voljo."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"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="4942810054116129684">"Ni se mogoče povezati s strežnikom."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"S strežnikom se ni mogoče povezati."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"Zahtevan je bil TLS, vendar ga strežnik ne podpira."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"Opozorilo: Če onemogočite pravico e-poštnega programa za upravljanja naprave, boste izbrisali vse e-poštne račune, ki jo potrebujejo, skupaj z e-pošto, stiki, dogodki koledarja in drugimi podatki."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Varnostna posodobitev"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"Za račun <xliff:g id="ACCOUNT">%s</xliff:g> morate posodobiti varnostne nastavitve."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Varnostne nastavitve računa »<xliff:g id="ACCOUNT">%s</xliff:g>« je treba posodobiti."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"Potrebna je varnostna posodobitev"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Računa »<xliff:g id="ACCOUNT">%s</xliff:g>« zaradi varnostnih zahtev ni mogoče sinhronizirati."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"Varnostne nastavitve za račun »<xliff:g id="ACCOUNT">%s</xliff:g>« je potrebno posodobiti."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"Varnostne nastavitve za račun »<xliff:g id="ACCOUNT">%s</xliff:g>« so bile spremenjene. Uporabniku ni treba storiti nič."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Potrebna je varn. posodobitev"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Varn. pravilnik je spremenjen"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Ne ustreza varn. pravilnikom"</string>
     <string name="account_security_title" msgid="3511543138560418587">"Varnost naprave"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Strežniku <xliff:g id="SERVER">%s</xliff:g> morate dovoliti, da na daljavo nadzira nekatere varnostne funkcije vaše naprave Android."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Urejanje podrobnosti"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"PIN ali geslo za zaklepanje zaslona sta potekla."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"Geslo za zaklepanje zaslona je poteklo"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Geslo za zaklepanje zaslona bo poteklo"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"PIN ali geslo za zaklepanje zaslona morate kmalu spremeniti, sicer bodo podatki za <xliff:g id="ACCOUNT">%s</xliff:g> izbrisani. Ga želite spremeniti zdaj?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Čim prej spremenite PIN ali geslo za zaklepanje zaslona, sicer bodo podatki za <xliff:g id="ACCOUNT">%s</xliff:g> izbrisani. Ali ga želite spremeniti zdaj?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"Geslo za zaklepanje zaslona je poteklo"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"Podatki za <xliff:g id="ACCOUNT">%s</xliff:g> se brišejo iz naprave. Lahko jih obnovite tako, da spremenite PIN ali geslo za zaklepanje zaslona. Ga želite spremeniti?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"Podatki za <xliff:g id="ACCOUNT">%s</xliff:g> bodo izbrisani iz naprave. Če jih želite obnoviti, spremenite PIN ali geslo za zaklepanje zaslona. Ali ga želite spremeniti zdaj?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Želite zavreči neshranjene spremembe?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Prijava ni uspela"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Uporabniško ime ali geslo za <xliff:g id="ACCOUNT">%s</xliff:g> je napačno. Ali ju želite posodobiti?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"Ime ali geslo za <xliff:g id="ACCOUNT">%s</xliff:g> ni pravilno. Ali ga želite posodobiti zdaj?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Privzeti račun"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Privzeto pošiljaj e-pošto iz tega računa"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Prenesi priloge"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Samodejni prenos prilog k nedavnim sporočilom s povezavo Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"E-poštna obvestila"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Pogostost sinhronizacije, obvestila itd."</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"Ko pride e-pošta, obvesti v sistemski vrstici"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Pošlji obvestilo o novi e-pošti"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Pogostost preverjanja mape »Prejeto«"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Nastavitve dohodne pošte"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Uporabniško ime, geslo in druge nastavitve dohodnega strežnika"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Nastavitve odhodne pošte"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Uporabniško ime, geslo in druge nastavitve odhodnega strežnika"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Pravilniki so uveljavljeni"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Brez"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Nepodprti pravilniki"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Brez"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"Poskusi sinhronizacijo"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Za sinhronizacijo računa se dotaknite tukaj"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Ime računa"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Vaše ime"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Podpis"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Hitri odgovori"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Uredite besedilo, ki ga pogosto vstavite, ko sestavljate e-pošto"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Uredite besedilo, ki ga pogosto vstavite v e-pošto"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Pripni besedilo k poslanim sporočilom"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Nastavitve obvestil"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Uporaba podatkov"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"Varnostni pravilniki"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Uredi hiter odgovor"</string>
     <string name="save_action" msgid="1988862706623227093">"Shrani"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Sinhroniziranje stikov"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sinhroniziraj stike za ta račun"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sinhroniziraj koledar"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Sinhroniziraj koledar za ta račun"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Sinhroniziraj koledar"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Sinhr. dogodek iz kol. za ta račun"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sinhroniz. e-pošte"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sinhroniziraj e-pošto za ta račun"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibriranje"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> rezultatov iz <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Nastavitve"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"Splošno"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Splošne nastavitve"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"Program"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Samodejno napredovanje"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Izberite, kateri zaslon naj se prikaže po brisanju sporočila"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Skrij potrditvena polja"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"Na seznamu sporočil se dotaknite želenega in ga pridržite, da ga izberete"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Potrditev pred brisanjem"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Sporočila"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Potrditev pred pošiljanjem"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Sporočila"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Naprej do"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Novejša sporočila"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Starejše sporočilo"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"Čakanje na rezultate"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Odziv nekaterih strežnikov je lahko počasen."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Mape"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Ne dovoli uporabe kamere naprave"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Zahtevaj geslo naprave"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"Omeji vnovično uporabo nedavnih gesel"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"Zahtevaj, da gesla potečejo"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"Zahtevaj, da nedej. napr. zaklene zaslon"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"Omejitev števila sinhroniziranih koledarskih dogodkov"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"Omejitev števila sinhroniziranih e-poštnih sporočil"</string>
+    <string name="quick_1" msgid="3426057697353380951">"Hvala!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"Velja!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"Trenutno nimam časa. Odgovorim pozneje."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Skličimo sestanek in se pogovorimo."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Sinhronizacija v ozadju je za ta račun med gostovanjem onemogočena."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"Pošiljanje odgovora ..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"Ni sporočil."</string>
 </resources>
diff --git a/res/values-sl/uploader.xml b/res/values-sl/uploader.xml
index d7b6591..0e6e813 100644
--- a/res/values-sl/uploader.xml
+++ b/res/values-sl/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Skrij podrobnosti"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Nastavitve"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Preneseno: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Račun"</string>
     <string name="upload" msgid="2615541458361216022">"Prenesi"</string>
     <string name="ok" msgid="2516349681897895312">"V redu"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 6f62415..5c102b5 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"Читање прилога из порука е-поште"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Омогућава овој апликацији да чита прилоге у порукама е-поште."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Омогућава апликацији да чита прилоге у порукама е-поште."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Приступ подацима о добављачу е-поште"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Омогућава овој апликацији да приступа бази података е-поште, укључујући примљене поруке, послате поруке, корисничка имена и лозинке."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Омогућава да ова апликација приступа бази података е-поште, укључујући примљене поруке, послате поруке, корисничка имена и лозинке."</string>
     <string name="app_name" msgid="5815426892327290362">"Пошаљи е-поштом"</string>
     <string name="compose_title" msgid="427986915662706899">"Нова порука"</string>
     <string name="debug_title" msgid="5175710493691536719">"Отклањање грешака"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"Готово"</string>
     <string name="create_action" msgid="3062715563215392251">"Направи нови"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"Избриши"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"Нема брзих одговора"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Нема брзих одговора."</string>
     <string name="discard_action" msgid="6532206074859505968">"Одбаци"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"Сачувај недов. пор."</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Уметни брзи одговор"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"Претрага"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Подешавања налога"</string>
     <string name="settings_action" msgid="6334807007967459412">"Подешавања"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"Опције синхронизације"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Опције синхронизације"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Означи као непрочитано"</string>
     <string name="move_action" msgid="3059189775933985898">"Премести"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> је написао/ла:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Уврсти наведени текст"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Укључи текст"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Потребно је да додате бар једног примаоца."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"Додајте најмање једног примаоца."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Поједине адресе е-поште су неважеће."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Датотека је превелика за прилог."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Уметање брзих одговора"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Сачувано"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Заустави"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Прилог је сачуван као <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Није могуће сачувати прилог."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Напомена: неки од прилога у прослеђеној поруци ће бити преузети пре слања."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"Није могуће сачувати прилог."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Неки од прилога у прослеђеној поруци ће бити преузети пре слања."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Порука"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Позови"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Није могуће проследити један или више прилога."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Прилог није прослеђен"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"Пријављивање на налог <xliff:g id="ACCOUNT_NAME">%s</xliff:g> није успело."</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"Пријављивање на налог <xliff:g id="ACCOUNT_NAME">%s</xliff:g> није успело."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"Пријављивање није могуће"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Старије"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Подешавање налога"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Додавање Exchange налога"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Додајте Exchange ActiveSync налог"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"Налог е-поште"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"Можете да подесите е-пошту за већину налога у свега неколико корака."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Можете да подесите Exchange налог у свега неколико корака."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Можете да подесите Exchange ActiveSync налог у свега неколико корака."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Можете да подесите налог у свега неколико корака."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Адреса е-поште"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Лозинка"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Подразумевано шаљи поруке е-поште са овог налога."</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"Подразумевано шаљи е-пошту са овог налога"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Ручно подешавање"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Унесите важећу адресу е-поште и лозинку."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Дуплирани налог"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"У току је провера подешавања сервера за долазну пошту…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"У току је провера подешавања одлазног сервера…"</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Подешавање налога"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"Налог је подешен и е-пошта стиже!"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"Налог је подешен и е-пошта стиже!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Именујте овај налог (опционално)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Ваше име (приказано у одлазним порукама)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Ово поље не сме да буде празно."</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Подешавања сервера за долазну пошту"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Корисничко име"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Лозинка"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3 сервер"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"IMAP сервер"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Сервер"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Порт"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Тип безбедности"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Ништа"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP сервер"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Порт"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Тип безбедности"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Захтева пријављивање."</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Захтевај пријављивање"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Корисничко име"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Лозинка"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"Подешавање налога"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Сваких 15 минута"</string>
     <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_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>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"Подразумевано шаљи е-пошту са овог налога"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Обавести ме о пријему е-поште"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Синхронизуј контакте са овог налога"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Синхронизуј календар са овог налога"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Синхронизуј е-пошту са овог налога"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Аутоматски преузми прилоге када је успостављена веза са Wi-Fi мрежом"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Није могуће довршити"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Дани за синхронизацију"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Месец дана"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Све"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Користи подр. под. налога"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Корисничко име или лозинка нису тачни."</string>
-    <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_auth_message" msgid="426627755590431364">"Корисничко име или лозинка су нетачни."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"Корисничко име или лозинка нису тачни."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Безбедно повезивање са сервером није могуће."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Безбедно повезивање са сервером није могуће."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"Потребан је сертификат клијента. Желите ли да се повежете са сервером помоћу сертификата клијента?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"Сертификат је неважећи или недоступан."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"Сервер је одговорио грешком. Проверите корисничко име и лозинку, а затим покушајте поново."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"Сертификат клијента је обавезан. Да ли желите да се повежете са сервером са сертификатом клијента?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"Сертификат је неважећи или недоступан."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"Сервер је одговорио грешком. Проверите корисничко име и лозинку, а затим покушајте поново."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"Повезивање са сервером није могуће."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Повезивање са сервером није могуће."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS је захтеван, али га сервер не подржава."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"УПОЗОРЕЊЕ: Деактивирањем овлашћења апликације Е-пошта за управљање уређајем избрисаћете све налоге е-поште који то·захтевају, заједно са адресом е-поште, контактима, догађајима календара и другим подацима."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Безбедносно ажурирање"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> захтева да ажурирате безбедносна подешавања."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Потребно је ажурирати безбедносна подешавања за налог „<xliff:g id="ACCOUNT">%s</xliff:g>“."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"Потребно је безбедносно ажур."</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Налог „<xliff:g id="ACCOUNT">%s</xliff:g>“ не може да се синхронизује због безбедносних захтева."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"Потребно је ажурирати безбедносна подешавања за налог „<xliff:g id="ACCOUNT">%s</xliff:g>“."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"Промењена су безбедносна подешавања налога „<xliff:g id="ACCOUNT">%s</xliff:g>“; није потребна ниједна радња корисника."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Потребно је безбедн. ажурирање"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Безбедн. смернице су промењене"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Безбед. смернице нису испуњене"</string>
     <string name="account_security_title" msgid="3511543138560418587">"Безбедност уређаја"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Сервер <xliff:g id="SERVER">%s</xliff:g> захтева да му омогућите удаљену контролу појединих безбедносних функција Android уређаја."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Измени детаље"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"PIN или лозинка за закључавање екрана су истекли."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"Лозинка за екран је истекла"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Лозинка за закључавање екрана истиче"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"Потребно је да ускоро промените PIN или лозинку за закључавање екрана или ће подаци за <xliff:g id="ACCOUNT">%s</xliff:g> бити избрисани. Желите ли да их промените сада?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Потребно је да ускоро промените PIN или лозинку за закључавање екрана или ће подаци за налог <xliff:g id="ACCOUNT">%s</xliff:g> бити избрисани. Да ли желите да их сада промените?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"Лозинка за закључавање екрана је истекла"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"Подаци за <xliff:g id="ACCOUNT">%s</xliff:g> се бришу са уређаја. Можете да их вратите уколико промените PIN или лозинку за закључавање екрана. Желите ли да их промените сада?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"Подаци за налог <xliff:g id="ACCOUNT">%s</xliff:g> се бришу са уређаја. Можете да их вратите ако промените PIN или лозинку за закључавање екрана. Желите ли да их промените сада?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Желите ли да одбаците несачуване промене?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Пријављивање није могуће"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Корисничко име или лозинка за <xliff:g id="ACCOUNT">%s</xliff:g> су нетачни. Желите ли да их ажурирате сада?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"Корисничко име или лозинка за налог <xliff:g id="ACCOUNT">%s</xliff:g> нису тачни. Да ли желите да их ажурирате сада?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Подразумевани налог"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Подразумевано шаљи поруке е-поште са овог налога"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Преузми прилоге"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Аутоматско преузимање прилога за недавне поруке преко Wi-Fi-ја"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Обавештења е-поштом"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Синхронизација учесталости, обавештења итд."</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"Обавештавање на системској траци када стигне порука е-поште"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Пошаљи обавештење када стигне е-пошта"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Учесталост провере пријемног сандучета"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Подешавања долазећих"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Корисничко име, лозинка и друга подешавања серв. долазне поште"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Подешавања одлазних"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Корисничко име, лозинка и друга подешавања серв. одлазне поште"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Примењене смернице"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Ниједно"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Неподржане смернице"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Ниједно"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"Покушај да синхронизујеш"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Додирните овде да бисте синхронизовали налог"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Име налога"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Ваше име"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Потпис"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Брзи одговори"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Измените текст који често умећете при писању порука е-поште"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Измените текст који често умећете при писању е-поште"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Додајте текст порукама које шаљете"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Подешавања обавештења"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Коришћење података"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"Безбедносне смернице"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Измена брзог одговора"</string>
     <string name="save_action" msgid="1988862706623227093">"Сачувај"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Синхронизација контаката"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Синхронизуј контакте за овај налог"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Синхронизуј календар"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Синхронизуј календар за овај налог"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Синхронизација календара"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Синхр. дог. календара за овај налог"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Синхронизуј е-пошту"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Синхронизуј е-пошту за овај налог"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Вибрација"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> резултата са домена <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Подешавања"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"Опште"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Општа подешавања"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"Апликација"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Аутоматски пређи"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Избор екрана који желите да прикажете након брисања поруке"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Сакриј поља за потврду"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"На листама порука додирните и задржите да бисте изабрали"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Потврди пре брисања"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Поруке"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Потврди пре слања"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Поруке"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Пређи на"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Новија порука"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Старија порука"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"Чека се на резултате"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Неким серверима је потребно доста времена."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Директоријуми"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Онемогући коришћење камере уређаја"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Захтевај лозинку за уређај"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"Ограничи пон. коришћење недавних лозинки"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"Захтевај да лозинке истекну"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"Захтевај неакт. уређај за закљ. екрана"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"Ограничи број синхронизованих догађаја календара"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"Ограничи број синхронизованих порука е-поште"</string>
+    <string name="quick_1" msgid="3426057697353380951">"Хвала!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"Добра идеја!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"Прочитаћу ово касније и јавити вам."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Хајде да организујемо састанак како бисмо о овоме разговарали."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Синхронизација у позадини за овај налог је онемогућена у ромингу."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"Слање одговора..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"Нема порука."</string>
 </resources>
diff --git a/res/values-sr/uploader.xml b/res/values-sr/uploader.xml
index 43f162d..752d7d0 100644
--- a/res/values-sr/uploader.xml
+++ b/res/values-sr/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Сакриј детаље"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Подешавања"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Отпремљено %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Налог"</string>
     <string name="upload" msgid="2615541458361216022">"Отпреми"</string>
     <string name="ok" msgid="2516349681897895312">"Потврди"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 0df8f2b..ad491ca 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"Läs bilagor i e-postmeddelanden"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Tillåter att appen läser bilagor i e-postmeddelanden."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Tillåter att appen läser bilagor i e-postmeddelanden."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Använd data från e-postleverantören"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Tillåter att appen kommer åt e-postdatabasen med bland annat mottagna meddelanden, skickade meddelanden, användarnamn och lösenord."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Tillåter att appen kommer åt e-postdatabasen med bland annat mottagna meddelanden, skickade meddelanden, användarnamn och lösenord."</string>
     <string name="app_name" msgid="5815426892327290362">"E-post"</string>
     <string name="compose_title" msgid="427986915662706899">"Skriv"</string>
     <string name="debug_title" msgid="5175710493691536719">"Felsökning"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"Klar"</string>
     <string name="create_action" msgid="3062715563215392251">"Skapa nytt"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"Ta bort"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"Inga snabba svar"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Inga snabba svar."</string>
     <string name="discard_action" msgid="6532206074859505968">"Släng"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"Spara utkast"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Infoga snabbsvar"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"Sök"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Kontoinställningar"</string>
     <string name="settings_action" msgid="6334807007967459412">"Inställningar"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"Synkroniseringsalternativ"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Synkroniseringsalternativ"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Markera som oläst"</string>
     <string name="move_action" msgid="3059189775933985898">"Flytta"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+kopia/heml kop"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> skrev:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Inkludera citerad text"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Inkludera text"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Du måste lägga till minst en mottagare."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"Lägg till minst en mottagare."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Några av e-postadresserna är ogiltiga."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Filen är för stor för att bifogas."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Infoga snabbsvar"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Sparad"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Stoppa"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Bilagan har sparats som <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Det gick inte att spara bilagan."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Obs! En eller flera bilagor i det vidarebefordrade meddelandet hämtas innan de skickas."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"Kunde inte spara bilagan."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"En eller flera bilagor i det vidarebefordrade meddelandet hämtas innan de skickas."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Meddelande"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Bjud in"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Det gick inte att vidarebefordra en eller flera bilagor."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Bilagan vidarebefordrades inte"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"Inloggning på <xliff:g id="ACCOUNT_NAME">%s</xliff:g> misslyckades."</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"Det gick inte att logga in <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"Det gick inte att logga in."</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Äldre"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" – "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Kontoinställningar"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Lägg till ett Exchange-konto"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Lägg till ett Exchange ActiveSync-konto"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"E-postkonto"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"Du kan konfigurera e-post för de flesta konton med några få steg."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Du kan konfigurera ett Exchange-konto med några få steg."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Du kan konfigurera ett Exchange ActiveSync-konto med några få steg."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Du kan konfigurera ditt konto med några få steg."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"E-postadress"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Lösenord"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Skicka e-post från det här kontot som standard"</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"Skicka e-post från det här kontot som standard"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuell inställning"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Ange en giltig e-postadress och lösenord."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Dubblettkonto"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Kontrollerar inkommande serverinställningar…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Kontrollerar utgående serverinställningar…"</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Kontoinställningar"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"Ditt konto är färdigt och snart kan du skicka och ta emot e-postmeddelanden."</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"Ditt konto är färdigt och snart kan du skicka och ta emot e-postmeddelanden."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Ge kontot ett namn (valfritt)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Ditt namn (visas för utgående meddelanden)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Fältet får inte vara tomt."</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Inkommande serverinställningar"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Användarnamn"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Lösenord"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3-server"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"IMAP-server"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Server"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Säkerhetstyp"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Ingen"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP-server"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Säkerhetstyp"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Kräv inloggning"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Kräv inloggning"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Användarnamn"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Lösenord"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"Kontoinställningar"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Var 15:e minut"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Var 30:e minut"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Varje timme"</string>
-    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Skicka e-post från det här kontot som standard"</string>
-    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Meddela mig när jag får e-post"</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Synkronisera kontakter från det här kontot."</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Synkronisera kalendrar från det här kontot."</string>
-    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Synkronisera e-post från det här kontot."</string>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"Skicka e-post från det här kontot som standard"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Meddela mig när jag får e-post"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Synkronisera kontakter från det här kontot"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Synkronisera kalendern från det här kontot"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Synkronisera e-post från det här kontot"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Hämta bilagor automatiskt när enheten är ansluten till Wi-Fi"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Det gick inte att avsluta"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Dagar för synkronisering"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"En månad"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Alla"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Använd standardinställning"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Fel användarnamn eller lösenord."</string>
-    <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_auth_message" msgid="426627755590431364">"Användarnamnet eller lösenordet är felaktigt."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"Felaktigt användarnamn eller lösenord."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Det går inte att upprätta en säker anslutning till servern."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Det går inte att upprätta en säker anslutning till servern."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"Klientcertifikat krävs. Vill du ansluta till servern med klientcertifikatet?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"Certifikatet är ogiltigt eller otillgängligt."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"Servern svarade med ett fel. Kontrollera ditt användarnamn och lösenord och försök igen."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"Ett klientcertifikat måste anges. Vill du ansluta till servern med ett klientcertifikat?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"Certifikatet är ogiltigt eller otillgängligt."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"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="4942810054116129684">"Det går inte att ansluta till servern."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Det går inte att ansluta till servern."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS krävs men stöds inte av servern."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"VARNING! Om du inaktiverar e-postappens behörighet att administrera enheten raderas alla e-postkonton som behöver behörigheten. Även e-post, kontakter, kalenderhändelser och andra data raderas."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Säkerhetsuppdatering"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"Enligt <xliff:g id="ACCOUNT">%s</xliff:g> måste du uppdatera säkerhetsinställningarna."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Kontot \"<xliff:g id="ACCOUNT">%s</xliff:g>\" kräver att säkerhetsinställningarna uppdateras."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"Säkerhetsuppdatering krävs"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Det går inte att synkronisera kontot <xliff:g id="ACCOUNT">%s</xliff:g> på grund av säkerhetskrav."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"Säkerhetsinställningarna måste uppdateras för kontot <xliff:g id="ACCOUNT">%s</xliff:g>."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"Säkerhetsinställningarna ändrades för kontot <xliff:g id="ACCOUNT">%s</xliff:g>. Inga åtgärder krävs från användaren."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Säkerhetsuppdatering krävs"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Säkerhetspolicyer har ändrats"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Säkerhetspolicy kan ej följas"</string>
     <string name="account_security_title" msgid="3511543138560418587">"Säkerhet för enhet"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Servern <xliff:g id="SERVER">%s</xliff:g> måste kunna fjärrkontrollera vissa säkerhetsfunktioner i din Android-enhet."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Redigera information"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"PIN-koden eller lösenordet till skärmlåset har gått ut."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"Skärmlösenordet har gått ut"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Skärmlåslösenordet går ut inom kort"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"Om du inte ändrar PIN-kod eller lösenord till skärmlåset inom kort raderas alla data för <xliff:g id="ACCOUNT">%s</xliff:g>. Vill du göra det nu?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Du måste ändra PIN-kod eller lösenord för skärmlåset snart, annars raderas data för kontot <xliff:g id="ACCOUNT">%s</xliff:g>. Vill du ändra nu?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"Skärmlåslösenordet har gått ut"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"Alla data för <xliff:g id="ACCOUNT">%s</xliff:g> tas bort från enheten. Du kan återställa dem genom att ändra PIN-koden eller lösenordet till skärmlåset. Vill du göra det nu?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"Alla data för <xliff:g id="ACCOUNT">%s</xliff:g> tas bort från enheten. Du kan återställa dem genom att ändra PIN-koden eller lösenordet för skärmlåset. Vill du göra det nu?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Vill du ignorera ändringar som inte har sparats?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Det gick inte att logga in."</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Du har angett ett felaktigt användarnamn eller lösenord for <xliff:g id="ACCOUNT">%s</xliff:g>. Vill du uppdatera dem nu?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"Användarnamnet eller lösenordet för <xliff:g id="ACCOUNT">%s</xliff:g> är felaktigt. Vill du uppdatera dem nu?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Standardkonto"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Skicka e-post från det här kontot som standard"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Hämta bilagor"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Hämta automatiskt bilagor för de senaste meddelandena via Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"E-postaviseringar"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Synkroniseringsfrekvens, aviseringar osv."</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"Avisera i systemfältet vid e-postmeddelande"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Skicka meddelande när du får e-post"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Intervall för e-postkontroll"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Inkommande inställningar"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Användarnamn, lösenord och andra inkommande serverinställningar"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Utgående inställningar"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Användarnamn, lösenord och andra utgående serverinställningar"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Verkställda policyer"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Inga"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Policyer som inte stöds"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Inga"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"Synkroniseringsförsök"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Tryck här för att synkronisera kontot"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Kontonamn"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Ditt namn"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Signatur"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Snabbsvar"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Redigera text som du ofta infogar när du skriver e-post"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Redigera text som du ofta infogar när du skriver e-post"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Lägg till text i meddelanden som du skickar"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Meddelandeinställningar"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Dataanvändning"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"Säkerhetspolicyer"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Redigera snabbsvar"</string>
     <string name="save_action" msgid="1988862706623227093">"Spara"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Synkronisera kontakter"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Synkronisera kontakter för det här kontot"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Synkronisera kalender"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Synkronisera kalendern för det här kontot"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Synkronisera kalender"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Synka kalenderhändelse för kontot"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synkronisera e-post"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synkronisera e-post för det här kontot"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrera"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> resultat från <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Inställningar"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"Allmänt"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Allmänna inställningar"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"App"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Flytta automatiskt"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Välj vilken skärm som ska visas när du tar bort ett meddelande"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Dölj kryssrutor"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"I samtalslistan trycker du länge om du vill markera"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Bekräfta innan du tar bort"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Meddelanden"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Bekräfta innan du skickar"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Meddelanden"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Flytta till"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Nyare meddelande"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Äldre meddelande"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"Väntar på resultat"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Vissa servrar kan ta lång tid."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Mappar"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Tillåt inte användning av kameran"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Kräv lösenord för enheten"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"Begränsa återanvändning av lösenord"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"Kräv att lösenord upphör att gälla"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"Kräv låst skärm på inaktiva enheter"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"Begränsa antalet kalenderhändelser som synkas"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"Begränsa antalet e-postmeddelanden som synkas"</string>
+    <string name="quick_1" msgid="3426057697353380951">"Tack!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"Låter bra!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"Jag läser detta senare och återkommer till dig."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Vi kan diskutera detta på ett möte."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Bakgrundssynkronisering för det här kontot har inaktiverats vid roaming."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"Svaret skickas ..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"Inga meddelanden."</string>
 </resources>
diff --git a/res/values-sv/uploader.xml b/res/values-sv/uploader.xml
index af8cfcb..f3b3b1e 100644
--- a/res/values-sv/uploader.xml
+++ b/res/values-sv/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Dölj detaljer"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Inställningar"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Överförde %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Konto"</string>
     <string name="upload" msgid="2615541458361216022">"Överför"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index d222eac..7600881 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"Soma viambatisho vya barua pepe"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Inaruhusu programu hii kusoma viambatisho vyako vya barua pepe."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Inaruhusu programu kusoma viambatisho vya barua pepe yako."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Fikia data ya mtoa huduma wa barua pepe"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Huruhusu programu hii kufikia hifadhidata yako ya barua pepe, pamoja na ujumbe uliopokewa, ujumbe uliotumwa, majina ya mtumiaji na nenosiri."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Inaruhusu programu hii kufikia hifadhidata yako ya barua pepe, ikiwa ni pamoja na jumbe zilizopokewa, jumbe zilizotumwa, majina ya mtumiaji 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">"Tatua"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"Kwisha"</string>
     <string name="create_action" msgid="3062715563215392251">"Unda mpya"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"Futa"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"Hakuna majibu ya haraka"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Hakuna majibu ya haraka."</string>
     <string name="discard_action" msgid="6532206074859505968">"Tupa"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"Hifadhi rasimu"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Ingiza jibu la haraka"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"Tafuta"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Mipangilio ya akaunti"</string>
     <string name="settings_action" msgid="6334807007967459412">"Mipangilio"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"Chaguo za kusawazisha"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Chaguo za ulandanishi"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Tia alama kuwa haijasomwa"</string>
     <string name="move_action" msgid="3059189775933985898">"Hamisha"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ Nakala kwa/Nakala fiche kwa"</string>
@@ -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="6950097435198536165">"Jumuisha maandishi 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 mpokeaji mmoja"</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"Ongeza 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>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Imehifadhiwa"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Simamisha"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Kiambatisho kimehifadhiwa kama <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Haikuweza kuhifadhi kiambatisho."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Zingatia: Moja au zaidi ya viambatisho katika ujumbe wako uliosambazwa vitapakuliwa kabla ya kutumwa."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"Haikuweza kuhifadhi kiambatisho."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Kiambatisho kimoja au zaidi katika ujumbe wako uliosambazwa kitapakuliwa kabla ya kutumwa."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Ujumbe"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Alika"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Haikuweza kusambaza kiambatisho kimoja au zaidi."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Kiambatishho hakijasambazwa"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> ilishindwa kuingia."</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"Kuingia <xliff:g id="ACCOUNT_NAME">%s</xliff:g> hakujafaulu."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"Haingeweza kuingia"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"B <xliff:g id="SIZE_IN_BYTES">%d</xliff:g>"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Nzee zaidi"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Usanidi wa akaunti"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Ongeza akaunti ya Exchange"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Ongeza akaunti ya Exchange ActiveSync"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"Akaunti ya barua pepe"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"Unaweza kusanidi barua pepe ya akaunti nyingi kwa hatua chache tu."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Unaweza kusanidi akaunti ya Exchange kwa hatua chache tu."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Unaweza kusanidi akaunti ya Exchange ActiveSync kwa hatua chache tu."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Unaweza kusanidi akaunti yako katika 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 kama chaguo-msingi"</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"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="3968270274727947460">"Tafadhali andika anwani na nenosiri halali ya barua pepe."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Akaunti Rudufu"</string>
@@ -250,7 +246,7 @@
     <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>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"Akaunti yako imesanidiwa, na barua pepe iko njiani!"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"Akaunti yako imesanidiwa, na barua pepe iko njiani!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Ipe akaunti hii jina (ya hiari)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Jina lako (linaloonyeshwa kwenye ujumbe unaotoka)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Uga hii haiwezi kuwa tupu."</string>
@@ -261,8 +257,7 @@
     <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>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Nenosiri"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Seva ya POP"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"Seva ya IMAP"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Seva"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Mlango"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Aina ya usalama"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Hamna"</string>
@@ -280,7 +275,7 @@
     <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 uingie"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Inahitaji kuingia"</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>
@@ -305,11 +300,11 @@
     <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 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_default_label" msgid="2617227194283720914">"Tuma barua pepe kutoka kwa akaunti hii kama chaguo-msingi"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Niarifu wakati barua pepe inapowasili"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Landanisha anwani kutoka kwa akaunti hii"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Landanisha kalenda kutoka kwa akaunti hii"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Landanisha barua pepe kutoka kwa akaunti hii"</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="9083263347962940552">"Imeshindwa kumaliza"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Siku hadi Usawazishaji"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Mwezi mmoja"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Zote"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Tumia akaunti chaguo-msingi"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Jina la mtumiaji na nenosiri sio sahihi."</string>
-    <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_auth_message" msgid="426627755590431364">"Jina la mtumiaji au nenosiri sio sahihi."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"Jina la mtumiaji au nenosiri si sahihi."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Haiwezi kuunganisha kwa seva kwa usalama."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Haiwezi kuunganisha kwa seva kwa usalama."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"Cheti cha mteja kinahitajika. Unganisha kwa seva na cheti cha mteja?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"Cheti ni batili au hakiwezi kufikiwa."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"Seva iliitikia na hitilafu; Kagua jina lako la mtumiaji na nenosiri na ujaribu tena."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"Cheti cha mteja kinahitajika. Je, unataka kuunganisha kwenye seva na cheti cha mteja?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"Cheti ni batili au hakiwezi kufikiwa."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"Seva ilijibu na hitilafu. Kagua jina lako la mtumiaji na nenosiri, kisha ujaribu tena."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"Haiwezi kuunganisha kwa seva."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Haiwezi kuunganisha kwa seva."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS inahitajika lakini haihimiliwi na seva."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"ILANI: Kuamilishua kibali cha programu ya Barua pepe ili kudhibiti kifaa chako itafuta 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="430041952584831904">"Usasisho wa usalama"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> inahitaji usasihe mipangilio yako ya usallama."</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="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Akaunti \"<xliff:g id="ACCOUNT">%s</xliff:g>\" haiwezi kulandanishwa kwa sababu ya mahitaji ya usalama."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"Akaunti \"<xliff:g id="ACCOUNT">%s</xliff:g>\" inahitaji kusasisha mipangilio ya usalama."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"Akaunti \"<xliff:g id="ACCOUNT">%s</xliff:g>\" ilibadilisha mipangilio yakeya usalama; hakunahatuaya usalama inayohitajika."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Uboreshaji wa usalama unahitajika"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Sera za kiusalama zimebadilishwa"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Sera za kiusalama haziwezi kufikiwa"</string>
     <string name="account_security_title" msgid="3511543138560418587">"Usalama wa kifaa"</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>
@@ -353,38 +352,45 @@
     <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 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_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Unahitaji kubadilisha PIN au nenosiri la kifungio skrini chako hivi karibuni, au data ya <xliff:g id="ACCOUNT">%s</xliff:g> itafutwa. Je, unataka kuibadilisha sasa?"</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="password_expired_dialog_content_fmt" msgid="6538210092073931079">"Data ya <xliff:g id="ACCOUNT">%s</xliff:g> inafutwa kutoka kwenye kifaa chako. Unaweza kuirejesha kwa kubadilisha PIN au nenosiri lako la kifungio skrini. Unataka kuibadilisha sasa?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Tupa mabadiliko yasiyohifadhiwa?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Haingeweza kuinga ndani"</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_login_dialog_content_fmt" msgid="8849649646111167377">"Jina la mtumiaji au nenosiri la <xliff:g id="ACCOUNT">%s</xliff:g> sio sahihi. Je, unataka kusasisha sasa hivi?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Akaunti 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="2980317599840958688">"Pakua viambatisho"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Pakua-otomatiki viambatisho kwa ujumbe wa hivi karibuni kupitia Wi-Fi"</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_notify_summary" msgid="8134339460923068254">"Tuma arifa wakati barua pepe inafika"</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, 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_enforced_label" msgid="7429582254433588882">"Sera zimetekelezwa"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Hamna"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Sera zisizokubaliwa"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Hamna"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"Jaribu usawazishi"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Gusa hapa ili kulandanisha akaunti hii"</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>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Majibu ya haraka"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Hariri maandishi unayoyaingiza mara kwa mara unapoandika barua pepe"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Hariri maandishi unayoyaingiza mara kwa mara unapoandika barua pepe"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Ambatisha maandishi kwa ujumbe unaotuma"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Mipangilio ya Arifa"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Matumizi ya data"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"Sera za kiusalama"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Hariri majibu ya haraka"</string>
     <string name="save_action" msgid="1988862706623227093">"Hifadhi"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Sawazisha anwani"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sawazisha anwani za akaunti hii"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sawazisha Kalenda"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Sawazisha kalenda ya akaunti hii"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Sawazisha kalenda"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Landanisha tukio la kalenda la akaunti hii"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Landanisha barua pepe"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sawazisha barua pepe za akaunti hii"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Tetema"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> matokeo <xliff:g id="DOMAIN">%2$s</xliff:g> kutoka"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Mipangilio"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"Kawaida"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Mipangilio ya kawaida"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"Programu"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Kioto mahiri"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Chagua skrini gani ya kuonyesha baada ya kufuta ujumbe"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Ficha visanduku tiki"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"Katika orodha ya jumbe, gusa na ushikilie ili uchague"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Thibitisha kabla ya kufuta"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Jumbe"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Thibitisha kabla ya kutuma"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Jumbe"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Mahiri katika"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Ujumbe mpya zaidi"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Ujumbe mzee zaidi"</string>
@@ -466,5 +478,18 @@
     <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">"Folda"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Usiruhusu matumizi ya kamera ya kifaa"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Zinahitaji nenosiri la kifaa"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"Zuia matumizi mapya ya nywila ya hivi karibuni"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"Inahitaji nywila kumalizika"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"Inahitaji kifaa bwete ili kufunga skrini yake"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"Wekea kikomo idadi ya matukio ya kalenda yanayolandanishwa"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"Wekea kikomo idadi ya barua pepe zinazolandanishwa"</string>
+    <string name="quick_1" msgid="3426057697353380951">"Asante!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"Iko sawa kwangu!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"Nitasoma hii baadaye na nitawasiliana na wewe."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Tupange mkutano wa kujadili hii."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Ulandanishi wa mandharinyuma ya akaunti hii imelemazwa wakati wa kuzurura."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"Inatuma majibu..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"Hakuna ujumbe."</string>
 </resources>
diff --git a/res/values-sw/uploader.xml b/res/values-sw/uploader.xml
index 9544b3e..42789ca 100644
--- a/res/values-sw/uploader.xml
+++ b/res/values-sw/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Ficha Maelezo"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Mipangilio"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Imepakia %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"Kishika nafasi<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Akaunti"</string>
     <string name="upload" msgid="2615541458361216022">"Pakia"</string>
     <string name="ok" msgid="2516349681897895312">"Sawa"</string>
diff --git a/res/values-sw600dp-land/dimensions.xml b/res/values-sw600dp-land/dimensions.xml
deleted file mode 100644
index c6af028..0000000
--- a/res/values-sw600dp-land/dimensions.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- tablet, landscape -->
-<resources>
-    <dimen name="message_compose_field_label_width">120dip</dimen>
-
-    <!-- width of mailbox list -->
-    <dimen name="mailbox_list_width">304dip</dimen>
-    <!-- width of the message list, on the message list + message view mode. -->
-    <dimen name="message_list_width">428dip</dimen>
-
-    <dimen name="action_bar_account_name_max_width">256dip</dimen>
-    <dimen name="action_bar_mailbox_name_left_margin">32dip</dimen>
-    <dimen name="action_bar_mailbox_name_max_width">256dip</dimen>
-
-    <dimen name="widget_senders_font_size">14sp</dimen>
-    <dimen name="widget_subject_font_size">14sp</dimen>
-    <dimen name="widget_date_font_size">14sp</dimen>
-
-    <!-- Account Setup Activities -->
-    <dimen name="setup_padding_top">16dip</dimen>
-    <dimen name="setup_padding_left">64dip</dimen>
-    <dimen name="setup_padding_right">64dip</dimen>
-
-</resources>
diff --git a/res/values-sw600dp-land/styles.xml b/res/values-sw600dp-land/styles.xml
deleted file mode 100644
index f7e094e..0000000
--- a/res/values-sw600dp-land/styles.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- tablet, landscape -->
-
-<resources>
-    <!-- Use fixed width in landscape -->
-    <style name="message_compose_scroll">
-        <item name="android:layout_width">800dip</item>
-    </style>
-</resources>
diff --git a/res/values-sw600dp-port/dimensions.xml b/res/values-sw600dp-port/dimensions.xml
index fb405f0..c7a8c6a 100644
--- a/res/values-sw600dp-port/dimensions.xml
+++ b/res/values-sw600dp-port/dimensions.xml
@@ -15,23 +15,6 @@
 -->
 
 <resources>
-    <dimen name="message_compose_field_label_width">120dip</dimen>
-
-    <!-- width of mailbox list -->
-    <dimen name="mailbox_list_width">206dip</dimen>
-    <!--
-        width of the message list, on the message list + message view mode.
-        (i.e. on portrait, it's the "expanded" message list.)
-    -->
-    <dimen name="message_list_width">440dip</dimen>
-
-    <dimen name="action_bar_account_name_max_width">128dip</dimen>
-    <dimen name="action_bar_mailbox_name_left_margin">16dip</dimen>
-    <dimen name="action_bar_mailbox_name_max_width">128dip</dimen>
-
-    <dimen name="widget_senders_font_size">14sp</dimen>
-    <dimen name="widget_subject_font_size">14sp</dimen>
-    <dimen name="widget_date_font_size">14sp</dimen>
 
     <!-- Account Setup Activities -->
     <dimen name="setup_padding_top">32dip</dimen>
diff --git a/res/values-sw600dp-port/styles.xml b/res/values-sw600dp-port/styles.xml
deleted file mode 100644
index bd312d4..0000000
--- a/res/values-sw600dp-port/styles.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- tablet, portrait -->
-
-<resources>
-    <!-- Use fixed margin in portrait -->
-    <style name="message_compose_scroll">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_marginLeft">16dip</item>
-        <item name="android:layout_marginRight">16dip</item>
-    </style>
-
-    <style name="accountSetupTypePrevious" parent="@style/accountSetupButton">
-        <item name="android:layout_alignParentBottom">true</item>
-        <item name="android:layout_alignParentLeft">true</item>
-        <item name="android:layout_marginBottom">48dip</item>
-        <item name="android:layout_marginLeft">48dip</item>
-    </style>
-
-    <!-- Cancel/Done buttons on the account settings (server settings) fragments -->
-    <style name="accountSettingsButton">
-        <item name="android:layout_width">125sp</item>
-        <item name="android:layout_height">48sp</item>
-        <item name="android:textSize">18sp</item>
-    </style>
-
-</resources>
diff --git a/res/values-sw600dp/bools.xml b/res/values-sw600dp/bools.xml
deleted file mode 100644
index 6027519..0000000
--- a/res/values-sw600dp/bools.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <bool name="use_two_pane">true</bool>
-
-    <!-- Reply/Reply All/Forward switcher in action bar -->
-    <bool name="message_compose_action_tabs">true</bool>
-</resources>
diff --git a/res/values-sw600dp/colors.xml b/res/values-sw600dp/colors.xml
deleted file mode 100644
index 63d5943..0000000
--- a/res/values-sw600dp/colors.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <color name="message_view_fogged_glass_color">#00000000</color>
-</resources>
diff --git a/res/values-sw600dp/dimensions.xml b/res/values-sw600dp/dimensions.xml
index 24671b8..1ba14b6 100644
--- a/res/values-sw600dp/dimensions.xml
+++ b/res/values-sw600dp/dimensions.xml
@@ -16,17 +16,6 @@
 
 <!-- tablet -->
 <resources>
-    <!-- Bottom padding used to compensate for the built in drop shadow in the
-         asset. -->
-    <dimen name="message_header_height">64dip</dimen>
-    <dimen name="message_header_bottom_padding">4dip</dimen>
-    <dimen name="message_header_badge_width">64dip</dimen>
-    <dimen name="message_header_name_margin">16dip</dimen>
-
-    <!-- hack around the fact that the checkbox below the reply state has a lot
-         of padding built into the asset -->
-    <dimen name="message_list_icon_padding_compensation">-6dip</dimen>
-
     <!-- Account Setup Activities -->
     <!-- inset distance for setup/settings buttons -->
     <dimen name="setup_buttons_padding_left">16dip</dimen>
@@ -53,14 +42,12 @@
     <dimen name="setup_item_inset_left">16dip</dimen>
     <dimen name="setup_item_inset_right">64dip</dimen>
 
-    <!-- Folder list items -->
-    <dimen name="mailbox_list_padding_left">16dip</dimen>
-    <dimen name="mailbox_list_padding_right">24dip</dimen>
-    <dimen name="mailbox_list_count_margin_left">16dip</dimen>
+    <!-- Account Setup Activities -->
+    <dimen name="setup_padding_top">16dip</dimen>
+    <dimen name="setup_padding_left">64dip</dimen>
+    <dimen name="setup_padding_right">64dip</dimen>
 
     <!-- Message list items -->
-    <dimen name="replystate_margin_left">7dip</dimen>
-    <dimen name="replystate_margin_top">10sp</dimen>
-    <dimen name="checkmark_margin_top">4sp</dimen>
-    <dimen name="star_margin_top">30sp</dimen>
+    <dimen name="replystate_margin_top">3sp</dimen>
+    <dimen name="replystate_margin_right">16dip</dimen>
 </resources>
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index 21230f6..08c573f 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -53,121 +53,8 @@
         <item name="android:textSize">18sp</item>
     </style>
 
-    <!-- Message view  -->
-    <style name="message_view_horizontal_divider">
-        <item name="android:layout_height">2dip</item>
-        <item name="android:background">?android:attr/dividerHorizontal</item>
-    </style>
-
-    <style name="message_compose_horizontal_divider">
-        <item name="android:layout_height">1dip</item>
-        <item name="android:background">?android:attr/dividerHorizontal</item>
-    </style>
-    <style name="message_compose_header_field_container_no_tray" parent="PlainEditText">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_gravity">center_vertical</item>
-        <item name="android:orientation">horizontal</item>
-    </style>
-    <style name="message_compose_header_field_container" parent="@android:style/Widget.AutoCompleteTextView">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:paddingLeft">0dip</item>
-        <item name="android:orientation">horizontal</item>
-        <item name="android:addStatesFromChildren">true</item>
-        <item name="android:focusable">false</item>
-        <item name="android:focusableInTouchMode">false</item>
-    </style>
-    <style name="message_compose_header_field_label">
-        <item name="android:layout_width">@dimen/message_compose_field_label_width</item>
-        <item name="android:layout_height">48dip</item>
-        <item name="android:layout_weight">0</item>
-        <item name="android:gravity">center_vertical</item>
-        <item name="android:paddingTop">0dip</item>
-        <item name="android:paddingBottom">0dip</item>
-        <item name="android:paddingLeft">16dip</item>
-        <item name="android:paddingRight">16dip</item>
-        <item name="android:ellipsize">end</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:textSize">18dip</item>
-        <item name="android:textColor">@color/text_secondary_color</item>
-    </style>
-    <style name="message_compose_header_field_value" parent="PlainEditText">
-        <item name="android:layout_width">0dip</item>
-        <item name="android:layout_height">48dip</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:gravity">center_vertical</item>
-        <item name="android:paddingTop">0dip</item>
-        <item name="android:paddingBottom">0dip</item>
-        <item name="android:paddingLeft">0dip</item>
-        <item name="android:paddingRight">0dip</item>
-        <item name="android:textSize">18dip</item>
-        <item name="android:textColor">@color/text_primary_color</item>
-        <item name="android:singleLine">true</item>
-    </style>
-
-    <style name="message_view_action_buttons" parent="android:Widget.Holo.Button.Borderless">
-        <item name="android:layout_width">56dip</item>
-        <item name="android:layout_height">56dip</item>
-        <item name="android:scaleType">center</item>
-    </style>
-
-    <style name="message_header_sender_name">
-        <item name="android:textSize">18dip</item>
-        <item name="android:textColor">@color/text_primary_color_inverse</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:ellipsize">end</item>
-    </style>
-
-    <style name="message_header_sender_address">
-        <item name="android:textSize">14dip</item>
-        <item name="android:textColor">@color/text_secondary_color_inverse</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:ellipsize">end</item>
-    </style>
-
     <style name="accountSetupTypePrevious" parent="@style/accountSetupButton">
         <item name="android:layout_toRightOf">@+id/main_content"</item>
         <item name="android:layout_alignParentRight">true</item>
     </style>
-
-    <style name="action_bar_spinner_primary_text">
-        <item name="android:includeFontPadding">false</item>
-        <item name="android:textSize">18sp</item>
-        <item name="android:textColor">@color/text_primary_color</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:ellipsize">end</item>
-    </style>
-
-    <style name="action_bar_spinner_secondary_text">
-        <item name="android:visibility">gone</item>
-    </style>
-
-    <style name="Attachment.Button" parent="@android:style/Widget.Holo.Button.Borderless">
-        <item name="android:layout_width">0dip</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:layout_height">match_parent</item>
-        <item name="android:layout_marginLeft">16dip</item>
-        <item name="android:layout_marginRight">16dip</item>
-        <item name="android:padding">0dip</item>
-        <item name="android:textColor">@color/buttontext</item>
-        <item name="android:textSize">14dip</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:ellipsize">end</item>
-        <item name="android:gravity">center</item>
-        <item name="android:textAllCaps">true</item>
-    </style>
-
-    <style name="message_list_item_normal">
-        <item name="android:paddingLeft">0dip</item>
-        <item name="android:paddingRight">0dip</item>
-    </style>
-
-    <style name="message_list_item_wide">
-        <item name="android:paddingLeft">16dip</item>
-        <item name="android:paddingRight">16dip</item>
-    </style>
-
 </resources>
diff --git a/res/values-sw800dp-land/dimen.xml b/res/values-sw800dp-land/dimen.xml
deleted file mode 100644
index 1b77584..0000000
--- a/res/values-sw800dp-land/dimen.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- tablet, landscape -->
-<resources>
-    <!-- Account Setup Activities -->
-    <dimen name="setup_padding_top">16dip</dimen>
-    <dimen name="setup_padding_left">128dip</dimen>
-    <dimen name="setup_padding_right">128dip</dimen>
-</resources>
-
diff --git a/res/values-sw800dp-port/styles.xml b/res/values-sw800dp-port/styles.xml
deleted file mode 100644
index 8a61b9f..0000000
--- a/res/values-sw800dp-port/styles.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- tablet, portrait -->
-
-<resources>
-    <!-- Override previous button in really large tablets -->
-    <style name="accountSetupTypePrevious" parent="@style/accountSetupButton">
-        <item name="android:layout_toRightOf">@+id/main_content"</item>
-        <item name="android:layout_alignParentRight">true</item>
-    </style>
-
-</resources>
-
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index a7ccc7c..90044e0 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"อ่านไฟล์แนบของอีเมล"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"อนุญาตให้แอปพลิเคชันนี้อ่านไฟล์แนบในอีเมลของคุณ"</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"อนุญาตให้แอปพลิเคชันนี้อ่านไฟล์แนบในอีเมลของคุณ"</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"เข้าถึงข้อมูลผู้ให้บริการอีเมล"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"อนุญาตให้แอปพลิเคชันนี้เข้าถึงฐานข้อมูลอีเมลของคุณ ซึ่งรวมถึงข้อความที่ได้รับ ข้อความที่ส่ง ชื่อผู้ใช้ และรหัสผ่าน"</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"อนุญาตให้แอปพลิเคชันนี้เข้าถึงฐานข้อมูลอีเมลของคุณ ซึ่งรวมถึงข้อความที่ได้รับ ข้อความที่ส่ง ชื่อผู้ใช้ และรหัสผ่าน"</string>
     <string name="app_name" msgid="5815426892327290362">"อีเมล"</string>
     <string name="compose_title" msgid="427986915662706899">"เขียน"</string>
     <string name="debug_title" msgid="5175710493691536719">"ดีบัก"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"เสร็จสิ้น"</string>
     <string name="create_action" msgid="3062715563215392251">"สร้างใหม่"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"ลบ"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"ไม่มีคำตอบด่วน"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"ไม่มีคำตอบด่วน"</string>
     <string name="discard_action" msgid="6532206074859505968">"ยกเลิก"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"บันทึกร่างจดหมาย"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"ใส่คำตอบด่วน"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"ค้นหา"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"การตั้งค่าบัญชี"</string>
     <string name="settings_action" msgid="6334807007967459412">"การตั้งค่า"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"ตัวเลือกการซิงค์"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"ตัวเลือกการซิงค์"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"ทำเครื่องหมายว่ายังไม่ได้อ่าน"</string>
     <string name="move_action" msgid="3059189775933985898">"ย้าย"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ สำเนา/สำเนาลับ"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> เขียนว่า:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"รวมข้อความที่ยกมา"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"รวมข้อความ"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"คุณต้องเพิ่มผู้รับอย่างน้อยหนึ่งราย"</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"เพิ่มผู้รับอย่างน้อยหนึ่งราย"</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"ที่อยู่อีเมลบางที่อยู่ไม่ถูกต้อง"</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"ไฟล์ใหญ่เกินไปที่จะแนบ"</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"ใส่คำตอบด่วน"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"บันทึกแล้ว"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"หยุด"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"เอกสารแนบถูกบันทึกเป็น <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"ไม่สามารถบันทึกไฟล์แนบ"</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"หมายเหตุ: เอกสารแนบอย่างน้อยหนึ่งรายการในข้อความที่ส่งต่อของคุณจะมีการดาวน์โหลดก่อนส่ง"</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"ไม่สามารถบันทึกไฟล์แนบ"</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"หมายเหตุ: ไฟล์แนบอย่างน้อยหนึ่งรายการในข้อความที่ส่งต่อของคุณจะมีการดาวน์โหลดก่อนส่ง"</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"ข้อความ"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"เชิญ"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"ไม่สามารถส่งต่อไฟล์แนบอย่างน้อยหนึ่งรายการ"</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"ไม่ได้ส่งต่อเอกสารแนบ"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"การลงชื่อเข้าใช้ <xliff:g id="ACCOUNT_NAME">%s</xliff:g> ล้มเหลว"</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"ลงชื่อเข้าใช้ <xliff:g id="ACCOUNT_NAME">%s</xliff:g> ไม่สำเร็จ"</string>
     <string name="login_failed_title" msgid="7624349996212476176">"ไม่สามารถลงชื่อเข้าใช้"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>ไบต์"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"เก่ากว่า"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" - "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"การตั้งค่าบัญชี"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"เพิ่มบัญชี Exchange"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"เพิ่มบัญชี Exchange ActiveSync"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"บัญชีอีเมล"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"คุณสามารถตั้งค่าอีเมลสำหรับ\\nบัญชีส่วนใหญ่ได้ในไม่กี่ขั้นตอน"</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"คุณสามารถตั้งค่าบัญชี Exchange ได้ในไม่กี่ขั้นตอน"</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"คุณสามารถตั้งค่าบัญชี Exchange ActiveSync ได้ในไม่กี่ขั้นตอน"</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"คุณสามารถตั้งค่าบัญชีได้ในไม่กี่ขั้นตอน"</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"ที่อยู่อีเมล"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"รหัสผ่าน"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"ส่งอีเมลจากบัญชีนี้เป็นค่าเริ่มต้น"</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"ส่งอีเมลจากบัญชีนี้เป็นค่าเริ่มต้น"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"ตั้งค่าด้วยตนเอง"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"พิมพ์ที่อยู่อีเมลและรหัสผ่านที่ถูกต้อง"</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"บัญชีซ้ำ"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"กำลังตรวจสอบการตั้งค่าเซิร์ฟเวอร์ขาเข้า..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"กำลังตรวจสอบการตั้งค่าเซิร์ฟเวอร์ขาออก..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"การตั้งค่าบัญชี"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"ตั้งค่าบัญชีของคุณแล้ว และอีเมลกำลังมาถึง"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"ตั้งค่าบัญชีของคุณแล้ว และอีเมลกำลังมาถึง!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"ตั้งชื่อให้กับบัญชีนี้ (เป็นตัวเลือก)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"ชื่อของคุณ (แสดงในข้อความขาออก)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"ต้องกรอกข้อมูลในฟิลด์นี้"</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"การตั้งค่าเซิร์ฟเวอร์ขาเข้า"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"ชื่อผู้ใช้"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"รหัสผ่าน"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"เซิร์ฟเวอร์ POP3"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"เซิร์ฟเวอร์ IMAP"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"เซิร์ฟเวอร์"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"พอร์ต"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"ประเภทการรักษาความปลอดภัย"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"ไม่มี"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"เซิร์ฟเวอร์ SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"พอร์ต"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"ประเภทการรักษาความปลอดภัย"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"ต้องลงชื่อเข้าใช้"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"จำเป็นต้องลงชื่อเข้าใช้"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"ชื่อผู้ใช้"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"รหัสผ่าน"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"การตั้งค่าบัญชี"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"ทุก 15 นาที"</string>
     <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_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>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"ส่งอีเมลจากบัญชีนี้เป็นค่าเริ่มต้น"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"แจ้งให้ฉันทราบเมื่อมีอีเมลเข้า"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"ซิงค์รายชื่อจากบัญชีนี้"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"ซิงค์ปฏิทินจากบัญชีนี้"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"ซิงค์อีเมลจากบัญชีนี้"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"ดาวน์โหลดไฟล์แนบโดยอัตโนมัติเมื่อเชื่อมต่อ Wi-Fi"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"ไม่สามารถดำเนินการให้เสร็จสิ้น"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"วันที่จะซิงค์"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"1 เดือน"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"ทั้งหมด"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"ใช้ค่าเริ่มต้นของบัญชี"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"ชื่อผู้ใช้หรือรหัสผ่านไม่ถูกต้อง"</string>
-    <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_auth_message" msgid="426627755590431364">"ชื่อผู้ใช้หรือรหัสผ่านไม่ถูกต้อง"</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"ชื่อผู้ใช้หรือรหัสผ่านไม่ถูกต้อง "\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์ได้อย่างปลอดภัย"</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์ได้อย่างปลอดภัย"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"ต้องใช้ใบรับรองไคลเอ็นต์ ต้องการเชื่อมต่อกับเซิร์ฟเวอร์ที่มีใบรับรองไคลเอ็นต์หรือไม่"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"ใบรับรองไม่ถูกต้องหรือไม่สามารถเข้าถึงได้"</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"เซิร์ฟเวอร์ตอบสนองโดยมีข้อผิดพลาด โปรดตรวจสอบชื่อผู้ใช้และรหัสผ่านของคุณ แล้วลองอีกครั้ง"</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"ต้องมีใบรับรองไคลเอ็นต์ คุณต้องการเชื่อมต่อกับเซิร์ฟเวอร์ด้วยใบรับรองไคลเอ็นต์หรือไม่"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"ใบรับรองไม่ถูกต้องหรือไม่สามารถเข้าถึงได้"</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"เซิร์ฟเวอร์ตอบสนองโดยมีข้อผิดพลาด โปรดตรวจสอบชื่อผู้ใช้และรหัสผ่านของคุณ แล้วลองอีกครั้ง"</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์"</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"ต้องใช้ TLS แต่เซิร์ฟเวอร์ไม่สนับสนุน"</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"คำเตือน: การปิดใช้งานสิทธิ์ของแอปพลิเคชันอีเมลในการดูแลอุปกรณ์ของคุณจะเป็นการลบบัญชีอีเมลทั้งหมดที่จำเป็นต้องใช้สิทธิ์นั้น พร้อมทั้งอีเมล สมุดโทรศัพท์ กิจกรรมในปฏิทิน และข้อมูลอื่นๆ"</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"การอัปเดตความปลอดภัย"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> กำหนดให้คุณต้องอัปเดตการตั้งค่าความปลอดภัย"</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"บัญชี \"<xliff:g id="ACCOUNT">%s</xliff:g>\" ต้องการการอัปเดตการตั้งค่าความปลอดภัย"</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"ต้องมีการอัปเดตการรักษาความปลอดภัย"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"ไม่สามารถซิงค์บัญชี \"<xliff:g id="ACCOUNT">%s</xliff:g>\" เนื่องจากข้อกำหนดด้านความปลอดภัย"</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"บัญชี \"<xliff:g id="ACCOUNT">%s</xliff:g>\" ต้องมีการอัปเดตการตั้งค่าความปลอดภัย"</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"เปลี่ยนการตั้งค่าความปลอดภัยของบัญชี \"<xliff:g id="ACCOUNT">%s</xliff:g>\" แล้ว ผู้ใช้ไม่จำเป็นต้องดำเนินการใดๆ"</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"ต้องอัปเดตการรักษาความปลอดภัย"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"เปลี่ยนนโยบายความปลอดภัยแล้ว"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"ไม่ตรงกับนโยบายความปลอดภัย"</string>
     <string name="account_security_title" msgid="3511543138560418587">"ความปลอดภัยของอุปกรณ์"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"เซิร์ฟเวอร์ <xliff:g id="SERVER">%s</xliff:g> ต้องการให้คุณอนุญาตให้ควบคุมคุณลักษณะความปลอดภัยบางอย่างของอุปกรณ์ Android ของคุณได้จากระยะไกล"</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"แก้ไขรายละเอียด"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"PIN หรือรหัสผ่านล็อกหน้าจอของคุณหมดอายุแล้ว"</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"รหัสผ่านล็อกหน้าจอหมดอายุแล้ว"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"รหัสผ่านล็อกหน้าจอใกล้หมดอายุ"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"คุณต้องเปลี่ยน PIN หรือรหัสผ่านล็อกหน้าจอของคุณโดยเร็ว มิฉะนั้นข้อมูลสำหรับ <xliff:g id="ACCOUNT">%s</xliff:g> จะถูกลบ เปลี่ยนรหัสตอนนี้หรือไม่"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"คุณต้องเปลี่ยน PIN หรือรหัสผ่านสำหรับการล็อกหน้าจอโดยเร็ว ไม่เช่นนั้นข้อมูลของ <xliff:g id="ACCOUNT">%s</xliff:g> จะถูกลบ คุณต้องการเปลี่ยนตอนนี้หรือไม่"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"รหัสผ่านล็อกหน้าจอหมดอายุแล้ว"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"ข้อมูลสำหรับ <xliff:g id="ACCOUNT">%s</xliff:g> กำลังถูกลบออกจากอุปกรณ์ของคุณ คุณสามารถคืนค่าข้อมูลได้โดยเปลี่ยน PIN หรือรหัสผ่านล็อกหน้าจอของคุณ เปลี่ยนรหัสตอนนี้หรือไม่"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"ข้อมูลสำหรับ <xliff:g id="ACCOUNT">%s</xliff:g> กำลังถูกลบออกจากอุปกรณ์ของคุณ คุณสามารถคืนค่าข้อมูลได้โดยเปลี่ยน PIN หรือรหัสผ่านล็อกหน้าจอของคุณ เปลี่ยนรหัสตอนนี้หรือไม่"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"ยกเลิกการเปลี่ยนแปลงที่ยังไม่ได้บันทึกหรือไม่"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"ลงชื่อเข้าใช้ไม่ได้"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"ชื่อผู้ใช้หรือรหัสผ่านสำหรับ <xliff:g id="ACCOUNT">%s</xliff:g> ไม่ถูกต้อง อัปเดตชื่อผู้ใช้และรหัสผ่านตอนนี้หรือไม่"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"ชื่อผู้ใช้หรือรหัสผ่านสำหรับ <xliff:g id="ACCOUNT">%s</xliff:g> ไม่ถูกต้อง คุณต้องการอัปเดตตอนนี้หรือไม่"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"บัญชีเริ่มต้น"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"ส่งอีเมลจากบัญชีนี้เป็นค่าเริ่มต้น"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"ดาวน์โหลดไฟล์แนบ"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"ดาวน์โหลดไฟล์แนบของข้อความล่าสุดผ่าน WiFi โดยอัตโนมัติ"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"การแจ้งเตือนทางอีเมล"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"ความถี่ในการซิงค์ การแจ้งเตือน ฯลฯ"</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"แจ้งในแถบระบบเมื่อได้รับอีเมล"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"ส่งการแจ้งเตือนเมื่อมีอีเมลเข้า"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"ความถี่ในการตรวจสอบกล่องจดหมาย"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"การตั้งค่าข้อความขาเข้า"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"ชื่อผู้ใช้ รหัสผ่าน และการตั้งค่าเซิร์ฟเวอร์ขาเข้าอื่นๆ"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"การตั้งค่าข้อความขาออก"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"ชื่อผู้ใช้ รหัสผ่าน และการตั้งค่าเซิร์ฟเวอร์ขาออกอื่นๆ"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"บังคับใช้นโยบายแล้ว"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"ไม่มี"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"นโยบายที่ไม่สนับสนุน"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"ไม่มี"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"พยายามซิงค์"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"แตะที่นี่เพื่อซิงค์บัญชีนี้"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"ชื่อบัญชี"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"ชื่อของคุณ"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"ลายเซ็น"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"คำตอบด่วน"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"แก้ไขข้อความที่คุณใช้เป็นประจำเมื่อเขียนอีเมล"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"แก้ไขข้อความที่คุณใช้เป็นประจำเมื่อเขียนอีเมล"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"เพิ่มข้อความต่อท้ายจดหมายที่คุณส่ง"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"การตั้งค่าการแจ้งเตือน"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"การใช้ข้อมูล"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"นโยบายความปลอดภัย"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"แก้ไขคำตอบด่วน"</string>
     <string name="save_action" msgid="1988862706623227093">"บันทึก"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"ซิงค์รายชื่อในสมุดโทรศัพท์"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"ซิงค์สมุดโทรศัพท์สำหรับบัญชีนี้"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"ซิงค์ปฏิทิน"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"ซิงค์ปฏิทินสำหรับบัญชีนี้"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"ซิงค์ปฏิทิน"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"ซิงค์กิจกรรมในปฏิทินสำหรับบัญชีนี้"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"ซิงค์อีเมล"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"ซิงค์อีเมลสำหรับบัญชีนี้"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"สั่น"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"ผลลัพธ์ <xliff:g id="RESULTS">%1$d</xliff:g> รายการจาก <xliff:g id="DOMAIN">%2$s</xliff:g> รายการ"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"การตั้งค่า"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"ทั่วไป"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"การตั้งค่าทั่วไป"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"แอปพลิเคชัน"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"เลื่อนไปข้างหน้าโดยอัตโนมัติ"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"เลือกหน้าจอที่จะแสดงขึ้นหลังจากที่คุณลบข้อความ"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"ซ่อนช่องทำเครื่องหมาย"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"แตะข้อความในรายการค้างไว้เพื่อเลือก"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"ยืนยันก่อนลบ"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"ข้อความ"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"ยืนยันก่อนส่ง"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"ข้อความ"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"เลื่อนไปที่"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"ข้อความที่ใหม่กว่า"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"ข้อความที่เก่ากว่า"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"กำลังรอผลลัพธ์"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"เซิร์ฟเวอร์บางอย่างอาจใช้เวลานาน"</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"โฟลเดอร์"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"ไม่อนุญาตให้ใช้กล้องถ่ายรูปของอุปกรณ์"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"ต้องมีรหัสผ่านของอุปกรณ์"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"จำกัดการนำรหัสผ่านล่าสุดมาใช้ใหม่"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"รหัสผ่านต้องมีวันหมดอายุ"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"อุปกรณ์ต้องไม่มีการทำงานเพื่อล็อกหน้าจอ"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"จำกัดจำนวนกิจกรรมในปฏิทินที่ซิงค์"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"จำกัดจำนวนอีเมลที่ซิงค์"</string>
+    <string name="quick_1" msgid="3426057697353380951">"ขอบคุณ!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"น่าสนใจนะ!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"ฉันจะอ่านและตอบกลับทีหลัง"</string>
+    <string name="quick_4" msgid="3988974084396883051">"จัดการประชุมเพื่อคุยเรื่องนี้กัน"</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"การซิงค์พื้นหลังสำหรับบัญชีนี้ถูกปิดใช้งานขณะโรมมิ่ง"</string>
+    <string name="confirm_response" msgid="5747902757569543165">"กำลังส่งการตอบกลับ..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"ไม่มีข้อความ"</string>
 </resources>
diff --git a/res/values-th/uploader.xml b/res/values-th/uploader.xml
index 3c4cd2d..9849adf 100644
--- a/res/values-th/uploader.xml
+++ b/res/values-th/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"ซ่อนรายละเอียด"</string>
     <string name="menu_settings" msgid="5088116127086866634">"การตั้งค่า"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"อัปโหลดแล้ว %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"บัญชี"</string>
     <string name="upload" msgid="2615541458361216022">"อัปโหลด"</string>
     <string name="ok" msgid="2516349681897895312">"ตกลง"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 3ffabdd..014522c 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"Basahin ang mga attachment sa email"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Binibigyang-daan ang application na ito na basahin ang iyong mga attachment sa email."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Binibigyang-daan ang app na basahin ang iyong mga attachment sa email."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"I-access ang data ng provider ng email"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Binibigyang-daan ang application na ito na i-access ang database ng iyong email, kabilang ang mga natanggap na mensahe, ipinadalang mensahe, username, at password."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Binibigyang-daan ang application na i-access ang database ng iyong email, kabilang ang mga natanggap na mensahe, naipadalang mensahe, username, at password."</string>
     <string name="app_name" msgid="5815426892327290362">"Email"</string>
     <string name="compose_title" msgid="427986915662706899">"Bumuo"</string>
     <string name="debug_title" msgid="5175710493691536719">"Debug"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"Tapos na"</string>
     <string name="create_action" msgid="3062715563215392251">"Lumikha ng bago"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"Tanggalin"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"Walang mga mabilisang pagtugon"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Walang mga mabilisang pagtugon."</string>
     <string name="discard_action" msgid="6532206074859505968">"Itapon"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"I-save ang draft"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Ipasok mabilisang tugon"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"Paghahanap"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Mga setting ng account"</string>
     <string name="settings_action" msgid="6334807007967459412">"Mga Setting"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"Mga pagpipilian sa pag-sync"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Mga pagpipilian sa pag-sync"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Markahan bilang hindi pa nababasa"</string>
     <string name="move_action" msgid="3059189775933985898">"Ilipat"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">"Si "\n\n"<xliff:g id="SENDER">%s</xliff:g> ay sumulat:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Isama ang naka-quote na teksto"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Isama ang teksto"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Dapat kang magdagdag ng hindi bababa sa isang recipient."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"Magdagdag ng hindi bababa sa isang recipient."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Di-wasto ang ilang email address."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Masyadong malaki ang file upang i-attach."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Ipasok ang mabilisang tugon"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Na-save"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Huminto"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Na-save attachment na <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Hindi mai-save ang attachment."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Paalala: Ida-download bago ang pagpapadala ang isa o higit pang mga attachment sa iyong ipinasang mensahe."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"Hindi ma-save ang attachment."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Ida-download ang isa o higit pang mga attachment sa iyong ipinasang mensahe bago ang pagpapadala."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Mensahe"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Imbitahan"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Hindi makapagpasa ng isa o higit pang mga attachment."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Hindi napasa ang attachment"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"Nabigo sa pag-signin sa <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"Hindi matagumpay ang pag-signin ng <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"Hindi makapag-sign in"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Mas luma"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Setup ng account"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Magdagdag ng Exchange account"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Magdagdag ng Exchange ActiveSync account"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"Email account"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"Maaari kang mag-set up ng email para sa karamihan ng mga account sa ilang hakbang lamang."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Maaari kang mag-set up ng isang Exchange account sa ilang hakbang lamang."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Maaari kang mag-set up ng isang Exchange ActiveSync account sa ilang hakbang lamang."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Mase-set up mo ang iyong account sa ilang hakbang lang."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Email address"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Password"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Magpadala ng email mula sa account na ito bilang default."</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"Magpadala ng email mula sa account na ito bilang default"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manu-manong pag-setup"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Mag-type ng wastong email address at password."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Duplicate na account"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Sinusuri ang mga setting ng papasok na server…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Sinusuri ang mga setting ng papalabas na server…"</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Setup ng account"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"Naka-set up ang iyong account, at paparating na ang email!"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"Naka-set up na ang iyong account at paparating na ang email!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Bigyan ng pangalan ang account na ito (opsyonal)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Iyong pangalan (na ipinapakita sa mga papalabas na mensahe)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Hindi maaaring blangko ang field na ito."</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Mga setting ng papasok na server"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Username"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Password"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3 server"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"IMAP server"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Server"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Uri ng seguridad"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Wala"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP server"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Uri ng seguridad"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Nangangailangan ng pag-sign-in."</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Hingin ang pag-signin"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Username"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Password"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"Setup ng account"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Tuwing 15 minuto"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Tuwing 30 minuto"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Oras-oras"</string>
-    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Magpadala ng email mula sa account na ito bilang default."</string>
-    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"I-notify ako kapag dumating ang email."</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"I-sync ang mga contact mula sa account na ito."</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"I-sync ang kalendaryo mula sa account na ito"</string>
-    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"I-sync ang email mula sa account na ito."</string>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"Magpadala ng email mula sa account na ito bilang default"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"I-notify ako kapag may dumating na email"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"I-sync ang mga contact mula sa account na ito"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"I-sync ang kalendaryo mula sa account na ito"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"I-sync ang email mula sa account na ito"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Awtomatikong i-download ang mga attachment kapag nakakonekta sa Wi-Fi"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Hindi matapos"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Mga araw upang i-sync"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Isang buwan"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Lahat"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Gamitin ang default ng account"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Mali ang username o password."</string>
-    <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_auth_message" msgid="426627755590431364">"Hindi tama ang username o password."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"Hindi tama ang username o password."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Hindi makakonekta nang ligtas sa server."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Hindi makakonekta nang ligtas sa server."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"Kinakailangan ang certificate ng client. Kumonekta sa server gamit ang certificate ng client?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"Di-wasto o hindi naa-access ang certificate."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"Tumugon ang server nang may error. Suriin ang iyong username at password pagkatapos ay subukang muli."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"Kinakailangan ng certificate ng client. Nais mo bang kumonekta sa server gamit ang isang certificate ng client?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"Di-wasto o hindi naa-access ang certificate."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"Tumugon ang server nang may error. Suriin ang iyong username at password, pagkatapos ay subukang muli."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"Hindi makakonekta sa server."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Hindi makakonekta sa server."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"Kinakailangan ang TLS ngunit hindi suportado ng server."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"BABALA: Ang pag-deactivate sa awtoridad ng Email app na pangasiwaan ang iyong device ay magtatanggal sa lahat ng email account na nangangailangan nito, kasama ang email, mga contact, mga kaganapan sa kalendaryo, at iba pang data ng mga ito."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Update sa seguridad"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"Kinakailangan ng <xliff:g id="ACCOUNT">%s</xliff:g> na i-update mo ang iyong mga setting ng seguridad."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Nangangailangan ang account na \"<xliff:g id="ACCOUNT">%s</xliff:g>\" ng pag-update ng mga setting ng seguridad."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"Kailangan update sa seguridad"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Hindi ma-sync ang account na \"<xliff:g id="ACCOUNT">%s</xliff:g>\" dahil sa mga kinakailangan sa seguridad."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"Kinakailangan ng account na \"<xliff:g id="ACCOUNT">%s</xliff:g>\" ng update sa mga setting ng seguridad."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"Binago ng account na \"<xliff:g id="ACCOUNT">%s</xliff:g>\" ang mga setting ng seguridad nito; walang kinakailangang pagkilos ng user."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Kailangan update sa seguridad"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Nabago patakaran sa seguridad"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Di masunod patakaran seguridad"</string>
     <string name="account_security_title" msgid="3511543138560418587">"Seguridad ng device"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Kinakailangan ng server na <xliff:g id="SERVER">%s</xliff:g> na payagan mo itong malayuang kontrolin ang ilang tampok sa seguridad ng iyong Android device."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"I-edit ang mga detalye"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"Nag-expire na ang iyong PIN o password sa pag-lock ng screen."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"Expire na passw. pg-lock scr"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Nag-e-expire password pag-lock ng screen"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"Dapat mong palitan ang iyong PIN o password sa pag-lock ng screen, o mabubura ang data para sa <xliff:g id="ACCOUNT">%s</xliff:g>. Palitan ito ngayon?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Kailangan mong baguhin ang iyong PIN o password para sa screen ng lock sa lalong madaling panahon, o mabubura ang data para sa <xliff:g id="ACCOUNT">%s</xliff:g>. Nais mo ba itong baguhin ngayon?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"Nag-expire na password pag-lock screen"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"Binubura ang data para sa <xliff:g id="ACCOUNT">%s</xliff:g> mula sa iyong device. Maaari mo itong ibalik sa pamamagitan ng pagbabago ng iyong PIN o password sa pag-lock ng screen. Palitan ito ngayon?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"Binubura ang data para sa <xliff:g id="ACCOUNT">%s</xliff:g> mula sa iyong device. Maipapanumbalik mo ito sa pamamagitan ng pagbabago sa iyong PIN o password para sa screen ng lock. Nais mo ba itong baguhin ngayon?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Itapon ang hindi naka-save na mga pagbabago?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Hindi makapag-sign in"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Hindi tama ang username o password para sa <xliff:g id="ACCOUNT">%s</xliff:g>. I-update ang mga ito ngayon?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"Hindi tama ang username o password para sa <xliff:g id="ACCOUNT">%s</xliff:g>. Nais mo bang i-update ang mga ito ngayon?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Default na account"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Magpadala ng email mula sa account na ito bilang default"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Mag-download ng mga attachment"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Awto i-download mga attachment sa mga bagong mensahe sa Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Mga notification sa email"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Dalas ng pag-sync, mga notification, atbp."</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"I-notify sa System bar kapag dumating ang email"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Magpadala ng notification kapag may dumating na email"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Dalas ng pagtingin sa inbox"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Mga setting ng papasok"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Mga setting ng username, password, at ibang papasok na server"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Mga setting ng papalabas"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Mga setting ng username, password, at ibang papalabas na server"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Ipinapatupad na mga patakaran"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Wala"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Mga hindi sinusuportahang patakaran"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Wala"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"Magtangkang i-sync"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Pumindot dito upang i-sync ang account na ito"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Pangalan ng account"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Iyong pangalan"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Lagda"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Mga mabilisang tugon"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"I-edit ang teksto na madalas mong ipasok kapag nag-i-email"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"I-edit tekstong madalas mong pinapasok kapag nagsusulat ng email"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Magsama ng teksto sa mga mensaheng iyong ipinapadala"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Mga setting ng notification"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Paggamit ng data"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"Mga patakaran sa seguridad"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"I-edit ang mabilisang tugon"</string>
     <string name="save_action" msgid="1988862706623227093">"I-save"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"I-sync ang mga contact"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sync ang contact sa account na ito"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sync ang Kalendaryo"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"I-sync kalendaryo sa account na ito"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"I-sync ang kalendaryo"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Sync ganap kalendaryo para ito acct"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"I-sync ang email"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"I-sync ang email sa account na ito"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"I-vibrate"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> (na) resulta mula sa <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Mga Setting"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"Pangkalahatan"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Mga pangkalahatang setting"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"Application"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Auto-advance"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Piliin kung aling screen ang ipapakita pagkatapos mong magtanggal ng mensahe"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Itago ang mga checkbox"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"Sa mga listahan ng mensahe, pindutin nang matagal upang piliin"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Kumpirmahin bago tanggalin"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Mga Mensahe"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Kumpirmahin bago ipadala"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Mga Mensahe"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Mag-advance sa"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Mas bagong mga mensahe"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Mas lumang mensahe"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"Naghihintay ng mga resulta"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Maaaring magtagal ang ilang server."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Mga Folder"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Wag payag paggamit ng camera ng device"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Hilingin ang password ng device"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"Paghigpitan gamit muli dating password"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"Hinging mag-expire ang mga password"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"Hilingin idle device i-lock screen nito"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"Limitahan ang bilang ng mga kaganapan sa kalendaryo na sini-sync"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"Limitahan ang bilang ng mga email na sini-sync"</string>
+    <string name="quick_1" msgid="3426057697353380951">"Salamat!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"Magaling sa akin!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"Babasahin ko ito sa ibang pagkakataon at babalik sa iyo."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Magtakda tayo ng pulong upang talakayin ito."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Hindi pinapagana ang background na pag-sync para sa account na ito habang nagro-roam."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"Ipinapadala ang tugon..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"Walang mga mensahe."</string>
 </resources>
diff --git a/res/values-tl/uploader.xml b/res/values-tl/uploader.xml
index 157de85..b21305c 100644
--- a/res/values-tl/uploader.xml
+++ b/res/values-tl/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Itago ang Mga Detalye"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Mga Setting"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Na-upload %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Account"</string>
     <string name="upload" msgid="2615541458361216022">"I-upload"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 5e3c2e5..f0649ae 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"E-posta eklerini oku"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Bu uygulamaya, e-posta eklerinizi okuma izni verir."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Uygulamaya e-posta eklerinizi okuma izni verir."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"E-posta sağlayıcı verilerine eriş"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Bu uygulamaya, alınan iletiler, gönderilen iletiler, kullanıcı adları ve şifreler de dahil olmak üzere e-posta veritabanınıza erişme izni verir."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Uygulamaya, alınan iletiler, gönderilen iletiler, kullanıcı adları ve şifreler de dahil olmak üzere e-posta veritabanınıza erişme izni verir."</string>
     <string name="app_name" msgid="5815426892327290362">"E-posta"</string>
     <string name="compose_title" msgid="427986915662706899">"E-Posta Yaz"</string>
     <string name="debug_title" msgid="5175710493691536719">"Hata Ayıklama"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"Bitti"</string>
     <string name="create_action" msgid="3062715563215392251">"Yeni oluştur"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"Sil"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"Hızlı yanıt yok"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Hızlı yanıt yok."</string>
     <string name="discard_action" msgid="6532206074859505968">"Sil"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"Taslak kaydet"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Hızlı yanıt ekle"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"Ara"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Hesap ayarları"</string>
     <string name="settings_action" msgid="6334807007967459412">"Ayarlar"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"Senkronizasyon seçenekleri"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Senkronizasyon seçenekleri"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Okunmadı olarak işaretle"</string>
     <string name="move_action" msgid="3059189775933985898">"Taşı"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> şunu yazdı:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Alıntılanan metni dahil et"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Metni ekle"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"En az bir alıcı eklemelisiniz."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"En az bir alıcı ekleyin."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Bazı e-posta adresleri geçersiz."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Dosya eklenemeyecek kadar büyük."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Hızlı yanıt ekle"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Kaydedildi"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Durdur"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Ek <xliff:g id="FILENAME">%s</xliff:g> olarak kaydedildi."</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Ek kaydedilemedi."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Not: Yönlendirilen iletinizdeki bir veya daha fazla ek, gönderme işleminden önce indirilecek."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"Ek kaydedilemedi."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Yönlendirilen iletinizdeki bir veya daha fazla ek, gönderme işleminden önce indirilecek."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"İleti"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Davet Et"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Bir veya birden fazla ek yönlendirilemedi."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Ek yönlendirilmedi"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> oturumu açılamadı"</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> oturumu açılamadı."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"Oturum açılamadı"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Daha eski"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Hesap kurulumu"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Bir Exchange hesabı ekleyin"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Bir Exchange ActiveSync hesabı ekleyin"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"E-posta hesabı"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"Çoğu hesap için yalnızca birkaç adımda e-posta oluşturabilirsiniz."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Yalnızca birkaç adımda Exchange hesabı oluşturabilirsiniz."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Yalnızca birkaç adımda Exchange ActiveSync hesabı oluşturabilirsiniz."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Hesabınızı birkaç adımda oluşturabilirsiniz."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"E-posta adresi"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Şifre"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"E-postayı varsayılan olarak bu hesaptan gönder."</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"E-postaları varsayılan olarak bu hesaptan gönder"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuel kurulum"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Geçerli bir e-posta adresi ve şifre yazın."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Yinelenen hesap"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Gelen sunucu ayarları denetleniyor..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Giden sunucu ayarları denetleniyor..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Hesap kurulumu"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"Hesabınız ayarlandı ve e-posta gönderildi!"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"Hesabınız ayarlandı ve e-posta gönderildi!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Bu hesaba bir ad ver (isteğe bağlı)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Adınız (giden iletilerde görüntülenir)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Bu alan boş olamaz."</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Gelen sunucu ayarları"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Kullanıcı adı"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Şifre"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3 sunucusu"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"IMAP sunucusu"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Sunucu"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Bağlantı Noktası"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Güvenlik türü"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Yok"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP sunucusu"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Bağlantı Noktası"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Güvenlik türü"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Oturum açılmasını gerektiriyor."</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Oturum açmayı gerektir"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Kullanıcı adı"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Şifre"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"Hesap kurulumu"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Her 15 dakikada bir"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Her 30 dakikada bir"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Saatte bir"</string>
-    <string name="account_setup_options_default_label" msgid="8869166381331276697">"E-postayı varsayılan olarak bu hesaptan gönder."</string>
-    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"E-posta geldiğinde bana bildir."</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Bu hesaptaki kişileri senkronize et."</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Bu hesaptaki takvimi senkronize et"</string>
-    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"E-postayı bu hesaptan senkronize et."</string>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"E-postaları varsayılan olarak bu hesaptan gönder"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"E-posta geldiğinde bana bildir"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Bu hesaptaki kişileri senkronize et"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Bu hesaptaki takvimi senkronize et"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"E-postayı bu hesaptan senkronize et"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Kablosuz\'a bağlandığında ekleri otomatik olarak indir"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Tamamlanamadı"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Senkronize edilecek gün sayısı"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Bir ay"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Tümü"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Varsayılanı kullan"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Kullanıcı adı veya şifre hatalı."</string>
-    <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_auth_message" msgid="426627755590431364">"Kullanıcı adı veya şifre hatalı."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"Kullanıcı adı veya şifre yanlış."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Sunucuya güvenli biçimde bağlanılamıyor."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Sunucuya güvenli biçimde bağlanılamıyor."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"İstemci sertifikası gerekli. Sunucuya istemci sertifikasıyla bağlanılsın mı?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"Sertifika geçersiz veya erişilemiyor."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"Sunucu hata gönderdi. Kullanıcı adınızı ve şifrenizi kontrol ettikten sonra tekrar deneyin."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"İstemci sertifikası gerekli. Sunucuya bir istemci sertifikası ile bağlanmak ister misiniz?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"Sertifika geçersiz veya erişilemez."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"Sunucu hata gönderdi. Kullanıcı adınızı ve şifrenizi kontrol ettikten sonra tekrar deneyin."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"Sunucuya bağlanılamıyor."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Sunucuya bağlanılamıyor."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS gerekli ancak sunucu tarafından desteklenmiyor."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"UYARI: E-posta uygulamasının cihazınızı yönetme yetkisinin devre dışı bırakılması, bunu gerektiren tüm e-posta hesaplarının yanı sıra bu hesaplar ait e-postaları, kişileri, takvim olaylarını ve diğer verileri siler."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Güvenlik güncellemesi"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> için güvenlik ayarlarınızı güncellemeniz gerekiyor."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" hesabı, güvenlik ayarları güncellemesi gerektiriyor."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"Güvenlik güncellemesi gerekli"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" hesabı güvenlik gereksinimleri nedeniyle senkronize edilemez."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" hesabı, güvenlik ayarları güncellemesi gerektiriyor."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" hesabının güvenlik ayarları değiştirildi; kullanıcının işlem yapmasına gerek yok."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Güvenlik güncellemesi gerekli"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Güvenlik politikaları değişti"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Güvenlik politikaları karşılanamıyor"</string>
     <string name="account_security_title" msgid="3511543138560418587">"Cihaz güvenliği"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"<xliff:g id="SERVER">%s</xliff:g> sunucusu, Android telefonunuzdaki bazı güvenlik özelliklerini uzaktan kontrol etmesine izin vermenizi gerektiriyor."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Ayrıntıları düzenle"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"Ekran kilidinizin PIN veya şifresinin süresi doldu."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"Ekr kilidi şifr süresi doldu"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Ekran kilidi şifresinin süresi doluyor"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"Ekran kilidi PIN\'inizi veya şifrenizi yakında değiştirmeniz gerekiyor, aksi takdirde <xliff:g id="ACCOUNT">%s</xliff:g> hesabına ait veriler silinecek. Şimdi değiştirmek ister misiniz?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Ekran kilidi PIN\'inizi veya şifrenizi kısa süre içinde değiştirmeniz gerekiyor, aksi takdirde <xliff:g id="ACCOUNT">%s</xliff:g> hesabına ait veriler silinecek. Bunu şimdi değiştirmek ister misiniz?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"Ekran kilidi şifresinin süresi doldu"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"<xliff:g id="ACCOUNT">%s</xliff:g> kullanıcısının verileri cihazınızdan siliniyor. Ekran kilidi PIN\'inizi veya şifrenizi değiştirerek bu verileri geri yükleyebilirsiniz. Şimdi değiştirmek ister misiniz?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"<xliff:g id="ACCOUNT">%s</xliff:g> hesabına ait veriler cihazınızdan siliniyor. Ekran kilidi PIN\'inizi veya şifrenizi değiştirerek bu verileri geri yükleyebilirsiniz. Bunu şimdi değiştirmek ister misiniz?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Kaydedilmeyen değişiklikler silinsin mi?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Oturum açılamadı."</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"<xliff:g id="ACCOUNT">%s</xliff:g> için kullanıcı adı veya şifre yanlış. Şimdi güncellemek ister misiniz?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"<xliff:g id="ACCOUNT">%s</xliff:g> için kullanıcı adı veya şifre yanlış. Bunları şimdi güncellemek ister misiniz?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Varsayılan hesap"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"E-postaları varsayılan olarak bu hesaptan gönder"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Ekleri indir"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Son iletilerin eklerini Kablosuz üzerinden otomatik indir"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"E-posta bildirimleri"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Sıklığı, bildirimleri vs. senkronize et"</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"E-posta geldiğinde Sistem çubuğunda bildir"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"E-posta geldiğinde bildirim gönder"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Gelen kutusunu denetleme sıklığı"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Gelen ayarlar"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Kullanıcı adı, şifre ve diğer gelen sunucu ayarları"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Giden ayarlar"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Kullanıcı adı, şifre ve diğer giden sunucu ayarları"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Politikalar uygulandı"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Hiçbiri"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Desteklenmeyen politikalar"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Hiçbiri"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"Senkronize etmeyi dene"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Bu hesabı senkronize etmek için buraya dokunun"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Hesap adı"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Adınız"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"İmza"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Hızlı yanıtlar"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"E-posta oluştururken sık girdiğiniz metinleri düzenleyin"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"E-posta oluştururken sık girdiğiniz metinleri düzenleyin"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Gönderdiğiniz iletilere metin ekleyin"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Bildirim ayarları"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Veri kullanımı"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"Güvenlik politikaları"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Hızlı yanıtı düzenle"</string>
     <string name="save_action" msgid="1988862706623227093">"Kaydet"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Kişileri senkronize et"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Bu hesaba ilişkin kişileri senkronize et"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Takvim\'i Senkronize Et"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Bu hesaba ilişkin takvimi senkronize et"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Takvimi senkronize et"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Bu hesabın takvim etkinliğini senkronize et"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"E-postayı senk. et"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Bu hesaba ilişkin e-postaları senkronize et"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Titreşim"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="DOMAIN">%2$s</xliff:g> alanından <xliff:g id="RESULTS">%1$d</xliff:g> sonuç"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Ayarlar"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"Genel"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Genel ayarlar"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"Uygulama"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Otomatik ilerle"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Bir iletiyi sildikten sonra gösterilecek ekranı seçin"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Onay kutularını gizle"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"İleti listelerinde seçmek için dokunun ve basılı tutun"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Silmeden önce onayla"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"İletiler"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Göndermeden önce onayla"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"İletiler"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Şu iletiye ilerle:"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Daha yeni ileti"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Eski ileti"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"Sonuçlar bekleniyor"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Bazı sunucularda uzun sürebilir."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Klasörler"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Cihaz kamerasının kullanımına izin verme"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Cihaz şifresi gerektir"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"Son şifrelerin tekrar kullanılmasını kısıtla"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"Şifrelerde son kullanım tarihi gerektir"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"Boştaki cihazın ekranını kilitlemesini gerektir"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"Senk. edilen takvim etkinliği sayısını sınırlandır"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"Senkronize edilen e-posta sayısını sınırlandır"</string>
+    <string name="quick_1" msgid="3426057697353380951">"Teşekkür ederiz!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"Benim için uygun görünüyor!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"Bunu daha sonra okuyup size geri döneceğim."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Bu konuyu tartışmak üzere bir toplantı ayarlayalım."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Dolaşımdayken bu hesabın arka plan senkronizasyonu devre dışı bırakılır."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"Yanıt gönderiliyor..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"İleti yok."</string>
 </resources>
diff --git a/res/values-tr/uploader.xml b/res/values-tr/uploader.xml
index 1c367db..a7a3076 100644
--- a/res/values-tr/uploader.xml
+++ b/res/values-tr/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Ayrıntıları Gizle"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Ayarlar"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Yükleme tarihi: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="PERCENTSIGN">%%</xliff:g><xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Hesap"</string>
     <string name="upload" msgid="2615541458361216022">"Yükle"</string>
     <string name="ok" msgid="2516349681897895312">"TAMAM"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 578e409..2782d1e 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"Читати вкладені файли пошти"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Дозволяє програмі читати вкладені файли вашої пошти."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Дозволяє програмі читати вкладені файли вашої пошти."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Доступ до даних постачальника послуг електронної пошти"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Дозволяє програмі отримувати доступ до бази даних вашої пошти, зокрема отриманих і надісланих повідомлень, імен користувачів та паролів."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Дозволяє програмі отримувати доступ до бази даних вашої пошти, зокрема отриманих і надісланих повідомлень, імен користувачів та паролів."</string>
     <string name="app_name" msgid="5815426892327290362">"Ел.пошта"</string>
     <string name="compose_title" msgid="427986915662706899">"Написати"</string>
     <string name="debug_title" msgid="5175710493691536719">"Налагодж."</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"Готово"</string>
     <string name="create_action" msgid="3062715563215392251">"Створити"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"Видалити"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"Швидких відповідей немає"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Швидких відповідей немає."</string>
     <string name="discard_action" msgid="6532206074859505968">"Відхилити"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"Зберег. чернетку"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Вставити швидк.відповідь"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"Пошук"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Налашт-ня обл. зап."</string>
     <string name="settings_action" msgid="6334807007967459412">"Налаштування"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"Параметри синхронізації"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Параметри синхронізації"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Позн. як непрочит."</string>
     <string name="move_action" msgid="3059189775933985898">"Переміст."</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+Копія/прихована"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> напис.:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Додати цитований текст"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Включити текст"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Потрібно додати принаймні 1 отримувача."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"Додайте принаймні одного отримувача."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Деякі електронні адреси недійсні."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Файл завеликий для вклад."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Вставити швидку відповідь"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Збережено"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Зупинити"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Вклад. файл збереж. як <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Вкладений файл не збережено."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Примітка. Перед надсиланням буде завантажено один або кілька вкладених файлів із повідомлення, яке ви пересилаєте."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"Вкладений файл не збережено."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Перед надсиланням буде завантажено один або кілька вкладених файлів із повідомлення, яке ви пересилаєте."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Повідомлення"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Запрошення"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Не вдалося переслати один або кілька вкладених файлів."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Вкладений файл не переслано"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"Помилка входу в обліковий запис <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"Помилка входу в обліковий запис <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"Не вдалося ввійти"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> Б"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Старіші"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" – "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Налаштування облікового запису"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Додати обл. запис Exchange"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Додати обл. запис Exchange ActiveSync"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"Обліковий запис електронної пошти"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"Можна налаштувати пошту для більшості облікових записів за допомогою лише кількох дій."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Можна налаштувати обліковий запис Exchange за допомогою лише кількох дій."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Можна налаштувати обліковий запис Exchange ActiveSync за допомогою лише кількох дій."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Обліковий запис можна налаштувати за допомогою лише кількох дій."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Електронна адреса"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Пароль"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Надс. ел.листи з цього обл. зап. за умовч."</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"Надсилати електронні листи з цього облікового запису за умовчанням"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Налашт-ня вручну"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Введіть дійсну електронну адресу та пароль."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Копія облікового запису"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Перевірка налашт-нь вихід. сервера…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Перевірка налашт-нь вихід. сервера…"</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Налаштування облікового запису"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"Ваш обліковий запис налаштовано. Скоро надійдуть листи!"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"Ваш обліковий запис налаштовано. Скоро надійдуть листи!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Назвіть цей обл. запис. (додатково)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Ваше ім\'я (відображено у вихідних повідомл.)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Це поле не може бути порожнім."</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Параметри сервера вхідних повідомлень"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Ім\'я корист."</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Пароль"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Cервер POP3"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"Сервер IMAP"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Сервер"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Порт"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Тип безпеки"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Немає"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Сервер SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Порт"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Тип безпеки"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Необхідно ввійти."</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Потрібно ввійти"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Ім\'я корист."</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Пароль"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"Налаштування облікового запису"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Кожні 15 хвилин"</string>
     <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_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>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"Надсилати електронні листи з цього облікового запису за умовчанням"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Сповіщати мене, коли надходить лист"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Синхронізувати контакти з цього облікового запису"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Синхронізувати календар із цього облікового запису"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Синхронізувати електронну пошту з цього облікового запису"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Автоматично завантажувати вкладення, коли є з\'єднання з Wi-Fi"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Не вдалося закінчити"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Синхронізувати за стільки днів:"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Один місяць"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Усі"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Парам. обл.зап. за умовч."</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Ім\'я кор. або пароль неправильн."</string>
-    <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_auth_message" msgid="426627755590431364">"Ім’я користувача чи пароль неправильні."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"Ім’я користувача або пароль неправильні."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Неможливо безпечно з’єднатись із сервером."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Неможливо безпечно з’єднатися із сервером."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"Потрібен сертифікат клієнта. Під’єднатися до сервера із сертифікатом клієнта?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"Сертифікат недійсний або недоступний."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"Сервер повідомив про помилку. Перевірте своє ім’я користувача та пароль і повторіть спробу."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"Потрібен сертифікат клієнта. Під’єднатися до сервера із сертифікатом клієнта?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"Сертифікат недійсний або недоступний."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"Сервер повідомив про помилку. Перевірте своє ім’я користувача та пароль і повторіть спробу."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"Неможливо з’єднатись із сервером."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Неможливо з’єднатись із сервером."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS обов\'язк., але не підтрм. цим сервером."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"ЗАСТЕРЕЖЕННЯ. Дезактивація повноважень програми електронної пошти на адміністрування вашого пристрою призведе до видалення всіх облікових записів електронної пошти, що потребують адміністрування, разом з їхніми електронними листами, контактами, подіями календаря й іншими даними."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Оновлення системи безпеки"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"Потрібно оновити налаштування безпеки для облікового запису <xliff:g id="ACCOUNT">%s</xliff:g>."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Облік. запис \"<xliff:g id="ACCOUNT">%s</xliff:g>\" потреб. оновл. налашт-нь безпеки"</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"Потрібне оновл. сист. безпеки"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Обліковий запис \"<xliff:g id="ACCOUNT">%s</xliff:g>\" неможливо синхронізувати через вимоги безпеки."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"Для облікового запису \"<xliff:g id="ACCOUNT">%s</xliff:g>\" потрібно оновити налаштування безпеки."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"Налаштування безпеки облікового запису \"<xliff:g id="ACCOUNT">%s</xliff:g>\" змінено. Користувачу не потрібно нічого робити."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Потрібно оновити прав. безпеки"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Правила безпеки змінено"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Неможл. дотрим. правил безпеки"</string>
     <string name="account_security_title" msgid="3511543138560418587">"Безпека пристрою"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Сервер <xliff:g id="SERVER">%s</xliff:g> потребує вашого дозволу віддалено контролювати деякі функції безпеки вашого пристрою Android."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Редаг. деталі"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"Термін дії PIN-коду чи пароля блокування екрана закінчився."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"Пароль блок. екр. вже не діє"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Терм. дії пароля блок. екр. закінчується"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"Незабаром потрібно буде змінити PIN-код або пароль блокування екрана, інакше дані для <xliff:g id="ACCOUNT">%s</xliff:g> буде стерто. Змінити зараз?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Незабаром потрібно буде змінити PIN-код або пароль блокування екрана, інакше дані для облікового запису <xliff:g id="ACCOUNT">%s</xliff:g> буде стерто. Змінити зараз?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"Терм. дії пароля блок. екрана закінчився"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"Дані для <xliff:g id="ACCOUNT">%s</xliff:g> стираються з вашого пристрою. Їх можна відновити, змінивши PIN-код або пароль блокування екрана. Змінити зараз?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"Дані для облікового запису <xliff:g id="ACCOUNT">%s</xliff:g> стираються з вашого пристрою. Їх можна відновити, змінивши PIN-код або пароль блокування екрана. Змінити зараз?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Відхилити незбережені зміни?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Не вдалося ввійти"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Ім’я користувача чи пароль для <xliff:g id="ACCOUNT">%s</xliff:g> неправильні. Оновити зараз?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"Ім’я користувача чи пароль для облікового запису <xliff:g id="ACCOUNT">%s</xliff:g> неправильні. Оновити зараз?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Обл. зап. за умовч."</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Надіс. ел.листи з цього обл. зап. за умовч."</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Завантажити вкладені файли"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Автом. завантажувати вклад. файли з останніх повідом. через WiFi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Сповіщення ел. пошти"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Синхронізуйте частоту, сповіщення тощо"</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"Сповіщати в системному рядку про надходження листа"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Надсилати сповіщення, коли надходить лист"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Частота перевірки вхідн."</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Налашт. вхід. повід."</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Ім’я корист., пароль й інші налашт-ня сервера вхідних повідомл."</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Налашт-ня вихідних"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Ім’я корист., пароль й інші налашт-ня сервера вихідних повідомл."</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Правила, які застосовуються"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Немає"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Правила, які не підтримуються"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Немає"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"Спробувати синхронізувати"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Торкніться тут, щоб синхронізувати цей обліковий запис"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Назва обл. зап."</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Ваше ім\'я"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Підпис"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Швидкі відповіді"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Змінити текст, який часто вставляється під час створення листів"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Редагувати текст, що часто вставляється під час створення листів"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Додав. текст у надісл. повідомл."</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Налаштування сповіщень"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Використання даних"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"Правила безпеки"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Редагувати швидку відповідь"</string>
     <string name="save_action" msgid="1988862706623227093">"Зберегти"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Синхрон. контакти"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Синхрон. контакти для облік. запису"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Синхроніз. Календар"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Синхроніз. календар для обл. запису"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Синхрон. календ."</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Синхроніз. календар із цим обл.зап."</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Синхроніз. ел.пошту"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Синхрон. ел. пошту для обл. запису"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Вібросигнал"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"Результатів з <xliff:g id="DOMAIN">%2$s</xliff:g>: <xliff:g id="RESULTS">%1$d</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Налаштування"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"Загальні"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Загальні налаштування"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"Програма"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Автоматичний перехід"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Виберіть, що відображати після видалення повідомлення"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Cховати прапорці"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"У списках повідомлень торкніться й утримуйте, щоб вибрати"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Підтвердити перед видаленням"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Повідомлення"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Підтвердити перед надсиланням"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Повідомлення"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Перейти до"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Новішого повідомлення"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Старішого повідомлення"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"Очікування результатів"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Деяким серверам потрібно багато часу."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Папки"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Забороняти використання камери пристрою"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Вимагати пароль пристрою"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"Обмежувати повторне викор. остан.паролів"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"Вимагати закінчення терміну дії пароля"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"Вимаг. блок-ня екрана неактивн. пристрою"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"Обмежувати к-сть синхронізованих подій календаря"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"Обмежувати к-сть синхронізованих електрон. листів"</string>
+    <string name="quick_1" msgid="3426057697353380951">"Дякую!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"Мені підходить!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"Я прочитаю це пізніше, а потім дам знати."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Потрібно зустрітися, щоб це обговорити."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"У роумінгу фонову синхронізацію для цього облікового запису вимкнено."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"Надсилання відповіді..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"Немає повідомлень."</string>
 </resources>
diff --git a/res/values-uk/uploader.xml b/res/values-uk/uploader.xml
index f894c08..6f6af5b 100644
--- a/res/values-uk/uploader.xml
+++ b/res/values-uk/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Сховати деталі"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Налаштування"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Завантажено: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Обліковий запис"</string>
     <string name="upload" msgid="2615541458361216022">"Завантажити"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 686e910..94731a2 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"Đọc tệp đính kèm trong email"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Cho phép ứng dụng này đọc tệp đính kèm trong email của bạn."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Cho phép ứng dụng đọc tệp đính kèm trong email của bạn."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Truy cập dữ liệu của nhà cung cấp email"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Cho phép ứng dụng này truy cập cơ sở dữ liệu email của bạn, bao gồm thư đã nhận, thư đã gửi, tên người dùng và mật khẩu."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Cho phép ứng dụng truy cập cơ sở dữ liệu email của bạn, bao gồm thư đã nhận, thư đã gửi, tên người dùng và mật khẩu."</string>
     <string name="app_name" msgid="5815426892327290362">"Email"</string>
     <string name="compose_title" msgid="427986915662706899">"Soạn"</string>
     <string name="debug_title" msgid="5175710493691536719">"Gỡ lỗi"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"Xong"</string>
     <string name="create_action" msgid="3062715563215392251">"Tạo mới"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"Xóa"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"Không có câu trả lời nhanh nào"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Không có câu trả lời nhanh nào."</string>
     <string name="discard_action" msgid="6532206074859505968">"Hủy"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"Lưu thư nháp"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Chèn trả lời nhanh"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"Tìm kiếm"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Cài đặt tài khoản"</string>
     <string name="settings_action" msgid="6334807007967459412">"Cài đặt"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"Tùy chọn đồng bộ hóa"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Tùy chọn đồng bộ hóa"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Đánh dấu là chưa đọc"</string>
     <string name="move_action" msgid="3059189775933985898">"Di chuyển"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> đã viết:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Bao gồm nội dung được trích dẫn"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Bao gồm văn bản"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Bạn phải thêm ít nhất một người nhận."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"Thêm ít nhất một người nhận."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Một số địa chỉ email không hợp lệ."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Tệp quá lớn để có thể đính kèm."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Chèn trả lời nhanh"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Đã lưu"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Dừng"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Đã lưu tệp đính kèm với tên <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Không thể lưu tệp đính kèm."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Lưu ý: Một hoặc nhiều tệp đính kèm trong thư chuyển tiếp của bạn sẽ được tải xuống trước khi gửi."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"Không thể lưu tệp đính kèm."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Một hoặc nhiều tệp đính kèm trong thư chuyển tiếp của bạn sẽ được tải xuống trước khi gửi."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Thư"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Mời"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Không thể chuyển tiếp một hoặc nhiều tệp đính kèm"</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Tệp đính kèm không được chuyển tiếp"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> đăng nhập không thành công."</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"Đăng nhập vào <xliff:g id="ACCOUNT_NAME">%s</xliff:g> không thành công."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"Không thể đăng nhập"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Cũ hơn"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Thiết lập tài khoản"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Thêm tài khoản Exchange"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Thêm tài khoản Exchange ActiveSync"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"Tài khoản email"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"Bạn có thể thiết lập email cho hầu hết mọi tài khoản chỉ bằng vài bước."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Bạn có thể thiết lập tài khoản Exchange chỉ bằng vài bước."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Bạn có thể thiết lập tài khoản Exchange ActiveSync chỉ bằng vài bước."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Bạn có thể thiết lập tài khoản của mình chỉ bằng vài bước."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Địa chỉ email"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Mật khẩu"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Gửi email từ tài khoản này theo mặc định."</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"Gửi email từ tài khoản này theo mặc định"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Thiết lập thủ công"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Hãy nhập địa chỉ email và mật khẩu hợp lệ."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Tài khoản trùng lặp"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Đang kiểm tra cài đặt máy chủ thư đến..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Đang kiểm tra cài đặt máy chủ thư đi..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Thiết lập tài khoản"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"Tài khoản của bạn đã được thiết lập và email đang được gửi!"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"Tài khoản của bạn đã được thiết lập và email đang được gửi!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Đặt tên cho tài khoản này (tùy chọn)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Tên bạn (được hiển thị trong tin nhắn đi)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Không được để trống trường này."</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Cài đặt máy chủ thư đến"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Tên người dùng"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Mật khẩu"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Máy chủ POP3"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"Máy chủ IMAP"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Máy chủ"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Cổng"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Loại bảo mật"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Không"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Máy chủ SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Cổng"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Loại bảo mật"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Yêu cầu đăng nhập."</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Yêu cầu đăng nhập"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Tên người dùng"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Mật khẩu"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"Thiết lập tài khoản"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"15 phút một lần"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"30 phút một lần"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Hàng giờ"</string>
-    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Gửi email từ tài khoản này theo mặc định."</string>
-    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Thông báo cho tôi khi email đến."</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Đồng bộ hóa danh bạ từ tài khoản này."</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Đồng bộ hóa lịch từ tài khoản này."</string>
-    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Đồng bộ hóa email từ tài khoản này."</string>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"Gửi email từ tài khoản này theo mặc định"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Thông báo cho tôi khi email đến"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Đồng bộ hóa danh bạ từ tài khoản này"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Đồng bộ hóa lịch từ tài khoản này"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Đồng bộ hóa email từ tài khoản này"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Tự động tải xuống tệp đính kèm khi được kết nối Wi-Fi"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Không thể kết thúc"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Số ngày đồng bộ hóa"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Một tháng"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Tất cả"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Sử dụng mặc định của tài khoản"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Tên người dùng hoặc mật khẩu không chính xác."</string>
-    <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_auth_message" msgid="426627755590431364">"Tên người dùng hoặc mật khẩu không chính xác."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"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="3836152264696108805">"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="2121921642915593041">"Không thể kết nối an toàn với máy chủ."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"Yêu cầu chứng chỉ ứng dụng khách. Kết nối với máy chủ có chứng chỉ ứng dụng khách?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"Chứng chỉ không hợp lệ hoặc không thể truy cập được."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"Máy chủ trả về lỗi. Hãy kiểm tra tên người dùng và mật khẩu rồi thử lại."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"Cần chứng chỉ ứng dụng khách. Bạn có muốn kết nối với máy chủ bằng chứng chỉ ứng dụng khách không?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"Chứng chỉ không hợp lệ hoặc không thể truy cập được."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"Máy chủ trả về lỗi. Hãy kiểm tra tên người dùng và mật khẩu rồi thử lại."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"Không thể kết nối với máy chủ."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Không thể kết nối với máy chủ."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS được yêu cầu nhưng không được máy chủ hỗ trợ."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"CẢNH BÁO: Việc vô hiệu hóa quyền quản lý điện thoại của bạn của ứng dụng Email sẽ xóa tất cả tài khoản email yêu cầu quyền đó, cùng với email, địa chỉ liên hệ, sự kiện lịch và các dữ liệu khác."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Cập nhật bảo mật"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> yêu cầu bạn cập nhật cài đặt bảo mật của mình."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Tài khoản \"<xliff:g id="ACCOUNT">%s</xliff:g>\" yêu cầu cập nhật cài đặt bảo mật."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"Yêu cầu cập nhật bảo mật"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Không thể đồng bộ hóa tài khoản \"<xliff:g id="ACCOUNT">%s</xliff:g>\" do các yêu cầu về bảo mật."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"Tài khoản \"<xliff:g id="ACCOUNT">%s</xliff:g>\" yêu cầu cập nhật cài đặt bảo mật."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"Tài khoản \"<xliff:g id="ACCOUNT">%s</xliff:g>\" đã thay đổi cài đặt bảo mật; không yêu cầu bất kỳ tác vụ người dùng nào."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Yêu cầu cập nhật bảo mật"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Chính sách bảo mật đã thay đổi"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Ko thể đáp ứng c.sách bảo mật"</string>
     <string name="account_security_title" msgid="3511543138560418587">"Bảo mật thiết bị"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Máy chủ <xliff:g id="SERVER">%s</xliff:g> yêu cầu bạn cho phép kiểm soát từ xa một số tính năng bảo mật của thiết bị Android của bạn."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Chỉnh sửa chi tiết"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"Mật khẩu hoặc mã PIN khóa màn hình của bạn đã hết hạn."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"Mật khẩu khóa màn hình đã hết hạn"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Mật khẩu khóa màn hình sắp hết hạn"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"Bạn phải sớm thay đổi mã PIN hoặc mật khẩu khóa màn hình của mình, nếu không dữ liệu cho <xliff:g id="ACCOUNT">%s</xliff:g> sẽ bị xóa. Thay đổi ngay bây giờ?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Bạn cần phải sớm thay đổi PIN khóa màn hình hoặc mật khẩu, nếu không dữ liệu của <xliff:g id="ACCOUNT">%s</xliff:g> sẽ bị xóa. Bạn có muốn thay đổi ngay bây giờ không?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"Mật khẩu khóa màn hình đã hết hạn"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"Dữ liệu của <xliff:g id="ACCOUNT">%s</xliff:g> đang bị xóa khỏi thiết bị của bạn. Bạn có thể khôi phục dữ liệu đó bằng cách thay đổi mật khẩu hoặc mã PIN khóa màn hình của mình. Bạn có muốn thay đổi ngay bây giờ không?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"Dữ liệu của <xliff:g id="ACCOUNT">%s</xliff:g> đang bị xóa khỏi thiết bị của bạn. Bạn có thể khôi phục dữ liệu bằng cách thay đổi PIN khóa màn hình hoặc mật khẩu của mình. Bạn có muốn thay đổi ngay bây giờ không?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Hủy những thay đổi chưa lưu?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Không thể đăng nhập"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Tên người dùng hoặc mật khẩu của <xliff:g id="ACCOUNT">%s</xliff:g> không đúng. Cập nhật tên người dùng hoặc mật khẩu ngay bây giờ?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"Tên người dùng hoặc mật khẩu của <xliff:g id="ACCOUNT">%s</xliff:g> không chính xác. Bạn có muốn cập nhật các thông tin này ngay bây giờ không?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Tài khoản mặc định"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Gửi email từ tài khoản này theo mặc định"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Tải xuống tệp đính kèm"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Tự động tải xuống tệp đính kèm tin nhắn gần đây qua Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Thông báo qua email"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Đồng bộ hóa tần suất, thông báo, v.v."</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"Thông báo trên thanh Hệ thống khi email đến"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Gửi thông báo khi email đến"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Tần suất kiểm tra hộp thư đến"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Cài đặt thư đến"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Tên người dùng, mật khẩu và các cài đặt máy chủ thư đến khác"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Cài đặt thư đi"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Tên người dùng, mật khẩu và cài đặt máy chủ thư đi khác"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Chính sách bắt buộc"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Bỏ chọn tất cả"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Chính sách không được hỗ trợ"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Bỏ chọn tất cả"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"Thử đồng bộ hóa"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Chạm vào đây để đồng bộ hóa tài khoản này"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Tên tài khoản"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Tên bạn"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Chữ ký"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Trả lời nhanh"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Chỉnh sửa văn bản mà bạn thường xuyên chèn khi soạn email"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Chỉnh sửa văn bản mà bạn thường xuyên chèn khi soạn email"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Thêm văn bản vào tin nhắn bạn gửi"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Cài đặt thông báo"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Sử dụng dữ liệu"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"Chính sách bảo mật"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Chỉnh sửa trả lời nhanh"</string>
     <string name="save_action" msgid="1988862706623227093">"Lưu"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Đồng bộ hóa danh bạ"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Đồng bộ hóa danh bạ cho tài khoản này"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Đồng bộ hóa lịch"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Đồng bộ hóa lịch cho tài khoản này"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Đồng bộ hóa lịch"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Đ.bộ hóa sự kiện lịch cho TK này"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Đồng bộ hóa email"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Đồng bộ hóa email cho tài khoản này"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Rung"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> kết quả từ <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Cài đặt"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"Chung"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Cài đặt chung"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"Ứng dụng"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Tự động tiến"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Chọn màn hình hiển thị sau khi bạn xóa thư"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Ẩn hộp kiểm"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"Trong danh sách các thư, chạm và giữ để chọn"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Xác nhận trước khi xóa"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Thư"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Xác nhận trước khi gửi"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Thư"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Chuyển sang"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Thư mới hơn"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Thư cũ hơn"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"Đang chờ kết quả"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Một số máy chủ có thể xử lý lâu."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Thư mục"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Ko cho phép sử dụng máy ảnh của thiết bị"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Yêu cầu mật khẩu của thiết bị"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"Hạn chế sử dụng lại các mật khẩu gần đây"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"Buộc mật khẩu hết hạn"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"Thiết bị cần ở chế độ rảnh để khóa màn hình"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"Giới hạn số lượng sự kiện lịch được đồng bộ hóa"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"Giới hạn số lượng email được đồng bộ hóa"</string>
+    <string name="quick_1" msgid="3426057697353380951">"Cảm ơn bạn!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"Tôi thấy được đấy!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"Tôi sẽ đọc thư này sau và sẽ liên hệ lại với bạn."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Chúng ta hãy cùng tổ chức một cuộc họp để thảo luận về vấn đề này."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Đồng bộ hóa nền cho tài khoản này bị tắt trong khi chuyển vùng."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"Đang gửi trả lời..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"Không có thư nào."</string>
 </resources>
diff --git a/res/values-vi/uploader.xml b/res/values-vi/uploader.xml
index f8ad2a0..66c6374 100644
--- a/res/values-vi/uploader.xml
+++ b/res/values-vi/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Ẩn chi tiết"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Cài đặt"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Đã tải lên %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Tài khoản"</string>
     <string name="upload" msgid="2615541458361216022">"Tải lên"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 0db981d..f86000d 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"读取电子邮件附件"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"允许此应用读取您的电子邮件附件。"</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"允许此应用读取您的电子邮件附件。"</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"访问电子邮件服务提供商数据"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"允许此应用访问您的电子邮件数据库,包括已收邮件、已发邮件、用户名和密码。"</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"允许此应用访问您的电子邮件数据库,包括已收邮件、已发邮件、用户名和密码。"</string>
     <string name="app_name" msgid="5815426892327290362">"电子邮件"</string>
     <string name="compose_title" msgid="427986915662706899">"写邮件"</string>
     <string name="debug_title" msgid="5175710493691536719">"调试"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"完成"</string>
     <string name="create_action" msgid="3062715563215392251">"新建"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"删除"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"没有快速回复"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"没有快速回复。"</string>
     <string name="discard_action" msgid="6532206074859505968">"放弃"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"保存草稿"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"插入快速回复"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"搜索"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"帐户设置"</string>
     <string name="settings_action" msgid="6334807007967459412">"设置"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"同步选项"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"同步选项"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"标记为未读"</string>
     <string name="move_action" msgid="3059189775933985898">"移动"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+抄送/密送"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g>编写:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"包含引用文字"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"包含原文"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"必须至少添加一个收件人。"</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"请至少添加一位收件人。"</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"某些电子邮件地址无效。"</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"文件太大,无法附加。"</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"插入快速回复"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"已保存"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"停止"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"附件已另存为“<xliff:g id="FILENAME">%s</xliff:g>”。"</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"无法保存该附件。"</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"注意:您的转发邮件中有一个或多个附件会先下载再发送。"</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"无法保存附件。"</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"您转发的邮件中有一个或多个附件需要先下载,然后才能发送。"</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"邮件"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"邀请"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"一个或多个附件无法转发。"</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"无法转发附件"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> 登录失败。"</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> 登录失败。"</string>
     <string name="login_failed_title" msgid="7624349996212476176">"无法登录"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"更早"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" - "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"帐户设置"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"添加 Exchange 帐户"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"添加 Exchange ActiveSync 帐户"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"电子邮件帐户"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"您只需执行几个步骤,即可为大多数帐户设置电子邮件。"</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"您只需执行几个步骤,即可设置 Exchange 帐户。"</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"您只需执行几个步骤,即可设置 Exchange ActiveSync 帐户。"</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"只需几步操作,即可设置自己的帐户。"</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"电子邮件地址"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"密码"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"默认情况下从此帐户发送电子邮件。"</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"默认情况下从此帐户发送电子邮件"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"手动设置"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"请键入有效的电子邮件地址和密码。"</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"帐户重复"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"正在检查接收服务器设置..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"正在检查外发服务器设置..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"帐户设置"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"您的帐户已设置完毕,可以收发电子邮件了!"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"您的帐户已设置完毕,可以收发电子邮件了!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"为此帐户创建名称(可选)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"您的姓名(显示在外发邮件上)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"此字段不能为空。"</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"接收服务器设置"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"用户名"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"密码"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3 服务器"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"IMAP 服务器"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"服务器"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"端口"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"安全类型"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"无"</string>
@@ -271,7 +266,7 @@
     <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"STARTTLS(接受所有证书)"</string>
     <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"STARTTLS"</string>
     <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"从服务器中删除电子邮件"</string>
-    <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"一律不"</string>
+    <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"永不"</string>
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"当我从收件箱中删除时"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAP 路径前缀"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"可选"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP 服务器"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"端口"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"安全类型"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"需要登录。"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"要求登录"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"用户名"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"密码"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"帐户设置"</string>
@@ -298,18 +293,18 @@
     <string name="account_setup_options_title" msgid="9016600767888846051">"帐户设置"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"帐户选项"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"邮件查收频率"</string>
-    <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"一律不"</string>
+    <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"永不"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"自动(推送)"</string>
     <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"每隔 5 分钟"</string>
     <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"每隔 10 分钟"</string>
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"每隔 15 分钟"</string>
     <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_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>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"默认情况下从此帐户发送电子邮件"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"收到电子邮件时通知我。"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"同步此帐户中的联系人"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"同步此帐户中的日历"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"同步此帐户中的电子邮件"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"连接到 Wi-Fi 后自动下载附件"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"无法完成"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"要同步的天数"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"一个月"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"全部"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"使用帐户的默认设置"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"用户名或密码不正确。"</string>
-    <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_auth_message" msgid="426627755590431364">"用户名或密码不正确。"</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"用户名或密码不正确。"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"无法安全地连接到服务器。"</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"无法安全地连接到服务器。"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"需要客户端证书。要通过客户端证书连接到服务器吗?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"证书无效或无法使用。"</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"该服务器返回了包含错误讯息的响应。请检查您的用户名和密码,然后重试。"</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"需要客户端证书。要通过客户端证书连接到服务器吗?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"证书无效或无法使用。"</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"该服务器返回了包含错误讯息的响应。请检查您的用户名和密码,然后重试。"</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"无法连接到服务器。"</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"无法连接到服务器。"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"需要 TLS,但服务器不支持 TLS。"</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"警告:撤消“电子邮件”应用管理您设备的权限会删除所有需要此权限的电子邮件帐户,以及这些帐户中的电子邮件、联系人、日历活动和其他数据。"</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"安全更新"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> 要求更新您的安全设置。"</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"帐户“<xliff:g id="ACCOUNT">%s</xliff:g>”要求更新安全设置。"</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"需要进行安全更新"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"帐户“<xliff:g id="ACCOUNT">%s</xliff:g>”由于安全要求而无法同步。"</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"帐户“<xliff:g id="ACCOUNT">%s</xliff:g>”需要更新安全设置。"</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"帐户“<xliff:g id="ACCOUNT">%s</xliff:g>”已更改其安全设置,用户无需进行任何操作。"</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"需要进行安全更新"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"安全政策已更改"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"无法满足安全政策的要求"</string>
     <string name="account_security_title" msgid="3511543138560418587">"设备安全性"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"“<xliff:g id="SERVER">%s</xliff:g>”服务器要求您允许其远程控制您 Android 设备的某些安全功能。"</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"编辑详情"</string>
@@ -353,45 +352,52 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"您的锁定屏幕 PIN 或密码已过期。"</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"锁定屏幕密码已过期"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"锁定屏幕密码即将过期"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"您必须尽快更改锁定屏幕 PIN 或密码,否则系统会清除 <xliff:g id="ACCOUNT">%s</xliff:g> 的数据。要立即更改吗?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"您需要尽快更改锁定屏幕 PIN 或密码,否则系统将会清除 <xliff:g id="ACCOUNT">%s</xliff:g> 的数据。要立即更改吗?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"锁定屏幕密码已过期"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"<xliff:g id="ACCOUNT">%s</xliff:g> 的数据已从设备中清除。您可以通过更改锁定屏幕 PIN 或密码还原这些数据。要立即更改吗?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"<xliff:g id="ACCOUNT">%s</xliff:g> 的数据已从设备中清除。您可以通过更改锁定屏幕 PIN 或密码来还原这些数据。要立即更改吗?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"要舍弃未保存的更改?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"无法登录"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"<xliff:g id="ACCOUNT">%s</xliff:g> 的用户名或密码错误。要立即更新吗?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"<xliff:g id="ACCOUNT">%s</xliff:g> 的用户名或密码不正确。要立即更新吗?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"默认帐户"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"默认情况下从此帐户发送电子邮件"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"下载附件"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"通过 Wi-Fi 自动下载最新邮件的附件"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"电子邮件通知"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"同步频率、通知等。"</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"收到电子邮件时在系统栏中显示通知"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"收到电子邮件时发送通知"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"收件箱检查频率"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"接收设置"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"用户名、密码和其他接收服务器设置"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"外发设置"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"用户名、密码和其他外发服务器设置"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"政策已执行"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"无"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"不支持的政策"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"无"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"尝试同步"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"触摸此处以同步此帐户"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"帐户名称"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"您的姓名"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"签名"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"快速回复"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"编辑撰写电子邮件时经常插入的文本"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"编辑您在撰写电子邮件时经常插入的文本"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"在您发送的邮件中附加文本"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"通知设置"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"数据使用"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"安全政策"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"编辑快速回复"</string>
     <string name="save_action" msgid="1988862706623227093">"保存"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"同步联系人"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"同步此帐户的联系人"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"同步日历"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"同步此帐户的日历"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"同步日历"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"同步此帐户的日历活动"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"同步电子邮件"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"同步此帐户的电子邮件"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"振动"</string>
     <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"收到电子邮件时也振动"</string>
     <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"始终"</string>
     <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"仅在静音时"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"一律不"</string>
+    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"永不"</string>
     <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"振动"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"选择铃声"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"服务器设置"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"来自 <xliff:g id="DOMAIN">%2$s</xliff:g> 的 <xliff:g id="RESULTS">%1$d</xliff:g> 条结果"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"设置"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"常规"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"常规设置"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"应用"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"自动跳转"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"选择要在删除邮件后显示的屏幕"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"隐藏复选框"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"在邮件列表中,触摸并按住即可选择"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"删除前先确认"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"邮件"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"发送前先确认"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"邮件"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"跳转至"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"更晚的邮件"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"更早的邮件"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"正在等待结果"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"有些服务器可能会花费较长的时间。"</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"文件夹"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"不允许使用设备的相机"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"需要设备密码"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"限制重复使用近期所用密码"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"强制密码在一段时间后过期"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"要求闲置设备锁定其屏幕"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"限制同步的日历活动数"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"限制同步的电子邮件数"</string>
+    <string name="quick_1" msgid="3426057697353380951">"非常感谢!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"我觉得不错!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"稍后我会阅读此邮件并给您回复。"</string>
+    <string name="quick_4" msgid="3988974084396883051">"让我们通过会议讨论一下这个问题。"</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"漫游时停用了此帐户的后台同步功能。"</string>
+    <string name="confirm_response" msgid="5747902757569543165">"正在发送回复..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"无邮件。"</string>
 </resources>
diff --git a/res/values-zh-rCN/uploader.xml b/res/values-zh-rCN/uploader.xml
index e227885..3dc5046 100644
--- a/res/values-zh-rCN/uploader.xml
+++ b/res/values-zh-rCN/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"隐藏详情"</string>
     <string name="menu_settings" msgid="5088116127086866634">"设置"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"上传时间:%s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"帐户"</string>
     <string name="upload" msgid="2615541458361216022">"上传"</string>
     <string name="ok" msgid="2516349681897895312">"确定"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 292a16d..2b41f65 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"讀取電子郵件附件"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"允許這個應用程式讀取您的電子郵件附件。"</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"允許這個應用程式讀取您的電子郵件附件。"</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"存取電子郵件供應商資料"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"允許這個應用程式存取您的電子郵件資料庫,包括收到的郵件、送出的郵件、使用者名稱和密碼。"</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"允許這個應用程式存取您的電子郵件資料庫,包括收到的郵件、寄件備份、使用者名稱和密碼。"</string>
     <string name="app_name" msgid="5815426892327290362">"電子郵件"</string>
     <string name="compose_title" msgid="427986915662706899">"撰寫郵件"</string>
     <string name="debug_title" msgid="5175710493691536719">"偵錯"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"完成"</string>
     <string name="create_action" msgid="3062715563215392251">"建立新回應"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"刪除"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"沒有快速回應"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"沒有任何快速回應。"</string>
     <string name="discard_action" msgid="6532206074859505968">"捨棄"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"儲存草稿"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"插入快速回應"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"搜尋"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"帳戶設定"</string>
     <string name="settings_action" msgid="6334807007967459412">"設定"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"同步處理選項"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"同步處理選項"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"標示為未讀取"</string>
     <string name="move_action" msgid="3059189775933985898">"移動"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"新增副本/密件副本"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g>提到:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"包含引用文字"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"包含文字"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"您必須新增至少一位收件者。"</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"請至少新增一個收件者。"</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"部分電子郵件地址無效。"</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"檔案過大,超過附件大小限制。"</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"插入快速回應"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"已儲存"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"停止"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"已將附件另存為 <xliff:g id="FILENAME">%s</xliff:g>。"</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"無法儲存附件。"</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"請注意:在傳送轉寄的郵件之前,系統會先下載郵件中一或多個附件。"</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"無法儲存附件。"</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"傳送轉寄的郵件之前,系統會先下載郵件中一或多個附件。"</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"郵件"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"邀請"</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"無法轉寄一或多個附件。"</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"無法轉寄附件"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> 登入失敗。"</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> 登入失敗。"</string>
     <string name="login_failed_title" msgid="7624349996212476176">"無法登入"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"較舊"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"帳戶設定"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"新增 Exchange 帳戶"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"新增 Exchange ActiveSync 帳戶"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"電子郵件帳戶"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"只要幾個步驟,就能設妥許多帳戶的電子郵件。"</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"只要幾個步驟,就可以設定 Exchange 帳戶。"</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"只要幾個步驟,就可以設定 Exchange ActiveSync 帳戶。"</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"只要幾個步驟即可設定您的帳戶。"</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"電子郵件地址"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"密碼"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"預設使用這個帳戶傳送電子郵件。"</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"預設使用這個帳戶傳送電子郵件"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"手動設定"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"輸入有效的電子郵件地址和密碼。"</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"複製帳戶"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"正在檢查收信伺服器設定..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"正在檢查外寄伺服器設定..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"帳戶設定"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"您的帳戶已設定完成,可以收發電子郵件了!"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"您的帳戶已設定完成,可以開始收發電子郵件了!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"設定帳戶名稱 (選擇性)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"您的姓名 (顯示於外寄郵件)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"這個欄位不能留空。"</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"內送伺服器設定"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"使用者名稱"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"密碼"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3 伺服器"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"IMAP 伺服器"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"伺服器"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"通訊埠"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"安全性類型"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"無"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP 伺服器"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"通訊埠"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"安全性類型"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"必須登入。"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"要求登入"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"使用者名稱"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"密碼"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"帳戶設定"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"每 15 分鐘檢查一次"</string>
     <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_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>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"預設使用這個帳戶傳送電子郵件"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"收到電子郵件時通知我"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"同步處理這個帳戶的聯絡人資訊"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"同步處理這個帳戶的日曆"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"同步處理這個帳戶的電子郵件"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"連上 Wi-Fi 時自動下載附件。"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"無法完成"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"同步處理的天數"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"1 個月"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"全部"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"使用帳戶預設值"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"使用者名稱或密碼不正確。"</string>
-    <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_auth_message" msgid="426627755590431364">"使用者名稱或密碼不正確。"</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"使用者名稱或密碼不正確。"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"無法安全連線至伺服器。"</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"無法安全連線至伺服器。"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"需要用戶端憑證。您要透過用戶端憑證連線至伺服器嗎?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"憑證無效或無法使用。"</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"伺服器傳回錯誤,請檢查您的使用者名稱和密碼,然後再試一次。"</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"需要用戶端憑證,您要透過用戶端憑證連線到伺服器嗎?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"憑證無效或無法使用。"</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"伺服器傳回錯誤,請檢查您的使用者名稱和密碼,然後再試一次。"</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"無法連線至伺服器。"</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"無法連線至伺服器。"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"必須使用 TLS,但此伺服器不支援。"</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"警告:如果停用「電子郵件」應用程式的裝置管理權限,系統將刪除所有需要使用這項權限的「電子郵件」帳戶,以及帳戶中所有的電子郵件、聯絡人、日曆活動和其他資料。"</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"安全性更新"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"您必須更新 <xliff:g id="ACCOUNT">%s</xliff:g> 的安全性設定。"</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"「<xliff:g id="ACCOUNT">%s</xliff:g>」帳戶必須進行安全性設定更新。"</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"必須更新安全性"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"因為不符合安全性需求,系統無法同步處理「<xliff:g id="ACCOUNT">%s</xliff:g>」帳戶。"</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"「<xliff:g id="ACCOUNT">%s</xliff:g>」帳戶的安全性設定必須更新。"</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"「<xliff:g id="ACCOUNT">%s</xliff:g>」帳戶已自行變更安全性設定,使用者不需採取任何行動。"</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"安全性必須更新"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"安全性政策已變更"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"不符合安全性政策標準"</string>
     <string name="account_security_title" msgid="3511543138560418587">"裝置安全性"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"<xliff:g id="SERVER">%s</xliff:g> 伺服器要求您的授權,使其可遠端控制 Android 裝置的一些安全性功能。"</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"請編輯資料"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"您的螢幕上鎖 PIN 或密碼已過期。"</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"螢幕上鎖密碼已過期"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"螢幕上鎖密碼即將過期"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"您必須儘快變更螢幕上鎖 PIN 或密碼,否則 <xliff:g id="ACCOUNT">%s</xliff:g> 的資料將遭到清除,要立即變更嗎?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"您必須儘快變更螢幕上鎖 PIN 或密碼,否則 <xliff:g id="ACCOUNT">%s</xliff:g> 的資料將遭到清除,要立即變更嗎?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"螢幕鎖定密碼已過期"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"<xliff:g id="ACCOUNT">%s</xliff:g> 的資料已從您的裝置中清除,如要還原這些資料,請變更螢幕上鎖 PIN 或密碼,要立即變更嗎?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"<xliff:g id="ACCOUNT">%s</xliff:g> 的資料已從您的裝置中清除,如要還原這些資料,請變更螢幕上鎖 PIN 或密碼,要立即變更嗎?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"要捨棄尚未儲存的變更?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"無法登入"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"<xliff:g id="ACCOUNT">%s</xliff:g> 的使用者名稱或密碼不正確,要立即更新嗎?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"<xliff:g id="ACCOUNT">%s</xliff:g> 的使用者名稱或密碼不正確。您要現在更新嗎?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"預設帳戶"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"預設使用這個帳戶傳送電子郵件"</string>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"下載附件"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"透過 WiFi 自動下載最新郵件的附件"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"電子郵件通知"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"同步處理頻率和通知等其他設定"</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"收到電子郵件時,在系統列中顯示通知"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"收到電子郵件時傳送通知"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"收件匣檢查頻率"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"內收設定"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"使用者名稱、密碼和其他內送伺服器設定"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"外寄設定"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"使用者名稱、密碼和其他外寄伺服器設定"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"強制執行的政策"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"無"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"不支援的政策"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"無"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"嘗試同步處理"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"輕觸這裡即可同步處理這個帳戶"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"帳戶名稱"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"您的姓名"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"簽名檔"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"快速回應"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"編輯您撰寫電子郵件時經常插入的文字"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"編輯您撰寫電子郵件時經常插入的文字"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"在送出的郵件後面附加文字"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"通知設定"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"資料用量"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"安全性政策"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"編輯快速回應"</string>
     <string name="save_action" msgid="1988862706623227093">"儲存"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"同步處理聯絡人"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"同步處理此帳戶的聯絡人"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"同步處理日曆"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"同步處理此帳戶的日曆"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"同步處理日曆"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"同步處理這個帳戶的日曆活動"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"同步處理電子郵件"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"同步處理此帳戶的電子郵件"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"震動"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"共有 <xliff:g id="RESULTS">%1$d</xliff:g> 個來自 <xliff:g id="DOMAIN">%2$s</xliff:g> 的搜尋結果"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"設定"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"一般"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"一般設定"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"應用程式"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"自動推進"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"選擇刪除郵件後所要顯示的畫面"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"隱藏核取方塊"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"在郵件清單中,輕觸並按住項目即可選取"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"刪除前需確認"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"郵件"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"傳送前需確認"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"郵件"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"推進至"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"較新的郵件"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"較舊的郵件"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"正在等待結果"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"有些伺服器可能需要較長的時間。"</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"資料夾"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"不允許使用裝置相機"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"需要裝置密碼"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"限制重複使用最近用過的密碼"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"強制密碼到期"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"要求裝置在閒置時鎖定螢幕"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"限制同步處理的日曆活動數量"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"限制同步處理的電子郵件數量"</string>
+    <string name="quick_1" msgid="3426057697353380951">"感謝您!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"這主意不錯!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"我稍晚看過後回覆您。"</string>
+    <string name="quick_4" msgid="3988974084396883051">"開會討論吧。"</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"系統會在漫遊時停用這個帳戶的背景同步處理。"</string>
+    <string name="confirm_response" msgid="5747902757569543165">"正在傳送回應..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"沒有任何郵件。"</string>
 </resources>
diff --git a/res/values-zh-rTW/uploader.xml b/res/values-zh-rTW/uploader.xml
index 4b32be3..3fd744b 100644
--- a/res/values-zh-rTW/uploader.xml
+++ b/res/values-zh-rTW/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"隱藏詳細資料"</string>
     <string name="menu_settings" msgid="5088116127086866634">"設定"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"上傳日期:%s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"帳戶"</string>
     <string name="upload" msgid="2615541458361216022">"上傳"</string>
     <string name="ok" msgid="2516349681897895312">"確定"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 358d096..72a0e35 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"Funda okunamathiselwe kwi-imeyili"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Ivumela lolu hlelo lokusebenza ukuba lufunde izinamathiseli zakho ze-imeyli."</string>
+    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Ivumela i-app ukufunda okunamathiselwe kwe-imeyili yakho."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Finyelela kwimininingo yomhlinzeki we-imeyli"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Ivumela lolu hlelo lokusebenza ukufinyelela kumininingo yakho egciniwe ye-Imeyili, kuhlanganise imiyalezo etholiwe, imiyalezo ethunyelwe, amagama abasebenzisi kanye namaphasiwedi."</string>
+    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Ivumela lolu hlelo lokusebenza ukufinyelela kumininingo yakho egciniwe ye-Imeyili, kuhlanganise imiyalezo etholiwe, imiyalezo ethunyelwe, amagama abasebenzisi kanye namaphasiwedi."</string>
     <string name="app_name" msgid="5815426892327290362">"I-imeyli"</string>
     <string name="compose_title" msgid="427986915662706899">"Bhala"</string>
     <string name="debug_title" msgid="5175710493691536719">"Lungisa iphutha"</string>
@@ -36,7 +36,7 @@
     <string name="done_action" msgid="7497990549515580249">"Kwenziwe"</string>
     <string name="create_action" msgid="3062715563215392251">"Yenza okusha"</string>
     <string name="delete_quick_response_action" msgid="3076922270182841978">"Susa"</string>
-    <string name="quick_responses_empty_view" msgid="1693308598242828422">"Azikho izimpendulo ezisheshayo"</string>
+    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Azikho izimpendulo ezisheshayo."</string>
     <string name="discard_action" msgid="6532206074859505968">"Lahla"</string>
     <string name="save_draft_action" msgid="6413714270991417223">"Londoloza okusazolungiswa"</string>
     <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Faka impendulo esheshayo"</string>
@@ -50,7 +50,7 @@
     <string name="search_action" msgid="6325101454876682308">"Sesha"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Izilungiselelo ze-akhawunti"</string>
     <string name="settings_action" msgid="6334807007967459412">"Izilungiselelo"</string>
-    <string name="mailbox_settings_action" msgid="8008375875310554776">"Vumelanisa okukhethwa kukho"</string>
+    <string name="menu_folder_options" msgid="2871906096248843471">"Vumelanisa okukhethwa kukho"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Maka njengokungafundiwe"</string>
     <string name="move_action" msgid="3059189775933985898">"Khipha"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
@@ -133,7 +133,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g>ubhale:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Hlanganisa umbhalo ocashuniwe"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Hlanganisa umbhalo"</string>
-    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Kumelwe wengeze okungenani umamukeli oyedwa."</string>
+    <string name="message_compose_error_no_recipients" msgid="140299472517968199">"Ngeza okungenani umamukeli oyedwa."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Amanye amakheli e-imeyili awalungile."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Ifayela inkulu kakhulu ukuba inamathiselwe."</string>
     <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Faka izimpendulo ezisheshayo"</string>
@@ -153,8 +153,8 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Kulondoloziwe"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Misa"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Isinamathiseli silondolozwe njenge-<xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Yehlulekile ukulondoloza okuxhunyiwe."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Yazi: Eyodwa noma eyengeziwe yezinamathiseli kumyalezo wakho odluliselwe izolandwa ngaphambi kokuthumelwa."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"Ayikwazanga ukugcina okunamathiselwe."</string>
+    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Eyodwa noma eyengeziwe yezinamathiseli kumlayezo wakho odluliselwe izolandwa ngaphambi kokuthumelwa."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Umyalezo"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Mema..."</string>
   <plurals name="message_view_show_attachments_action">
@@ -210,7 +210,7 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Ayikwazi ukudlulisa isinamathiseli esisodwa noma ezengeziwe"</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Okunamathiselwa kwi-imeyli akuthunyelwanga"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> ukungena ngemvume kwehlulekile"</string>
+    <string name="login_failed_ticker" msgid="2169365211566829350">"I-<xliff:g id="ACCOUNT_NAME">%s</xliff:g> ingene ngemvume ngempumelelo."</string>
     <string name="login_failed_title" msgid="7624349996212476176">"Ayikwazanga ukungena ngemvume."</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
@@ -232,15 +232,11 @@
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Okudadlana"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Ukumisa i-akhawunti"</string>
-    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Yengeza i-akhawunti Yokushintshanisa"</string>
-    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Yengeza i-akhawunti Yokuvumelanisa Okusebenzsayo Kokushintshanisa"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"I-akhawunti ye-Imeyli"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"Ungase ulungisele ukusebenza i-imeyili yamanye ama-akhawunti ngezinyathelo ezimbalwa."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Ungamisa i-akhawunti ye-Exchange ngezinyathelo ezimbalwa nje."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Ungamisa i-akhawunti ye-Exchange ActiveSync ngezinyathelo ezimbalwa nje."</string>
+    <string name="accounts_welcome" msgid="8337750045270269649">"Ungasetha i-akhawunti yakho ngezinyathelo ezimbalwa."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Ikheli le-imeyli"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Iphasiwedi"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Thumela i-imeyli kusuka kule akhawunti ngokuzenzakalelayo"</string>
+    <string name="account_setup_basics_default_label" msgid="8896222991837026736">"Thumela i-imeyli kusuka kule akhawunti ngokwakhona"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Ukumisela"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Sicela uthayiphe ikheli le-imeyili elilungile kanye nephasiwedi."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"I-akhawunti Ephindiwe"</string>
@@ -250,7 +246,7 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Ihlola izilungiselelo zesiphakeli ezingenayo..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Ihlola izilungiselelo zesiphakeli eziphumayo..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Ukumisa i-akhawunti"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"I-akhawunti yakho imisiwe, futhi i-imeyli isendleleni!"</string>
+    <string name="account_setup_names_headline" msgid="914858472109729140">"I-akhawunti yakho imisiwe, futhi i-imeyli isendleleni!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Nike le-akhawunti igama (okokuzikhethela)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Igama lakho (liboniswa emiyalezweni ephumayo)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Lesi sikhundla akumele singabi nalutho."</string>
@@ -261,8 +257,7 @@
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Izilungiselelo zeseva engenayo"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Igama lomsebenzisi"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Iphasiwedi"</string>
-    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Iseva ye-POP3"</string>
-    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"Iseva ye-IMAP"</string>
+    <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Isiphakeli"</string>
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Imbobo yokuxhuma"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Uhlobo lokuphepha"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Lutho"</string>
@@ -280,7 +275,7 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Iseva ye-SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Imbobo yokuxhuma"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Uhlobo lokuphepha"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Dinga ukungena."</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Kudingeka ukungena ngemvume"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Igama lomsebenzisi"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Iphasiwedi"</string>
     <string name="account_setup_exchange_title" msgid="396004732514751781">"Ukuhlela i-akhawunti"</string>
@@ -305,11 +300,11 @@
     <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Njalo ngamaminithi angu-15"</string>
     <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Njalo ngamaminithi angu-30"</string>
     <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Njalo ngehora"</string>
-    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Thumela i-imeyli kusuka kule akhawunti ngokuzenzakalelayo"</string>
-    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Ngazise lapho i-imeyli ifika."</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Vumelanisa othintana nabo kusuka kule akhawunti."</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Vumelanisa ikhalenda kule akhawunti."</string>
-    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Vumelanisa i-imeyli kule akhawunti."</string>
+    <string name="account_setup_options_default_label" msgid="2617227194283720914">"Thumela i-imeyli kusuka kule akhawunti ngokuzenzakalelayo"</string>
+    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Ngazise lapho i-imeyli ifika"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Vumelanisa othintana nabo kusuka kule akhawunti"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Vumelanisa ikhalenda kule akhawunti"</string>
+    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Vumelanisa i-imeyli kule akhawunti."</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Layisha okunamathiselwa kwi-imeyili ngokuzenzakalelayo uma uxhunyiwe kukuxhuma kungenazintambo"</string>
     <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Ayikwazanga ukuqeda"</string>
     <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Izinsuku zokuvumelanisa"</string>
@@ -321,13 +316,13 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Inyanga eyodwa"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Konke"</string>
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Sebenzisa okuzenzakalelayo kwe-akhawunti"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Igama lomsebenzisi noma iphasiwedi ayilungile."</string>
-    <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_auth_message" msgid="426627755590431364">"Igama lakho lomsebenzisi noma iphasiwedi ayilungile."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="737111956772240007">"Igama lomsebenzisi noma iphasiwedi ayilungile."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Ayikwazi ukuxhuma ngokuphephile kwiseva."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Ayikwazi ukuxhuma ngokuphephile kwiseva. "\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"Kudingeka isitifiketi sekhasimende. Xhuma esiphakelini ngesitifiketi sekhasimende?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"Isitifiketi asivumelekile noma asingeneki"</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"Iseva iphendule ngephutha, sicela uhlole igama lakho lomsebenzisi nephasiwedi bese uzama futhi."</string>
+    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"Isititiketi seklayenti siyadingeka. Ingabe ufuna ukuxhuma kuseva ngesitifiketi seklayenti?"</string>
+    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"Isitifiketi asivumelekile noma asifinyeleleki."</string>
+    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"Iseva iphendule ngephutha, sicela uhlole igama lakho lomsebenzisi nephasiwedi bese uzama futhi."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"Ayikwazi ukuxhuma kwiseva."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Ayikwazi ukuxhuma kwiseva. "\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"I-TLS iyadingeka kodwa ayisekelwa iseva."</string>
@@ -343,8 +338,12 @@
     <string name="disable_admin_warning" msgid="6196985268695592382">"ISEXWAYISO: Yenza kungasebenzi imvume yohlelo lokusebenza lwe-Imeyli ukubhalisa idivaysi yakho kuzosusa wonke ama-akhawunti e-Imeyli ayidingayo, kuhlanganise ne-imeyli yayo, othintana nabo, amakhalenda, izenzakalo, neminye imininingo."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Okwakamuva kwezokuphepha"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> idinga ukuba ubuyekeze izilungiselelo zakho zokuzivikela."</string>
-    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"i-Akhawunti \" <xliff:g id="ACCOUNT">%s</xliff:g> \" idinga ukubuyekeza izilungiselelo zokuphepha."</string>
-    <string name="security_notification_content_title" msgid="3352841884304076235">"Ukubuyekeza kwezokuphepha kuyadingeka"</string>
+    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"I-Akhawuni \"<xliff:g id="ACCOUNT">%s</xliff:g>\" ayikwazi ukuvumelanisa ngenxa yezimfuneko sokuphepha."</string>
+    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"I-Akhawunti \"<xliff:g id="ACCOUNT">%s</xliff:g>\" idinga ukubuyekeza izilungiselelo zokuphepha."</string>
+    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"I-Akhawunti \"<xliff:g id="ACCOUNT">%s</xliff:g>\" ishintshe izilungiselelo zayo zokuphepha; asikho isenzo somsebenzisi esidingekayo."</string>
+    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Ukubuyekeza ezokuphepha kuyadingeka"</string>
+    <string name="security_notification_content_change_title" msgid="443490921895642130">"Izinqubomgomo zokuphepha zishintshiwe"</string>
+    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Izinqubomgomo zokuphepha azikwazi ukuhlangabezwa"</string>
     <string name="account_security_title" msgid="3511543138560418587">"Ukuphepha kweDivaysi"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Iseva <xliff:g id="SERVER">%s</xliff:g> idinga ukuba uyivumele ukuba ilawule kude ezinye izici zokuphepha kwedivayisi ye-Android."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Hlela imininingwane"</string>
@@ -353,38 +352,45 @@
     <string name="password_expired_ticker" msgid="4230570412974108968">"Iphinikhodi noma iphasiwedi yakho yokuvala isikrini iphelelwe isikhathi."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"Iphasiwedi yokuvala isikrini iphelelwe isikhathi"</string>
     <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Iphasiwedi yesikrini yokuvala iphelelwa isikhathi"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"Kumele ushintshe iphinikhodi noma iphasiwedi yokuvala isikrini maduze, noma idatha ye-<xliff:g id="ACCOUNT">%s</xliff:g> izosulwa. Ishintshe manje?"</string>
+    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Udinga ukushintsha i-PIN yesikrini sakho sokukhuya noma iphasiwedi ngokushesha, noma idatha ye-<xliff:g id="ACCOUNT">%s</xliff:g> izosulwa. Ufuna ukuyishintsha manje?"</string>
     <string name="password_expired_dialog_title" msgid="2186547998125938084">"Iphasiwedi 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 iphasiwedi. Ishintshe manje?"</string>
+    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"Idatha le-<xliff:g id="ACCOUNT">%s</xliff:g> lisuliwe kudivayisi. Ungalibuyisa ngokushintsha i-PIN yakho yokukhiya isikrini noma iphasiwedi. Ufuna ukuyishintsha manje?"</string>
     <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Lahla izinguquko ezingagciniwe?"</string>
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Ayikwazanga ukungena ngemvume."</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Igama lomsebenzisi noma iphasiwedi ye-<xliff:g id="ACCOUNT">%s</xliff:g> ayilungile. Wabuyekeze manje?"</string>
+    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"Igama lomsebenzisi noma iphasiwedi ye-<xliff:g id="ACCOUNT">%s</xliff:g> ayilungile. Ufuna ukuzivuselela 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>
     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Layisha ngokungenisa okunamathelayo"</string>
     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Dawuniloda ngokuzenzakalla ukunamathiseleka emiyalezweni yakamuva nge-Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Izaziso ze-Imeyli"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Ukuvama kokuvumelanisa, isaziso, nokunye."</string>
-    <string name="account_settings_notify_summary" msgid="6301122709602752038">"Ngazise Kusistimu ochaza ngesimo uma i-imeyli ifika"</string>
+    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Thumela isaziso uma i-imeyili ifika"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Ukuvama ukuhlola ibhokisi lemiyalezo engenayo"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Izilungiselelo ezingenayo"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Igama lombebenzisi, iphasiwedi, nezinye izilungiselelo zeseva ezingenayo"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Izilungiselelo eziphumayo"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Igama lomsebenzisi, iphasiwedi, nezinye izilungiselelo zeseva eziphumayo"</string>
+    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Izinqubomgomo ziphoqiwe"</string>
+    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Lutho"</string>
+    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Izinqubomo ezingasekelwe"</string>
+    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Lutho"</string>
+    <string name="account_settings_retry_label" msgid="1104680719299842829">"Zama ukuvumelanisa"</string>
+    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Thinta lapha ukuze uvumelanise le akhawunti"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Igama le-akhawunti"</string>
     <string name="account_settings_name_label" msgid="8186406122590008449">"Igama lakho"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Isiginesha"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Izimpendulo ezisheshayo"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Hlela umbhalo owusebenzisa njalo uma ubhala ama-imeyli"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Hlela umbhalo owusebenzisa njalo uma ubhala ama-imeyli"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Jobelela umbhalo emiyalezweni oyithumelayo"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Izilungiselelo zesaziso"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Ukusebenzisa idatha"</string>
+    <string name="account_settings_policies" msgid="6292833636418641840">"Izinqubomgomo zokuphepha"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Hlela izimpendulo ezisheshayo"</string>
     <string name="save_action" msgid="1988862706623227093">"Londoloza"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Vumelanisa othintana nabo"</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Vumelanisa othintana nabo bale akhawunti"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Vumelanisa Ikhalenda"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Vumelanisa ikhalenda yale akhawunti"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Vumelanisa ikhalenda"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Vumelanisa umcimbi wekhalenda kule akhawunti"</string>
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Vumelanisa i-imeyli"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Vumelanisa i-imeyli yale akhawunti"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Dlidliza"</string>
@@ -422,10 +428,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> imiphumela ephuma <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Izilungiselelo"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"Okuvamile"</string>
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Izilungiselelo ezijwayelekile"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"Uhlelo lokusebenza"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Okuseqophelweni okuzenzakalelayo"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Khetha ukuthi isiphi isikrini esizoboniswa emuva kokuba ususe umyalezo"</string>
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Fihla amabhokisi okuhlola"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"Ezinhlwini zemilayezo, thinta bese ubamba ukuze ukhethe"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Qinisekisa ngaphambi kokususa"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Imilayezo"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Qinisekisa ngaphambi kokuthumela"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Imilayezo"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Dlulela ku"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Umyalezo omusha"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Umyalezo wakudala"</string>
@@ -466,5 +478,18 @@
     <string name="search_slow_warning_title" msgid="2826118321880530239">"Ilinde imiphumela"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Amanye amaseva angathatha isikhathi eside."</string>
     <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Amafolda"</string>
+    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Ungavumeli ukusebenza kwekhamera yedivayisi"</string>
+    <string name="policy_require_password" msgid="7177274900480984702">"Idinga iphasiwedi yedivayisi"</string>
+    <string name="policy_password_history" msgid="5743544498302303181">"Khawulela ukusetshenziswa kabusha kwamaphasiwedi wakamuva"</string>
+    <string name="policy_password_expiration" msgid="1248123255253649199">"Cela ukuthi amaphasiwedi aphalwe isikhathi"</string>
+    <string name="policy_screen_timeout" msgid="414869965358468080">"Dinga idivayisi yokumisa ukukhiya isikrini sayo"</string>
+    <string name="policy_calendar_age" msgid="627405158087482302">"Khawulela inombolo yemicimbi yekhalenda evunyelanisiwe"</string>
+    <string name="policy_email_age" msgid="7144148367145424963">"Khawulela inombolo yama-imeyili avumelanisiwe"</string>
+    <string name="quick_1" msgid="3426057697353380951">"Siyabonga!"</string>
+    <string name="quick_2" msgid="4188036352885736617">"Kuzwaka kukuhle kimi!"</string>
+    <string name="quick_3" msgid="8061819976353395585">"Ngizofunda lokho emvakwesikhashana."</string>
+    <string name="quick_4" msgid="3988974084396883051">"Masihlele umhlangano ukuxoxisana ngalokhu."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Ukuvumelaniswa okungemumva kule-akhawunti ayisebenzi ngesikhathi usazula zula."</string>
+    <string name="confirm_response" msgid="5747902757569543165">"Thumela impendulo..."</string>
+    <string name="no_conversations" msgid="5559527390337162819">"Ayikho imilayezo."</string>
 </resources>
diff --git a/res/values-zu/uploader.xml b/res/values-zu/uploader.xml
index 47750de..60a78f1 100644
--- a/res/values-zu/uploader.xml
+++ b/res/values-zu/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Fihla imininingwane"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Izilungiselelo"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Kulayishiwe %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"I-akhawunti"</string>
     <string name="upload" msgid="2615541458361216022">"Layisha"</string>
     <string name="ok" msgid="2516349681897895312">"KULUNGILE"</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index c881e6e..d51fb17 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -185,26 +185,13 @@
         <item>@string/mailbox_name_display_junk</item>
     </string-array>
 
-    <!-- Arrays "mailbox_display_names" and "mailbox_display_icons" MUST match the order
-         of the types of mailboxes defined in EmailContent -->
-    <array name="mailbox_display_icons" translatable="false">
-        <!-- TYPE_INBOX = 0 -->
-        <item>@drawable/ic_folder_inbox_holo_light</item>
-        <!-- TYPE_MAIL = 1 -->
-        <item></item>
-        <!-- TYPE_PARENT = 2 -->
-        <item></item>
-        <!-- TYPE_DRAFTS = 3 -->
-        <item>@drawable/ic_folder_drafts_holo_light</item>
-        <!-- TYPE_OUTBOX = 4 -->
-        <item>@drawable/ic_folder_outbox_holo_light</item>
-        <!-- TYPE_SENT = 5 -->
-        <item>@drawable/ic_folder_sent_holo_light</item>
-        <!-- TYPE_TRASH = 6 -->
-        <item>@drawable/ic_menu_trash_holo_light</item>
-        <!-- TYPE_JUNK = 7 -->
-        <item>@drawable/ic_spam_normal_holo_light</item>
-    </array>
+    <!-- A small number of default quick responses -->
+    <string-array name="default_quick_responses">
+        <item>@string/quick_1</item>
+        <item>@string/quick_2</item>
+        <item>@string/quick_3</item>
+        <item>@string/quick_4</item>
+    </string-array>
 
     <!-- Account color chips on combined view -->
     <array name="combined_view_account_colors" translatable="false">
@@ -219,10 +206,10 @@
         <item>@color/combined_view_account_color_9</item>
     </array>
 
-    <!-- Length of the subject text in the message list items in dips for the
-         various modes: wide, and narrow -->
-    <integer-array name="subject_lengths">
-        <item>50</item>
-        <item>25</item>
-    </integer-array>
+    <!-- Host addresses starting with these infer an smtp address replacing the word with "smtp" -->
+    <string-array translatable="false" name="smtp_host_prefixes">
+        <item>pop3</item>
+        <item>pop</item>
+        <item>imap</item>
+    </string-array>
 </resources>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 8521cf4..7faf95d 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -21,4 +21,46 @@
         <attr name="maxWidth" format="dimension"/>
         <attr name="maxHeight" format="dimension"/>
     </declare-styleable>
+    <declare-styleable name="EmailServiceInfo">
+        <attr name="protocol" format="string"/>
+        <attr name="name" format="string"/>
+        <attr name="accountType" format="string"/>
+        <attr name="serviceClass" format="string"/>
+        <attr name="intent" format="string"/>
+        <attr name="port" format="integer"/>
+        <attr name="portSsl" format="integer"/>
+        <attr name="defaultSsl" format="boolean"/>
+        <attr name="offerTls" format="boolean"/>
+        <attr name="offerCerts" format="boolean"/>
+        <attr name="offerLocalDeletes" format="boolean"/>
+        <attr name="defaultLocalDeletes" format="integer"/>
+        <attr name="offerPrefix" format="boolean"/>
+        <attr name="usesSmtp" format="boolean"/>
+        <attr name="syncChanges" format="boolean"/>
+        <attr name="syncContacts" format="boolean"/>
+        <attr name="syncCalendar" format="boolean"/>
+        <attr name="usesAutodiscover" format="boolean"/>
+        <attr name="offerLookback" format="boolean"/>
+        <attr name="defaultLookback">
+            <enum name="auto" value="-2"/>
+            <enum name="days1" value="1"/>
+            <enum name="days3" value="2"/>
+            <enum name="weeks1" value="3"/>
+            <enum name="weeks2" value="4"/>
+            <enum name="months1" value="5"/>
+            <enum name="all" value="6"/>
+        </attr>
+        <attr name="offerAttachmentPreload" format="boolean"/>
+        <attr name="syncIntervalStrings" format="reference"/>
+        <attr name="syncIntervals" format="reference"/>
+        <attr name="defaultSyncInterval">
+            <enum name="push" value="-2"/>
+            <enum name="never" value="-1"/>
+            <enum name="mins5" value="5"/>
+            <enum name="mins10" value="10"/>
+            <enum name="mins15" value="15"/>
+            <enum name="mins30" value="30"/>
+            <enum name="mins60" value="60"/>
+        </attr>
+    </declare-styleable>
 </resources>
diff --git a/res/values/bools.xml b/res/values/bools.xml
deleted file mode 100644
index 4a6977b..0000000
--- a/res/values/bools.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <bool name="use_two_pane">false</bool>
-
-    <!-- Reply/Reply All/Forward switcher in action bar -->
-    <bool name="message_compose_action_tabs">false</bool>
-</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index f00f37e..a504941 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -15,6 +15,7 @@
 -->
 
 <!-- See also values-xlarge for specializations for xlarge screens -->
+<!-- See also values-xlarge for specializations for xlarge screens -->
 <resources>
     <!-- Account setup screens -->
     <color name="account_setup_headline_color">#5E802B</color>
@@ -23,25 +24,11 @@
     <color name="account_setup_divider_color">#CCCCCC</color>
 
     <!-- Main UI -->
-    <color name="message_list_item_background_unread">#404040</color>
-    <color name="message_list_item_background_read">#000000</color>
-    <color name="account_folder_list_item_separator">#303030</color>
     <color name="connection_error_banner">#fffff1a8</color>
 
     <!-- Standard text colors -->
-    <color name="text_primary_color">#000000</color>
     <color name="text_secondary_color">#666666</color>
     <color name="text_ternary_color">#aaaaaa</color>
-    <color name="text_disabled_color">#888888</color>
-
-    <color name="button_text_color">#777777</color>
-    <color name="button_text_disabled_color">#cccccc</color>
-
-    <!-- TODO: properly put these text colors in the theme and use selectors -->
-    <color name="text_primary_color_inverse">#ffffff</color>
-    <color name="text_secondary_color_inverse">#eeeeee</color>
-
-    <color name="divider_color">#ff808080</color>
 
     <!-- Account color chips on combined view -->
     <color name="combined_view_account_color_1">#ff71aea7</color>
@@ -54,23 +41,6 @@
     <color name="combined_view_account_color_8">#ff738359</color>
     <color name="combined_view_account_color_9">#ff9d50a4</color>
 
-    <!-- Drop target colors -->
-    <color name="mailbox_drop_unavailable_fg_color">#ff999999</color>
-    <color name="mailbox_drop_available_bg_color">#00ffffff</color>
-    <color name="mailbox_drop_destructive_bg_color">#fff10000</color>
-
-    <!--  Widget colors -->
-    <color name="widget_default_text_color">#ff000000</color>
-    <color name="widget_light_text_color">#ff666666</color>
-    <color name="widget_title_color">#333333</color>
-    <color name="widget_unread_color">#777777</color>
-
-    <color name="message_view_info_back_color">#deecfa</color>
-    <color name="message_view_header_color">#3cb8e6</color>
-    <color name="message_activated_color">#3cb8e6</color>
-
-    <color name="error_bar_background">#ffff66</color>
-
-    <!-- Compose colors -->
-    <color name="compose_label_text">#aaaaaa</color>
-</resources>
+    <color name="button_text_color">#777777</color>
+    <color name="button_text_disabled_color">#cccccc</color>
+</resources>
\ No newline at end of file
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index 888d2a8..a466dd3 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -25,24 +25,6 @@
     <dimen name="message_list_badge_margin">4dip</dimen>
     <dimen name="message_list_icon_padding_compensation">3dip</dimen>
 
-    <dimen name="message_header_height">48dip</dimen>
-    <dimen name="message_header_badge_width">48dip</dimen>
-    <dimen name="message_header_name_margin">4dip</dimen>
-
-    <dimen name="error_message_height">48dip</dimen>
-
-    <dimen name="widget_senders_font_size">14sp</dimen>
-    <dimen name="widget_subject_font_size">14sp</dimen>
-    <dimen name="widget_date_font_size">14sp</dimen>
-
-    <dimen name="message_list_drag_offset">16dip</dimen>
-    <dimen name="message_list_drag_count_font_size">42sp</dimen>
-    <dimen name="message_list_drag_count_left_margin">16dip</dimen>
-    <dimen name="message_list_drag_message_font_size">18sp</dimen>
-    <dimen name="message_list_drag_message_right_margin">16dip</dimen>
-
-    <dimen name="compose_scrollview_width">700dip</dimen>
-
     <!-- Account settings fragments -->
     <dimen name="settings_fragment_padding_top">16dip</dimen>
     <dimen name="settings_fragment_padding_left">16dip</dimen>
@@ -61,21 +43,11 @@
     <dimen name="setup_item_inset_left">0dip</dimen>
     <dimen name="setup_item_inset_right">0dip</dimen>
 
-    <!-- MessageListItem -->
-    <dimen name="minimum_width_wide_mode">720dip</dimen>
-
     <!-- Username/password entry -->
     <dimen name="setup_credentials_input_width">340dip</dimen>
 
-    <!-- Folder list item -->
-    <dimen name="mailbox_list_padding_left">8dip</dimen>
-    <dimen name="mailbox_list_padding_right">16dip</dimen>
-    <dimen name="mailbox_list_count_margin_left">8dip</dimen>
-
     <!-- Message list items -->
-    <dimen name="replystate_margin_left">0dip</dimen>
+    <dimen name="replystate_margin_left">8dip</dimen>
+    <dimen name="replystate_margin_right">0dip</dimen>
     <dimen name="replystate_margin_top">10sp</dimen>
-    <dimen name="checkmark_margin_top">3sp</dimen>
-    <dimen name="star_margin_top">28sp</dimen>
-    <dimen name="date_margin_top">9sp</dimen>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3a89687..237ff11 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -15,16 +15,21 @@
 -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Names of packages and authorities that are common to all apps
+    and read from resources -->
+    <!-- Name of the search suggestions authority that looks up recent suggestions. This
+         needs to be modified in AndroidManifest.xml and res/xml/searchable.xml as well.  -->
+    <string name="suggestions_authority" translatable="false">com.android.email.suggestionsprovider</string>
 
     <!-- Permissions label for reading attachments -->
     <string name="permission_read_attachment_label">Read email attachments</string>
     <!-- Permissions description for reading attachments -->
-    <string name="permission_read_attachment_desc">Allows this application to read your email
+    <string name="permission_read_attachment_desc">Allows the app to read your email
         attachments.</string>
     <!-- Permissions label for accessing the main provider -->
     <string name="permission_access_provider_label">Access email provider data</string>
     <!-- Permissions description for accessing the main provider -->
-    <string name="permission_access_provider_desc">Allows this application to access your email
+    <string name="permission_access_provider_desc">Allows the app to access your email
         database, including received messages, sent messages, usernames, and passwords.</string>
 
     <!-- Name of application on Home screen -->
@@ -66,7 +71,7 @@
     <string name="delete_quick_response_action">Delete</string>
     <!-- Message informing user when a list that would contain quick responses
             is empty [CHAR_LIMIT=80] -->
-    <string name="quick_responses_empty_view">No quick responses</string>
+    <string name="quick_responses_empty_view">No quick responses.</string>
     <!-- Menu item/button name -->
     <string name="discard_action">Discard</string>
     <!-- Menu item/button name [CHAR_LIMIT=16] -->
@@ -94,8 +99,8 @@
     <string name="account_settings_action">Account settings</string>
     <!-- Menu item for settings [CHAR LIMIT=40]-->
     <string name="settings_action">Settings</string>
-    <!-- Menu item [CHAR LIMIT=32] -->
-    <string name="mailbox_settings_action">Sync options</string>
+    <!-- Menu item: options for this mailbox. [CHAR LIMIT = 32] -->
+    <string name="menu_folder_options">Sync options</string>
     <!-- Menu item -->
     <string name="mark_as_unread_action">Mark as unread</string>
     <!-- Menu item for moving messages to folders [CHAR LIMIT=10] -->
@@ -223,11 +228,11 @@
     <string name="debug_enable_debug_logging_label" translatable="false">
         Enable extra debug logging?</string>
     <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
-    <string name="debug_enable_exchange_logging_label" translatable="false">
-        Enable exchange parser logging? (extremely verbose)</string>
+    <string name="debug_enable_verbose_logging_label" translatable="false">
+        Enable extremely verbose logging?</string>
     <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
-    <string name="debug_enable_exchange_file_logging_label" translatable="false">
-        Enable exchange sd card logging?</string>
+    <string name="debug_enable_file_logging_label" translatable="false">
+        Enable sd card logging?</string>
     <!-- Do Not Translate.  Button label, shown only on debug screen -->
     <string name="debug_clear_webview_cache" translatable="false">
         Clear WebView cache</string>
@@ -315,7 +320,7 @@
          [CHAR_LIMIT=32] -->
     <string name="message_compose_include_quoted_text_checkbox_label">Include text</string>
     <!-- Toast that appears if you try to send with no recipients. -->
-    <string name="message_compose_error_no_recipients">You must add at least one recipient.</string>
+    <string name="message_compose_error_no_recipients">Add at least one recipient.</string>
     <!-- An address field contains invalid email addresses. -->
     <string name="message_compose_error_invalid_email">Some email addresses are invalid.</string>
     <!-- Toast that appears when an attachment is too big to send. -->
@@ -357,10 +362,10 @@
     <string name="message_view_status_attachment_saved">Attachment saved
 as <xliff:g id="filename">%s</xliff:g>.</string>
     <!-- Toast after attachment could not be saved [CHAR LIMIT=30] -->
-    <string name="message_view_status_attachment_not_saved">Couldn\'t save the attachment.</string>
+    <string name="message_view_status_attachment_not_saved">Couldn\'t save attachment.</string>
     <!-- Toast upon using "send" when one or more attachments will need to be background loaded
       [CHAR LIMIT=none]-->
-    <string name="message_view_attachment_background_load">Note: One or more attachments in your
+    <string name="message_view_attachment_background_load">One or more attachments in your
         forwarded message will be downloaded prior to sending.</string>
     <!--Button on the message view screen to show the message content [CHAR LIMIT=16] -->
     <string name="message_view_show_message_action">Message</string>
@@ -495,7 +500,7 @@
 
     <!-- Notification ticker when email account authentication fails [CHAR LIMIT=none] -->
     <string name="login_failed_ticker">
-        <xliff:g id="account_name">%s</xliff:g> signin failed.</string>
+        <xliff:g id="account_name">%s</xliff:g> signin unsuccessful.</string>
     <!-- Notification title when email account authentication fails [CHAR LIMIT=30]-->
     <string name="login_failed_title">Couldn\'t sign in</string>
 
@@ -531,31 +536,19 @@
 
     <!-- Title of screen when setting up new email account [CHAR LIMIT=45] -->
     <string name="account_setup_basics_title">Account setup</string>
-    <!-- Title of the screen when adding exchange account [CHAR LIMIT=45] -->
-    <string name="account_setup_basics_exchange_title">
-        Add an Exchange account</string>
-    <!-- Title of the screen when adding exchange account [CHAR LIMIT=45] -->
-    <string name="account_setup_basics_exchange_title_alternate">
-        Add an Exchange ActiveSync account</string>
     <!-- Headline of screen when setting up new email account (large text over divider)
         [CHAR LIMIT=none] -->
     <string name="account_setup_basics_headline">Email account</string>
     <!-- On "Set up email" screen, enthusiastic welcome message. -->
-    <string name="accounts_welcome">You can set up email for most accounts in just a few steps.
+    <string name="accounts_welcome">You can set up your account in just a few steps.
         </string>
-    <!-- On "Set up email" screen, enthusiastic welcome message (in EAS mode). -->
-    <string name="accounts_welcome_exchange">You can set up an Exchange account in just a few
-        steps.</string>
-    <!-- On "Set up email" screen, enthusiastic welcome message (in EAS mode). -->
-    <string name="accounts_welcome_exchange_alternate">
-        You can set up an Exchange ActiveSync account in just a few steps.</string>
     <!-- On "Set up email" screen, hint for account email address text field -->
     <string name="account_setup_basics_email_label">Email address</string>
     <!-- On "Set up email" screen, hint for account email password text field -->
     <string name="account_setup_basics_password_label">Password</string>
     <!-- On "Set up email" screen, checkbox label for making the new account the default account -->
     <string name="account_setup_basics_default_label">
-        Send email from this account by default.</string>
+        Send email from this account by default</string>
     <!-- Button name on "Set up email" screen -->
     <string name="account_setup_basics_manual_setup_action">Manual setup</string>
     <!-- Toast when we can't build a URI from the given email & password -->
@@ -590,7 +583,7 @@
     <!-- Text that appears on "Set up email" screen after successfully setting up an account
         [CHAR LIMIT=none] -->
     <string name="account_setup_names_headline">
-        Your account is set up, and email is on its way!</string>
+        Your account is set up and email is on its way!</string>
     <!-- On "Set up email" screen, label of text field -->
     <string name="account_setup_names_account_name_label">
         Give this account a name (optional)</string>
@@ -630,9 +623,7 @@
     <!-- "Incoming server settings" screen, label for text field -->
     <string name="account_setup_incoming_password_label">Password</string>
     <!-- "Incoming server settings" screen, label for text field -->
-    <string name="account_setup_incoming_pop_server_label">POP3 server</string>
-    <!-- "Incoming server settings" screen, label for text field -->
-    <string name="account_setup_incoming_imap_server_label">IMAP server</string>
+    <string name="account_setup_incoming_server_label">Server</string>
     <!-- "Incoming server settings" screen, label for text field -->
     <string name="account_setup_incoming_port_label">Port</string>
     <!-- "Incoming server settings" screen, label for pop-up menu -->
@@ -681,7 +672,7 @@
     <!-- On "Outgoing server settings" screen, label for pop-up menu -->
     <string name="account_setup_outgoing_security_label">Security type</string>
     <!-- On "Outgoing server settings" screen, label for check box -->
-    <string name="account_setup_outgoing_require_login_label">Require sign-in.</string>
+    <string name="account_setup_outgoing_require_login_label">Require signin</string>
     <!-- On "Outgoing server settings" screen, label for text field -->
     <string name="account_setup_outgoing_username_label">Username</string>
     <!-- On "Outgoing server settings" screen, label for text field -->
@@ -735,20 +726,16 @@
     <string name="account_setup_options_mail_check_frequency_1hour">Every hour</string>
     <!-- Check box label on "Set up email" screen to make this the default account -->
     <!-- Note, this should usually match the default account summary preference string -->
-    <string name="account_setup_options_default_label">Send email from this account by default.</string>
+    <string name="account_setup_options_default_label">Send email from this account by default</string>
     <!-- In Account setup options & Account Settings screens, check box for new-mail notification -->
-    <string name="account_setup_options_notify_label">Notify me when email arrives.</string>
+    <string name="account_setup_options_notify_label">Notify me when email arrives</string>
     <!-- In Account setup options screen, optional check box to also sync contacts -->
-    <string name="account_setup_options_sync_contacts_label">Sync contacts from this account.
-    </string>
+    <string name="account_setup_options_sync_contacts_label">Sync contacts from this account</string>
     <!-- In Account setup options screen, optional check box to also sync contacts -->
-    <string name="account_setup_options_sync_calendar_label">Sync calendar from this account.
-    </string>
+    <string name="account_setup_options_sync_calendar_label">Sync calendar from this account</string>
     <!-- In Account setup options screen, check box to sync email -->
-    <string name="account_setup_options_sync_email_label">Sync email from this account.
-    </string>
-    <!-- In Account setup options screen, check box to auto-download attachments  [CHAR LIMIT=none]
-        -->
+    <string name="account_setup_options_sync_email_label">Sync email from this account</string>
+    <!-- In Account setup options screen, check box to auto-download attachments  [CHAR LIMIT=none] -->
     <string name="account_setup_options_background_attachments_label">
         Automatically download attachments when connected to Wi-Fi</string>
     <!-- Dialog title when "setup" could not finish -->
@@ -774,9 +761,9 @@
     <string name="account_setup_options_mail_window_default">Use account\'s default</string>
 
     <!-- "Setup could not finish" dialog text; e.g., Username or password incorrect -->
-    <string name="account_setup_failed_dlg_auth_message">Username or password incorrect.</string>
+    <string name="account_setup_failed_dlg_auth_message">Username or password is incorrect.</string>
     <!-- "Setup could not finish" dialog text; e.g., Username or password incorrect\n(ERR01 Account does not exist) -->
-    <string name="account_setup_failed_dlg_auth_message_fmt">Username or password incorrect.\n(<xliff:g id="error">%s</xliff:g>)</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt">Username or password is incorrect.\n(<xliff:g id="error">%s</xliff:g>)</string>
 
     <!-- An error message presented to the user when the server's identity
          cannot be established or trusted [CHAR LIMIT=NONE] -->
@@ -789,16 +776,15 @@
     <!-- An error message presented to the user when the server requires a
          client certificate to connect [CHAR LIMIT=NONE] -->
     <string name="account_setup_failed_certificate_required"
-        >Client certificate is required. Connect to server with client certificate?</string>
+        >A client certificate is required. Do you want to connect to the server with a client certificate?</string>
     <!-- An error message presented to the user when the certificate they
          specified for connecting to a server is inaccessible [CHAR LIMIT=NONE] -->
     <string name="account_setup_failed_certificate_inaccessible"
-        >Certificate is invalid or inaccessible.</string>
+        >The certificate is invalid or inaccessible.</string>
 
     <!-- Dialog text for ambiguous setup failure; server error/bad credentials [CHAR LIMIT=none] -->
     <string name="account_setup_failed_check_credentials_message">
-         The server responded with an error. Check your username and password
-         then try again.</string>
+         The server responded with an error. Check your username and password, then try again.</string>
 
     <!-- "Setup could not finish" dialog text; e.g., Cannot connect to server -->
     <string name="account_setup_failed_dlg_server_message">Can\'t connect to server.</string>
@@ -832,7 +818,7 @@
          [CHAR LIMIT=none] -->
     <string name="account_setup_security_policies_required_fmt">
          The server <xliff:g id="server">%s</xliff:g> requires that you allow it to remotely control
-         some security features of your Android device.  Do you want to finish setting up this
+         some security features of your Android device. Do you want to finish setting up this
          account?</string>
     <!-- Additional diagnostic text when validation failed due to required provisioning not
          being supported [CHAR LIMIT=none] -->
@@ -856,14 +842,30 @@
          provisioning, just before jumping into system settings such as Device Policy grant,
          PIN/password, or encryption setup.  [CHAR LIMIT=none] -->
     <string name="account_security_dialog_content_fmt">
-         <xliff:g id="account">%s</xliff:g> requires that you update your security settings.</string>
+         <xliff:g id="account">%s</xliff:g> requires that you update your security
+         settings.</string>
 
     <!-- Notification ticker when device security required (note: unused in Holo XL) -->
-    <string name="security_notification_ticker_fmt">
+    <string name="security_unsupported_ticker_fmt">
+            Account \"<xliff:g id="account">%s</xliff:g>\" can\'t be synced due to security
+    requirements.</string>
+    <!-- Notification ticker when device security required (note: unused in Holo XL) -->
+    <string name="security_needed_ticker_fmt">
             Account \"<xliff:g id="account">%s</xliff:g>\" requires security settings update.
     </string>
+    <!-- Notification ticker when device security required (note: unused in Holo XL) -->
+    <string name="security_changed_ticker_fmt">
+            Account \"<xliff:g id="account">%s</xliff:g>\" changed its security settings; no user
+            action is required.
+    </string>
     <!-- Notification content title when device security required [CHAR_LIMIT=30] -->
-    <string name="security_notification_content_title">Security update required</string>
+    <string name="security_notification_content_update_title">Security update required</string>
+    <!-- Notification content title when device security policies have changed [CHAR_LIMIT=36] -->
+    <string name="security_notification_content_change_title">Security policies have
+         changed</string>
+    <!-- Notification content title when device security policies cannot be met [CHAR_LIMIT=30] -->
+    <string name="security_notification_content_unsupported_title">Security policies can\'t be
+         met</string>
     <!-- Title of the activity that dispatches changes to device security.  Not normally seen. -->
     <string name="account_security_title">Device security</string>
     <!-- Additional diagnostic text when the email app asserts control of the phone.
@@ -892,15 +894,15 @@
     <string name="password_expire_warning_dialog_title">Lock screen password expiring</string>
     <!-- Dialog content device pin/password is going to expire soon. [CHAR_LIMIT=none] -->
     <string name="password_expire_warning_dialog_content_fmt">
-         You must change your lock screen PIN or password soon, or the data for
-         <xliff:g id="account">%s</xliff:g> will be erased. Change it now?</string>
+         You need to change your lock screen PIN or password soon, or the data for
+         <xliff:g id="account">%s</xliff:g> will be erased. Do you want to change it now?</string>
 
     <!-- Dialog title if device pin/password has already expired. [CHAR_LIMIT=40] -->
     <string name="password_expired_dialog_title">Lock screen password expired</string>
     <!-- Dialog content device pin/password has already expired. [CHAR_LIMIT=none] -->
     <string name="password_expired_dialog_content_fmt">
          The data for <xliff:g id="account">%s</xliff:g> is being erased from your device.
-         You can restore it by changing your lock screen PIN or password. Change it now?</string>
+         You can restore it by changing your lock screen PIN or password. Do you want to change it now?</string>
 
     <!-- On AccountSettingsXL, dialog text if you try to exit in/out/eas fragment (server settings)
          without checking/saving [CHAR LIMIT=none]-->
@@ -913,7 +915,7 @@
         [CHAR_LIMIT=none] -->
     <string name="account_settings_login_dialog_content_fmt">
          The username or password for <xliff:g id="account">%s</xliff:g> is incorrect.
-         Update them now?</string>
+         Do you want to update them now?</string>
 
     <!-- On Settings screen, setting option name -->
     <string name="account_settings_default_label">Default account</string>
@@ -932,20 +934,32 @@
         [CHAR LIMIT=50] -->
     <string name="account_settings_summary">Sync frequency, notifications, etc.</string>
     <!-- On Settings screen, setting summary text -->
-    <string name="account_settings_notify_summary">Notify in System bar when email arrives</string>
+    <string name="account_settings_notify_summary">Send notification when email arrives</string>
     <!-- On Settings screen, setting option name and title of dialog box that opens -->
     <string name="account_settings_mail_check_frequency_label">Inbox check frequency</string>
     <!-- On Settings screen, setting option name -->
     <string name="account_settings_incoming_label">Incoming settings</string>
-   <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+    <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
     <string name="account_settings_incoming_summary">
         Username, password, and other incoming server settings</string>
     <!-- On Settings screen, setting option name -->
     <string name="account_settings_outgoing_label">Outgoing settings</string>
-   <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+    <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
     <string name="account_settings_outgoing_summary">
         Username, password, and other outgoing server settings</string>
     <!-- On Settings screen, setting option name -->
+    <string name="account_settings_enforced_label">Policies enforced</string>
+    <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+    <string name="account_settings_enforced_summary">None</string>
+    <!-- On Settings screen, setting option name -->
+    <string name="account_settings_unsupported_label">Unsupported policies</string>
+    <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+    <string name="account_settings_unsupported_summary">None</string>
+    <!-- On Settings screen, label for button that attempts to sync the account -->
+    <string name="account_settings_retry_label">Attempt sync</string>
+    <!-- On Settings screen, summmary for button that attempts to sync an account [CHAR LIMIT=64] -->
+    <string name="account_settings_retry_summary">Touch here to sync this account</string>
+    <!-- On Settings screen, setting option name -->
     <string name="account_settings_description_label">Account name</string>
     <!-- On Settings screen, setting option name -->
     <string name="account_settings_name_label">Your name</string>
@@ -956,13 +970,15 @@
     <string name="account_settings_edit_quick_responses_label">Quick responses</string>
     <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
     <string name="account_settings_edit_quick_responses_summary">
-        Edit text that you frequently insert when composing emails</string>
+        Edit text that you frequently insert when composing email</string>
     <!-- On Settings screen, setting option name -->
     <string name="account_settings_signature_hint">Append text to messages you send</string>
     <!-- On Settings screen, section heading -->
     <string name="account_settings_notifications">Notification settings</string>
     <!-- On Settings screen, section heading for data usage [CHAR LIMIT=70] -->
     <string name="account_settings_data_usage">Data usage</string>
+    <!-- On Settings screen, section heading -->
+    <string name="account_settings_policies">Security policies</string>
 
     <!-- On settings screen, dialog heading informing user to edit a quick response -->
     <string name="edit_quick_response_dialog">Edit quick response</string>
@@ -974,9 +990,9 @@
     <!-- On settings screen, sync contacts summary text [CHAR LIMIT=35] -->
     <string name="account_settings_sync_contacts_summary">Sync contacts for this account</string>
     <!-- On settings screen, sync calendar check box label [CHAR LIMIT=20]-->
-        <string name="account_settings_sync_calendar_enable">Sync Calendar</string>
-    <!-- On settings screen, sync calendar summary text [CHAR LIMIT=35] -->
-    <string name="account_settings_sync_calendar_summary">Sync calendar for this account</string>
+        <string name="account_settings_sync_calendar_enable">Sync calendar</string>
+    <!-- On settings screen, sync calendar summary text [CHAR LIMIT=50] -->
+    <string name="account_settings_sync_calendar_summary">Sync calendar event for this account</string>
     <!-- On settings screen, sync email check box label [CHAR LIMIT=20]-->
     <string name="account_settings_sync_email_enable">Sync email</string>
     <!-- On settings screen, sync email summary text [CHAR LIMIT=35] -->
@@ -1086,7 +1102,7 @@
 
     <!-- General Preferences Screen -->
     <!-- Label in preferences header to describe general preferences [CHAR LIMIT=32] -->
-    <string name="header_label_general_preferences">General</string>
+    <string name="header_label_general_preferences">General settings</string>
     <!-- First category in general preferences [CHAR LIMIT=64] -->
     <string name="category_general_preferences">Application</string>
 
@@ -1097,8 +1113,27 @@
     <!-- General preference: Description of the setting for the direction to move to
          when deleting the current message.
          Options contain "newer message","older message", etc. [CHAR LIMIT=64] -->
-    <string name="general_preference_auto_advance_summary">
-         Choose which screen to show after you delete a message</string>
+    <string name="general_preference_auto_advance_summary">Choose which screen to show after you
+         delete a message</string>
+    <!-- General preference: Label of the setting for hiding checkboxes in the
+         message list [CHAR LIMIT=32] -->
+    <string name="general_preference_hide_checkboxes_label">Hide checkboxes</string>
+    <!-- General preference: Description of the setting for hiding checkboxes in the
+         message list [CHAR LIMIT=64] -->
+    <string name="general_preference_hide_checkboxes_summary">In lists of messages, touch and
+         hold to select</string>
+    <!-- General preference: Label of the setting for requiring confirmation before
+         message deletion [CHAR LIMIT=32] -->
+    <string name="general_preference_confirm_delete_label">Confirm before deleting</string>
+    <!-- General preference: Description of the setting for requiring confirmation before
+         message deletion [CHAR LIMIT=64] -->
+    <string name="general_preference_confirm_delete_summary">Messages</string>
+    <!-- General preference: Label of the setting for requiring confirmation before
+         message sending [CHAR LIMIT=32] -->
+    <string name="general_preference_confirm_send_label">Confirm before sending</string>
+    <!-- General preference: Description of the setting for requiring confirmation before
+         message sending [CHAR LIMIT=32] -->
+    <string name="general_preference_confirm_send_summary">Messages</string>
     <!-- General preference: Title of the dialog box containing options for setting for
          the direction to move to when deleting the current message.
          Options contain "newer message","older message", etc. [CHAR LIMIT=32] -->
@@ -1226,7 +1261,44 @@
          Used only in layout computation, and never actually exposed to the user. -->
     <string name="long_string" translatable="false">looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong</string>
 
+    <!-- A policy disallowing the user of the device's camera [CHAR LIMIT=50] -->
+    <string name="policy_dont_allow_camera">Disallow use of the device\'s camera</string>
+    <!-- A policy requiring a device lock screen password [CHAR LIMIT=50] -->
+    <string name="policy_require_password">Require device password</string>
+    <!-- A policy disallowing the reuse of recent passwords [CHAR LIMIT=50] -->
+    <string name="policy_password_history">Restrict the reuse of recent passwords</string>
+    <!-- A policy that forces a password to expire after a set period of time [CHAR LIMIT=50] -->
+    <string name="policy_password_expiration">Require passwords to expire</string>
+    <!-- A policy requiring a maximum amount of time the device can sit idle before the lock screen
+        is activated [CHAR LIMIT=50] -->
+    <string name="policy_screen_timeout">Require an idle device to lock its screen</string>
+    <!-- A policy limiting the number of old calendar events synced [CHAR LIMIT=50] -->
+    <string name="policy_calendar_age">Limit the number of calendar events synced</string>
+    <!-- A policy limiting the number of emails synced [CHAR LIMIT=50] -->
+    <string name="policy_email_age">Limit the number of emails synced</string>
+
+    <!-- The four strings below represent "quick responses" which the user can insert into a
+        message being composed with just a couple of taps.  These four responses MUST be defined,
+        but need not include a string (i.e. they are optional).  Further, the responses can be
+        customized as necessary by the translator, in case one or more of these is inappropriate in
+        a particular locale or if there are better options available. -->
+    <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
+    <string name="quick_1">Thanks!</string>
+    <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
+    <string name="quick_2">Sounds good to me!</string>
+    <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
+    <string name="quick_3">I\'ll read this later and get back to you.</string>
+    <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
+    <string name="quick_4">Let\'s set up a meeting to discuss this.</string>
+
     <!-- This is the message warning the user that they must sync manually when roaming. [CHAR LIMIT=none]-->
     <string name="require_manual_sync_message">Background sync for this account is disabled while\
      roaming.</string>
+
+    <!-- This is shown when a user responds to a meeting invitation [CHAR LIMIT=none]-->
+    <string name="confirm_response">Sending response...</string>
+
+    <!-- Displayed in the middle of the screen when the inbox is empty [CHAR LIMIT 100]-->
+    <string name="no_conversations">No messages.</string>
 </resources>
+
diff --git a/res/values/styles.xml b/res/values/styles.xml
index c88ff59..956a86c 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -16,13 +16,6 @@
 
 <!-- non-xlarge.  See also values-xlarge for specializations for xlarge screens -->
 <resources>
-    <style name="EmailTheme" parent="@android:style/Theme.Holo.Light">
-    </style>
-
-    <style name="ThemeNoTitleBar" parent="android:Theme.NoTitleBar">
-        <item name="android:windowContentOverlay">@null</item>
-    </style>
-
     <!-- The headline at the top of every account settings fragments (in preferences) -->
     <!-- TODO these are estimates for the phone UX - final sizes TBD -->
     <style name="accountSettingsHeadline">
@@ -52,176 +45,5 @@
         <item name="android:textColor">?android:attr/textColorPrimary</item>
         <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
     </style>
-
-    <!-- EditText style without the "tray" -->
-    <style name="PlainEditText" parent="android:Widget.Holo.Light.EditText">
-        <item name="android:background">@null</item>
-    </style>
-
-    <style name="notification_secondary_text">
-        <item name="android:textColor">?android:attr/textColorSecondary</item>
-    </style>
-
-    <style name="widget_list_item">
-        <item name="android:textColor">?android:attr/textColorSecondary</item>
-        <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
-    </style>
-
-    <style name="message_details_value">
-        <item name="android:textSize">14dip</item>
-        <item name="android:textColor">@color/text_secondary_color</item>
-        <item name="android:singleLine">false</item>
-        <item name="android:lineSpacingMultiplier">1.5</item>
-    </style>
-
-    <style name="message_details_value_selectable" parent="message_details_value">
-        <item name="android:textIsSelectable">true</item>
-    </style>
-
-    <style name="message_details_label" parent="message_details_value">
-        <item name="android:textStyle">bold</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:layout_marginRight">8dp</item>
-        <item name="android:layout_marginLeft">8dp</item>
-    </style>
-
-    <style name="message_view_subject">
-        <item name="android:textSize">18dip</item>
-        <item name="android:textColor">@color/text_primary_color</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:enabled">false</item>
-        <item name="android:ellipsize">end</item>
-    </style>
-
-    <style name="Attachment" />
-
-    <style name="Attachment.Button" parent="@android:style/Widget.Holo.Button.Borderless">
-        <item name="android:minHeight">0dip</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_width">0dip</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:layout_gravity">center_vertical</item>
-        <item name="android:paddingTop">8dip</item>
-        <item name="android:paddingBottom">8dip</item>
-        <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:textColor">@color/buttontext</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:textAllCaps">true</item>
-    </style>
-
-    <style name="attachment_container">
-        <item name="android:background">@drawable/attachment_background</item>
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:orientation">horizontal</item>
-    </style>
-
-    <style name="attachment_name">
-        <item name="android:id">@id/attachment_name</item>
-        <item name="android:paddingLeft">5dip</item>
-        <item name="android:maxLines">1</item>
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:textColor">@color/text_primary_color</item>
-    </style>
-
-    <style name="attachment_thumbnail">
-        <item name="android:layout_gravity">center_vertical</item>
-        <item name="android:paddingLeft">5dip</item>
-        <item name="android:layout_width">32dip</item>
-        <item name="android:layout_height">32dip</item>
-    </style>
-
-    <style name="action_bar_custom_view">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">match_parent</item>
-    </style>
-
-    <style name="message_view_text">
-        <item name="android:textSize">14dip</item>
-        <item name="android:textColor">@color/text_secondary_color</item>
-    </style>
-
-    <style name="message_view_horizontal_divider">
-        <item name="android:layout_height">1dip</item>
-        <item name="android:background">?android:attr/dividerHorizontal</item>
-    </style>
-
-    <style name="message_view_tab" parent="@android:style/Widget.Holo.Light.Tab">
-        <item name="android:layout_height">32dip</item>
-        <item name="android:gravity">center</item>
-        <item name="android:textSize">14dip</item>
-        <item name="android:textColor">@color/text_secondary_color</item>
-    </style>
-
-    <style name="action_bar_account_name">
-        <item name="android:textSize">18dip</item>
-        <item name="android:textColor">@color/text_primary_color</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:ellipsize">end</item>
-    </style>
-
-    <style name="action_bar_account_name_secondary">
-        <item name="android:textSize">14dip</item>
-        <item name="android:textColor">@color/text_ternary_color</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:ellipsize">end</item>
-    </style>
-
-    <style name="action_bar_spinner_primary_text">
-        <item name="android:textSize">16sp</item>
-        <item name="android:textColor">@color/text_primary_color</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:ellipsize">end</item>
-    </style>
-
-    <style name="action_bar_spinner_secondary_text">
-        <item name="android:textSize">14sp</item>
-        <item name="android:textColor">@color/text_secondary_color</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:ellipsize">end</item>
-        <item name="android:layout_marginTop">-4dip</item>
-    </style>
-
-    <style name="search_header">
-        <item name="android:layout_height">32dip</item>
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:paddingLeft">6dip</item>
-        <item name="android:paddingRight">6dip</item>
-    </style>
-
-    <style name="message_list_item_normal">
-        <!-- no styles on phones -->
-    </style>
-    <style name="message_list_item_wide">
-        <!-- no styles on phones -->
-    </style>
-
-    <style name="message_view_action_buttons" parent="android:Widget.Holo.Button.Borderless">
-        <item name="android:layout_width">48dip</item>
-        <item name="android:layout_height">48dip</item>
-        <item name="android:scaleType">center</item>
-    </style>
-
-    <style name="message_header_sender_name">
-        <item name="android:textSize">16dip</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:textColor">@color/text_primary_color_inverse</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:ellipsize">end</item>
-    </style>
-
-    <style name="message_header_sender_address">
-        <item name="android:textSize">14dip</item>
-        <item name="android:textColor">@color/text_secondary_color_inverse</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:ellipsize">end</item>
-    </style>
-
-    <style name="QuotedTextHeaderStyle">
-        <item name="android:textColor">#777777</item>
-        <item name="android:textSize">12sp</item>
-    </style>
 </resources>
 
diff --git a/res/xml/account_settings_preferences.xml b/res/xml/account_settings_preferences.xml
old mode 100644
new mode 100755
index 7b6fa9b..03cb7c6
--- a/res/xml/account_settings_preferences.xml
+++ b/res/xml/account_settings_preferences.xml
@@ -136,11 +136,23 @@
     </PreferenceCategory>
 
     <PreferenceCategory
-        android:title="@string/account_settings_category_delete_account">
+        android:key="account_policies"
+        android:title="@string/account_settings_policies">
 
-        <PreferenceScreen
-            android:key="delete_account"
-            android:title="@string/account_settings_delete_account_label" />
+        <com.android.email.activity.setup.PolicyListPreference
+            android:key="policies_enforced"
+            android:title="@string/account_settings_enforced_label"
+            android:summary="@string/account_settings_enforced_summary" />
+
+        <com.android.email.activity.setup.PolicyListPreference
+            android:key="policies_unsupported"
+            android:title="@string/account_settings_unsupported_label"
+            android:summary="@string/account_settings_unsupported_summary" />
+
+        <Preference
+            android:key="policies_retry_account"
+            android:title="@string/account_settings_retry_label"
+            android:summary="@string/account_settings_retry_summary" />
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/general_preferences.xml b/res/xml/general_preferences.xml
index 93beefb..abb01f6 100644
--- a/res/xml/general_preferences.xml
+++ b/res/xml/general_preferences.xml
@@ -17,38 +17,54 @@
 <!-- App-wide preferences -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <PreferenceCategory
-            android:key="category_general_preferences"
-            android:title="@string/category_general_preferences">
+    <CheckBoxPreference
+        android:key="confirm_delete"
+        android:persistent="true"
+        android:defaultValue="false"
+        android:title="@string/general_preference_confirm_delete_label"
+        android:summary="@string/general_preference_confirm_delete_summary" />
 
-        <ListPreference
-            android:key="auto_advance"
-            android:title="@string/general_preference_auto_advance_label"
-            android:summary="@string/general_preference_auto_advance_summary"
-            android:entries="@array/general_preference_auto_advance_entries"
-            android:entryValues="@array/general_preference_auto_advance_values"
-            android:dialogTitle="@string/general_preference_auto_advance_dialog_title" />
+    <CheckBoxPreference
+        android:key="confirm_send"
+        android:persistent="true"
+        android:defaultValue="false"
+        android:title="@string/general_preference_confirm_send_label"
+        android:summary="@string/general_preference_confirm_send_summary" />
 
-        <!-- Note, summary is set dynamically in GeneralPreferences.java -->
-        <ListPreference
-            android:key="text_zoom"
-            android:title="@string/general_preference_text_zoom_label"
-            android:entries="@array/general_preference_text_zoom_entries"
-            android:entryValues="@array/general_preference_text_zoom_values"
-            android:dialogTitle="@string/general_preference_text_zoom_dialog_title" />
+    <ListPreference
+        android:key="auto_advance"
+        android:title="@string/general_preference_auto_advance_label"
+        android:summary="@string/general_preference_auto_advance_summary"
+        android:entries="@array/general_preference_auto_advance_entries"
+        android:entryValues="@array/general_preference_auto_advance_values"
+        android:dialogTitle="@string/general_preference_auto_advance_dialog_title" />
 
-        <!-- This may be removed in GeneralPreferences.java -->
-        <CheckBoxPreference
-            android:key="reply_all"
-            android:persistent="true"
-            android:defaultValue="false"
-            android:title="@string/general_preference_reply_all_label"
-            android:summary="@string/general_preference_reply_all_summary" />
+    <!-- Note, summary is set dynamically in GeneralPreferences.java -->
+    <ListPreference
+        android:key="text_zoom"
+        android:title="@string/general_preference_text_zoom_label"
+        android:entries="@array/general_preference_text_zoom_entries"
+        android:entryValues="@array/general_preference_text_zoom_values"
+        android:dialogTitle="@string/general_preference_text_zoom_dialog_title" />
 
-        <PreferenceScreen
-            android:key="clear_trusted_senders"
-            android:title="@string/general_preferences_clear_trusted_senders_title"
-            android:summary="@string/general_preferences_clear_trusted_senders_summary" />
+    <CheckBoxPreference
+        android:key="hide_checkboxes"
+        android:persistent="true"
+        android:defaultValue="false"
+        android:title="@string/general_preference_hide_checkboxes_label"
+        android:summary="@string/general_preference_hide_checkboxes_summary" />
 
-    </PreferenceCategory>
+    <!-- This may be removed in GeneralPreferences.java -->
+    <CheckBoxPreference
+        android:key="reply_all"
+        android:persistent="true"
+        android:defaultValue="false"
+        android:title="@string/general_preference_reply_all_label"
+        android:summary="@string/general_preference_reply_all_summary" />
+
+    <PreferenceScreen
+        android:key="clear_trusted_senders"
+        android:title="@string/general_preferences_clear_trusted_senders_title"
+        android:summary="@string/general_preferences_clear_trusted_senders_summary" />
+
 </PreferenceScreen>
diff --git a/res/xml/pop_imap_authenticator.xml b/res/xml/pop_imap_authenticator.xml
index e82b94b..ca34a8c 100644
--- a/res/xml/pop_imap_authenticator.xml
+++ b/res/xml/pop_imap_authenticator.xml
@@ -22,7 +22,7 @@
 
 <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
     android:accountType="com.android.email"
-    android:icon="@mipmap/ic_launcher_email"
+    android:icon="@mipmap/ic_launcher_mail"
     android:smallIcon="@drawable/stat_notify_email_generic"
     android:label="@string/app_name"
     android:accountPreferences="@xml/account_preferences"
diff --git a/res/xml/syncadapter_pop_imap.xml b/res/xml/syncadapter_pop_imap.xml
index c1c0734..f4a7120 100644
--- a/res/xml/syncadapter_pop_imap.xml
+++ b/res/xml/syncadapter_pop_imap.xml
@@ -23,5 +23,6 @@
 <sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
     android:contentAuthority="com.android.email.provider"
     android:accountType="com.android.email"
-    android:supportsUploading="false"
+    android:supportsUploading="true"
+    android:allowParallelSyncs="true"
 />
diff --git a/res/xml/widget_info.xml b/res/xml/widget_info.xml
index 5f3622f..047857e 100644
--- a/res/xml/widget_info.xml
+++ b/res/xml/widget_info.xml
@@ -21,5 +21,5 @@
     android:previewImage="@drawable/email_widget_preview"
     android:initialLayout="@layout/widget"
     android:resizeMode="horizontal|vertical"
-    android:configure="com.android.email.widget.WidgetConfiguration"
+    android:configure="com.android.email2.ui.MailboxSelectionActivityEmail"
     />