DO NOT MERGE: Move emailcommon2 sources to emailcommon

Change-Id: I06df7e467cd2e0117df8b8db3ddc6ff9da13f1c7

2 files changed, 64 insertions, 39 deletions

diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 8ba8c1969..1e73f8840 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 a13e3197d..f42e288a5 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>