DO NOT MERGE: Move emailcommon2 sources to emailcommon

Change-Id: I06df7e467cd2e0117df8b8db3ddc6ff9da13f1c7
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>