diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index daa1595..b3a3a38 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"Ja"</string>
     <string name="no" msgid="6731231425810196216">"Nee"</string>
     <string name="create" msgid="3578857613172647409">"Skep"</string>
+    <string name="allow" msgid="3349662621170855910">"Laat toe"</string>
+    <string name="deny" msgid="6947806159746484865">"Weier"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Onbekend"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"Jy het nou <xliff:g id="STEP_COUNT">%1$d</xliff:g> stappe oor voor jy \'n ontwikkelaar is."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Jy het nou <xliff:g id="STEP_COUNT">%1$d</xliff:g> stap oor voor jy \'n ontwikkelaar is."</item>
+    <item quantity="other" msgid="6722953419953594148">"Jy het nou <xliff:g id="STEP_COUNT">%1$d</xliff:g> stappe oor voor jy \'n ontwikkelaar is."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Jy is nou \'n ontwikkelaar!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Toemaar, jy is reeds \'n ontwikkelaar."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"DRAADLOOS en NETWERKE"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Onbekende fout"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Koud"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Ontdekbaar"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Sigbaar vir alle nabye Bluetooth-toestelle (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Sigbaar vir alle Bluetooth-toestelle wat naby is"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Nie sigbaar vir ander Bluetooth-toestelle nie"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Net sigbaar vir saamgebinde toestelle"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Maak toestel opspoorbaar"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Sigbaarheid-tydperk"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Stel hoe lank die toestel opspoorbaar moet wees"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Sluit stembellery"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Voorkom die gebruik van die Bluetooth-beller wanneer die skerm gesluit is"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth-toestelle"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Wys ontvangde lêers"</string>
     <string name="device_picker" msgid="8398232791303186677">"Kieser vir Bluetooth-toestelle"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth-toestemmingsversoek"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"\'n Program wil Bluetooth aanskakel. Toelaat?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"\'n Program op jou tablet wil jou tablet opspoorbaar maak vir ander Bluetooth-toestelle vir <xliff:g id="TIMEOUT">%1$d</xliff:g> sekondes . Toelaat?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"\'n Program op jou foon wil jou foon opspoorbaar maak vir ander Bluetooth-toestelle vir <xliff:g id="TIMEOUT">%1$d</xliff:g> sekondes . Toelaat?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"\'n Program op jou tablet wil jou tablet \"altyd opspoorbaar\" maak vir ander Bluetooth-toestelle. Toelaat?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"\'n Program op jou foon wil jou foon \"altyd opspoorbaar\" maak vir ander Bluetooth-toestelle. Toelaat?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"\'n Program op jou tablet wil Bluetooth aanskakel en jou tablet opspoorbaar maak vir ander toestelle vir <xliff:g id="TIMEOUT">%1$d</xliff:g> sekondes. Toelaat?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"\'n Program op jou foon wil Bluetooth aanskakel en jou foon opspoorbar maak vir ander toestelle vir <xliff:g id="TIMEOUT">%1$d</xliff:g> sekondes. Toelaat?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"\'n Program op jou tablet wil Bluetooth aanskakel en jou tablet opspoorbaar maak vir ander toestelle. Toelaat?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"\'n Program op jou foon wil Bluetooth aanskakel en jou foon opspoorbar maak vir ander toestelle? Toelaat?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"\'n Program wil Bluetooth aanskakel."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"\'n Program wil jou tablet sigbaar maak vir ander Bluetooth-toestelle vir <xliff:g id="TIMEOUT">%1$d</xliff:g> sekondes."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"\'n Program wil jou foon sigbaar maak vir ander Bluetooth-toestelle vir <xliff:g id="TIMEOUT">%1$d</xliff:g> sekondes."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"\'n Program wil jou tablet sigbaar maak vir ander Bluetooth-toestelle. Jy kan dit later verander in Bluetooth-instellings."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"\'n Program wil jou foon sigbaar maak vir ander Bluetooth-toestelle. Jy kan dit later verander in Bluetooth-instellings."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"\'n Program wil Bluetooth aanskakel en jou tablet sigbaar maak vir ander toestelle vir <xliff:g id="TIMEOUT">%1$d</xliff:g> sekondes."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"\'n Program wil Bluetooth aanskakel en jou foon sigbaar maak vir ander toestelle vir <xliff:g id="TIMEOUT">%1$d</xliff:g> sekondes."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"\'n Program wil Bluetooth aanskakel en jou tablet sigbaar maak vir ander toestelle. Jy kan dit later verander in Bluetooth-instellings."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"\'n Progam wil Bluetooth aanskakel en jou foon sigbaar maak vir ander toestelle. Jy kan dit later verander in Bluetooth-instellings."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Skakel tans Bluetooth af…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Skakel tans Bluetooth af…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Outokoppel"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Te veel verkeerde pogings!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Probeer weer oor <xliff:g id="NUMBER">%d</xliff:g> sekondes."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Die program is nie op jou foon geïnstalleer nie."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Kanselleer"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Volgende"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Beveilig jou tablet"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Beveilig jou foon"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Beskerm jou tablet teen ongemagtigde gebruik deur \'n persoonlike skermontsluitpatroon te skep. Laat gly jou vinger oor die volgende skerm om die kolletjies in enige volgorde te verbind. Jy moet ten minste vier kolletjies verbind. "\n\n"Reg om te begin? Raak Volgende."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Beskerm jou foon teen ongemagtigde gebruik deur \'n persoonlike skermontsluit-patroon te skep. Gly met jou vinger om ten minste vier kolletjies in enige volgorde op die volgende skerm te verbind. "\n\n"Gereed? Raak \"Volgende\"."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Bestuur programme"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Bestuur en verwyder geïnstalleerde programme"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Programme"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 87f773a..ed58358 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"አዎ"</string>
     <string name="no" msgid="6731231425810196216">"አይ"</string>
     <string name="create" msgid="3578857613172647409">"ፍጠር"</string>
+    <string name="allow" msgid="3349662621170855910">"ይፍቀዱ"</string>
+    <string name="deny" msgid="6947806159746484865">"ይከልክሉ"</string>
     <string name="device_info_default" msgid="7847265875578739287">"ያልታወቀ"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"አሁን ገንቢ ለመሆን <xliff:g id="STEP_COUNT">%1$d</xliff:g> ደረጃዎች ይቀርዎታል።"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"አሁን ገንቢ ለመሆን <xliff:g id="STEP_COUNT">%1$d</xliff:g> ደረጃ ይቀርዎታል።"</item>
+    <item quantity="other" msgid="6722953419953594148">"አሁን ገንቢ ለመሆን <xliff:g id="STEP_COUNT">%1$d</xliff:g> ደረጃዎች ይቀርዎታል።"</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"አሁን ገንቢ ሆነዋል!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"አያስፈልግም፣ አስቀድሞ ገንቢ ሆነዋል።"</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"ገመድ አልባ&amp; አውታረ መረቦች"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"ያልታወቀ ስህተት"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"ቀዝቃዛ"</string>
     <string name="bluetooth" msgid="5549625000628014477">"ብሉቱዝ"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"መገኘት የሚችል"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"ለሁሉም የብሉቱዝ መሣሪያዎች(<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>) የሚታይ"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"ለሁሉም የብሉቱዝ መሣሪያዎች የሚታይ"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"ለሌሎች የብሉቱዝ መሣሪያዎች አይታይም"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"ለተጣመሩ መሣሪያዎች ብቻ የሚታይ"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"መሳሪያው መገኘት የሚችል አድርግ"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"የታይነትጊዜ አብቅቷል"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"መሣሪያ በምን ያህል ጊዜ እንደሚገኝ አዘጋጅ"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"በድምፅ መደወያ ቆልፍ"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"ማያው ሲቆለፍ የብሉቱዝ ደዋዩ እንዳይጠቀምበት ተከላከል።"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"የብሉቱዝመሣሪያዎች"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"የደረሱ ፋይሎችን አሳይ"</string>
     <string name="device_picker" msgid="8398232791303186677">"የብሉቱዝ መሣሪያ መራጭ"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"የብሉቱዝ ፈቃድ ጥየቃ"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"መተግበሪያ ብሉቱዝን ማብራት ይፈልጋል:: ፍቀድ?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"በጡባዊህ ላይ ያለ መተግበሪያ ብሉቱዝን አብርቶ ለ<xliff:g id="TIMEOUT">%1$d</xliff:g> ሰከንዶች ያህል ጡባዊህ በሌሎች መሣሪያዎች እንዲገኝ ማድረግ ይፈልጋል:: ፍቀድ?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"በስልክህ ላይ ያለ መተግበሪያ ብሉቱዝን አብርቶ ለ<xliff:g id="TIMEOUT">%1$d</xliff:g> ሰከንዶች ያህል ስልክህ በሌሎች መሣሪያዎች እንዲገኝ ማድረግ ይፈልጋል::  ፍቀድ?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"በጡባዊህ ላይ ያለ መተግበሪያ ብሉቱዝን አብርቶ ጡባዊህ በሌሎች መሣሪያዎች “ሁልጊዜ እንዲገኝ ማድረግ ይፈልጋል:: ፍቀድ?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"በስልክህ ላይ ያለ መተግበሪያ ብሉቱዝን አብርቶ ስልክህ በሌሎች መሣሪያዎች “ሁልጊዜ እንዲገኝ ማድረግ ይፈልጋል::  ፍቀድ?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"በጡባዊህ ላይ ያለ መተግበሪያ ብሉቱዝን አብርቶ ለ<xliff:g id="TIMEOUT">%1$d</xliff:g> ሰከንዶች ያህል ጡባዊህ በሌሎች መሣሪያዎች እንዲገኝ ማድረግ ይፈልጋል:: ፍቀድ?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"በስልክህ ላይ ያለ መተግበሪያ ብሉቱዝን አብርቶ ለ<xliff:g id="TIMEOUT">%1$d</xliff:g> ሰከንዶች ያህል ስልክህ በሌሎች መሣሪያዎች እንዲገኝ ማድረግ ይፈልጋል::  ፍቀድ?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"በጡባዊህ ላይ ያለ መተግበሪያ ብሉቱዝን አብርቶ ጡባዊህ በሌሎች መሣሪያዎች እንዲገኝ ማድረግ ይፈልጋል:: ፍቀድ?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"በስልክህ ላይ ያለ መተግበሪያ ብሉቱዝን አብርቶ ስልክህ በሌሎች መሣሪያዎች እንዲገኝ ማድረግ ይፈልጋል::  ፍቀድ?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"አንድ መተግበሪያ ብሉቱዝን ማብራት ይፈልጋል።"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"አንድ መተግበሪያ ጡባዊዎን ለ<xliff:g id="TIMEOUT">%1$d</xliff:g> ሰከንዶች ያህል ለሌሎች የብሉቱዝ መሣሪያዎች እንዲታይ ሊያደርገው ይፈልጋል።"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"አንድ መተግበሪያ ስልክዎን ለ<xliff:g id="TIMEOUT">%1$d</xliff:g> ሰከንዶች ያህል ለሌሎች የብሉቱዝ መሣሪያዎች እንዲታይ ሊያደርገው ይፈልጋል።"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"አንድ መተግበሪያ ጡባዊዎን ለሌሎች የብሉቱዝ መሣሪያዎች እንዲታይ ሊያደርገው ይፈልጋል። ይሄን በኋላ ላይ በብሉቱዝ ቅንብሮች ውስጥ ሊቀይሩት ይችላሉ።"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"አንድ መተግበሪያ ስልክዎን ለሌሎች የብሉቱዝ መሣሪያዎች እንዲታይ ሊያደርገው ይፈልጋል። ይሄን በኋላ ላይ በብሉቱዝ ቅንብሮች ውስጥ ሊቀይሩት ይችላሉ።"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"አንድ መተግበሪያ ብሉቱዝን አብርቶ ጡባዊዎን ለ<xliff:g id="TIMEOUT">%1$d</xliff:g> ሰከንዶች ያህል ለሌሎች መሣሪያዎች እንዲታይ ሊያደርገው ይፈልጋል።"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"አንድ መተግበሪያ ብሉቱዝን አብርቶ ስልክዎን ለ<xliff:g id="TIMEOUT">%1$d</xliff:g> ሰከንዶች ያህል ለሌሎች መሣሪያዎች እንዲታይ ሊያደርገው ይፈልጋል።"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"አንድ መተግበሪያ ብሉቱዝን አብርቶ ጡባዊዎን ለሌሎች መሣሪያዎች እንዲታይ ሊያደርገው ይፈልጋል። ይሄን በኋላ ላይ በብሉቱዝ ቅንብሮች ውስጥ ሊቀይሩት ይችላሉ።"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"አንድ መተግበሪያ ብሉቱዝን አብርቶ ስልክዎን ለሌሎች መሣሪያዎች እንዲታይ ሊያደርገው ይፈልጋል። ይሄን በኋላ ላይ በብሉቱዝ ቅንብሮች ውስጥ ሊቀይሩት ይችላሉ።"</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"ብሉቱዝ በማብራት ላይ..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"ብሉቱዝ በማጥፋት ላይ..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"በራስ ሰር ተገናኝ"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"በጣም ብዙ የተሳሳቱ ሙከራዎች!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"በ<xliff:g id="NUMBER">%d</xliff:g>ሰከንዶች ውስጥ እንደገና ሞክር።"</string>
     <string name="activity_not_found" msgid="5551664692991605325">"መተግበሪያ በስልክዎ ላይ አልተጫነም።"</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"ይቅር"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"ቀጥል"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"ጡባዊዎን በማስጠበቅ ላይ"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"ስልክዎን በማስጠበቅ ላይ"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"የግል ማያ መክፈቻ ስርዓተ ጥለት በመፍጠር ጡባዊህን ካልተፈቀደ ጥቅም ትከላከላለህ። በሚቀጥለው ማያ ላይ በማንኛውም ስርዓተ ነጥቦቹን ለማገናኘት ጣትህን ተጠቀም። ቢያንስ አራት ነጥቦች ማገናኘት አለብህ።"\n\n" ለመጀመር ዝግጁ ነህ? \"ቀጥል\" ንካ።"</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"የግል የስርዓተ ጥለት ማያ መክፈቻ በመፍጠር ስልክህን ካልተፈቀደ ጥቅም ጠብቅ። በሚቀጥለው ማያ ላይ በማንኛውም መልኩ ቢያንስ አራት ነጥቦች ጣትህን በመጠቀም አገናኝ። "\n\n" ለመጀመር ዝግጁ ነው? \"ቀጥሎ\" የሚለውን ንካ።"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"መተግበሪያዎች አስተዳድር"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"የተጫኑ መተግበራያዎች አስተዳድር እና አስወግድ"</string>
     <string name="applications_settings" msgid="1721442176406964682">"መተግበሪያዎች"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 18cff0e..a55765d 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"نعم"</string>
     <string name="no" msgid="6731231425810196216">"لا"</string>
     <string name="create" msgid="3578857613172647409">"إنشاء"</string>
+    <string name="allow" msgid="3349662621170855910">"سماح"</string>
+    <string name="deny" msgid="6947806159746484865">"رفض"</string>
     <string name="device_info_default" msgid="7847265875578739287">"غير معروف"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"لا يفصلك الآن عن الوصول إلى مرحلة مطوري البرامج سوى <xliff:g id="STEP_COUNT">%1$d</xliff:g> من الخطوات."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"لا يفصلك الآن عن الوصول إلى مرحلة مطوري البرامج سوى <xliff:g id="STEP_COUNT">%1$d</xliff:g> من الخطوات."</item>
+    <item quantity="other" msgid="6722953419953594148">"لا يفصلك الآن عن الوصول إلى مرحلة مطوري البرامج سوى <xliff:g id="STEP_COUNT">%1$d</xliff:g> من الخطوات."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"لقد أصبحت الآن مطور برامج!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"لا حاجة لذلك، فأنت مطور برامج فعلاً."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"اللاسلكي والشبكات"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"خطأ غير معروف"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"بارد"</string>
     <string name="bluetooth" msgid="5549625000628014477">"بلوتوث"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"قابل للاكتشاف"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"مرئي لجميع أجهزة بلوتوث القريبة (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"مرئي لجميع أجهزة بلوتوث القريبة"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"ليس مرئيًا لأجهزة بلوتوث الأخرى"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"مرئي فقط للأجهزة المقترنة"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"جعل الجهاز قابل للاكتشاف"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"مهلة الرؤية"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"تعيين الوقت الذي يكون فيه الجهاز قابلاً للاكتشاف"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"تأمين الطلب الصوتي"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"منع استخدام طالب البلوتوث عندما تكون الشاشة مؤمّنة"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"أجهزة بلوتوث"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"إظهار الملفات المستلمة"</string>
     <string name="device_picker" msgid="8398232791303186677">"منتقي جهاز البلوتوث"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"طلب إذن بلوتوث"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"هل تريد السماح لأي تطبيق يريد تشغيل بلوتوث؟"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"يريد أحد التطبيقات على الجهاز اللوحي جعله قابلاً للاكتشاف بواسطة أجهزة البلوتوث الأخرى لمدة <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانية. هل تريد السماح بذلك؟"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"يريد أحد التطبيقات على الهاتف جعله قابلاً للاكتشاف بواسطة أجهزة البلوتوث الأخرى لمدة <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانية. هل تريد السماح بذلك؟"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"يريد أحد التطبيقات على الجهاز اللوحي جعله \"قابلاً للاكتشاف دائمًا\" بواسطة أجهزة البلوتوث الأخرى. هل تريد السماح بذلك؟"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"يريد أحد التطبيقات على الهاتف جعله قابلاً للاكتشاف بواسطة أجهزة البلوتوث الأخرى. هل تريد السماح بذلك؟"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"يريد أحد التطبيقات على الجهاز اللوحي تشغيل بلوتوث وجعله قابلاً للاكتشاف بواسطة الأجهزة الأخرى لمدة <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانية. هل تريد السماح بذلك؟"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"يريد أحد التطبيقات على الهاتف تشغيل البلوتوث وجعل هاتفك قابلاً للاكتشاف بواسطة الأجهزة الأخرى لمدة <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانية. هل تريد السماح بذلك؟"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"يريد أحد التطبيقات على الجهاز اللوحي تشغيل بلوتوث وجعله قابلاً للاكتشاف بواسطة الأجهزة الأخرى. هل تريد السماح بذلك؟"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"يريد أحد التطبيقات على الهاتف تشغيل البلوتوث وجعل هاتفك قابلاً للاكتشاف بواسطة الأجهزة الأخرى. هل تريد السماح بذلك؟"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"يريد أحد التطبيقات تشغيل بلوتوث."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"يريد أحد التطبيقات أن يجعل جهازك اللوحي مرئيًا لأجهزة البلوتوث الأخرى لمدة <xliff:g id="TIMEOUT">%1$d</xliff:g> من الثواني."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"يريد أحد التطبيقات أن يجعل هاتفك مرئيًا لأجهزة البلوتوث الأخرى لمدة <xliff:g id="TIMEOUT">%1$d</xliff:g> من الثواني."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"يريد أحد التطبيقات جعل جهازك اللوحي مرئيًا لأجهزة بلوتوث الأخرى. يمكنك تغيير هذا لاحقًا في إعدادات بلوتوث."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"يريد أحد التطبيقات جعل هاتفك مرئيًا لأجهزة بلوتوث الأخرى. يمكنك تغيير هذا لاحقًا في إعدادات بلوتوث."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"يريد أحد التطبيقات تشغيل البلوتوث وجعل جهازك اللوحي مرئيًا للأجهزة الأخرى لمدة <xliff:g id="TIMEOUT">%1$d</xliff:g> من الثواني."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"يريد أحد التطبيقات تشغيل البلوتوث وجعل هاتفك مرئيًا للأجهزة الأخرى لمدة <xliff:g id="TIMEOUT">%1$d</xliff:g> من الثواني."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"يريد أحد التطبيقات تشغيل البلوتوث وجعل جهازك اللوحي مرئيًا للأجهزة الأخرى. يمكنك تغيير هذا لاحقًا في إعدادات بلوتوث."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"يريد أحد التطبيقات تشغيل البلوتوث وجعل هاتفك مرئيًا للأجهزة الأخرى. يمكنك تغيير هذا لاحقًا في إعدادات بلوتوث."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"جارٍ تشغيل البلوتوث..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"جارٍ إيقاف تشغيل البلوتوث..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"اتصال تلقائي"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"المحاولات غير الصحيحة كثيرة للغاية!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"حاول مرة أخرى خلال <xliff:g id="NUMBER">%d</xliff:g> ثانية."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"لم يتم تثبيت التطبيق على هاتفك."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"إلغاء"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"التالي"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"تأمين الجهاز اللوحي"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"تأمين الهاتف"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"يمكنك حماية الجهاز اللوحي من الاستخدام غير المصرح به من خلال إنشاء نقش شخصي لإلغاء تأمين الشاشة. استخدم إصبعك لتوصيل النقاط بأي ترتيب في الشاشة التالية. يلزمك توصيل أربع نقاط على الأقل."\n\n"هل أنت مستعد للبدء؟ المس \"التالي\"."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"يمكنك حماية الهاتف من الاستخدام غير المصرح به من خلال إنشاء نقش شخصي لإلغاء تأمين الشاشة. استخدم إصبعك لتوصيل النقاط لتوصيل أربع نقاط على الأقل بأي ترتيب في الشاشة التالية. "\n\n"هل أنت مستعد للبدء؟ المس \"التالي\"."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"إدارة التطبيقات"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"إدارة التطبيقات المثبتة وإزالتها"</string>
     <string name="applications_settings" msgid="1721442176406964682">"التطبيقات"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 178d0b6..5bc8a26 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"Так"</string>
     <string name="no" msgid="6731231425810196216">"Не"</string>
     <string name="create" msgid="3578857613172647409">"Стварыць"</string>
+    <string name="allow" msgid="3349662621170855910">"Дазволіць"</string>
+    <string name="deny" msgid="6947806159746484865">"Забараніць"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Невядома"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"Зараз вы ў некалькіх (<xliff:g id="STEP_COUNT">%1$d</xliff:g>) кроках ад таго, каб стаць распрацоўшчыкам."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Зараз вы ў некалькіх (<xliff:g id="STEP_COUNT">%1$d</xliff:g>) кроках ад таго, каб стаць распрацоўшчыкам."</item>
+    <item quantity="other" msgid="6722953419953594148">"Зараз вы ў некалькіх (<xliff:g id="STEP_COUNT">%1$d</xliff:g>) кроках ад таго, каб стаць распрацоўшчыкам."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Цяпер вы - распрацоўшчык!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Не трэба, вы ўжо з\'яўляецеся распрацоўшчыкам."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"БЕСПРАВАДНАЯ ПЕРАДАЧА І СЕТКІ"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Невядомая памылка"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Халодны"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Бачнасць"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Зрабіць бачнай для ўсіх блізкіх прылад Bluetooth (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Бачна для ўсіх блізкіх прылад Bluetooth"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Не бачны для іншых прылад Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Бачная толькі для падключаных прылад"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Зрабіць прыладу бачнай"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Тайм-аўт бачнасці"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Настаўце час, на працягу якога прылада будзе даступная"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Блакаваць галасавы набор"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Забараніць выкарыстанне набіральніка Bluetooth, калі экран заблакаваны"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Прылады Bluetooth"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Паказаць атрыманыя файлы"</string>
     <string name="device_picker" msgid="8398232791303186677">"Выбiрае Bluetooth-прыладу"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Запыт дазволу Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Прыкладанне спрабуе ўключыць Bluetooth. Дазволіць?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Прыкладанне на планшэце хоча зрабіць яго бачным для іншых прылад Bluetooth на <xliff:g id="TIMEOUT">%1$d</xliff:g> с. Дазволіць?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Прыкладанне на тэлефоне хоча зрабіць яго бачным для іншых прылад Bluetooth на <xliff:g id="TIMEOUT">%1$d</xliff:g> с. Дазволіць?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Прыкладанне на планшэце хоча ўключыць зрабіць яго заўсёды бачным для іншых прылад. Дазволіць?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Прыкладанне на тэлефоне хоча зрабіць яго заўсёды бачным для іншых прылад Bluetooth. Дазволіць?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Прыкладанне на планшэце хоча зрабіць яго бачным для іншых прылад Bluetooth на <xliff:g id="TIMEOUT">%1$d</xliff:g> с. Дазволіць?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Прыкладанне з вашага тэлефона хоча ўключыць Bluetooth i зрабiць ваш тэлефон бачным для iншых прылад на <xliff:g id="TIMEOUT">%1$d</xliff:g> с. Дазволiць?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Прыкладанне на планшэце хоча ўключыць Bluetooth і зрабіць планшэт бачным для іншых прылад. Дазволіць?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Прыкладанне з вашага тэлефона хоча ўключыць Bluetooth i зрабiць ваш тэлефон бачным для iншых прылад. Дазволiць?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Прыкладанне iмкнецца ўключыць Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Прыкладанне iмкнецца зрабіць ваш планшэт бачным для іншых прылад Bluetooth на <xliff:g id="TIMEOUT">%1$d</xliff:g> с."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Прыкладанне iмкнецца зрабіць ваш тэлефон бачным для іншых прылад Bluetooth на <xliff:g id="TIMEOUT">%1$d</xliff:g> с."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Прыкладанне iмкнецца зрабіць ваш ​​планшэт бачным для іншых прылад з Bluetooth. Вы можаце змяніць гэта пазней у наладах Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Прыкладанне iмкнецца зрабіць ваш ​​тэлефон бачным для іншых прылад з Bluetooth. Вы можаце змяніць гэта пазней у наладах Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Прыкладанне iмкнецца ўключыць Bluetooth і зрабіць ваш ​​планшэт бачным для іншых прылад на <xliff:g id="TIMEOUT">%1$d</xliff:g> с."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Прыкладанне iмкнецца ўключыць Bluetooth і зрабіць ваш ​​тэлефон бачным для іншых прылад на <xliff:g id="TIMEOUT">%1$d</xliff:g> с."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Прыкладанне iмкнецца ўключыць Bluetooth і зрабіць ваш ​​планшэт бачным для іншых прылад. Вы можаце змяніць гэта пазней у наладах Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Прыкладанне iмкнецца ўключыць Bluetooth і зрабіць ваш ​​тэлефон бачным для іншых прылад. Вы можаце змяніць гэта пазней у наладах Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Уключэнне Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Адключэнне Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Аўтаматычнае падключэнне"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Занадта шмат няўдалых спробаў"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Паўтарыце спробу праз <xliff:g id="NUMBER">%d</xliff:g> секунд."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Прыкладанне не ўсталявана на вашым тэлефоне."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Адмяніць"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Далей"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Абарона планшэта"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Абарона тэлефона"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Абараніце свой планшэт ад несанкцыянаванага выкарыстання, стварыўшы персанальную камбінацыю разблакоўкі экрана. Пальцам злучыце кропкі на наступным экране ў любым парадку. Вы павінны злучыць як мінімум чатыры кропкі."\n\n"Гатовы? Нацiснiце \"Далей\"."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Абараніце свой тэлефон ад несанкцыянаванага выкарыстання, стварыўшы персанальную камбінацыю разблакоўкі экрана. На наступным экране злучыце ў любым парадку не менш за чатыры кропкi. "\n" "\n" Гатовы пачаць? Націсніце \"Далей\"."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Кіраванне прыкладаннямі"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Кіраванне ўсталяванымi прыкладаннямi і iх выдаленне"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Прыкладаннi"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 09a19bd..5792637 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">" Да"</string>
     <string name="no" msgid="6731231425810196216">"Не"</string>
     <string name="create" msgid="3578857613172647409">"Създаване"</string>
+    <string name="allow" msgid="3349662621170855910">"Разрешаване"</string>
+    <string name="deny" msgid="6947806159746484865">"Отказ"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Неизвестно"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"Вече сте на <xliff:g id="STEP_COUNT">%1$d</xliff:g> стъпки от това, да бъдете програмист."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Вече сте на <xliff:g id="STEP_COUNT">%1$d</xliff:g> стъпка от това, да бъдете програмист."</item>
+    <item quantity="other" msgid="6722953419953594148">"Вече сте на <xliff:g id="STEP_COUNT">%1$d</xliff:g> стъпки от това, да бъдете програмист."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Вече сте програмист!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Не е необходимо – вече сте програмист."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"КАБЕЛНИ И БЕЗЖИЧНИ МРЕЖИ"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Неизвестна грешка"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Студено"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Откриваемо"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Видимо за всички у-ва с Bluetooth в района (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Видимо за всички устройства с Bluetooth в района"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Не е видимо за други устройства с Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Видимо само за сдвоени устройства"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Устройството да стане откриваемо"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Време за изчакване за видимост"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Задаване на време, за което устройството ще бъде откриваемо"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Заключване на гласовото набиране"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Предотвратява употребата на набирането за Bluetooth при заключен екран"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth устройства"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Показване на получени файлове"</string>
     <string name="device_picker" msgid="8398232791303186677">"Инструмент за избор на устройство с Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Заявка за разрешение на Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Приложение иска да включи Bluetooth. Ще разрешите ли това?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Приложение на таблета ви иска да го направи откриваем от други устройства с Bluetooth за <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди. Ще разрешите ли това?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Приложение на телефона ви иска да го направи откриваем от други устройства с Bluetooth за <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди. Ще разрешите ли това?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Приложение на таблета ви иска да го направи „винаги откриваем“ от други устройства с Bluetooth. Ще разрешите ли това?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Приложение на телефона ви иска го направи „винаги откриваем“ от други устройства с Bluetooth. Ще разрешите ли това?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Приложение на таблета ви иска да включи Bluetooth и да го направи откриваем от други устройства за <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди. Ще разрешите ли това?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Приложение на телефона ви иска да включи Bluetooth и да го направи откриваем от други устройства за <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди. Ще разрешите ли това?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Приложение на таблета ви иска да включи Bluetooth и да го направи откриваем от други устройства. Ще разрешите ли това?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Приложение на телефона ви иска да включи Bluetooth и да го направи откриваем от други устройства. Ще разрешите ли това?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Приложение иска да включи Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Приложение иска да направи таблета ви видим за други устройства с Bluetooth за <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Приложение иска да направи телефона ви видим за други устройства с Bluetooth за <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Приложение иска да направи таблета ви видим за други устройства с Bluetooth. Можете да промените това по-късно от настройките за функцията."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Приложение иска да направи телефона ви видим за други устройства с Bluetooth. Можете да промените това по-късно от настройките за функцията."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Приложение иска да включи Bluetooth и да направи таблета ви видим за други устройства за <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Приложение иска да включи Bluetooth и да направи телефона ви видим за други устройства за <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Приложение иска да включи Bluetooth и да направи таблета ви видим за други устройства. Можете да промените това по-късно от настройките за функцията."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Приложение иска да включи Bluetooth и да направи телефона ви видим за други устройства. Можете да промените това по-късно от настройките за функцията."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth се включва..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth се изключва…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Автоматично свързване"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Твърде много грешни опити!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Опитайте отново след <xliff:g id="NUMBER">%d</xliff:g> секунди."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Приложението не е инсталирано на телефона ви."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Отказ"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Напред"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Подсигуряване на таблета ви"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Защитаване на телефона ви"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Защитете таблета си от неупълномощена употреба, като създадете лична фигура за отключване на екрана. Плъзнете пръст, за да свържете в произволен ред точките на следващия екран. Трябва да свържете поне четири точки. "\n\n"Готови ли сте да започнете? Докоснете „Напред“."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Защитете телефона си от неупълномощена употреба, като създадете лична фигура за отключване на екрана. Плъзнете пръст, за да свържете в произволен ред поне 4 точки на следващия екран. "\n\n"Готови ли сте да започнете? Докоснете „Напред“."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Управление на приложенията"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Управление и премахване на инсталирани приложения"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Приложения"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 63d22a7..dc01d0e 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"Sí"</string>
     <string name="no" msgid="6731231425810196216">"No"</string>
     <string name="create" msgid="3578857613172647409">"Crea"</string>
+    <string name="allow" msgid="3349662621170855910">"Permet"</string>
+    <string name="deny" msgid="6947806159746484865">"Denega"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Desconegut"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"Ara ja només et queden <xliff:g id="STEP_COUNT">%1$d</xliff:g> passos per convertir-te en desenvolupador."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Ara ja només et queda <xliff:g id="STEP_COUNT">%1$d</xliff:g> pas per convertir-te en desenvolupador."</item>
+    <item quantity="other" msgid="6722953419953594148">"Ara ja només et queden <xliff:g id="STEP_COUNT">%1$d</xliff:g> passos per convertir-te en desenvolupador."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Ara ja ets un desenvolupador!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"No cal, ja ets un desenvolupador."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"Connexions sense fil i xarxes"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Error desconegut"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Fred"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Detectable"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Visible per a tots els dispositius Bluetooth propers (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visible per a tots els dispositius Bluetooth propers"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Ocult per a altres dispositius Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Només visible per als dispositius sincronitzats"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Fes que el dispositiu es pugui detectar"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Temps d\'espera de la visib."</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Defineix durant quanta estona podrà detectar-se el dispositiu"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloqueja el marcatge per veu"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Impedeix l\'ús del marcador Bluetooth quan la pantalla estigui bloquejada"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Dispositius Bluetooth"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostra els fitxers rebuts"</string>
     <string name="device_picker" msgid="8398232791303186677">"Selector de dispositiu Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Sol·licitud de permís de Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Una aplicació vol activar el Bluetooth. Vols permetre-ho?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Una aplicació de la teva tauleta vol permetre que altres dispositius amb Bluetooth puguin descobrir la teva tauleta durant <xliff:g id="TIMEOUT">%1$d</xliff:g> segons. Vols permetre-ho?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Una aplicació del teu telèfon vol permetre que altres dispositius amb Bluetooth puguin descobrir el teu telèfon durant <xliff:g id="TIMEOUT">%1$d</xliff:g> segons. Vols permetre-ho?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Una aplicació de la teva tauleta vol permetre que altres dispositius amb Bluetooth puguin \"descobrir-la sempre\". Vols permetre-ho?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Una aplicació del teu telèfon vol permetre que altres dispositius amb Bluetooth puguin \"descobrir sempre\" el teu telèfon. Vols permetre-ho?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Una aplicació de la tauleta vol activar Bluetooth i permetre que altres dispositius puguin descobrir-la durant <xliff:g id="TIMEOUT">%1$d</xliff:g> segons. Vols permetre-ho?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Una aplicació del teu telèfon vol activar el Bluetooth i vol permetre que altres dispositius puguin descobrir el teu telèfon durant <xliff:g id="TIMEOUT">%1$d</xliff:g> segons. Ho vols permetre?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Una aplicació de la teva tauleta vol activar el Bluetooth i permetre que altres dispositius puguin descobrir-la. Vols permetre-ho?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Una aplicació del teu telèfon vol activar el Bluetooth i permetre que altres dispositius puguin descobrir el teu telèfon. Vols permetre-ho?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Una aplicació vol activar el Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Una aplicació vol que la tauleta sigui visible per a la resta de dispositius amb Bluetooth durant <xliff:g id="TIMEOUT">%1$d</xliff:g> segons."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Una aplicació vol que el telèfon sigui visible per a la resta de dispositius amb Bluetooth durant <xliff:g id="TIMEOUT">%1$d</xliff:g> segons."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Una aplicació vol que la tauleta sigui visible per a altres dispositius amb Bluetooth. Més endavant podràs canviar la configuració de Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Una aplicació vol que el telèfon sigui visible per a altres dispositius amb Bluetooth. Més endavant podràs canviar la configuració de Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Una aplicació vol activar el Bluetooth i fer que la tauleta sigui visible per a la resta de dispositius durant <xliff:g id="TIMEOUT">%1$d</xliff:g> segons."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Una aplicació vol activar el Bluetooth i fer que el telèfon sigui visible per a la resta de dispositius durant <xliff:g id="TIMEOUT">%1$d</xliff:g> segons."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Una aplicació vol activar el Bluetooth i fer que la tauleta sigui visible per a la resta de dispositius. Més endavant podràs canviar la configuració de Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Una aplicació vol activar el Bluetooth i fer que el telèfon sigui visible per a la resta de dispositius. Més endavant podràs canviar la configuració de Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"S\'està activant el Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"S\'està desactivant Bluetooth??"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Connexió automàtica"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Massa intents incorrectes"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Torneu-ho a provar d\'aquí a <xliff:g id="NUMBER">%d</xliff:g> segons."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"L\'aplicació no està instal·lada al telèfon."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Cancel·la"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Següent"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Seguretat de la tauleta"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Protecció del telèfon"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Protegeix la tauleta de l\'ús no autoritzat: crea un patró personal de desbloqueig de la pantalla. Fes lliscar el dit per connectar els punts en l\'ordre que vulguis a la pantalla següent. Has de connectar un mínim de quatre punts. "\n\n"Estàs preparat per començar? Toca Següent."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Protegeix el telèfon de l\'ús no autoritzat: crea un patró personal de desbloqueig de la pantalla. Fes lliscar el dit per connectar quatre punts com a mínim en l\'ordre que vulguis a la pantalla següent. "\n\n"Estàs preparat per començar? Toca Següent."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gestiona les aplicacions"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gestiona i elimina les aplicacions instal·lades"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Aplicacions"</string>
@@ -1674,7 +1670,7 @@
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Ús de dades"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Cicle d\'ús de dades"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Itinerància de dades"</string>
-    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Restringeix dades referència"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Restringeix dades de referència"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Separa l\'ús de 4G"</string>
     <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Mostra l\'ús de Wi-Fi"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Mostra l\'ús d\'Ethernet"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 4c04f2a..4f851d7 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"Ano"</string>
     <string name="no" msgid="6731231425810196216">"Ne"</string>
     <string name="create" msgid="3578857613172647409">"Vytvořit"</string>
+    <string name="allow" msgid="3349662621170855910">"Povolit"</string>
+    <string name="deny" msgid="6947806159746484865">"Odmítnout"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Neznámé"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"Nyní jste <xliff:g id="STEP_COUNT">%1$d</xliff:g> klepnutí od toho, abyste se stali vývojářem."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Jste pouhé <xliff:g id="STEP_COUNT">%1$d</xliff:g> klepnutí od toho, abyste se stali vývojářem."</item>
+    <item quantity="other" msgid="6722953419953594148">"Jste <xliff:g id="STEP_COUNT">%1$d</xliff:g> klepnutí od toho, abyste se stali vývojářem."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Nyní jste vývojář."</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Není potřeba, již jste vývojář."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"BEZDRÁTOVÁ PŘIPOJENÍ A SÍTĚ"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Neznámá chyba"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Nejméně zajímavé"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Viditelné"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Viditelné pro všechna okolní zařízení Bluetooth (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Viditelné pro všechny okolní zařízení Bluetooth"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Neviditelné pro ostatní zařízení Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Viditelné pouze pro spárovaná zařízení"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Přepne zařízení do viditelného režimu"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Časový limit viditelnosti"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Nastavit dobu, po kterou bude zařízení ve viditelném režimu"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Uzamknout hlasové vytáčení"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Zabránit použití vytáčení Bluetooth při uzamčené obrazovce"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Zařízení Bluetooth"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Zobrazit přijaté soubory"</string>
     <string name="device_picker" msgid="8398232791303186677">"Výběr zařízení Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Požadavek na povolení zařízení Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Aplikace chce zapnout připojení Bluetooth. Povolit?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Aplikace v tabletu chce nastavit tablet do viditelného režimu pro ostatní zařízení Bluetooth na <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Povolit?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Aplikace v telefonu chce nastavit telefon do viditelného režimu pro ostatní zařízení Bluetooth na <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Povolit?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Aplikace v tabletu chce trvale nastavit tablet do viditelného režimu pro ostatní zařízení Bluetooth. Povolit?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Aplikace v telefonu chce trvale nastavit telefon do viditelného režimu pro ostatní zařízení Bluetooth. Povolit?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Aplikace v tabletu chce zapnout připojení Bluetooth a nastavit tablet na <xliff:g id="TIMEOUT">%1$d</xliff:g> s. do viditelného režimu. Povolit?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Aplikace v telefonu chce zapnout připojení Bluetooth a nastavit telefon do viditelného režimu na <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Povolit?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Aplikace v tabletu chce zapnout Bluetooth a nastavit tablet do viditelného režimu pro ostatní zařízení. Povolit?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Aplikace v telefonu chce zapnout připojení Bluetooth a nastavit telefon do viditelného režimu. Povolit?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Aplikace chce zapnout Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Aplikace požaduje zviditelnění tabletu pro ostatní zařízení Bluetooth na <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Aplikace požaduje zviditelnění telefonu pro ostatní zařízení Bluetooth na <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Aplikace chce tablet zviditelnit pro ostatní zařízení Bluetooth. Toto můžete později změnit v nastavení Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Aplikace chce telefon zviditelnit pro ostatní zařízení Bluetooth. Toto můžete později změnit v nastavení Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Aplikace chce zapnout Bluetooth a na <xliff:g id="TIMEOUT">%1$d</xliff:g> s tablet zviditelnit pro ostatní zařízení."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Aplikace chce zapnout Bluetooth a na <xliff:g id="TIMEOUT">%1$d</xliff:g> s telefon zviditelnit pro ostatní zařízení."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Aplikace chce zapnout Bluetooth a zviditelnit tablet pro ostatní zařízení. Později to můžete změnit v nastavení Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Aplikace chce zapnout Bluetooth a zviditelnit telefon pro ostatní zařízení. Později to můžete změnit v nastavení Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Zapínání Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Vypínání rozhraní Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automatické připojení"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Příliš mnoho neplatných pokusů."</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Sekundy zbývající do dalšího pokusu: <xliff:g id="NUMBER">%d</xliff:g>."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Aplikace není v telefonu nainstalována."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Zrušit"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Další"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Zabezpečení tabletu"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Zabezpečení telefonu"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Tablet můžete chránit před neoprávněným použitím pomocí osobního bezpečnostního gesta pro odemknutí obrazovky. Tečky na následující obrazovce spojte prstem v jakémkoli pořadí. Je potřeba spojit alespoň čtyři tečky. "\n\n"Jakmile budete připraveni začít, dotkněte se tlačítka Další."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Svůj telefon můžete chránit před neoprávněným použitím pomocí osobního gesta pro odemknutí obrazovky. Tečky na následující obrazovce spojte prstem v jakémkoli pořadí. Je třeba spojit alespoň čtyři tečky. "\n\n"Jakmile budete připraveni začít, dotkněte se tlačítka Další."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Spravovat aplikace"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Umožňuje spravovat a odebírat instalované aplikace"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Aplikace"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 29888ea..e3f005d 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"Ja"</string>
     <string name="no" msgid="6731231425810196216">"Nej"</string>
     <string name="create" msgid="3578857613172647409">"Opret"</string>
+    <string name="allow" msgid="3349662621170855910">"Tillad"</string>
+    <string name="deny" msgid="6947806159746484865">"Afvis"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Ukendt"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"Du er nu <xliff:g id="STEP_COUNT">%1$d</xliff:g> skridt væk fra at være udvikler."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Du er nu <xliff:g id="STEP_COUNT">%1$d</xliff:g> skridt væk fra at være udvikler."</item>
+    <item quantity="other" msgid="6722953419953594148">"Du er nu <xliff:g id="STEP_COUNT">%1$d</xliff:g> skridt væk fra at være udvikler."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Nu er du udvikler."</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Det behøver du ikke. Du er allerede udvikler."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"TRÅDLØST OG NETVÆRK"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Ukendt fejl"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Kold"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Søgbar"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Synlig for alle Bluetooth-enheder i nærheden (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Synlig for alle Bluetooth-enheder i nærheden"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Ikke synlig for andre Bluetooth-enheder"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Kun synlig for parrede enheder"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Gør enheden søgbar"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Timeout for synlighed"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Indstil i hvor lang tid enheden vil være søgbar"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Lås stemmeopkald"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Bloker brug af Bluetooth-opkald, når skærmen er låst"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth-enheder"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Vis modtagne filer"</string>
     <string name="device_picker" msgid="8398232791303186677">"Valg af Bluetooth-enhed"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Anmodning om Bluetooth-tilladelse"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"En app ønsker at aktivere Bluetooth. Vil du tillade dette?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"En app på din tablet ønsker at gøre din tablet søgbar for andre Bluetooth-enheder i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vil du tillade dette?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"En app på telefonen ønsker at gøre telefonen søgbar for andre Bluetooth-enheder i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vil du tillade dette?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"En app på din tablet ønsker at gøre din tablet \"altid søgbar\" for andre Bluetooth-enheder. Vil du tillade dette?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"En app på telefonen ønsker at gøre din telefon \"altid søgbar\" for andre Bluetooth-enheder. Vil du tillade dette?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"En app på din tablet ønsker at slå Bluetooth til og gøre din tablet søgbar for andre enheder i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vil du tillade dette?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"En app på telefonen forsøger at aktivere Bluetooth og gøre telefonen søgbar for andre enheder i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vil du tillade dette?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"En app på din tablet ønsker at aktivere Bluetooth og gøre din tablet søgbar for andre enheder. Vil du tillade dette?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"En app på telefonen forsøger at aktivere Bluetooth og gøre telefonen søgbar for andre enheder. Vil du tillade dette?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"En app ønsker at aktivere Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"En app ønsker at gøre din tablet synlig for andre Bluetooth-enheder i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"En app ønsker at gøre din telefon synlig for andre Bluetooth-enheder i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"En app ønsker at gøre din tablet synlig for andre Bluetooth-enheder. Du kan ændre dette senere i Bluetooth-indstillinger."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"En app ønsker at gøre din telefon synlig for andre Bluetooth-enheder. Du kan ændre dette senere i Bluetooth-indstillinger."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"En app ønsker at aktivere Bluetooth og gøre din tablet synlig for andre enheder i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"En app ønsker at aktivere Bluetooth og gøre din telefon synlig for andre enheder i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"En app ønsker at aktivere Bluetooth og gøre din tablet synlig for andre enheder. Du kan ændre dette senere i Bluetooth-indstillinger."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"En app ønsker at aktivere Bluetooth og gøre din telefon synlig for andre enheder. Du kan ændre dette senere i Bluetooth-indstillinger."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Aktiverer Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth slukker??"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Opret automatisk forbindelse"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"For mange forkerte forsøg!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Prøv igen om <xliff:g id="NUMBER">%d</xliff:g> sekunder."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Applikationen er ikke installeret på din telefon."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Annuller"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Næste"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Sådan beskytter du din tabletcomputer"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Beskyt din telefon"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Beskyt din tablet mod uautoriseret brug ved at oprette et personligt mønster til at låse skærmen op. Brug din finger til at forbinde punkterne vilkårligt på den næste skærm. Du skal forbinde mindst fire punkter."\n\n"Er du klar? Tryk på Næste."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Beskyt din telefon mod uautoriseret brug ved at oprette et personligt mønster til at låse skærmen op. Brug fingeren til at forbinde mindst fire punkter i vilkårlig rækkefølge på næste skærmbillede. "\n\n"Når du er klar til at begynde, trykker du på Næste."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Administrer apps"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Administrer og fjern installerede apps"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Apps"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 679c1f6..e015ef3 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"Ja"</string>
     <string name="no" msgid="6731231425810196216">"Nein"</string>
     <string name="create" msgid="3578857613172647409">"Erstellen"</string>
+    <string name="allow" msgid="3349662621170855910">"Zulassen"</string>
+    <string name="deny" msgid="6947806159746484865">"Ablehnen"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Unbekannt"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"In <xliff:g id="STEP_COUNT">%1$d</xliff:g> Schritten sind Sie ein Entwickler."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"In <xliff:g id="STEP_COUNT">%1$d</xliff:g> Schritt sind Sie ein Entwickler."</item>
+    <item quantity="other" msgid="6722953419953594148">"In <xliff:g id="STEP_COUNT">%1$d</xliff:g> Schritten sind Sie ein Entwickler."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Sie sind jetzt ein Entwickler!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Okay, sind Sie bereits ein Entwickler."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"Drahtlos &amp; Netzwerke"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Unbekannter Fehler"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Kalt"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Sichtbar"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Sichtbar für alle Bluetooth-Geräte in der Nähe (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Sichtbar für alle Bluetooth-Geräte in der Nähe"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Nicht sichtbar für andere Bluetooth-Geräte"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Nur sichtbar für Partnergeräte"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Gerät sichtbar machen"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Timeout für Sichtbarkeit"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Festlegen, wie lange das Gerät sichtbar sein soll"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Sprachwahl sperren"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Verwendung des Bluetooth-Dialers bei gesperrtem Bildschirm verhindern"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth-Geräte"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Erhaltene Dateien anzeigen"</string>
     <string name="device_picker" msgid="8398232791303186677">"Bluetooth-Geräteauswahl"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth-Berechtigungsanfrage"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Eine App versucht, Bluetooth zu aktivieren. Zulassen?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Eine App auf Ihrem Tablet versucht, Ihr Tablet für <xliff:g id="TIMEOUT">%1$d</xliff:g> Sekunden für andere Bluetooth-Geräte sichtbar zu machen. Möchten Sie dies zulassen?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Eine App auf Ihrem Telefon versucht, Ihr Telefon für <xliff:g id="TIMEOUT">%1$d</xliff:g> Sekunden für andere Bluetooth-Geräte sichtbar zu machen. Möchten Sie dies zulassen?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Eine App auf Ihrem Tablet versucht, Ihr Telefon für andere Bluetooth-Geräte dauerhaft sichtbar zu machen. Möchten Sie dies zulassen?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Eine App auf Ihrem Telefon versucht, Ihr Telefon immer für andere Bluetooth-Geräte sichtbar zu machen. Möchten Sie dies zulassen?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Eine App auf Ihrem Tablet versucht, Blueooth zu aktivieren und Ihr Tablet für <xliff:g id="TIMEOUT">%1$d</xliff:g> Sekunden für andere Geräte sichtbar zu machen. Möchten Sie dies zulassen?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Eine App auf Ihrem Telefon versucht, Bluetooth zu aktivieren und Ihr Telefon für <xliff:g id="TIMEOUT">%1$d</xliff:g> Sekunden für andere Telefone sichtbar zu machen. Möchten Sie dies zulassen?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Eine App auf Ihrem Tablet versucht, Bluetooth zu aktivieren und Ihr Tablet für andere Geräte erkennbar zu machen. Zulassen?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Eine App auf Ihrem Telefon versucht, Bluetooth zu aktivieren und Ihr Telefon für andere Geräte sichtbar zu machen. Möchten Sie dies zulassen?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Eine App versucht, Bluetooth zu aktivieren."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Eine App versucht, Ihr Tablet für <xliff:g id="TIMEOUT">%1$d</xliff:g> Sekunden für andere Bluetooth-Geräte sichtbar zu machen."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Eine App versucht, Ihr Telefon für <xliff:g id="TIMEOUT">%1$d</xliff:g> Sekunden für andere Bluetooth-Geräte sichtbar zu machen."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Eine App versucht, Ihr Tablet für andere Bluetooth-Geräte sichtbar zu machen. Sie können diese Einstellung später in den Bluetooth-Einstellungen ändern."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Eine App versucht, Ihr Telefon für andere Bluetooth-Geräte sichtbar zu machen. Sie können diese Einstellung später in den Bluetooth-Einstellungen ändern."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Eine App versucht, Bluetooth zu aktivieren und Ihr Tablet für <xliff:g id="TIMEOUT">%1$d</xliff:g> Sekunden für andere Geräte sichtbar zu machen."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Eine App versucht, Bluetooth zu aktivieren und Ihr Telefon für <xliff:g id="TIMEOUT">%1$d</xliff:g> Sekunden für andere Geräte sichtbar zu machen."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Eine App versucht, Bluetooth zu aktivieren und Ihr Tablet für andere Geräte sichtbar zu machen. Sie können diese Einstellung später in den Bluetooth-Einstellungen ändern."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Eine App versucht, Bluetooth zu aktivieren und Ihr Telefon für andere Geräte sichtbar zu machen. Sie können diese Einstellung später in den Bluetooth-Einstellungen ändern."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth wird aktiviert..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth wird deaktiviert..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automatische Verbindung"</string>
@@ -1023,12 +1025,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Zu viele fehlgeschlagene Versuche!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"In <xliff:g id="NUMBER">%d</xliff:g> Sekunden erneut versuchen."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"App ist nicht auf dem Telefon installiert."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Abbrechen"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Weiter"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Sichern Ihres Tablets"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Telefon sichern"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Schützen Sie Ihr Tablet vor unbefugtem Zugriff: Erstellen Sie ein persönliches Entsperrungsmuster für Ihren Bildschirm. Verbinden Sie auf dem nächsten Bildschirm in beliebiger Reihenfolge mindestens vier Punkte mit dem Finger."\n\n"Bereit? Tippen Sie auf \"Weiter\"."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Schützen Sie Ihr Telefon vor unbefugtem Zugriff! Erstellen Sie ein persönliches Entsperrungsmuster für Ihren Bildschirm. Verbinden Sie auf dem nächsten Bildschirm in beliebiger Reihenfolge mindestens vier Punkte mit dem Finger. "\n\n"Bereit? Dann tippen Sie auf \"Weiter\"."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Apps verwalten"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Installierte Apps verwalten und entfernen"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Apps"</string>
@@ -1559,7 +1555,7 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Verbindung wird hergestellt..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Weiter zum nächsten Schritt"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP wird nicht unterstützt."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"Während der Einrichtung können Sie keine EAP-WLAN-Verbindung konfigurieren. Sie können dies anschließend in den Einstellungen unter \"Drahtlos &amp;amp Netzwerke\" vornehmen."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"Während der Einrichtung können Sie keine EAP-WLAN-Verbindung konfigurieren. Sie können dies anschließend in den Einstellungen unter \"Drahtlos &amp; Netzwerke\" vornehmen."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Der Verbindungsaufbau kann einige Minuten dauern..."</string>
     <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Tippen Sie auf "<b>"Weiter"</b>", um mit der Einrichtung fortzufahren."\n\n"Tippen Sie auf "<b>"Zurück"</b>", um eine Verbindung zu einem anderen WLAN-Netzwerk herzustellen."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synchronisierung aktiviert"</string>
@@ -1675,7 +1671,7 @@
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Datenverbrauch"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Datenverbrauchszyklus"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Daten-Roaming"</string>
-    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Hintergrunddaten"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Hintergrunddaten beschränken"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"4G-Nutzung separat anzeigen"</string>
     <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"WLAN anzeigen"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Ethernet-Nutzung anzeigen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 84b06e7..47d4df5 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"Ναι"</string>
     <string name="no" msgid="6731231425810196216">"Όχι"</string>
     <string name="create" msgid="3578857613172647409">"Δημιουργία"</string>
+    <string name="allow" msgid="3349662621170855910">"Αποδοχή"</string>
+    <string name="deny" msgid="6947806159746484865">"Απόρριψη"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Άγνωστο"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"Απομένουν <xliff:g id="STEP_COUNT">%1$d</xliff:g> βήματα για να γίνετε προγραμματιστής."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Απομένουν <xliff:g id="STEP_COUNT">%1$d</xliff:g> βήματα για να γίνετε προγραμματιστής."</item>
+    <item quantity="other" msgid="6722953419953594148">"Απομένουν <xliff:g id="STEP_COUNT">%1$d</xliff:g> βήματα για να γίνετε προγραμματιστής."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Είστε πλέον προγραμματιστής!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Δεν χρειάζεται, είστε ήδη προγραμματιστής."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"ΑΣΥΡΜΑΤΟ και ΔΙΚΤΥΑ"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Άγνωστο σφάλμα"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Κρύο"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Ανιχνεύσιμο"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Ορατό σε όλες τις κοντινές συσκευές Bluetooth (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Ορατό σε όλες τις κοντινές συσκευές Bluetooth"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Δεν είναι ορατό σε άλλες συσκευές Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Ορατό μόνο σε συζευγμένες συσκευές"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Να γίνει η συσκευή ανιχνεύσιμη"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Λήξη χρονικού ορίου προβολής"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Ρυθμίστε τον χρόνο δυνατότητας ανίχνευσης της συσκευής"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Κλείδωμα της λειτουργίας φωνητικών κλήσεων"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Να μην επιτρέπεται η χρήση του προγράμματος κλήσης bluetooth όταν η οθόνη είναι κλειδωμένη"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Συσκευές Bluetooth"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Εμφάνιση ληφθέντων αρχείων"</string>
     <string name="device_picker" msgid="8398232791303186677">"Επιλογέας συσκευής Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Αίτημα άδειας Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Κάποια εφαρμογή θέλει να ενεργοποιήσει το Bluetooth. Να επιτραπεί;"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Μια εφαρμογή από το tablet σας θέλει να ενεργοποιήσει τη δυνατότητα ανίχνευσης του tablet σας από άλλες Bluetooth για <xliff:g id="TIMEOUT">%1$d</xliff:g> δευτερόλεπτα. Να επιτραπεί;"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Μια εφαρμογή από το τηλέφωνό σας θέλει να ενεργοποιήσει τη δυνατότητα ανίχνευσης του τηλεφώνου σας από άλλες Bluetooth για <xliff:g id="TIMEOUT">%1$d</xliff:g> δευτερόλεπτα. Να επιτραπεί;"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Μια εφαρμογή στο tablet σας θέλει να το καταστήσει \"μόνιμα ανιχνεύσιμο\" από άλλες συσκευές Bluetooth. Να επιτραπεί;"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Μια εφαρμογή στο τηλέφωνό σας θέλει να το καταστήσει \"μόνιμα ανιχνεύσιμο\" από άλλες συσκευές Bluetooth. Να επιτραπεί;"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Μια εφαρμογή από το tablet σας θέλει να ενεργοποιήσει το Bluetooth και να καταστήσει το tablet σας ανιχνεύσιμο από άλλες συσκευές για <xliff:g id="TIMEOUT">%1$d</xliff:g> δευτερόλεπτα. Να επιτραπεί;"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Κάποια εφαρμογή του τηλεφώνου σας απαιτεί την ενεργοποίηση του Bluetooth και τη δυνατότητα ανίχνευσης του τηλεφώνου σας από άλλες συσκευές για <xliff:g id="TIMEOUT">%1$d</xliff:g> δευτερόλεπτα. Να επιτραπεί;"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Μια εφαρμογή από το tablet σας θέλει να ενεργοποιήσει το Bluetooth και να καταστήσει το tablet σας ανιχνεύσιμο από άλλες συσκευές. Να επιτραπεί;"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Κάποια εφαρμογή του τηλεφώνου σας απαιτεί την ενεργοποίηση του Bluetooth και τη δυνατότητα ανίχνευσης του τηλεφώνου σας από άλλες συσκευές. Να επιτραπεί;"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Μια εφαρμογή θέλει να ενεργοποιήσει το Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Μια εφαρμογή θέλει να κάνει ορατό το tablet σας σε άλλες συσκευές Bluetooth για <xliff:g id="TIMEOUT">%1$d</xliff:g> δευτερόλεπτα."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Μια εφαρμογή θέλει να κάνει ορατό το τηλέφωνό σας σε άλλες συσκευές Bluetooth για <xliff:g id="TIMEOUT">%1$d</xliff:g> δευτερόλεπτα."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Μια εφαρμογή θέλει να κάνει το tablet σας ορατό σε άλλες συσκευές Bluetooth. Μπορείτε να αλλάξετε την επιλογή αργότερα, από τις ρυθμίσεις Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Μια εφαρμογή θέλει να κάνει το τηλέφωνό σας ορατό σε άλλες συσκευές Bluetooth. Μπορείτε να αλλάξετε την επιλογή αργότερα, από τις ρυθμίσεις Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Μια εφαρμογή θέλει να ενεργοποιήσει το Bluetooth και να κάνει το tablet σας ορατό σε άλλες συσκευές για <xliff:g id="TIMEOUT">%1$d</xliff:g> δευτερόλεπτα."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Μια εφαρμογή θέλει να ενεργοποιήσει το Bluetooth και να κάνει το τηλέφωνό σας ορατό σε άλλες συσκευές για <xliff:g id="TIMEOUT">%1$d</xliff:g> δευτερόλεπτα."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Μια εφαρμογή θέλει να ενεργοποιήσει το Bluetooth και να κάνει το tablet σας ορατό σε άλλες συσκευές. Μπορείτε να αλλάξετε την επιλογή αργότερα, από τις ρυθμίσεις Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Μια εφαρμογή θέλει να ενεργοποιήσει το Bluetooth και να κάνει το τηλέφωνό σας ορατό σε άλλες συσκευές. Μπορείτε να αλλάξετε την επιλογή αργότερα, από τις ρυθμίσεις Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Ενεργοποίηση του Bluetooth…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Απενεργοποίηση Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Αυτόματη σύνδεση"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Πάρα πολλές ανεπιτυχείς προσπάθειες!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Προσπαθήστε ξανά σε <xliff:g id="NUMBER">%d</xliff:g> δευτερόλεπτα."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Η εφαρμογή δεν έχει εγκατασταθεί στο τηλέφωνό σας."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Ακύρωση"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Επόμενο"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Ασφάλεια του tablet σας"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Ασφάλιση του τηλεφώνου σας"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Προστατέψτε το tablet σας από μη εξουσιοδοτημένη χρήση, δημιουργώντας ένα προσωπικό μοτίβο ξεκλειδώματος οθόνης. Σύρετε το δάχτυλό σας για να συνδέσετε τις τελείες με οποιαδήποτε σειρά στην επόμενη οθόνη. Πρέπει να συνδέσετε τουλάχιστον τέσσερις τελείες. "\n\n"Είστε έτοιμοι να ξεκινήσετε; Αγγίξτε το στοιχείο \"Επόμενο\"."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Προστατέψτε το τηλέφωνό σας από μη εξουσιοδοτημένη χρήση, δημιουργώντας ένα προσωπικό μοτίβο ξεκλειδώματος οθόνης. Σύρετε το δάχτυλό σας για να συνδέσετε τουλάχιστον τέσσερις τελείες με οποιαδήποτε σειρά στην επόμενη οθόνη. "\n\n"Είστε έτοιμοι να ξεκινήσετε; Αγγίξτε το στοιχείο \"Επόμενο\"."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Διαχείριση εφαρμογών"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Διαχείριση και κατάργηση εγκατεστημένων εφαρμογών"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Εφαρμογές"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 3e40bda..04f7625 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"Yes"</string>
     <string name="no" msgid="6731231425810196216">"No"</string>
     <string name="create" msgid="3578857613172647409">"Create"</string>
+    <string name="allow" msgid="3349662621170855910">"Allow"</string>
+    <string name="deny" msgid="6947806159746484865">"Deny"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Unknown"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"You are now <xliff:g id="STEP_COUNT">%1$d</xliff:g> steps away from being a developer."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"You are now <xliff:g id="STEP_COUNT">%1$d</xliff:g> step away from being a developer."</item>
+    <item quantity="other" msgid="6722953419953594148">"You are now <xliff:g id="STEP_COUNT">%1$d</xliff:g> steps away from being a developer."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"You are now a developer!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"No need, you are already a developer."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"WIRELESS &amp; NETWORKS"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Unknown error"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Cold"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Discoverable"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Visible to all Bluetooth devices nearby (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visible to all Bluetooth devices nearby"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Not visible to other Bluetooth devices"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Only visible to paired devices"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Make device discoverable"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Visibility timeout"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Set how long device will be discoverable"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Lock voice dialling"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Prevent use of the Bluetooth dialler when the screen is locked"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth devices"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Show files received"</string>
     <string name="device_picker" msgid="8398232791303186677">"Bluetooth device chooser"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth permission request"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"An app wants to turn on Bluetooth. Allow?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"An app on your tablet wants to make your tablet discoverable by other Bluetooth devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds. Allow?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"An app on your phone wants to make your phone discoverable by other Bluetooth devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds. Allow?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"An app on your tablet wants to make your tablet “always discoverable” by other Bluetooth devices. Allow?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"An app on your phone wants to make your phone “always discoverable” by other Bluetooth devices. Allow?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"An app on your tablet wants to turn on Bluetooth and make your tablet discoverable by other devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds. Allow?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"An app on your phone wants to turn on Bluetooth and make your phone discoverable by other devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds. Allow?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"An app on your tablet wants to turn on Bluetooth and make your tablet discoverable by other devices. Allow?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"An app on your phone wants to turn on Bluetooth and make your phone discoverable by other devices. Allow?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"An app wants to turn on Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"An app wants to make your tablet visible to other Bluetooth devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"An app wants to make your phone visible to other Bluetooth devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"An app wants to make your tablet visible to other Bluetooth devices. You can change this later in Bluetooth settings."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"An app wants to make your phone visible to other Bluetooth devices. You can change this later in Bluetooth settings."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"An app wants to turn on Bluetooth and make your tablet visible to other devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"An app wants to turn on Bluetooth and make your phone visible to other devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"An app wants to turn on Bluetooth and make your tablet visible to other devices. You can change this later in Bluetooth settings."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"An app wants to turn on Bluetooth and make your phone visible to other devices. You can change this later in Bluetooth settings."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Turning on Bluetooth…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Turning Bluetooth off…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Auto-connect"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Too many incorrect attempts!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Try again in <xliff:g id="NUMBER">%d</xliff:g> seconds."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Application is not installed on your phone."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Cancel"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Next"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Securing your tablet"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Securing your phone"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Protect your tablet from unauthorised use by creating a personal screen unlock pattern. Slide your finger to connect the dots in any order on the next screen. You need to connect at least four dots. "\n\n"Ready to start? Touch Next."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Protect your phone from unauthorised use by creating a personal screen unlock pattern. Slide your finger to connect at least four dots in any order on the next screen. "\n\n"Ready to start? Touch Next."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Manage apps"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Manage and remove installed apps"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Apps"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 6641f8d..14d3552 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"Sí"</string>
     <string name="no" msgid="6731231425810196216">"No"</string>
     <string name="create" msgid="3578857613172647409">"Crear"</string>
+    <string name="allow" msgid="3349662621170855910">"Permitir"</string>
+    <string name="deny" msgid="6947806159746484865">"Rechazar"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Desconocido"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"Ahora estás a <xliff:g id="STEP_COUNT">%1$d</xliff:g> pasos de ser un programador."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Ahora estás a <xliff:g id="STEP_COUNT">%1$d</xliff:g> paso de ser un programador."</item>
+    <item quantity="other" msgid="6722953419953594148">"Ahora estás a <xliff:g id="STEP_COUNT">%1$d</xliff:g> pasos de ser un programador."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Ahora eres un programador."</string>
     <string name="show_dev_already" msgid="2151632240145446227">"No es necesario, ya eres un programador."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"CONEXIONES INALÁMBRICAS Y REDES"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Error desconocido"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Frío"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Visible"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Visible para todos los dispositivos Bluetooth cercanos (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visible para todos los dispositivos Bluetooth cercanos"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"No visible para otros dispositivos Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Solo visible para los dispositivos sincronizados"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Hacer que el dispositivo sea visible"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Tiempo de visibilidad"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Configurar el tiempo durante el que el dispositivo será detectable"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloquear marcación por voz"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Impedir el uso de Bluetooth del dispositivo cuando la pantalla esté bloqueada."</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Dispositivos Bluetooth"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostrar los archivos recibidos"</string>
     <string name="device_picker" msgid="8398232791303186677">"Selector de dispositivos Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Solicitud de permiso de Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Una aplicación desea activar el Bluetooth. ¿Lo permites?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Una aplicación de tu tableta desea hacerla visible para otros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Lo permites?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Una aplicación de tu dispositivo desea hacerlo visible para otros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Lo permites?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Una aplicación de tu tableta quiere que esta sea \"siempre visible\" para otros dispositivos Bluetooth. ¿Lo permites?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Una aplicación de tu dispositivo quiere que este sea \"siempre visible\" para otros dispositivos Bluetooth. ¿Lo permites?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Una aplicación de tu tableta desea activar el Bluetooth y hacerlo visible para otros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Lo permites?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Una aplicación en tu dispositivo desea activar Bluetooth y hacer que tu dispositivo sea visible para otros dispositivos por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Lo permites?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Una aplicación de tu tableta desea activar Bluetooth y hacer visible tu tableta para otros dispositivos. ¿Lo permites?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Una aplicación en tu dispositivo desea activar Bluetooth y hacer que tu dispositivo sea visible para otros dispositivos. ¿Lo permites?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Una aplicación desea activar el Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Una aplicación quiere hacer visible tu tablet para otros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Una aplicación quiere hacer visible tu dispositivo para otros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Una aplicación quiere hacer visible tu tablet para otros dispositivos Bluetooth. Puedes cambiar esta configuración más tarde en los ajustes de Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Una aplicación quiere hacer visible tu dispositivo para otros dispositivos Bluetooth. Puedes cambiar esta configuración más tarde en los ajustes de Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Una aplicación quiere activar el Bluetooth y hacer visible tu tablet para otros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Una aplicación quiere activar el Bluetooth y hacer visible tu dispositivo para otros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Una aplicación quiere activar el Bluetooth y hacer visible tu tablet para otros dispositivos. Puedes cambiar esta configuración más tarde en los ajustes de Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Una aplicación quiere activar el Bluetooth y hacer visible tu dispositivo para otros dispositivos. Puedes cambiar esta configuración más tarde en los ajustes de Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Activando Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"¿Desactivar Bluetooth?"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Conectar automáticamente"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"¡Demasiados intentos incorrectos!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Vuelve a intentarlo en <xliff:g id="NUMBER">%d</xliff:g> segundos."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"La aplicación no está instalada en tu dispositivo."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Cancelar"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Siguiente"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Protección de tu tablet"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Protección de tu dispositivo"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Protege tu tableta contra usos no autorizados al crear un patrón de desbloqueo de pantalla personal. Usa el dedo para unir en cualquier orden los puntos de la siguiente pantalla. Debes conectar al menos cuatro puntos. "\n\n"Para comenzar, toca Siguiente."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Protege tu dispositivo contra el uso no autorizado creando un patrón de desbloqueo de pantalla personal. Usa el dedo para conectar al menos cuatro puntos en cualquier orden en la siguiente pantalla. "\n\n"¿Listo para empezar? Toca \"Siguiente\"."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Administrar aplicaciones"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Administrar y eliminar aplicaciones instaladas"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Aplicaciones"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 5bef9da..04d4fa2 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"Sí"</string>
     <string name="no" msgid="6731231425810196216">"No"</string>
     <string name="create" msgid="3578857613172647409">"Crear"</string>
+    <string name="allow" msgid="3349662621170855910">"Permitir"</string>
+    <string name="deny" msgid="6947806159746484865">"Denegar"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Desconocido"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"Solo te quedan <xliff:g id="STEP_COUNT">%1$d</xliff:g> pasos para ser un desarrollador."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Solo te queda <xliff:g id="STEP_COUNT">%1$d</xliff:g> paso para ser un desarrollador."</item>
+    <item quantity="other" msgid="6722953419953594148">"Solo te quedan <xliff:g id="STEP_COUNT">%1$d</xliff:g> pasos para ser un desarrollador."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"¡Ahora eres un desarrollador!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"No es necesario, ya eres un desarrollador."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"CONEXIONES INALÁMBRICAS Y REDES"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Error desconocido"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Nivel bajo"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Ajustes de Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Visible"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Visible para dispositivos Bluetooth cercanos (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visible para dispositivos Bluetooth cercanos"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Oculto para otros dispositivos Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Solo visible para dispositivos sincronizados"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Hacer visible el dispositivo"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Tiempo de visibilidad"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Definir cuánto tiempo estará visible el dispositivo"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloquear marcación por voz"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Evitar el uso del marcador a través de Bluetooth cuando la pantalla esté bloqueada"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Dispositivos Bluetooth"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostrar archivos recibidos"</string>
     <string name="device_picker" msgid="8398232791303186677">"Selector de dispositivo Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Solicitud de permiso de Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Una aplicación quiere activar el Bluetooth. ¿Quieres permitirlo?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Una aplicación del tablet quiere hacerlo visible para otros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Quieres permitirlo?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Una aplicación del teléfono quiere hacerlo visible para otros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Quieres permitirlo?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Una aplicación del tablet quiere que el tablet sea siempre visible para otros dispositivos Bluetooth. ¿Quieres permitirlo?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Una aplicación del teléfono quiere que el teléfono sea visible siempre para otros dispositivos Bluetooth. ¿Quieres permitirlo?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Una aplicación del tablet quiere activar el Bluetooth y hacerlo visible para otros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Quieres permitirlo?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Una aplicación del teléfono quiere activar el Bluetooth y hacer el teléfono visible para otros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Quieres permitirlo?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Una aplicación del tablet quiere activar el Bluetooth y hacerlo visible para otros dispositivos. ¿Quieres permitirlo?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Una aplicación del teléfono quiere activar el Bluetooth y hacer el teléfono visible para otros dispositivos. ¿Quieres permitirlo?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Una aplicación quiere activar el Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Una aplicación quiere hacer visible tu tablet para otros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Una aplicación quiere hacer visible tu teléfono para otros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Una aplicación quiere hacer visible tu tablet para otros dispositivos Bluetooth. Puedes cambiar esta configuración más tarde en los ajustes de Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Una aplicación quiere hacer visible tu teléfono para otros dispositivos Bluetooth. Puedes cambiar esta configuración más tarde en los ajustes de Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Una aplicación quiere activar el Bluetooth y hacer visible tu tablet para otros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Una aplicación quiere activar el Bluetooth y hacer visible tu teléfono para otros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Una aplicación quiere activar el Bluetooth y hacer visible tu tablet para otros dispositivos. Puedes cambiar esta configuración más tarde en los ajustes de Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Una aplicación quiere activar el Bluetooth y hacer visible tu teléfono para otros dispositivos. Puedes cambiar esta configuración más tarde en los ajustes de Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Activando Bluetooth…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Desactivando Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Conexión automática"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Se han realizado demasiados intentos incorrectos."</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Espera <xliff:g id="NUMBER">%d</xliff:g> segundos y vuelve a intentarlo."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"La aplicación no está instalada en el teléfono."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Cancelar"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Siguiente"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Protección del tablet"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Protección del teléfono"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Protege el tablet contra usos no autorizados creando un patrón de desbloqueo de pantalla personal. Desliza el dedo para unir los puntos en cualquier orden en la siguiente pantalla. Debes conectar al menos cuatro puntos. "\n\n"Para comenzar, toca Siguiente."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Protege tu teléfono contra usos no autorizados creando un patrón de desbloqueo de pantalla. Usa el dedo para unir los puntos en cualquier orden en la siguiente pantalla. "\n\n"Si estás preparado para comenzar, toca Siguiente."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Administrar aplicaciones"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Administrar y eliminar aplicaciones instaladas"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Aplicaciones"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index fe5d7fd..cb53833 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"Jah"</string>
     <string name="no" msgid="6731231425810196216">"Ei"</string>
     <string name="create" msgid="3578857613172647409">"Loo"</string>
+    <string name="allow" msgid="3349662621170855910">"Luba"</string>
+    <string name="deny" msgid="6947806159746484865">"Keela"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Tundmatu"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"<xliff:g id="STEP_COUNT">%1$d</xliff:g> sammu veel ja olete arendaja."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"<xliff:g id="STEP_COUNT">%1$d</xliff:g> sammu veel ja olete arendaja."</item>
+    <item quantity="other" msgid="6722953419953594148">"<xliff:g id="STEP_COUNT">%1$d</xliff:g> sammu veel ja olete arendaja."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Olete nüüd arendaja!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Ei ole vaja, olete juba arendaja."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"TRAADITA ÜHENDUS JA VÕRGUD"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Tundmatu viga"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Külm"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Leitav"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Nähtav kõigile lähedalasuvatele Bluetooth-seadmetele (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Nähtav kõigile lähedalasuvatele Bluetooth-seadmetele"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Ei ole nähtav teistele Bluetooth-seadmetele"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Nähtav ainult seotud seadmetele"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Muuda seade leitavaks"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Nähtavuse ajalõpp"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Määrake seadme leitavuse aeg"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Lukusta häälvalimine"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Vältige Bluetoothi valija kasutamist, kui ekraan on lukustatud"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth-seadmed"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Näita vastuvõetud faile"</string>
     <string name="device_picker" msgid="8398232791303186677">"Bluetooth-seadme valija"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetoothi loa taotlus"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Rakendus soovib Bluetoothi sisse lülitada. Kas lubada?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Tahvelarvutis olev rakendus soovib tahvelarvuti muuta teistele Bluetooth-seadmetele <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundiks nähtavaks. Kas lubada?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Telefonis olev rakendus soovib telefoni muuta teistele Bluetooth-seadmetele <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundiks nähtavaks. Kas lubada?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Tahvelarvutis olev rakendus soovib tahvelarvuti muuta teistele Bluetooth-seadmetele alati nähtavaks. Kas lubada?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Telefonis olev rakendus soovib telefoni muuta teistele Bluetooth-seadmetele alati nähtavaks. Kas lubada?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Tahvelarvutis olev rakendus soovib Bluetoothi sisse lülitada ja muuta tahvelarvuti teistele seadmetele <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundiks nähtavaks. Kas lubada?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Teie telefonis olev rakendus soovib Bluetoothi sisse lülitada ja muuta telefoni teistele seadmetele <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundiks nähtavaks. Kas lubada?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Tahvelarvutis olev rakendus soovib Bluetoothi sisse lülitada ja muuta tahvelarvuti teistele seadmetele nähtavaks. Kas lubada?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Teie telefonis olev rakendus soovib Bluetoothi sisse lülitada ja muuta telefoni teistele seadmetele nähtavaks. Kas lubada?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Rakendus soovib Bluetoothi sisse lülitada."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Rakendus soovib muuta <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundiks teie tahvelarvuti teistele Bluetoothi seadmetele nähtavaks."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Rakendus soovib muuta <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundiks teie telefoni teistele Bluetoothi seadmetele nähtavaks."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Rakendus soovib muuta tahvelarvuti nähtavaks teistele Bluetoothi seadmetele. Saate seda hiljem muuta Bluetoothi seadetes."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Rakendus soovib muuta telefoni nähtavaks teistele Bluetoothi seadmetele. Saate seda hiljem muuta Bluetoothi seadetes."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Rakendus soovib Bluetoothi sisse lülitada ja muuta tahvelarvuti teistele seadmetele <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundiks nähtavaks."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Rakendus soovib Bluetoothi sisse lülitada ja muuta telefoni teistele seadmetele <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundiks nähtavaks."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Rakendus soovib Bluetoothi sisse lülitada ja muuta tahvelarvuti teistele seadmetele nähtavaks. Saate seda hiljem muuta Bluetoothi seadetes."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Rakendus soovib Bluetoothi sisse lülitada ja muuta telefoni teistele seadmetele nähtavaks. Saate seda hiljem muuta Bluetoothi seadetes."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetoothi sisselülitamine ..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetoothi väljalülitamine ..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automaatne ühendamine"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Liiga palju valesid katseid."</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Proovige uuesti <xliff:g id="NUMBER">%d</xliff:g> sekundi pärast."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Rakendus pole teie telefoni installitud."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Tühista"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Järgmine"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Tahvelarvuti turvaliseks muutmine"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Telefoni turvaliseks muutmine"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Kaitske oma tahvelarvutit volitamata kasutamise eest, luues ekraani isikliku avamismustri. Järgmisel ekraanil ühendage sõrmega punktid mis tahes järjekorras. Peate ühendama vähemalt neli punkti. "\n\n"Kas olete valmis alustama? Puudutage valikut Järgmine."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Kaitske oma telefoni volitamata kasutamise eest, luues ekraani isikliku avamismustri. Järgmisel ekraanil ühendage sõrmega mis tahes järjekorras vähemalt neli punkti. "\n\n"Kas olete valmis alustama? Puudutage valikut Järgmine."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Halda rakendusi"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Installitud rakenduste haldamine ja eemaldamine"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Rakendused"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index cfb6496..a99d737 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"بله"</string>
     <string name="no" msgid="6731231425810196216">"خیر"</string>
     <string name="create" msgid="3578857613172647409">"ایجاد"</string>
+    <string name="allow" msgid="3349662621170855910">"اجازه دادن"</string>
+    <string name="deny" msgid="6947806159746484865">"ردکردن"</string>
     <string name="device_info_default" msgid="7847265875578739287">"ناشناس"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"شما در حال حاضر، <xliff:g id="STEP_COUNT">%1$d</xliff:g> قدم تا برنامه‌نویس شدن فاصله دارید."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"شما در حال حاضر، <xliff:g id="STEP_COUNT">%1$d</xliff:g> قدم تا برنامه‌نویس شدن فاصله دارید."</item>
+    <item quantity="other" msgid="6722953419953594148">"شما در حال حاضر، <xliff:g id="STEP_COUNT">%1$d</xliff:g> قدم تا برنامه‌نویس شدن فاصله دارید."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"شما اکنون یک برنامه‌نویس هستید!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"نیازی نیست، شما در حال حاضر یک برنامه‌نویس هستید."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"بی‌سیم و شبکه‌ها"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"خطای ناشناس"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"سرد"</string>
     <string name="bluetooth" msgid="5549625000628014477">"بلوتوث"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"قابل شناسایی"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"قابل مشاهده برای تمام دستگاه‌های بلوتوث مجاور (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"قابل مشاهده برای تمام دستگاه‌های بلوتوث مجاور"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"برای دیگر دستگاه‌های بلوتوث قابل مشاهده نیست"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"فقط برای دستگاه‌های مرتبط شده قابل مشاهده است"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"دستگاه قابل شناسایی شود"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"پایان زمان قابل مشاهده بودن"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"مدت زمان قابل شناسایی بودن دستگاه را تنظیم کنید"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"قفل کردن شماره گیری صوتی"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"ممانعت از استفاده شماره‌گیر بلوتوث هنگام قفل شدن صفحه"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"دستگاه‌های بلوتوث"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"نمایش فایل‌های دریافتی"</string>
     <string name="device_picker" msgid="8398232791303186677">"انتخاب‌گر دستگاه بلوتوث"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"درخواست مجوز بلوتوث"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"برنامه‌ای می‌خواهد بلوتوث را روشن کند. اجازه می‌دهید؟"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"برنامه‌ای در رایانهٔ لوحی شما می‌خواهد رایانهٔ شما را به مدت <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانیه توسط دستگاه‌های بلوتوث دیگر قابل شناسایی کند. اجازه می‌دهید؟"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"برنامه‌ای در گوشی شما می‌خواهد گوشی شما را توسط دستگاه‌های بلوتوث دیگر به مدت <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانیه قابل شناسایی کند. اجازه می‌دهید؟"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"برنامه‌ای در رایانهٔ لوحی شما می‌خواهد رایانهٔ شما را توسط دستگاه‌های بلوتوث دیگر \"برای همیشه قابل شناسایی\" کند. اجازه می‌دهید؟"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"برنامه‌ای در گوشی شما می‌خواهد گوشی شما را توسط دستگاه‌های بلوتوث دیگر \"همیشه قابل شناسایی\" کند. اجازه می‌دهید؟"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"برنامه‌ای در رایانهٔ لوحی شما می‌خواهد بلوتوث را روشن کند و رایانهٔ شما را به مدت <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانیه توسط دستگاه‌های بلوتوث دیگر قابل شناسایی کند. اجازه می‌دهید؟"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"یک برنامه در گوشی شما می‌خواهد بلوتوث را روشن کند و باعث شود گوشی شما توسط دستگاه‌های دیگر به مدت <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانیه قابل شناسایی باشد. اجازه می‌دهید؟"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"برنامه‌ای در رایانهٔ لوحی شما می‌خواهد بلوتوث را روشن کند و رایانهٔ شما را توسط برنامه‌های دیگر قابل شناسایی کند. اجازه می‌دهید؟"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"یک برنامه در گوشی شما می‌خواهد بلوتوث را روشن کند و باعث شود گوشی شما توسط دستگاه‌های دیگر قابل شناسایی باشد. اجازه می‌دهید؟"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"برنامه‌ای می‌خواهد بلوتوث را روشن کند."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"برنامه‌ای می‌خواهد رایانه لوحی شما را برای سایر دستگاه‌های بلوتوث به مدت <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانیه قابل مشاهده کند."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"برنامه‌ای می‌خواهد تلفن شما را برای سایر دستگاه‌های بلوتوث به مدت <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانیه قابل مشاهده کند."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"برنامه‌ای می‌خواهد رایانه لوحی شما را برای سایر دستگاه‌های بلوتوث قابل مشاهده کند. شما می‌توانید بعداً این تنظیم را در تنظیمات بلوتوث تغییر دهید."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"برنامه‌ای می‌خواهد تلفن شما را برای سایر دستگاه‌های بلوتوث قابل مشاهده کند. شما می‌توانید بعداً این تنظیم را در تنظیمات بلوتوث تغییر دهید."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"برنامه‌ای می‌خواهد بلوتوث را روشن کند و رایانه لوحی شما را برای سایر دستگاه‌ها به مدت <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانیه قابل مشاهده کند."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"برنامه‌ای می‌خواهد بلوتوث را روشن کند و تلفن شما را برای سایر دستگاه‌های دیگر به مدت <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانیه قابل مشاهده کند."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"برنامه‌ای می‌خواهد بلوتوث را روشن کند و رایانه لوحی شما را برای سایر دستگاه‌ها قابل مشاهده کند. شما می‌توانید این ویژگی را بعداً در تنظیمات بلوتوث تغییر دهید."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"برنامه‌ای می‌خواهد بلوتوث را روشن کند و تلفن شما را برای سایر دستگاه‌ها قابل مشاهده کند. شما می‌توانید بعداً این تنظیم را در تنظیمات بلوتوث تغییر دهید."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"روشن کردن بلوتوث؟؟؟"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"خاموش کردن بلوتوث؟؟؟"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"اتصال خودکار"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"تلاش‌های اشتباه زیادی انجام شده است!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"در <xliff:g id="NUMBER">%d</xliff:g> ثانیه دوباره امتحان کنید."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"برنامه کاربردی در گوشی شما نصب نشد."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"لغو"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"بعدی"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"محافظت از رایانهٔ لوحی خود"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"حفظ امنیت تلفن شما"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"با ایجاد یک الگوی شخصی باز کردن قفل صفحه، از رایانهٔ لوحی خود در برابر استفادهٔ غیرمجاز محافظت کنید. با کشیدن انگشت خود، در صفحهٔ بعدی نقاط را با ترتیب دلخواه متصل کنید. حداقل باید چهار نقطه را به هم متصل کنید. "\n\n"آماده هستید؟ \"بعدی\" را لمس کنید."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"با ایجاد یک الگوی باز کردن قفل صفحه شخصی، از گوشی خود در برابر استفادهٔ غیرمجاز محافظت کنید. با استفاده از انگشت خود، در صفحهٔ بعدی حداقل 4 نقطه را با ترتیب دلخواه متصل کنید. "\n\n"آماده شروع هستید؟ \"بعدی\" را لمس کنید."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"مدیریت برنامه‌ها"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"مدیریت و حذف برنامه‌های نصب شده"</string>
     <string name="applications_settings" msgid="1721442176406964682">"برنامه‌ها"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 18fd493..41476c3 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"Kyllä"</string>
     <string name="no" msgid="6731231425810196216">"Ei"</string>
     <string name="create" msgid="3578857613172647409">"Luo"</string>
+    <string name="allow" msgid="3349662621170855910">"Salli"</string>
+    <string name="deny" msgid="6947806159746484865">"Hylkää"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Tuntematon"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"Kehittäjäasetukset otetaan käyttöön <xliff:g id="STEP_COUNT">%1$d</xliff:g> vaiheen päästä."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Kehittäjäasetukset otetaan käyttöön <xliff:g id="STEP_COUNT">%1$d</xliff:g> vaiheen päästä."</item>
+    <item quantity="other" msgid="6722953419953594148">"Kehittäjäasetukset otetaan käyttöön <xliff:g id="STEP_COUNT">%1$d</xliff:g> vaiheen päästä."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Olet nyt kehittäjä!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Ei tarvitse klikata, olet jo kehittäjä."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"LANGATTOMAT YHTEYDET JA VERKOT"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Tuntematon virhe"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Kylmää"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Tunnistettavissa"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Näkyy kaikille lähistöllä oleville Bluetooth-laitteille (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Näkyy kaikille lähistöllä oleville Bluetooth-laitteille"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Ei näy muille Bluetooth-laitteille"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Näkyy vain laitepareille"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Aseta laite tunnistettavaksi"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Näkyvyyden aikakatkaisu"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Määritä, kuinka kauan laite on tunnistettavissa"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Lukitse äänipuhelut"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Estä Bluetooth-puhelut kun näyttö on lukittu"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth-laitteet"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Näytä vastaanotetut tiedostot"</string>
     <string name="device_picker" msgid="8398232791303186677">"Bluetooth-laitevalitsin"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth-yhteyspyyntö"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Sovellus haluaa ottaa Bluetoothin käyttöön. Sallitaanko?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Tablet-laitteesi sovellus haluaa asettaa tablet-laitteen muiden Bluetooth-laitteiden tunnistettavaksi <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunnin ajaksi. Sallitaanko?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Puhelimesi sovellus haluaa asettaa puhelimen muiden Bluetooth-laitteiden tunnistettavaksi <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunnin ajaksi. Sallitaanko?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Tablet-laitteesi sovellus haluaa asettaa tablet-laitteen muiden Bluetooth-laitteiden tunnistettavaksi. Sallitaanko?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Puhelimesi sovellus haluaa asettaa puhelimen muiden Bluetooth-laitteiden tunnistettavaksi. Sallitaanko?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Tablet-laitteesi sovellus haluaa ottaa Bluetooth-yhteyden käyttöön ja asettaa tablet-laitteen muiden Bluetooth-laitteiden tunnistettavaksi <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunnin ajaksi. Sallitaanko?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Puhelimesi sovellus haluaa ottaa Bluetooth-yhteyden käyttöön ja asettaa puhelimen muiden laitteiden tunnistettavaksi <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunnin ajaksi. Sallitaanko?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Tablet-laitteesi sovellus haluaa ottaa Bluetooth-yhteyden käyttöön ja asettaa tablet-laitteesi muiden Bluetooth-laitteiden tunnistettavaksi. Sallitaanko?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Puhelimesi sovellus haluaa ottaa Bluetooth-yhteyden käyttöön ja asettaa puhelimen muiden laitteiden tunnistettavaksi. Sallitaanko?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Sovellus haluaa ottaa Bluetoothin käyttöön."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Sovellus haluaa asettaa tablet-laitteen muiden Bluetooth-laitteiden tunnistettavaksi <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunnin ajaksi."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Sovellus haluaa asettaa puhelimen muiden Bluetooth-laitteiden tunnistettavaksi <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunnin ajaksi."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Sovellus haluaa asettaa tablet-laitteen muiden Bluetooth-laitteiden tunnistettavaksi. Voit muuttaa valintaa myöhemmin Bluetooth-asetuksista."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Sovellus haluaa asettaa puhelimen muiden Bluetooth-laitteiden tunnistettavaksi. Voit muuttaa valintaa myöhemmin Bluetooth-asetuksista."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Sovellus haluaa ottaa Bluetooth-yhteyden käyttöön ja asettaa tablet-laitteen muiden Bluetooth-laitteiden tunnistettavaksi <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunnin ajaksi."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Sovellus haluaa ottaa Bluetooth-yhteyden käyttöön ja asettaa puhelimen muiden laitteiden tunnistettavaksi <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunnin ajaksi."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Sovellus haluaa ottaa Bluetooth-yhteyden käyttöön ja asettaa tablet-laitteen muiden laitteiden tunnistettavaksi. Voit muuttaa valintaa myöhemmin Bluetooth-asetuksista."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Sovellus haluaa ottaa Bluetooth-yhteyden käyttöön ja asettaa puhelimen muiden laitteiden tunnistettavaksi. Voit muuttaa valintaa myöhemmin Bluetooth-asetuksista."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth otetaan käyttöön…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth poistetaan käytöstä..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Yhdistä automaattisesti"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Liikaa virheellisiä yrityksiä!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Yritä uudelleen <xliff:g id="NUMBER">%d</xliff:g> sekunnin kuluttua."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Sovellusta ei ole asennettu puhelimeesi."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Peruuta"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Seuraava"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Tablet-laitteen suojaaminen"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Puhelimen suojaaminen"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Suojaa tablet-laitetta luvattomalta käytöltä luomalla henkilökohtainen ruudun lukituksenpoistokuvio. Yhdistä seuraavassa ruudussa olevat pisteet sormellasi haluamassasi järjestyksessä. Yhdistä vähintään neljä pistettä. "\n\n"Oletko valmis? Kosketa Seuraava."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Suojaa puhelintasi luvattomalta käytöltä luomalla henkilökohtainen näytön lukituksenpoistokuvio. Yhdistä seuraavassa ruudussa olevat pisteet (vähintään neljä) sormellasi haluamassasi järjestyksessä."\n\n"Oletko valmis? Kosketa Seuraava."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Hallinnoi sovelluksia"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Hallinnoi ja poista asennettuja sovelluksia"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Sovellukset"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index dbd1490..0e58c8d 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"Oui"</string>
     <string name="no" msgid="6731231425810196216">"Non"</string>
     <string name="create" msgid="3578857613172647409">"Créer"</string>
+    <string name="allow" msgid="3349662621170855910">"Autoriser"</string>
+    <string name="deny" msgid="6947806159746484865">"Refuser"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Inconnu"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"Plus que <xliff:g id="STEP_COUNT">%1$d</xliff:g> étapes pour devenir un développeur."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Plus que <xliff:g id="STEP_COUNT">%1$d</xliff:g> étape pour devenir un développeur."</item>
+    <item quantity="other" msgid="6722953419953594148">"Plus que <xliff:g id="STEP_COUNT">%1$d</xliff:g> étapes pour devenir un développeur."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Vous êtes désormais un développeur !"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Inutile, vous êtes déjà un développeur."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"SANS FIL ET RÉSEAUX"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Erreur inconnue"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Peu populaire"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Identifiable"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Identifiable par tous appareils Bluetooth à proximité (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Identifiable par appareils Bluetooth à proximité"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Non identifiable par d\'autres appareils Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Identifiable uniquement par les appareils associés"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Permettre l\'identification de l\'appareil"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Délai de visibilité"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Définir la durée pendant laquelle l\'appareil est identifiable"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloquer les appels par reconnaissance vocale"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Désactiver les appels via le Bluetooth lorsque l\'écran est verrouillé"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Appareils Bluetooth"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Afficher les fichiers reçus"</string>
     <string name="device_picker" msgid="8398232791303186677">"Sélecteur d\'appareil Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Demande d\'autorisation Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Une application souhaite activer Bluetooth. Autoriser cette action ?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Une application de votre tablette souhaite rendre votre tablette identifiable par d\'autres appareils Bluetooth pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes. Autoriser cette action ?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Une application de votre téléphone souhaite rendre votre téléphone identifiable par d\'autres appareils Bluetooth pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes. Autoriser cette action ?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Une application de votre tablette souhaite rendre votre tablette \"toujours identifiable\" par d\'autres appareils Bluetooth. Autoriser cette action ?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Une application de votre téléphone souhaite rendre votre téléphone \"toujours identifiable\" par d\'autres appareils Bluetooth. Autoriser cette action ?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Une application de votre tablette souhaite activer Bluetooth et rendre votre tablette identifiable par d\'autres appareils pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes. Autoriser cette action ?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Une application de votre téléphone souhaite activer Bluetooth et rendre votre téléphone identifiable par d\'autres appareils pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes. Autoriser cette action ?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Une application de votre tablette souhaite activer Bluetooth et rendre votre tablette identifiable par d\'autres appareils. Autoriser cette action ?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Une application de votre téléphone souhaite activer Bluetooth et rendre votre téléphone identifiable par d\'autres appareils. Autoriser cette action ?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Une application souhaite activer le Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Une application souhaite que d\'autres appareils Bluetooth puissent détecter votre tablette pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Une application souhaite que d\'autres appareils Bluetooth puissent détecter votre téléphone pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Une application souhaite que d\'autres appareils Bluetooth puissent détecter votre tablette. Vous pourrez ensuite annuler cette opération dans les paramètres du Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Une application souhaite que d\'autres appareils Bluetooth puissent détecter votre téléphone. Vous pourrez ensuite annuler cette opération dans les paramètres du Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Une application veut activer le Bluetooth et souhaite également que d\'autres appareils puissent détecter votre tablette pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Une application veut activer le Bluetooth et souhaite également que d\'autres appareils puissent détecter votre téléphone pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Une application veut activer le Bluetooth et souhaite également que d\'autres appareils puissent détecter votre tablette. Vous pourrez ensuite annuler cette opération dans les paramètres du Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Une application veut activer le Bluetooth et souhaite également que d\'autres appareils puissent détecter votre téléphone. Vous pourrez ensuite annuler cette opération dans les paramètres du Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Activation du Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Désactivation du Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Connexion automatique"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Trop de tentatives échouées !"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Réessayer dans <xliff:g id="NUMBER">%d</xliff:g> secondes."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"L\'application n\'est pas installée sur votre téléphone."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Annuler"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Suivant"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Sécurisation de votre tablette"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Sécurisation de votre téléphone"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Protégez votre tablette contre toute utilisation non autorisée en créant un schéma personnel de déverrouillage de l\'écran. À l\'aide de votre doigt, reliez les points dans l\'ordre de votre choix sur l\'écran suivant. Vous devez relier au moins quatre points. "\n\n"Vous êtes prêt ? Appuyez sur \"Suivant\"."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Protégez votre téléphone contre toute utilisation non autorisée en créant un schéma personnel de déverrouillage de l\'écran. Avec votre doigt, reliez au moins quatre points dans l\'ordre de votre choix sur l\'écran suivant. "\n\n"Vous êtes prêt ? Appuyez sur \"Suivant\"."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gérer les applications"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gérer et supprimer les applications installées"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Applications"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index c6392e3..f3f1a94 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"हां"</string>
     <string name="no" msgid="6731231425810196216">"नहीं"</string>
     <string name="create" msgid="3578857613172647409">"बनाएं"</string>
+    <string name="allow" msgid="3349662621170855910">"अनुमति दें"</string>
+    <string name="deny" msgid="6947806159746484865">"अस्वीकार करें"</string>
     <string name="device_info_default" msgid="7847265875578739287">"अज्ञात"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"अब आप डेवलपर बनने से <xliff:g id="STEP_COUNT">%1$d</xliff:g> चरण दूर हैं."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"अब आप डेवलपर बनने से <xliff:g id="STEP_COUNT">%1$d</xliff:g> चरण दूर हैं"</item>
+    <item quantity="other" msgid="6722953419953594148">"अब आप डेवलपर बनने से <xliff:g id="STEP_COUNT">%1$d</xliff:g> चरण दूर हैं."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"अब आप डेवलपर बन गए हैं!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"आवश्यकता नहीं, आप पहले से ही डेवलपर हैं."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"वायरलेस और नेटवर्क"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"अज्ञात त्रुटि"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"ठंडा"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"खोज योग्‍य"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"आसपास के सब Bluetooth उप. के लि‍ए दृश्‍यमान (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"सभी आस-पास के Bluetooth उपकरणों के लि‍ए दृश्‍यमान"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"अन्‍य Bluetooth उपकरणों के लि‍ए दृश्‍यमान नहीं"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"केवल युग्‍मि‍त उपकरणों के लि‍ए दृश्‍यमान"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"उपकरण को खोज योग्‍य बनाएं"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"दृश्यता समयबाह्य"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"सेट करें कि कितनी देर तक उपकरण खोज योग्‍य रहेगा"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"ध्‍वनि डायलिंग लॉक करें"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"जब स्‍क्रीन लॉक हो, तो bluetooth डायलर के उपयोग को रोकें"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth उपकरण"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"प्राप्त फ़ाइलें दिखाएं"</string>
     <string name="device_picker" msgid="8398232791303186677">"Bluetooth उपकरण चयनकर्ता"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth अनूमति अनुरोध"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"कोई एप्‍लिकेशन Bluetooth चालू करना चाहता है. अनुमति दें?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"आपके टेबलेट पर कोई एप्‍लिकेशन <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंड के लिए अन्‍य Bluetooth उपकरणों द्वारा आपके टेबलेट को खोजने योग्‍य बनाना चाहता है. अनुमति दें?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"आपके फ़ोन पर कोई एप्‍लिकेशन <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंड के लिए अन्‍य Bluetooth उपकरणों द्वारा आपके फ़ोन को खोजने योग्‍य बनाना चाहता है. अनुमति दें?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"आपके टेबलेट पर कोई एप्‍लिकेशन आपके टेबलेट को अन्‍य Bluetooth उपकरणों द्वारा “हमेशा खोजने योग्‍य” बनाना चाहता है. अनुमति दें?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"आपके फ़ोन पर कोई एप्‍लिकेशन आपके फ़ोन को अन्‍य Bluetooth उपकरणों द्वारा “हमेशा खोजने योग्‍य” बनाना चाहता है. अनुमति दें?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"आपके टेबलेट पर कोई एप्‍लिकेशन Bluetooth चालू करना चाहता है और आपके टेबलेट को अन्‍य उपकरणों द्वारा <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंड के लिए खोजने योग्‍य बनाना चाहता है. अनुमति दें?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"आपके फ़ोन पर कोई एप्‍लिकेशन Bluetooth चालू करना चाहता है और आपके फ़ोन को अन्‍य उपकरणों द्वारा <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंड के लिए खोजने योग्‍य बनाना चाहता है. अनुमति दें?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"आपके टेबलेट पर कोई एप्‍लिकेशन Bluetooth चालू करना चाहता है और आपके टेबलेट को अन्‍य उपकरणों द्वारा खोजने योग्‍य बनाना चाहता है. अनुमति दें?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"आपके फ़ोन पर कोई एप्‍लिकेशन Bluetooth चालू करना चाहता है और आपके फ़ोन को अन्‍य उपकरणों द्वारा खोजने योग्‍य बनाना चाहता है. अनुमति दें?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"एक एप्लिकेशन Bluetooth को चालू करना चाहता है."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"एक एप्लिकेशन आपके टेबलेट को <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंड के लिए अन्य Bluetooth उपकरणों हेतु दृश्यमान बनाना चाहता है."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"एक एप्लिकेशन आपके फ़ोन को <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंड के लिए अन्य Bluetooth उपकरणों हेतु दृश्यमान बनाना चाहता है."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"एक एप्लिकेशन आपके टेबलेट को अन्य Bluetooth उपकरणों हेतु दृश्यमान बनाना चाहता है. आप इसे बाद में Bluetooth सेटिंग में बदल सकते हैं."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"एक एप्लिकेशन आपके फ़ोन को अन्य Bluetooth उपकरणों हेतु दृश्यमान बनाना चाहता है. आप इसे बाद में Bluetooth सेटिंग में बदल सकते हैं."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"एक एप्लिकेशन Bluetooth को चालू करना और आपके टेबलेट को <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंड के लिए अन्य उपकरणों हेतु दृश्यमान बनाना चाहता है."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"एक एप्लिकेशन Bluetooth को चालू करना और आपके फ़ोन को <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंड के लिए अन्य उपकरणों हेतु दृश्यमान बनाना चाहता है."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"एक एप्लिकेशन Bluetooth को चालू करना और आपके टेबलेट को अन्य उपकरणों हेतु दृश्यमान बनाना चाहता है. आप इसे बाद में Bluetooth सेटिंग में बदल सकते हैं."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"एक एप्लिकेशन Bluetooth को चालू करना और आपके फ़ोन को अन्य उपकरणों हेतु दृश्यमान बनाना चाहता है. आप इसे बाद में Bluetooth सेटिंग में बदल सकते हैं."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth चालू हो रहा है.."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth बंद कर रहे हैं…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"स्‍वत: कनेक्‍ट करें"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"बहुत से गलत प्रयास!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g> सेकंड में पुन: प्रयास करें."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"आपके फ़ोन पर एप्लिकेशन इंस्टॉल नहीं है."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"रद्द करें"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"अगला"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"अपने टेबलेट को सुरक्षित करना"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"आपके फ़ोन को सुरक्षित करना"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"कोई निजी स्‍क्रीन अनलॉक प्रतिमान बनाकर अपने टेबलेट को अनधिकृत उपयोग से बचाएं. बिंदुओं को किसी भी क्रम में जोड़ने के लिए अपनी अंगुली को अगली स्‍क्रीन पर स्लाइड करें. आपको कम से कम चार बिंदुओं को जोड़ना होगा. "\n\n"प्रारंभ करने के लिए तैयार हैं? अगला स्पर्श करें."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"व्यक्तिगत स्‍क्रीन अनलॉक प्रतिमान बनाकर अपने फ़ोन को अनधिकृत उपयोग से बचाएं. कम से कम चार बिंदुओं को किसी भी क्रम में जोड़ने के लिए अपनी अंगुली को अगली स्‍क्रीन पर स्लाइड करें. "\n\n"शुरू करने के लिए तैयार हैं? अगला स्पर्श करें."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"एप्लिकेशन प्रबंधित करें"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"इंस्‍टॉल किए गए एप्‍लिकेशन प्रबंधित करें और निकालें"</string>
     <string name="applications_settings" msgid="1721442176406964682">"एप्लिकेशन"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 0e25d3f..745fde9 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"Da"</string>
     <string name="no" msgid="6731231425810196216">"Ne"</string>
     <string name="create" msgid="3578857613172647409">"Izradi"</string>
+    <string name="allow" msgid="3349662621170855910">"Dopusti"</string>
+    <string name="deny" msgid="6947806159746484865">"Odbij"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Nepoznato"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"Postat ćete razvojni programer za ovoliko koraka: <xliff:g id="STEP_COUNT">%1$d</xliff:g>."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Još <xliff:g id="STEP_COUNT">%1$d</xliff:g> korak i postat ćete razvojni programer."</item>
+    <item quantity="other" msgid="6722953419953594148">"Još <xliff:g id="STEP_COUNT">%1$d</xliff:g> koraka i postat ćete razvojni programer ."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Sad ste razvojni programer!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Nema potrebe, već ste razvojni programer."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"BEŽIČNO POVEZIVANJE i MREŽE"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Nepoznata pogreška"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Hladno"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Moguće prepoznavanje"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Vidljivo svim Bluetooth uređajima u blizini (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Vidljivo svim Bluetooth uređajima u blizini"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Nije vidljiv drugim Bluetooth uređajima"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Vidljivo samo uparenim uređajima"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Omogući prepoznavanje uređaja"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Vidljivost je istekla"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Odredite koliko će dugo biti moguće otkriti uređaj"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Zaključaj biranje glasom"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Spriječite upotrebu Bluetooth birača ako je zaslon zaključan"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth uređaji"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Prikaži primljene datoteke"</string>
     <string name="device_picker" msgid="8398232791303186677">"Birač Bluetooth uređaja"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Zatraženo je Bluetooth dopuštenje"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Aplikacija želi uključiti Bluetooth. Dopustiti?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Aplikacija na vašem tabletnom računalu želi omogućiti otkrivanje vašeg tabletnog računala drugim Bluetooth uređajima u trajanju od <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Dopustiti?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Aplikacija na vašem telefonu želi omogućiti otkrivanje vašeg telefona drugim Bluetooth uređajima u trajanju od <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Dopustiti?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Aplikacija na vašem tabletnom računalu želi omogućiti trajno otkrivanje vašeg tabletnog računala drugim Bluetooth uređajima. Dopustiti?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Aplikacija na vašem telefonu želi omogućiti trajno otkrivanje vašeg telefona drugim Bluetooth uređajima. Dopustiti?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Aplikacija na vašem tabletnom računalu želi uključiti Bluetooth i omogućiti otkrivanje vašeg tabletnog računala drugim uređajima u trajanju od <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Dopustiti?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Aplikacija na vašem telefonu želi uključiti Bluetooth i omogućiti prepoznavanje vašeg telefona drugim uređajima u trajanju od <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Dopustiti?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Aplikacija na vašem tabletnom računalu želi omogućiti otkrivanje vašeg tabletnog računala drugim Bluetooth uređajima. Dopustiti?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Aplikacija na vašem telefonu želi uključiti Bluetooth i omogućiti prepoznavanje vašeg telefona drugim uređajima. Dopustiti?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Aplikacija želi uključiti Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Aplikacija želi vaše tabletno računalo učiniti vidljivim drugim Bluetooth uređajima u trajanju od <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Aplikacija želi vaš telefon učiniti vidljivim drugim Bluetooth uređajima u trajanju od <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Aplikacija želi učiniti vaše tabletno računalo vidljivim drugim Bluetooth uređajima. To možete kasnije promijeniti u postavkama Bluetootha."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Aplikacija želi učiniti vaš telefon vidljivim drugim Bluetooth uređajima. To možete kasnije promijeniti u postavkama Bluetootha."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Aplikacija želi uključiti Bluetooth i vaše tabletno računalo učiniti vidljivim drugim uređajima u trajanju od <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Aplikacija želi uključiti Bluetooth i vaš telefon učiniti vidljivim drugim uređajima u trajanju od <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Aplikacija želi uključiti Bluetooth i vaše tabletno računalo učiniti vidljivim drugim uređajima. To možete kasnije promijeniti u postavkama Bluetootha."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Aplikacija želi uključiti Bluetooth i vaš telefon učiniti vidljivim drugim uređajima. To možete kasnije promijeniti u postavkama Bluetootha."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Uključivanje Bluetootha…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Isključivanje Bluetootha?"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automatsko povezivanje"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Previše netočnih pokušaja!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Pokušajte ponovo za <xliff:g id="NUMBER">%d</xliff:g> s."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Aplikacija nije instalirana na vašem telefonu."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Odustani"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Dalje"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Osiguravanje tabletnog uređaja"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Osiguravanje telefona"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Zaštitite svoje tabletno računalo od neautorizirane upotrebe stvaranjem osobnog uzorka za otključavanje zaslona. Klizite prstom kako biste točke na zaslonu povezali bilo kojim redoslijedom. Trebate povezati najmanje četiri točke."\n\n"Jeste li spremni? Dodirnite Dalje."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Zaštitite svoj telefon od neovlaštene upotrebe izradom vlastitog uzorka za otključavanje zaslona. Na sljedećem zaslonu klizite prstom da biste spojili najmanje četiri točke bilo kojim redoslijedom. "\n\n"Spremni za početak? Dodirnite \"Dalje\"."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Upravljanje aplikacijama"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Upravljanje instaliranim aplikacijama i njihovo uklanjanje"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Aplikacije"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 956c2c1..62a086f 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"Igen"</string>
     <string name="no" msgid="6731231425810196216">"Nem"</string>
     <string name="create" msgid="3578857613172647409">"Létrehozás"</string>
+    <string name="allow" msgid="3349662621170855910">"Engedélyezés"</string>
+    <string name="deny" msgid="6947806159746484865">"Elutasítás"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Ismeretlen"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"<xliff:g id="STEP_COUNT">%1$d</xliff:g> lépésre van attól, hogy fejlesztő legyen."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"<xliff:g id="STEP_COUNT">%1$d</xliff:g> lépésre van attól, hogy fejlesztő legyen."</item>
+    <item quantity="other" msgid="6722953419953594148">"<xliff:g id="STEP_COUNT">%1$d</xliff:g> lépésre van attól, hogy fejlesztő legyen."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Ön mostantól már fejlesztő!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Nincs rá szükség, Ön már fejlesztő."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"VEZETÉK NÉLKÜLI és EGYÉB HÁLÓZATOK"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Ismeretlen hiba történt"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Közömbös"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Felderíthető"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Az összes közeli Bluetooth eszköz számára látható (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Az összes közeli Bluetooth eszköz számára látható"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Nem látható a többi Bluetooth eszköz számára"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Csak párosított eszközök számára látható"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Az eszköz legyen felderíthető"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Láthatóság időkerete"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Állítsa be, milyen hosszan legyen felfedezhető az eszköz"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Hanghívás zárolása"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"A bluetooth tárcsázó használatának megakadályozása, ha a képernyő le van zárva"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth eszközök"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Beérkező fájlok megjelenítése"</string>
     <string name="device_picker" msgid="8398232791303186677">"Bluetooth-eszközválasztó"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth engedélykérés"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Egy alkalmazás be akarja kapcsolni a Bluetooth funkciót. Engedélyezi?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"A táblagépen lévő egyik alkalmazás felfedezhetővé akarja tenni a táblagépet más eszközök számára <xliff:g id="TIMEOUT">%1$d</xliff:g> másodpercig. Engedélyezi?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"A telefonon lévő egyik alkalmazás felfedezhetővé akarja tenni a telefont más eszközök számára <xliff:g id="TIMEOUT">%1$d</xliff:g> másodpercig. Engedélyezi?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"A táblagépen lévő egyik alkalmazás \"mindig felfedezhető\" állapotúvá szeretné tenni táblagépét más Bluetooth eszközök számára. Engedélyezi?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"A telefonon lévő egyik alkalmazás \"mindig felfedezhető\" állapotúvá szeretné tenni telefonját más Bluetooth eszközök számára. Engedélyezi?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"A táblagépen lévő egyik alkalmazás be akarja kapcsolni a Bluetooth funkciót, és a táblagépet felfedezhetővé akarja tenni más eszközök számára <xliff:g id="TIMEOUT">%1$d</xliff:g> másodpercig. Engedélyezi?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"A telefonon lévő egyik alkalmazás be akarja kapcsolni a Bluetooth funkciót, és a telefont felfedezhetővé akarja tenni más eszközök számára <xliff:g id="TIMEOUT">%1$d</xliff:g> másodpercig. Engedélyezi?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"A táblagépen lévő egyik alkalmazás be akarja kapcsolni a Bluetooth funkciót, és a táblagépet felfedezhetővé akarja tenni más eszközök számára. Engedélyezi?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"A telefonon lévő egyik alkalmazás be akarja kapcsolni a Bluetooth funkciót, és a telefont felfedezhetővé akarja tenni más eszközök számára. Engedélyezi?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Egy alkalmazás be akarja kapcsolni a Bluetooth funkciót."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Egy alkalmazás láthatóvá akarja tenni a táblagépet más Bluetooth-eszközök számára <xliff:g id="TIMEOUT">%1$d</xliff:g> másodpercig."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Egy alkalmazás láthatóvá akarja tenni a telefont más Bluetooth-eszközök számára <xliff:g id="TIMEOUT">%1$d</xliff:g> másodpercig."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Az egyik alkalmazás láthatóvá akarja tenni a táblagépet más eszközök számára. Ezt később módosíthatja a Bluetooth beállításokban."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Az egyik alkalmazás láthatóvá akarja tenni a telefont más eszközök számára. Ezt később módosíthatja a Bluetooth beállításokban."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Az egyik alkalmazás be akarja kapcsolni a Bluetooth funkciót, és a táblagépet láthatóvá akarja tenni más eszközök számára <xliff:g id="TIMEOUT">%1$d</xliff:g> másodpercig."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Az egyik alkalmazás be akarja kapcsolni a Bluetooth funkciót, és a telefont láthatóvá akarja tenni más eszközök számára <xliff:g id="TIMEOUT">%1$d</xliff:g> másodpercig."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Az egyik alkalmazás be akarja kapcsolni a Bluetooth funkciót, és a táblagépet láthatóvá akarja tenni más eszközök számára. Ezt később módosíthatja a Bluetooth beállításokban."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Az egyik alkalmazás be akarja kapcsolni a Bluetooth funkciót, és a telefont láthatóvá akarja tenni más eszközök számára. Ezt később módosíthatja a Bluetooth beállításokban."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth bekapcsolása?"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth kikapcsolása…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automatikus csatlakozás"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Túl sok helytelen próbálkozás!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Próbálja újra <xliff:g id="NUMBER">%d</xliff:g> másodperc múlva."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Az alkalmazás már nincs telepítve a telefonján."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Mégse"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Tovább"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"A táblagép védelme"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"A telefon védelme"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Védje meg táblagépét a jogosulatlan használattól egy személyes képernyőfeloldási minta létrehozásával. Ujjával tetszőleges sorrendben kösse össze a pontokat a következő képernyőn. Legalább négy pontot össze kell kötnie. "\n\n"Készen áll? Érintse meg a Tovább gombot."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Védje meg telefonját a jogosulatlan használattól egy személyes képernyőfeloldási minta létrehozásával. Ujjával tetszőleges sorrendben kössön össze legalább négy pontot a következő képernyőn. "\n\n"Készen áll? Érintse meg a Tovább gombot."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Alkalmazások kezelése"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Telepített alkalmazások kezelése és eltávolítása"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Alkalmazások"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index c4196aa..1c13b2c 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"Ya"</string>
     <string name="no" msgid="6731231425810196216">"Tidak"</string>
     <string name="create" msgid="3578857613172647409">"Buat"</string>
+    <string name="allow" msgid="3349662621170855910">"Izinkan"</string>
+    <string name="deny" msgid="6947806159746484865">"Tolak"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Tidak diketahui"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"Anda saat ini tinggal melakukan <xliff:g id="STEP_COUNT">%1$d</xliff:g> langkah untuk menjadi pengembang."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Tinggal <xliff:g id="STEP_COUNT">%1$d</xliff:g> langkah untuk menjadi pengembang."</item>
+    <item quantity="other" msgid="6722953419953594148">"Tinggal <xliff:g id="STEP_COUNT">%1$d</xliff:g> langkah untuk menjadi pengembang."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Sekarang Anda adalah seorang pengembang!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Tidak perlu, Anda sudah menjadi pengembang."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"NIRKABEL &amp; JARINGAN"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Kesalahan tidak dikenal"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Dingin"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Dapat ditemukan"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Terlihat utk semua perangkat Bluetooth terdekat (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Terlihat untuk semua perangkat Bluetooth terdekat"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Tidak terlihat oleh perangkat Bluetooth lain"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Hanya terlihat oleh perangkat yang disandingkan"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Buat perangkat dapat ditemukan"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Batas waktu keterlihatan"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Setel berapa lama perangkat dapat ditemukan"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Kunci pemanggilan suara"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Mencegah penggunaan aplikasi telepon Bluetooth ketika layar terkunci"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Perangkat bluetooth"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Tampilkan file yang diterima"</string>
     <string name="device_picker" msgid="8398232791303186677">"Pemilih perangkat bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Permintaan izin bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Sebuah apl ingin menghidupkan Bluetooth. Izinkan?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Sebuah apl pada tablet Anda ingin membuat tablet dapat ditemukan oleh perangkat Bluetooth lainnya selama <xliff:g id="TIMEOUT">%1$d</xliff:g> detik. Izinkan?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Sebuah apl pada ponsel Anda ingin membuat ponsel dapat ditemukan oleh perangkat Bluetooth yang lain selama <xliff:g id="TIMEOUT">%1$d</xliff:g> detik. Izinkan?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Sebuah apl pada tablet Anda ingin membuat tablet \"selalu ditemukan\" oleh perangkat Bluetooth lainnya. Izinkan?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Sebuah apl pada ponsel ingin membuat ponsel Anda \"selalu ditemukan\" oleh perangkat Bluetooth lainnya. Izinkan?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Sebuah apl pada tablet Anda ingin mengaktifkan Bluetooth dan membuatnya dapat ditemukan oleh perangkat lain selama <xliff:g id="TIMEOUT">%1$d</xliff:g> detik. Izinkan?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Sebuah apl pada ponsel Anda ingin mengaktifkan Bluetooth dan membuat ponsel dapat ditemukan oleh perangkat lain selama <xliff:g id="TIMEOUT">%1$d</xliff:g> detik. Izinkan?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Sebuah apl pada tablet Anda ingin mengaktifkan Bluetooth dan membuatnya dapat ditemukan oleh perangkat lain. Izinkan?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Sebuah apl pada ponsel Anda ingin mengaktifkan Bluetooth dan membuatnya dapat ditemukan oleh perangkat lain. Izinkan?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Sebuah aplikasi ingin mengaktifkan Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Sebuah aplikasi ingin menampilkan tablet Anda pada perangkat Bluetooth lain selama <xliff:g id="TIMEOUT">%1$d</xliff:g> detik."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Sebuah aplikasi ingin menampilkan ponsel Anda pada perangkat Bluetooth lain selama <xliff:g id="TIMEOUT">%1$d</xliff:g> detik."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Sebuah aplikasi ingin menampilkan ponsel Anda di perangkat Bluetooth lain. Anda dapat mengubah ini nanti di setelan Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Sebuah aplikasi ingin menampilkan ponsel Anda di perangkat Bluetooth lain. Anda dapat mengubah ini nanti di setelan Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Sebuah aplikasi ingin mengaktifkan Bluetooth dan menampilkan tablet Anda di perangkat lain selama <xliff:g id="TIMEOUT">%1$d</xliff:g> detik."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Sebuah aplikasi ingin mengaktifkan Bluetooth dan menampilkan ponsel Anda di perangkat lain selama <xliff:g id="TIMEOUT">%1$d</xliff:g> detik."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Sebuah aplikasi ingin mengaktifkan Bluetooth dan menampilkan tablet Anda di perangkat lain. Anda dapat mengubah ini nanti di setelan Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Sebuah aplikasi ingin mengaktifkan Bluetooth dan menampilkan ponsel Anda di perangkat lain. Anda dapat mengubah ini nanti di setelan Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Menyalakan Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Mematikan Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Sambung-otomatis"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Terlalu banyak upaya yang salah!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Coba lagi dalam <xliff:g id="NUMBER">%d</xliff:g> detik."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Aplikasi tidak dipasang pada ponsel Anda."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Batal"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Berikutnya"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Mengamankan tablet Anda"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Mengamankan ponsel Anda"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Lindungi tablet Anda dari penggunaan yang tidak sah dengan membuat pola pembuka kunci layar pribadi. Geser jari Anda untuk menghubungkan titik-titik secara acak di layar berikutnya. Anda perlu menghubungkan setidaknya empat titik. "\n\n"Siap memulai? Sentuh Berikutnya."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Lindungi ponsel Anda dari penggunaan yang tidak sah dengan membuat pola pembuka kunci layar pribadi. Geser jari Anda untuk menghubungkan setidaknya empat titik dengan sembarang urutan pada layar berikutnya. "\n\n"Siap memulai? Sentuh Berikutnya."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Kelola apl"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Mengelola dan menghapus apl terpasang"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Apl"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 0a37d04..85528ca 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"Sì"</string>
     <string name="no" msgid="6731231425810196216">"No"</string>
     <string name="create" msgid="3578857613172647409">"Crea"</string>
+    <string name="allow" msgid="3349662621170855910">"Consenti"</string>
+    <string name="deny" msgid="6947806159746484865">"Rifiuta"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Sconosciuto"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"Ora ti mancano <xliff:g id="STEP_COUNT">%1$d</xliff:g> passaggi per diventare uno sviluppatore."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Ora ti manca <xliff:g id="STEP_COUNT">%1$d</xliff:g> passaggio per diventare uno sviluppatore."</item>
+    <item quantity="other" msgid="6722953419953594148">"Ora ti mancano <xliff:g id="STEP_COUNT">%1$d</xliff:g> passaggi per diventare uno sviluppatore."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Ora sei uno sviluppatore."</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Non è necessario, sei già uno sviluppatore."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"WIRELESS E RETI"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Errore sconosciuto"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Minimo"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Rilevabile"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Visibile a tutti dispositivi Bluetooth vicini (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visibile a tutti dispositivi Bluetooth vicini"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Non visibile ad altri dispositivi Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Visibile solo ai dispositivi accoppiati"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Rendi rilevabile il dispositivo"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Timeout visibilità"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Imposta la durata della rilevabilità del dispositivo"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Blocca composizione vocale"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Impedisci l\'uso del compositore Bluetooth quando lo schermo è bloccato"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Dispositivi Bluetooth"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostra file ricevuti"</string>
     <string name="device_picker" msgid="8398232791303186677">"Selettore dispositivo Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Richiesta autorizzazione Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Un\'applicazione vuole attivare il Bluetooth. Consentire?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Un\'applicazione sul tablet vuole rendere il tablet rilevabile da altri dispositivi Bluetooth per <xliff:g id="TIMEOUT">%1$d</xliff:g> secondi. Consentire?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Un\'applicazione sul telefono vuole rendere il telefono rilevabile da altri dispositivi Bluetooth per <xliff:g id="TIMEOUT">%1$d</xliff:g> secondi. Consentire?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Un\'applicazione sul tablet vuole rendere il tablet \"sempre rilevabile\" da altri dispositivi Bluetooth. Consentire?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Un\'applicazione sul telefono vuole rendere il telefono \"sempre rilevabile\" da altri dispositivi Bluetooth. Consentire?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Un\'applicazione sul tablet vuole attivare il Bluetooth e rendere il tablet rilevabile da altri dispositivi per <xliff:g id="TIMEOUT">%1$d</xliff:g> secondi. Consentire?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Un\'applicazione sul telefono vuole attivare il Bluetooth e rendere il telefono rilevabile da altri dispositivi per <xliff:g id="TIMEOUT">%1$d</xliff:g> secondi. Consentire?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Un\'applicazione sul tablet vuole attivare il  Bluetooth e rendere il tablet rilevabile da altri dispositivi. Consentire?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Un\'applicazione sul telefono vuole attivare il Bluetooth e rendere il telefono rilevabile da altri dispositivi. Consentire?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Un\'app chiede di attivare il Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Un\'app chiede di rendere il tablet visualizzabile da altri dispositivi Bluetooth per <xliff:g id="TIMEOUT">%1$d</xliff:g> secondi."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Un\'app chiede di rendere il telefono visualizzabile da altri dispositivi Bluetooth per <xliff:g id="TIMEOUT">%1$d</xliff:g> secondi."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Un\'app chiede di rendere il tablet visualizzabile da altri dispositivi Bluetooth. Puoi modificare questa impostazione in seguito nelle impostazioni Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Un\'app chiede di rendere il telefono visualizzabile da altri dispositivi Bluetooth. Puoi modificare questa impostazione in seguito nelle impostazioni Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Un\'app chiede di attivare il Bluetooth e di rendere il tablet visualizzabile da altri dispositivi per <xliff:g id="TIMEOUT">%1$d</xliff:g> secondi."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Un\'app chiede di attivare il Bluetooth e di rendere il telefono visualizzabile da altri dispositivi per <xliff:g id="TIMEOUT">%1$d</xliff:g> secondi."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Un\'app chiede di attivare il Bluetooth e di rendere il tablet visualizzabile da altri dispositivi. Puoi modificare questa impostazione in seguito nelle impostazioni Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Un\'app chiede di attivare il Bluetooth e di rendere il telefono visualizzabile da altri dispositivi. Puoi modificare questa impostazione in seguito nelle impostazioni Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Attivazione Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Disattivazione Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Connessione automatica"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Troppi tentativi errati."</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Riprova fra <xliff:g id="NUMBER">%d</xliff:g> secondi."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Applicazione non installata sul telefono."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Annulla"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Avanti"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Protezione del tablet"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Protezione del telefono"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Proteggi il tuo tablet dall\'uso non autorizzato creando una sequenza di sblocco dello schermo personale. Fai scorrere il dito per collegare i pallini in qualsiasi ordine nella schermata successiva. Devi collegare almeno quattro pallini. "\n\n"Sei pronto per iniziare? Tocca \"Avanti\"."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Proteggi il tuo telefono dall\'uso non autorizzato creando una sequenza di sblocco dello schermo personale. Fai scorrere il dito per collegare almeno quattro pallini in qualsiasi ordine nella schermata successiva. "\n\n"Sei pronto per iniziare? Tocca \"Avanti\"."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gestisci applicazioni"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gestisci e rimuovi applicazioni installate"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Applicazioni"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 5eaa8e0..46ebceb 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"כן"</string>
     <string name="no" msgid="6731231425810196216">"לא"</string>
     <string name="create" msgid="3578857613172647409">"צור"</string>
+    <string name="allow" msgid="3349662621170855910">"אפשר"</string>
+    <string name="deny" msgid="6947806159746484865">"דחה"</string>
     <string name="device_info_default" msgid="7847265875578739287">"לא ידוע"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"אתה כעת במרחק של <xliff:g id="STEP_COUNT">%1$d</xliff:g> צעדים מלהיות מפתח."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"אתה כעת במרחק של צעד <xliff:g id="STEP_COUNT">%1$d</xliff:g> מלהיות מפתח."</item>
+    <item quantity="other" msgid="6722953419953594148">"אתה כעת במרחק של <xliff:g id="STEP_COUNT">%1$d</xliff:g> צעדים מלהיות מפתח."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"אתה כעת מפתח!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"אין צורך, אתה כבר מפתח."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"אלחוטי ורשתות"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"שגיאה לא מוכרת"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"קר"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"גלוי"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"גלוי לכל מכשירי Bluetooth הסמוכים (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"גלוי לכל מכשירי Bluetooth הסמוכים"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"לא גלוי עבור מכשירי Bluetooth אחרים"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"גלוי רק למכשירים מותאמים"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"הפוך את המכשיר לגלוי"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"זמן קצוב לחשיפה"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"הגדר במשך כמה זמן המכשיר יהיה גלוי"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"נעל חיוג קולי"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"מנע את השימוש בחייגן Bluetooth כאשר המסך נעול"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"מכשירי Bluetooth"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"הצג קבצים שהתקבלו"</string>
     <string name="device_picker" msgid="8398232791303186677">"בוחר מכשיר Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"בקשה להרשאת Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"יישום מסוים רוצה להפעיל את Bluetooth. לאפשר?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"יישום מסוים בטבלט שלך רוצה להפוך את הטבלט לגלוי בפני מכשירי Bluetooth אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות. לאפשר?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"יישום מסוים בטלפון שלך רוצה להפוך את הטלפון לגלוי בפני מכשירי Bluetooth אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות. לאפשר?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"יישום מסוים בטבלט שלך רוצה להפוך את הטבלט ל\'גלוי תמיד\' בפני מכשירי Bluetooth אחרים. לאפשר?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"יישום מסוים בטלפון שלך רוצה להפוך את הטלפון ל\'גלוי תמיד\' למכשירי Bluetooth אחרים. לאפשר?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"יישום מסוים בטבלט שלך רוצה להפעיל את Bluetooth ולהפוך את הטבלט לגלוי בפני מכשירים אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות. לאפשר?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"יישום מסוים בטלפון שלך רוצה להפעיל את Bluetooth ולהפוך את הטלפון לגלוי בפני מכשירים אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות. לאפשר?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"יישום מסוים בטבלט שלך רוצה להפעיל את Bluetooth ולהפוך את הטבלט לגלוי בפני מכשירים אחרים. לאפשר?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"יישום מסוים בטלפון שלך רוצה להפעיל את Bluetooth ולהפוך את הטלפון לגלוי בפני מכשירים אחרים. לאפשר?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"יישום מסוים רוצה להפעיל את ה-Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"יישום מסוים רוצה להפוך את הטאבלט שלך לגלוי בפני מכשירי Bluetooth אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"יישום מסוים רוצה להפוך את הטלפון שלך לגלוי בפני מכשירי Bluetooth אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"יישום מסוים רוצה להפוך את הטאבלט שלך לגלוי בפני מכשירי Bluetooth אחרים. ניתן לשנות זאת מאוחר יותר בהגדרות ה-Bluetooth"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"יישום מסוים רוצה להפוך את הטלפון שלך לגלוי בפני מכשירי Bluetooth אחרים. ניתן לשנות זאת מאוחר יותר בהגדרות ה-Bluetooth"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"יישום מסוים רוצה להפעיל את ה-Bluetooth ולהפוך את הטאבלט שלך לגלוי בפני מכשירים אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"יישום מסוים רוצה להפעיל את ה-Bluetooth ולהפוך את הטלפון שלך לגלוי בפני מכשירים אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"יישום מסוים רוצה להפעיל את ה-Bluetooth ולהפוך את הטאבלט שלך לגלוי בפני מכשירים אחרים. ניתן לשנות זאת מאוחר יותר בהגדרות ה-Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"יישום מסוים רוצה להפעיל את ה-Bluetooth ולהפוך את הטלפון שלך לגלוי בפני מכשירים אחרים. ניתן לשנות זאת מאוחר יותר בהגדרות ה-Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"מפעיל Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth נכבה…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"חיבור אוטומטי"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"ניסיונות כושלים רבים מדי!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"נסה שוב בעוד <xliff:g id="NUMBER">%d</xliff:g> שניות."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"היישום אינו מותקן בטלפון."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"ביטול"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"הבא"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"אבטחת הטבלט"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"אבטחת הטלפון"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"הגן על הטבלט שלך מפני שימוש לא מורשה על ידי יצירת קו ביטול נעילה אישי למסך. הסט את האצבע כדי לחבר את הנקודות בכל סדר שתבחר במסך הבא. עליך לחבר לפחות ארבע נקודות. "\n\n"מוכן להתחיל? גע ב\'הבא\'."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"הגן על הטלפון שלך מפני שימוש לא מורשה על ידי יצירת קו ביטול נעילה אישי במסך. השתמש באצבע כדי לחבר לפחות ארבע נקודות בכל סדר שהוא במסך הבא."\n\n"מוכן להתחיל? גע באפשרות \'הבא\'."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"נהל יישומים"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"נהל והסר יישומים מותקנים"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Apps"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index a1d7658..ef3cbfb 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"はい"</string>
     <string name="no" msgid="6731231425810196216">"いいえ"</string>
     <string name="create" msgid="3578857613172647409">"作成"</string>
+    <string name="allow" msgid="3349662621170855910">"許可"</string>
+    <string name="deny" msgid="6947806159746484865">"許可しない"</string>
     <string name="device_info_default" msgid="7847265875578739287">"不明"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"デベロッパーになるまであと<xliff:g id="STEP_COUNT">%1$d</xliff:g>ステップです。"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"デベロッパーになるまであと<xliff:g id="STEP_COUNT">%1$d</xliff:g>ステップです。"</item>
+    <item quantity="other" msgid="6722953419953594148">"デベロッパーになるまであと<xliff:g id="STEP_COUNT">%1$d</xliff:g>ステップです。"</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"これでデベロッパーになりました！"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"必要ありません。既にデベロッパーです。"</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"無線とネットワーク"</string>
@@ -107,14 +112,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"不明なエラー"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"低温"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"検出可能"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"周辺のすべてのBluetoothデバイスに表示（<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>）"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"周辺のすべてのBluetoothデバイスに表示"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"他のBluetoothデバイスには非表示"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"ペア設定したデバイスにのみ表示"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"この端末の検出を許可する"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"表示のタイムアウト"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"端末の検出可能時間を設定する"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"ボイスダイヤルをロック"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"画面がロックされているときはBluetoothボイスダイヤルを使用しない"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth端末"</string>
@@ -148,15 +150,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"受信済みファイルを表示"</string>
     <string name="device_picker" msgid="8398232791303186677">"Bluetoothデバイスの選択"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth許可リクエスト"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"アプリがBluetoothをONにしようとしています。許可しますか？"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"アプリが、<xliff:g id="TIMEOUT">%1$d</xliff:g>秒間他のBluetoothデバイスからこのタブレットを検出可能にしようとしています。許可しますか？"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"アプリが、<xliff:g id="TIMEOUT">%1$d</xliff:g>秒間他のBluetoothデバイスからこの携帯端末を検出可能にしようとしています。許可しますか？"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"アプリが、このタブレットを他のBluetoothデバイスから「常に検出可能」にしようとしています。許可しますか？"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"アプリが、この端末を他のBluetoothデバイスから「常に検出可能」にしようとしています。許可しますか？"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"アプリが、<xliff:g id="TIMEOUT">%1$d</xliff:g>秒間BluetoothをONにして他のデバイスからこのタブレットを検出可能にしようとしています。許可しますか？"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"アプリが、<xliff:g id="TIMEOUT">%1$d</xliff:g>秒間BluetoothをONにして他のデバイスからこの携帯端末を検出可能にしようとしています。許可しますか？"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"アプリが、BluetoothをONにして他のデバイスからこのタブレットを検出可能にしようとしています。許可しますか？"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"アプリが、BluetoothをONにして他のデバイスからこの携帯端末を検出可能にしようとしています。許可しますか？"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"アプリがBluetoothをONにしようとしています。"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"アプリが、<xliff:g id="TIMEOUT">%1$d</xliff:g>秒間他のBluetoothデバイスにこのタブレットを表示しようとしています。"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"アプリが、<xliff:g id="TIMEOUT">%1$d</xliff:g>秒間他のBluetoothデバイスにこの携帯端末を表示しようとしています。"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"アプリが他のBluetoothデバイスにこのタブレットを表示しようとしています。これは後からBluetoothの設定で変更できます。"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"アプリが他のBluetoothデバイスにこの携帯端末を表示しようとしています。これは後からBluetoothの設定で変更できます。"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"アプリが、<xliff:g id="TIMEOUT">%1$d</xliff:g>秒間BluetoothをONにして他のデバイスにこのタブレットを表示しようとしています。"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"アプリが、<xliff:g id="TIMEOUT">%1$d</xliff:g>秒間BluetoothをONにして他のデバイスにこの携帯端末を表示しようとしています。"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"アプリがBluetoothをONにして他のデバイスにこのタブレットを表示しようとしています。これは後からBluetoothの設定で変更できます。"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"アプリがBluetoothをONにして他のデバイスにこの携帯端末を表示しようとしています。これは後からBluetoothの設定で変更できます。"</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"BluetoothをONにしています..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"BluetoothをOFFにしています..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"自動接続"</string>
@@ -1024,12 +1026,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"誤った回数が多すぎます。"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g>秒後にやり直してください。"</string>
     <string name="activity_not_found" msgid="5551664692991605325">"アプリは端末にインストールされていません。"</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"キャンセル"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"次へ"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"タブレットの保護"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"携帯端末の保護"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"秘密の画面ロック解除パターンを作成してタブレットを不正使用から守ります。次の画面で指を使って、4つ以上の点を好きな順序で結んでください。"\n\n"準備ができたら[次へ]をタップしてください。"</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"秘密の画面ロック解除パターンを作成して端末を不正使用から守ります。次の画面で指を使って点を好きな順序で結んでください。4つ以上の点を結ぶ必要があります。"\n\n"準備ができたら[次へ]をタップしてください。"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"アプリを管理"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"インストール済みアプリを管理、削除する"</string>
     <string name="applications_settings" msgid="1721442176406964682">"アプリ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 378a28d..64585b6 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"예"</string>
     <string name="no" msgid="6731231425810196216">"아니요"</string>
     <string name="create" msgid="3578857613172647409">"만들기"</string>
+    <string name="allow" msgid="3349662621170855910">"허용"</string>
+    <string name="deny" msgid="6947806159746484865">"거부"</string>
     <string name="device_info_default" msgid="7847265875578739287">"알 수 없음"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"개발자가 되려면 <xliff:g id="STEP_COUNT">%1$d</xliff:g>단계가 남았습니다."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"개발자가 되려면 <xliff:g id="STEP_COUNT">%1$d</xliff:g>단계가 남았습니다."</item>
+    <item quantity="other" msgid="6722953419953594148">"개발자가 되려면 <xliff:g id="STEP_COUNT">%1$d</xliff:g>단계가 남았습니다."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"개발자가 되셨습니다."</string>
     <string name="show_dev_already" msgid="2151632240145446227">"이미 개발자입니다."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"무선 및 네트워크"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"알 수 없는 오류"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"부족함"</string>
     <string name="bluetooth" msgid="5549625000628014477">"블루투스"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"검색 가능"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"모든 가까운 블루투스 기기에 표시(<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"모든 가까운 블루투스 기기에 표시"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"다른 블루투스 기기에 표시되지 않음"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"페어링된 기기에만 표시"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"장치를 검색 가능하게 설정"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"검색 가능 시간제한"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"검색 가능 기간 설정"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"잠금 시 음성 다이얼링"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"화면 잠금 시 블루투스 다이얼러 사용 방지"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"블루투스 장치"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"받은 파일 보기"</string>
     <string name="device_picker" msgid="8398232791303186677">"블루투스 기기 선택기"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"블루투스 권한 요청"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"앱에서 블루투스를 사용하려고 합니다. 허용하시겠습니까?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"태블릿의 앱이 <xliff:g id="TIMEOUT">%1$d</xliff:g>초 동안 다른 블루투스 기기에서 사용자의 태블릿을 검색할 수 있도록 설정하려고 합니다. 허용하시겠습니까?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"휴대전화의 앱이 <xliff:g id="TIMEOUT">%1$d</xliff:g>초 동안 다른 블루투스 기기에서 사용자의 휴대전화를 검색할 수 있도록 설정하려고 합니다. 허용하시겠습니까?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"태블릿의 앱이 다른 블루투스 기기에서 사용자의 태블릿을 \'항상 검색\'할 수 있도록 설정하려고 합니다. 허용하시겠습니까?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"휴대전화의 앱이 다른 블루투스 기기에서 사용자의 휴대전화를 \'항상 검색\'할 수 있도록 설정하려고 합니다. 허용하시겠습니까?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"태블릿의 앱이 블루투스를 사용 설정하고 <xliff:g id="TIMEOUT">%1$d</xliff:g>초 동안 다른 기기에서 사용자의 태블릿을 검색할 수 있도록 설정하려고 합니다. 허용하시겠습니까?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"휴대전화의 앱이 블루투스를 사용 설정하고 <xliff:g id="TIMEOUT">%1$d</xliff:g>초 동안 다른 기기에서 사용자의 휴대전화를 검색할 수 있도록 설정하려고 합니다. 허용하시겠습니까?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"태블릿의 앱이 블루투스를 사용 설정하고 다른 기기에서 사용자의 태블릿을 검색할 수 있도록 설정하려고 합니다. 허용하시겠습니까?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"휴대전화의 앱이 블루투스를 사용 설정하고 다른 기기에서 사용자의 휴대전화를 검색할 수 있도록 설정하려고 합니다. 허용하시겠습니까?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"앱에서 블루투스를 사용하도록 설정하려고 합니다."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"앱에서 <xliff:g id="TIMEOUT">%1$d</xliff:g>초 동안 다른 블루투스 기기에 사용자의 태블릿이 표시되도록 설정하려고 합니다."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"앱에서 <xliff:g id="TIMEOUT">%1$d</xliff:g>초 동안 다른 블루투스 기기에 사용자의 휴대전화가 표시되도록 설정하려고 합니다."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"앱에서 다른 블루투스 기기에 사용자의 태블릿이 표시되도록 설정하려고 합니다. 나중에 블루투스 설정에서 변경할 수 있습니다."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"앱에서 다른 블루투스 기기에 사용자의 휴대전화가 표시되도록 설정하려고 합니다. 나중에 블루투스 설정에서 변경할 수 있습니다."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"앱에서 블루투스를 사용하고 <xliff:g id="TIMEOUT">%1$d</xliff:g>초 동안 다른 기기에 사용자의 태블릿이 표시되도록 설정하려고 합니다."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"앱에서 블루투스를 사용하고 <xliff:g id="TIMEOUT">%1$d</xliff:g>초 동안 다른 기기에 사용자의 휴대전화가 표시되도록 설정하려고 합니다."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"앱에서 블루투스를 사용하고 다른 기기에 사용자의 태블릿이 표시되도록 설정하려고 합니다. 나중에 블루투스 설정에서 변경할 수 있습니다."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"앱에서 블루투스를 사용하고 다른 기기에 사용자의 휴대전화가 표시되도록 설정하려고 합니다. 나중에 블루투스 설정에서 변경할 수 있습니다."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"블루투스를 켜는 중"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"블루투스를 사용 중지하는 중"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"자동 연결"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"잘못된 시도 횟수가 너무 많습니다."</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g>초 후에 다시 시도하세요."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"휴대전화에 설치되어 있지 않은 애플리케이션입니다."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"취소"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"다음"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"태블릿 보안 설정"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"휴대전화 보안 설정"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"나만의 화면 잠금해제 패턴을 만들어서 인증되지 않은 사람이 태블릿을 사용하지 못하게 할 수 있습니다. 다음 화면에서 손가락을 슬라이드하여 원하는 순서로 점을 연결하세요. 최소한 4개의 점을 연결해야 합니다. "\n\n"시작할 준비가 되었으면 \'다음\'을 터치합니다."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"나만의 화면 잠금해제 패턴을 만들어서 인증되지 않은 사람이 휴대전화를 사용하지 못하게 할 수 있습니다. 다음 화면에서 손가락을 슬라이드하여 원하는 순서로 최소한 4개의 점을 연결하세요. "\n\n"시작할 준비가 되었으면 \'다음\'을 터치합니다."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"앱 관리"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"설치된 앱 관리 및 제거"</string>
     <string name="applications_settings" msgid="1721442176406964682">"애플리케이션"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 17646c9..b4fdd31 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"Taip"</string>
     <string name="no" msgid="6731231425810196216">"Ne"</string>
     <string name="create" msgid="3578857613172647409">"Kurti"</string>
+    <string name="allow" msgid="3349662621170855910">"Leisti"</string>
+    <string name="deny" msgid="6947806159746484865">"Atmesti"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Nežinomas"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"Liko atlikti <xliff:g id="STEP_COUNT">%1$d</xliff:g> veiksm. ir būsite kūrėjas."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Liko atlikti <xliff:g id="STEP_COUNT">%1$d</xliff:g> veiksm. ir būsite kūrėjas."</item>
+    <item quantity="other" msgid="6722953419953594148">"Liko atlikti <xliff:g id="STEP_COUNT">%1$d</xliff:g> veiksm. ir būsite kūrėjas."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Dabar esate kūrėjas!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Nereikia, jūs jau esate kūrėjas."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"BEVIELIS RYŠYS IR TINKLAI"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Nežinoma klaida"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Neveikiantis"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Randamas"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Matoma visiems netol. esant. „Bluetooth“ įr. (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Matoma visiems netoliese esan. „Bluetooth“ įreng."</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Nematoma kitiems „Bluetooth“ įrenginiams"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Matoma tik suporuotiems įrenginiams."</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Padaryti įrenginį atrandamą"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Baigėsi skirtasis matomumo laikas"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Nustatyti, kiek laiko įrenginys bus aptinkamas"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Užrakinti numerio rinkimą balsu"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Neleisti naudoti „Bluetooth“ numerio rinkiklio, kai ekranas užrakintas"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"„Bluetooth“ įrenginiai"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Rodyti gautus failus"</string>
     <string name="device_picker" msgid="8398232791303186677">"„Bluetooth“ įrenginio pasirinkimo priemonė"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"„Bluetooth“ leidimo užklausa"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Programoje norima įjungti „Bluetooth“. Leisti?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Programoje planšetiniame kompiuteryje norima padaryti planšetinį kompiuterį <xliff:g id="TIMEOUT">%1$d</xliff:g> sek. aptinkamą kitų „Bluetooth“ įrenginių. Leisti?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Programoje telefone norima padaryti telefoną <xliff:g id="TIMEOUT">%1$d</xliff:g> sek. aptinkamą kitų „Bluetooth“ įrenginių. Leisti?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Programoje planšetiniame kompiuteryje norima padaryti planšetinį kompiuterį „visada aptinkamą“ kitų „Bluetooth“ įrenginių. Leisti?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Programoje telefone norima padaryti telefoną „visada aptinkamą“ kitų „Bluetooth“ įrenginių. Leisti?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Programoje planšetiniame kompiuteryje norima įjungti „Bluetooth“ ir padaryti planšetinį kompiuterį <xliff:g id="TIMEOUT">%1$d</xliff:g> sek. aptinkamą kitų įrenginių. Leisti?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Programoje telefone norima įjungti „Bluetooth“ ir padaryti telefoną <xliff:g id="TIMEOUT">%1$d</xliff:g> sek. aptinkamą kitų įrenginių. Leisti?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Programoje planšetiniame kompiuteryje norima įjungti „Bluetooth“ ir padaryti jį aptinkamą kitų įrenginių. Leisti?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Programoje telefone norima įjungti „Bluetooth“ ir padaryti telefoną aptinkamą kitų įrenginių. Leisti?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Programa nori įjungti „Bluetooth“."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Programa nori padaryti planšetinį kompiuterį <xliff:g id="TIMEOUT">%1$d</xliff:g> sek. aptinkamą kitų „Bluetooth“ įrenginių."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Programa nori padaryti telefoną <xliff:g id="TIMEOUT">%1$d</xliff:g> sek. aptinkamą kitų „Bluetooth“ įrenginių."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Programa nori padaryti planšetinį kompiuterį matomą kitų „Bluetooth“ įrenginių. Tai galėsite vėliau pakeisti „Bluetooth“ nustatymuose."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Programa nori padaryti telefoną matomą kitų „Bluetooth“ įrenginių. Tai galėsite vėliau pakeisti „Bluetooth“ nustatymuose."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Programa nori įjungti „Bluetooth“ ir padaryti planšetinį kompiuterį <xliff:g id="TIMEOUT">%1$d</xliff:g> sek. matomą kitų įrenginių."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Programa nori įjungti „Bluetooth“ ir padaryti telefoną <xliff:g id="TIMEOUT">%1$d</xliff:g> sek. matomą kitų įrenginių."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Programa nori įjungti „Bluetooth“ ir padaryti planšetinį kompiuterį matomą kitų įrenginių. Tai galėsite vėliau pakeisti „Bluetooth“ nustatymuose."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Programa nori įjungti „Bluetooth“ ir padaryti telefoną matomą kitų įrenginių. Tai galėsite vėliau pakeisti „Bluetooth“ nustatymuose."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Įjungti „Bluetooth“?"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"„Bluetooth“ išjungiamas…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automatiškai prisijungti"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Per daug neteisingų bandymų!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Bandyti dar kartą po <xliff:g id="NUMBER">%d</xliff:g> sek."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Programa jūsų telefone neįdiegta."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Atšaukti"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Kitas"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Planšetinio kompiuterio saugumo užtikrinimas"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Telefono apsaugojimas"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Apsaugokite planšetinį kompiuterį nuo neteisėto naudojimo sukurdami asmeninį ekrano atrakinimo šabloną. Pirštu bet kokia tvarka sujunkite taškus kitame ekrane. Reikia sujungti bent keturis taškus. "\n\n"Pasiruošę pradėti? Palieskite „Kitas“."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Apsaugokite telefoną nuo neteisėto naudojimo sukurdami asmeninį ekrano atrakinimo modelį. Pirštu bet kokia tvarka sujunkite mažiausiai keturis taškus kitame ekrane. "\n\n"Pasiruošę pradėti? Palieskite „Kitas“."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Valdyti programas"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Tvarkykite ir pašalinkite įdiegtas programas"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Programos"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 6c59ae7..99ce391 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"Jā"</string>
     <string name="no" msgid="6731231425810196216">"Nē"</string>
     <string name="create" msgid="3578857613172647409">"Izveidot"</string>
+    <string name="allow" msgid="3349662621170855910">"Atļaut"</string>
+    <string name="deny" msgid="6947806159746484865">"Aizliegt"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Nezināms"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"Atlikušas <xliff:g id="STEP_COUNT">%1$d</xliff:g> darbības, lai jūs kļūtu par izstrādātāju."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Lai jūs kļūtu par izstrādātāju, atlikusi <xliff:g id="STEP_COUNT">%1$d</xliff:g> darbība."</item>
+    <item quantity="other" msgid="6722953419953594148">"Lai jūs kļūtu par izstrādātāju, atlikušas <xliff:g id="STEP_COUNT">%1$d</xliff:g> darbības."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Tagad jūs esat izstrādātājs!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Nav nepieciešams, ja jau esat izstrādātājs."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"BEZVADU PAKALPOJUMI UN TĪKLI"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Nezināma kļūda"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Auksts"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Atklājams"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Redzams visām blakus esošām Bluetooth ier. (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Redzams visām blakus esošām Bluetooth ierīcēm"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Nav redzams citām Bluetooth ierīcēm"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Redzams tikai pārī savienotām ierīcēm"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Padarīt ierīci atklājamu"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Redzamības noildze"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Iestatiet laiku, cik ilgi ierīce būs atklājama."</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloķēt balss iezvani"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Neļaut izmantot Bluetooth iezvanprogrammu, kad ekrāns ir bloķēts"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth ierīces"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Rādīt saņemtos failus"</string>
     <string name="device_picker" msgid="8398232791303186677">"Bluetooth ierīces izvēle"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth atļaujas pieprasījums"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Lietotnē tiek mēģināts ieslēgt Bluetooth savienojumu. Vai atļaut?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Planšetdatorā instalētā lietotnē tiek mēģināts uz <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundēm padarīt planšetdatoru redzamu citām Bluetooth ierīcēm. Vai atļaut?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Tālrunī instalētā lietotnē tiek mēģināts uz <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundēm padarīt tālruni redzamu citām Bluetooth ierīcēm. Vai atļaut?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Planšetdatorā instalētā lietotnē tiek mēģināts padarīt planšetdatoru vienmēr redzamu citām Bluetooth ierīcēm. Vai atļaut?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Tālrunī instalētā lietotnē tiek mēģināts padarīt tālruni vienmēr redzamu citām Bluetooth ierīcēm. Vai atļaut?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Planšetdatorā instalētā lietotnē tiek mēģināts uz <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundēm ieslēgt Bluetooth savienojumu un padarīt planšetdatoru redzamu citām ierīcēm. Vai atļaut?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Tālrunī instalētā lietotnē tiek mēģināts uz <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundēm ieslēgt Bluetooth savienojumu un padarīt tālruni redzamu citām ierīcēm. Vai to atļaut?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Planšetdatorā instalētā lietotnē tiek mēģināts ieslēgt Bluetooth savienojumu un padarīt planšetdatoru redzamu citām ierīcēm. Vai atļaut?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Tālrunī instalētā lietotnē tiek mēģināts ieslēgt Bluetooth savienojumu un padarīt tālruni redzamu citām ierīcēm. Vai atļaut?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Lietotnē tiek mēģināts ieslēgt Bluetooth savienojumu. Vai atļaut?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Planšetdatorā instalētā lietotnē tiek mēģināts uz <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundēm padarīt planšetdatoru redzamu citām Bluetooth ierīcēm."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Tālrunī instalētā lietotnē tiek mēģināts uz <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundēm padarīt tālruni redzamu citām Bluetooth ierīcēm."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Planšetdatorā instalētā lietotnē tiek mēģināts padarīt planšetdatoru redzamu citām Bluetooth ierīcēm. Vēlāk varēsiet to mainīt Bluetooth iestatījumos."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Tālrunī instalētā lietotnē tiek mēģināts padarīt tālruni redzamu citām Bluetooth ierīcēm. Vēlāk varēsiet to mainīt Bluetooth iestatījumos."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Planšetdatorā instalētā lietotnē tiek mēģināts uz <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundēm ieslēgt Bluetooth savienojumu un padarīt planšetdatoru redzamu citām ierīcēm. Vai atļaut?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Tālrunī instalētā lietotnē tiek mēģināts uz <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundēm ieslēgt Bluetooth savienojumu un padarīt tālruni redzamu citām ierīcēm. Vai atļaut?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Planšetdatorā instalētā lietotnē tiek mēģināts ieslēgt Bluetooth savienojumu un padarīt planšetdatoru redzamu citām ierīcēm. Vēlāk varēsiet to mainīt Bluetooth iestatījumos."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Tālrunī instalētā lietotnē tiek mēģināts ieslēgt Bluetooth savienojumu un padarīt tālruni redzamu citām ierīcēm. Vēlāk varēsiet to mainīt Bluetooth iestatījumos."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Tiek ieslēgta tehnoloģija Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Notiek Bluetooth savienojuma izslēgšana…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automātiski izveidot savienojumu"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Pārāk daudz nepareizu mēģinājumu!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Mēģiniet vēlreiz pēc <xliff:g id="NUMBER">%d</xliff:g> sekundēm."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Lietojumprogramma jūsu tālrunī nav instalēta."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Atcelt"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Tālāk"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Planšetdatora drošība"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Tālruņa nodrošināšana"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Aizsargājiet savu planšetdatoru pret neatļautu lietošanu, izveidojot personalizētu ekrāna grafisko atslēgu. Velkot ar pirkstu, jebkurā secībā savienojiet nākamajā ekrānā redzamos punktus. Ir jāsavieno vismaz četri punkti. "\n\n"Vai esat gatavs sākt? Pieskarieties vienumam Tālāk."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Aizsargājiet savu tālruni pret neatļautu lietošanu, izveidojot personalizētu ekrāna atbloķēšanas rakstu. Velkot ar pirkstu, jebkurā secībā savienojiet vismaz četrus no nākamajā ekrānā redzamajiem punktiem. "\n\n"Vai esat gatavs sākt? Pieskarieties vienumam Tālāk."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Pārvaldīt lietotnes"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Pārvaldiet un noņemiet instalētās lietotnes"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Lietotnes"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index ba7083a..d71e802 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"Ya"</string>
     <string name="no" msgid="6731231425810196216">"Tidak"</string>
     <string name="create" msgid="3578857613172647409">"Buat"</string>
+    <string name="allow" msgid="3349662621170855910">"Benarkan"</string>
+    <string name="deny" msgid="6947806159746484865">"Nafikan"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Tidak diketahui"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"Anda kini <xliff:g id="STEP_COUNT">%1$d</xliff:g> langkah daripada menjadi pemaju."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Anda kini <xliff:g id="STEP_COUNT">%1$d</xliff:g> langkah daripada menjadi pemaju."</item>
+    <item quantity="other" msgid="6722953419953594148">"Anda kini <xliff:g id="STEP_COUNT">%1$d</xliff:g> langkah daripada menjadi pemaju."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Anda kini pemaju!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Tidak perlu, anda sudah pun menjadi pemaju."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"WAYARLES &amp; RANGKAIAN"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Ralat tidak diketahui"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Sejuk"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Boleh ditemui"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Kelihatan kpd semua peranti Bluetooth berdekatan (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Kelihatan kpd semua peranti Bluetooth berdekatan"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Tidak kelihatan kepada peranti Bluetooth lain"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Hanya kelihatan kepada peranti yg menjadi pasangan"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Jadikan peranti boleh ditemui"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Tamat masa kebolehlihatan"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Menetapkan berapa lama peranti akan boleh ditemui"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Kunci dailan suara"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Halang penggunaan pendail bluetooth apabila skrin dikunci"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Peranti Bluetooth"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Tunjukkan fail yang diterima"</string>
     <string name="device_picker" msgid="8398232791303186677">"Pemilih peranti Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Permintaan kebenaran Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Aplikasi mahu menghidupkan Bluetooth. Benarkan?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Satu aplikasi pada tablet anda ingin menjadikan tablet anda ditemui oleh peranti Bluetooth yang lain untuk <xliff:g id="TIMEOUT">%1$d</xliff:g> saat. Benarkan?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Satu aplikasi dengan telefon anda ingin menjadikan telefon anda boleh ditemui oleh peranti Bluetooth yang lain untuk <xliff:g id="TIMEOUT">%1$d</xliff:g> saat. Benarkan?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Satu aplikasi pada tablet anda ingin menjadikan tablet anda \"sentiasa boleh ditemui\" oleh peranti Bluetooth yang lain. Benarkan?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Satu aplikasi dengan telefon anda ingin menjadikan telefon anda \"sentiasa boleh ditemui\" oleh peranti Bluetooth yang lain. Benarkan?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Satu aplikasi pada tablet anda ingin menghidupkan Bluetooth dan menjadikan tablet anda boleh ditemui oleh peranti lain selama <xliff:g id="TIMEOUT">%1$d</xliff:g> saat. Benarkan?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Satu aplikasi pada telefon anda ingin menghidupkan Bluetooth dan menjadikan telefon anda boleh ditemui oleh peranti lain untuk <xliff:g id="TIMEOUT">%1$d</xliff:g> saat. Benarkan?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Satu aplikasi pada tablet anda ingin menjadikan tablet anda boleh ditemui oleh peranti Bluetooth yang lain. Benarkan?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Satu aplikasi pada telefon anda ingin menghidupkan Bluetooth dan menjadikan telefon anda boleh ditemui oleh peranti lain. Benarkan?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Satu apl ingin menghidupkan Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Satu apl ingin menjadikan tab;et anda kelihatan kepada peranti Bluetooth lain untuk <xliff:g id="TIMEOUT">%1$d</xliff:g> saat."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Satu apl ingin menjadikan telefon anda kelihatan kepada peranti Bluetooth lain untuk <xliff:g id="TIMEOUT">%1$d</xliff:g> saat."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Satu apl mahu menjadikan tablet anda kelihatan kepada peranti Bluetooth lain. Anda boleh menukar tetapan ini kemudian dalam tetapan Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Satu apl mahu menjadikan telefon anda kelihatan kepada peranti Bluetooth lain. Anda boleh menukar tetapan ini kemudian dalam tetapan Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Satu apl ingin menghidupkan Bluetooth dan menjadikan tablet anda kelihatan kepada peranti lain untuk <xliff:g id="TIMEOUT">%1$d</xliff:g> saat."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Satu apl ingin menghidupkan Bluetooth dan menjadikan telefon anda kelihatan kepada peranti lain untuk <xliff:g id="TIMEOUT">%1$d</xliff:g> saat."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Satu apl mahu menghidupkan Bluetooth dan menjadikan tablet anda kelihatan kepada peranti lain. Anda boleh menukar tetapan ini kemudian dalam tetapan Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Satu apl mahu menghidupkan Bluetooth dan menjadikan telefon anda kelihatan kepada peranti lain. Anda boleh menukar tetapan ini kemudian dalam tetapan Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Menghidupkan Bluetooth…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Mematikan Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Autosambung"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Terlalu banyak percubaan yang salah!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Cuba lagi dalam <xliff:g id="NUMBER">%d</xliff:g> saat."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Aplikasi tidak dipasang pada telefon anda."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Batal"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Seterusnya"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Melindungi tablet anda"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Melindungi telefon anda"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Lindungi tablet anda daripada penggunaan tanpa kebenaran dengan membuat corak buka kunci skrin peribadi. Luncurkan jari anda untuk menyambungkan titik dalam sebarang tertib pada skrin berikutnya. Anda mesti menyambungkan sekurang-kurangnya empat titik."\n\n"Sedia untuk bermula? Sentuh Seterusnya."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Lindungi telefon anda daripada penggunaan tanpa kebenaran dengan membuat corak buka kunci skrin peribadi. Luncurkan jari anda untuk menyambungkan sekurang-kurangnya empat titik dalam sebarang tertib pada skrin seterusnya. "\n\n"Sedia untuk bermula? Sentuh Seterusnya."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Urus aplikasi"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Urus dan alih keluar aplikasi yang dipasang"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Aplikasi"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index d286014..9fdfd71 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"Ja"</string>
     <string name="no" msgid="6731231425810196216">"Nei"</string>
     <string name="create" msgid="3578857613172647409">"Opprett"</string>
+    <string name="allow" msgid="3349662621170855910">"Tillat"</string>
+    <string name="deny" msgid="6947806159746484865">"Avslå"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Ukjent"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"Du er nå <xliff:g id="STEP_COUNT">%1$d</xliff:g> trinn fra å bli en utvikler."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Du er nå <xliff:g id="STEP_COUNT">%1$d</xliff:g> trinn fra å bli en utvikler."</item>
+    <item quantity="other" msgid="6722953419953594148">"Du er nå <xliff:g id="STEP_COUNT">%1$d</xliff:g> trinn fra å bli en utvikler."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Du er nå utvikler!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Det trengs ikke, du er allerede utvikler."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"TRÅDLØST OG NETTVERK"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Ukjent feil"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Kald"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Synlig"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Synlig for alle Bluetooth-enheter i nærheten (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Synlig for alle Bluetooth-enheter i nærheten"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Ikke synlig for andre Bluetooth-enheter"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Synlig bare for sammenkoblede enheter"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Gjør enheten synlig"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Tidsavbrudd for synlighet"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Angi hvor lenge enheten skal være synlig"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Lås taleanrop"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Forhindrer bruk av Bluetooth-telefon når skjermen er låst"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth-enheter"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Vis mottatte filer"</string>
     <string name="device_picker" msgid="8398232791303186677">"Bluetooth-enhetsvelger"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth-tillatelse"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"En app ønsker å slå på Bluetooth. Vil du tillate dette?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"En app på nettbrettet ditt ønsker å gjøre nettbrettet synlig for andre Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vil du tillate dette?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"En app på telefonen din ønsker å gjøre telefonen synlig for andre Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vil du tillate dette?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"En app på nettbrettet ditt ønsker å angi at nettbrettet alltid er synlig for andre Bluetooth-enheter. Vil du tillate dette?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"En app på telefonen din ønsker å gjøre telefonen alltid tilgjengelig for andre Bluetooth-enheter. Vil du tillate dette?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"En app på nettbrettet ditt ønsker å slå på Bluetooth og gjøre nettbrettet synlig for andre enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vil du tillate dette?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"En app på telefonen ønsker å slå på Bluetooth og gjøre telefonen synlig for andre enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vil du tillate dette?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"En app på nettbrettet ditt ønsker å slå på Bluetooth og gjøre nettbrettet synlig for andre enheter. Vil du tillate dette?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"En app på telefonen ønsker å slå på Bluetooth og gjøre telefonen synlig for andre enheter. Vil du tillate dette?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"En app ønsker å slå på Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"En app ønsker å gjøre nettbrettet ditt synlig for andre Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"En app ønsker å gjøre telefonen din synlig for andre Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"En app ønsker å gjøre nettbrettet ditt synlig for andre Bluetooth-enheter. Du kan endre dette i Bluetooth-innstillingene senere."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"En app ønsker å gjøre telefonen din synlig for andre Bluetooth-enheter. Du kan endre dette i Bluetooth-innstillingene senere."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"En app ønsker å slå på Bluetooth og gjøre nettbrettet ditt synlig for andre enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"En app ønsker å slå på Bluetooth og gjøre telefonen din synlig for andre enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"En app ønsker å slå på Bluetooth og gjøre nettbrettet ditt synlig for andre enheter. Du kan endre dette i Bluetooth-innstillingene senere."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"En app ønsker å slå på Bluetooth og gjøre telefonen din synlig for andre enheter. Du kan endre dette i Bluetooth-innstillingene senere."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Slår på Bluetooth …"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Slår av Bluetooth …"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automatisk tilkobling"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"For mange gale forsøk!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Prøv igjen om <xliff:g id="NUMBER">%d</xliff:g> sekunder."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Appen er ikke installert på telefonen din."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Avbryt"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Neste"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Slik sikrer du nettbrettet"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Sikring av telefonen"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Beskytt nettbrettet mot uautorisert bruk ved å opprette et personlig skjermopplåsingsmønster. På neste side kan du dra fingeren fra prikk til prikk i en hvilken som helst rekkefølge. Du må binde sammen minst fire prikker."\n\n"Er du klar til å begynne? Trykk på Neste."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Beskytt telefonen mot uautorisert bruk ved å opprette et personlig skjermopplåsingsmønster. På neste skjermbilde drar du fingeren rundt for å danne et vilkårlig mønster mellom minst fire punkter. "\n\n"Når du er du klar til å begynne, trykker du på Neste."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Administrer apper"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Administrer og fjern installerte apper"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Apper"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index c67e754..e3c699c 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"Ja"</string>
     <string name="no" msgid="6731231425810196216">"Nee"</string>
     <string name="create" msgid="3578857613172647409">"Aanmaken"</string>
+    <string name="allow" msgid="3349662621170855910">"Toestaan"</string>
+    <string name="deny" msgid="6947806159746484865">"Weigeren"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Onbekend"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"U moet nog <xliff:g id="STEP_COUNT">%1$d</xliff:g> stappen uitvoeren om ontwikkelaar te worden."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"U moet nog <xliff:g id="STEP_COUNT">%1$d</xliff:g> stap uitvoeren om ontwikkelaar te worden."</item>
+    <item quantity="other" msgid="6722953419953594148">"U moet nog <xliff:g id="STEP_COUNT">%1$d</xliff:g> stappen uitvoeren om ontwikkelaar te worden."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"U bent nu ontwikkelaar!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Niet nodig, u bent al ontwikkelaar."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"DRAADLOOS EN NETWERKEN"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Onbekende fout"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Koud"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Kan worden gevonden"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Zichtbaar voor alle Bluetooth-apparaten in de buurt (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Zichtbaar voor alle Bluetooth-apparaten in de buurt"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Niet zichtbaar voor andere Bluetooth-apparaten"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Alleen zichtbaar voor gekoppelde apparaten"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Zorgen dat het apparaat kan worden gevonden"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Time-out voor zichtbaarheid"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Instellen hoe lang het apparaat vindbaar is"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Spraakkeuze vergrendelen"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Gebruik van de Bluetooth-dialer voorkomen wanneer het scherm is vergrendeld"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth-apparaten"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Ontvangen bestanden weergeven"</string>
     <string name="device_picker" msgid="8398232791303186677">"Bluetooth-apparaatkiezer"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Machtigingsverzoek voor Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Een app wil Bluetooth inschakelen. Wilt u dit toestaan?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Een app op uw tablet wil uw tablet <xliff:g id="TIMEOUT">%1$d</xliff:g> seconden vindbaar maken voor andere Bluetooth-apparaten. Wilt u dit toestaan?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Een app op uw telefoon wil uw telefoon <xliff:g id="TIMEOUT">%1$d</xliff:g> seconden vindbaar maken voor andere Bluetooth-apparaten. Wilt u dit toestaan?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Een app op uw tablet wil uw tablet altijd vindbaar maken voor andere Bluetooth-apparaten. Wilt u dit toestaan?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Een app op uw telefoon wil uw telefoon altijd vindbaar maken voor andere Bluetooth-apparaten. Wilt u dit toestaan?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Een app op uw tablet wil Bluetooth inschakelen en uw tablet <xliff:g id="TIMEOUT">%1$d</xliff:g> seconden vindbaar maken voor andere apparaten. Wilt u dit toestaan?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Een app op uw telefoon wil Bluetooth inschakelen en uw telefoon <xliff:g id="TIMEOUT">%1$d</xliff:g> seconden vindbaar maken voor andere apparaten. Wilt u dit toestaan?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Een app op uw tablet wil Bluetooth inschakelen en uw tablet vindbaar maken voor andere apparaten. Wilt u dit toestaan?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Een app op uw telefoon wil Bluetooth inschakelen en uw telefoon vindbaar maken voor andere apparaten. Wilt u dit toestaan?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Een app wil Bluetooth inschakelen."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Een app wil uw tablet <xliff:g id="TIMEOUT">%1$d</xliff:g> seconden zichtbaar maken voor andere Bluetooth-apparaten."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Een app wil uw telefoon <xliff:g id="TIMEOUT">%1$d</xliff:g> seconden zichtbaar maken voor andere Bluetooth-apparaten."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Een app wil uw tablet zichtbaar maken voor andere Bluetooth-apparaten. U kunt dit later wijzigen in de Bluetooth-instellingen."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Een app wil uw telefoon zichtbaar maken voor andere Bluetooth-apparaten. U kunt dit later wijzigen in de Bluetooth-instellingen."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Een app wil Bluetooth inschakelen en uw tablet <xliff:g id="TIMEOUT">%1$d</xliff:g> seconden zichtbaar maken voor andere apparaten."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Een app wil Bluetooth inschakelen en uw telefoon <xliff:g id="TIMEOUT">%1$d</xliff:g> seconden zichtbaar maken voor andere apparaten."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Een app wil Bluetooth inschakelen en uw tablet zichtbaar maken voor andere apparaten. U kunt dit later wijzigen in de Bluetooth-instellingen."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Een app wil Bluetooth inschakelen en uw telefoon zichtbaar maken voor andere apparaten. U kunt dit later wijzigen in de Bluetooth-instellingen."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth inschakelen.."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth uitschakelen…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automatisch verbinding maken"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Te veel onjuiste pogingen!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Probeer het over <xliff:g id="NUMBER">%d</xliff:g> seconden opnieuw."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Deze app is niet geïnstalleerd op uw telefoon."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Annuleren"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Volgende"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Uw tablet beveiligen"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Uw telefoon beveiligen"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Beveilig uw tablet tegen ongeoorloofd gebruik door een persoonlijk schermontgrendelingspatroon in te stellen. Gebruik op het volgende scherm uw vinger om de punten met elkaar te verbinden. U moet minimaal vier punten met elkaar verbinden. "\n\n"Bent u er klaar voor? Raak \'Volgende\' aan."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Beveilig uw telefoon tegen ongeoorloofd gebruik door een persoonlijk schermontgrendelingspatroon in te stellen. Gebruik op het volgende scherm uw vinger om de punten met elkaar te verbinden. U moet minimaal vier punten met elkaar verbinden. "\n\n"Bent u er klaar voor? Raak \'Volgende\' aan."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Apps beheren"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Geïnstalleerde apps beheren en verwijderen"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Apps"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 475ceff..dd34564 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"Tak"</string>
     <string name="no" msgid="6731231425810196216">"Nie"</string>
     <string name="create" msgid="3578857613172647409">"Utwórz"</string>
+    <string name="allow" msgid="3349662621170855910">"Zezwól"</string>
+    <string name="deny" msgid="6947806159746484865">"Odmów"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Nieznany"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"Od zostania programistą dzieli Cię już tylko tyle kroków: <xliff:g id="STEP_COUNT">%1$d</xliff:g>."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Od zostania programistą dzieli Cię już tylko <xliff:g id="STEP_COUNT">%1$d</xliff:g> krok."</item>
+    <item quantity="other" msgid="6722953419953594148">"Od zostania programistą dzieli Cię już tylko tyle kroków: <xliff:g id="STEP_COUNT">%1$d</xliff:g>."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Jesteś teraz programistą!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"W porządku, już jesteś programistą."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"SIECI ZWYKŁE I BEZPRZEWODOWE"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Nieznany błąd"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Zimna"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Wykrywalny"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Widoczne dla wszystkich urządzeń Bluetooth (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Widoczne dla wszystkich urządzeń Bluetooth"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Niewidoczne dla innych urządzeń Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Widoczne tylko dla urządzeń sparowanych"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Zezwalaj na wykrywanie urządzenia"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Czas widoczności"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Ustaw czas, przez jaki urządzenie będzie wykrywalne"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Zablokuj wybieranie głosowe"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Zapobiegaj używaniu wybierania Bluetooth, gdy ekran jest zablokowany"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Lista urządzeń"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Pokaż odebrane pliki"</string>
     <string name="device_picker" msgid="8398232791303186677">"Wybór urządzenia Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Prośba o pozwolenie na włączenie modułu Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Aplikacja chce włączyć moduł Bluetooth. Zezwolić?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Aplikacja na tablecie chce go ustawić jako wykrywalny dla innych urządzeń Bluetooth przez <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Zezwolić?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Aplikacja na telefonie chce go ustawić jako wykrywalny dla innych urządzeń Bluetooth przez <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Zezwolić?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Aplikacja na tablecie chce go ustawić jako zawsze wykrywalny dla innych urządzeń Bluetooth. Zezwolić?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Aplikacja na telefonie chce go ustawić jako zawsze wykrywalny dla innych urządzeń Bluetooth. Zezwolić?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Aplikacja na tablecie chce włączyć moduł Bluetooth i ustawić tablet jako wykrywalny dla innych urządzeń przez <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Zezwolić?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Aplikacja na telefonie chce włączyć moduł Bluetooth i ustawić telefon jako wykrywalny dla innych urządzeń przez <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Zezwolić?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Aplikacja na tablecie chce włączyć moduł Bluetooth i ustawić tablet jako wykrywalny dla innych urządzeń. Zezwolić?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Aplikacja na telefonie chce włączyć moduł Bluetooth i ustawić telefon jako wykrywalny dla innych urządzeń. Zezwolić?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Aplikacja chce włączyć Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Aplikacja chce ustawić Twój tablet jako wykrywalny dla innych urządzeń Bluetooth przez <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Aplikacja chce ustawić Twój telefon jako wykrywalny dla innych urządzeń Bluetooth przez <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Aplikacja chce ustawić Twój tablet jako wykrywalny dla innych urządzeń Bluetooth. Później możesz to zmienić w ustawieniach Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Aplikacja chce ustawić Twój telefon jako wykrywalny dla innych urządzeń Bluetooth. Później możesz to zmienić w ustawieniach Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Aplikacja chce włączyć Bluetooth i ustawić tablet jako wykrywalny dla innych urządzeń przez <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Aplikacja chce włączyć Bluetooth i ustawić telefon jako wykrywalny dla innych urządzeń przez <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Aplikacja chce włączyć Bluetooth i ustawić Twój tablet jako wykrywalny dla innych urządzeń. Później możesz to zmienić w ustawieniach Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Aplikacja chce włączyć Bluetooth i ustawić Twój telefon jako wykrywalny dla innych urządzeń. Później możesz to zmienić w ustawieniach Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Włączanie Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Wyłączanie Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Połącz automatycznie"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Zbyt wiele nieudanych prób!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Spróbuj ponownie za <xliff:g id="NUMBER">%d</xliff:g> sekund."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Aplikacja nie jest zainstalowana na telefonie."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Anuluj"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Dalej"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Zabezpieczanie tabletu"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Zabezpieczanie telefonu"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Chroń swój tablet przed nieautoryzowanym użyciem, tworząc osobisty wzór odblokowania ekranu. Na następnym ekranie połącz palcem co najmniej cztery kropki w dowolnej kolejności. "\n\n"Wszystko gotowe? Wybierz Dalej."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Chroń swój telefon przed nieautoryzowanym użyciem, tworząc osobisty wzór odblokowania ekranu. Na następnym ekranie połącz palcem co najmniej cztery kropki w dowolnej kolejności. "\n\n"Wszystko gotowe? Wybierz Dalej."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Zarządzaj aplikacjami"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Zarządzaj zainstalowanymi aplikacjami i usuwaj je."</string>
     <string name="applications_settings" msgid="1721442176406964682">"Aplikacje"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 0802c6c..1d0dcad 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"Sim"</string>
     <string name="no" msgid="6731231425810196216">"Não"</string>
     <string name="create" msgid="3578857613172647409">"Criar"</string>
+    <string name="allow" msgid="3349662621170855910">"Permitir"</string>
+    <string name="deny" msgid="6947806159746484865">"Recusar"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Desconhecido"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"Está agora a <xliff:g id="STEP_COUNT">%1$d</xliff:g> passos de se tornar um programador."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Está agora a <xliff:g id="STEP_COUNT">%1$d</xliff:g> passos de se tornar um programador"</item>
+    <item quantity="other" msgid="6722953419953594148">"Está agora a <xliff:g id="STEP_COUNT">%1$d</xliff:g> passos de se tornar um programador."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Agora é um programador!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Não é necessário, já é um programador."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"REDES SEM FIOS E OUTRAS"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Erro desconhecido"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Frio"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Detectável"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Visível p/ tds aparelhos Bluetooth próximos (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visível para tds os aparelhos Bluetooth nas prox."</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Não visível a outros aparelhos Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Visível apenas para aparelhos sincronizados"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Tornar o dispositivo detectável"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Tempo limite de visibilidade"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Definir durante quanto tempo ficará o dispositivo detectável"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloquear marcação por voz"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Evitar a utilização do telefone Bluetooth quando o ecrã está bloqueado"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Dispositivos Bluetooth"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostrar ficheiros recebidos"</string>
     <string name="device_picker" msgid="8398232791303186677">"Selecionador de aparelho Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Pedido de emparelhamento de Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Uma aplicação pretende ativar o Bluetooth. Permitir?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Uma aplicação do tablet pretende que outros aparelhos Bluetooth possam detetar o seu tablet durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Permitir?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Uma aplicação do telemóvel pretende que outros aparelhos Bluetooth possam detetar o seu telemóvel durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Permitir?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Uma aplicação do tablet pretende que o tablet possa “sempre ser detetado” por outros aparelhos Bluetooth. Permitir?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Uma aplicação do telemóvel pretende que o telemóvel possa \"sempre ser detetado\" por outros aparelhos Bluetooth. Permitir?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Uma aplicação do tablet pretende ativar o Bluetooth para que o tablet possa ser detetado por outros aparelhos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Permitir?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Uma aplicação do telemóvel pretende ativar o Bluetooth para que o telemóvel possa ser detetado por outros aparelhos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Permitir?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Uma aplicação do tablet pretende ativar o Bluetooth para que o tablet possa ser detetado por outros aparelhos. Permitir?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Uma aplicação do telemóvel pretende ativar o Bluetooth para que o telemóvel possa ser detetado por outros aparelhos. Permitir?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Uma aplicação pretende ativar o Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Uma aplicação pretende tornar o seu tablet visível para outros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Uma aplicação pretende tornar o seu telemóvel visível para outros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Uma aplicação pretende tornar o seu tablet visível para outros dispositivos Bluetooth. Pode alterar esta opção mais tarde nas definições de Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Uma aplicação pretende tornar o seu telemóvel visível para outros dispositivos Bluetooth. Pode alterar esta opção mais tarde nas definições de Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Uma aplicação pretende ativar o Bluetooth e tornar o seu tablet visível para outros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Uma aplicação pretende ativar o Bluetooth e tornar o seu telemóvel visível para outros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Uma aplicação pretende ativar o Bluetooth e tornar o seu tablet visível para outros dispositivos. Pode alterar esta opção mais tarde nas definições de Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Uma aplicação pretende ativar o Bluetooth e tornar o seu telemóvel visível para outros dispositivos. Pode alterar esta opção mais tarde nas definições de Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"A ligar o Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Desativar o Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Ligação automática"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Demasiadas tentativas incorrectas!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Tente novamente dentro de <xliff:g id="NUMBER">%d</xliff:g> segundos."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"A aplicação não está instalada no telemóvel."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Cancelar"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Seguinte"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Manter a segurança do tablet"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Manter o telefone seguro"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Proteja o tablet contra a utilização não autorizada, criando uma sequência pessoal de desbloqueio do ecrã. Deslize lentamente o dedo para ligar os pontos por qualquer ordem no ecrã seguinte. É necessário ligar, pelo menos, quatro pontos. "\n\n"Pronto para começar? Toque em Seguinte."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Proteja o telemóvel contra a utilização não autorizada, criando uma sequência de desbloqueio do ecrã pessoal. Deslize lentamente o dedo para ligar, pelo menos, quatro pontos por qualquer ordem no ecrã seguinte. "\n\n"Pronto para começar? Toque em Seguinte."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gerir aplicações"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gerir e remover aplicações instaladas"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Aplicações"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index e8c951f..7b4100d 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"Sim"</string>
     <string name="no" msgid="6731231425810196216">"Não"</string>
     <string name="create" msgid="3578857613172647409">"Criar"</string>
+    <string name="allow" msgid="3349662621170855910">"Permitir"</string>
+    <string name="deny" msgid="6947806159746484865">"Recusar"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Desconhecido"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"Faltam <xliff:g id="STEP_COUNT">%1$d</xliff:g> etapas para você se tornar um desenvolvedor."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Falta <xliff:g id="STEP_COUNT">%1$d</xliff:g> etapa para você se tornar um desenvolvedor."</item>
+    <item quantity="other" msgid="6722953419953594148">"Faltam <xliff:g id="STEP_COUNT">%1$d</xliff:g> etapas para você se tornar um desenvolvedor."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Você agora é um desenvolvedor!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Não é necessário. Você já é um desenvolvedor."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"REDES SEM FIO E OUTRAS"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Erro desconhecido"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Menos vistos"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Detectável"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Visível para todos os disp. Bluetooth próx. (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visível para todos os dispos. Bluetooth próximos"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Não visível para outros dispositivos Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Visível somente para dispositivos pareados"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Tornar o dispositivo detectável"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Tempo limite de visibilidade"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Definir por quanto tempo o aparelho ficará detectável"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloquear discagem por voz"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Impedir o uso do discador Bluetooth quando a tela estiver bloqueada."</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Dispositivos Bluetooth"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostrar arquivos recebidos"</string>
     <string name="device_picker" msgid="8398232791303186677">"Seletor de dispositivo Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Solicitação de permissão para Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Um aplicativo quer ativar o Bluetooth. Permitir?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Um aplicativo em seu tablet quer torná-lo detectável por outros dispositivos Bluetooth por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Permitir?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Um aplicativo em seu telefone quer torná-lo detectável por outros dispositivos Bluetooth por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Permitir?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Um aplicativo em seu tablet quer tornar seu tablet \"sempre detectável\" por outros dispositivos Bluetooth. Permitir?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Um aplicativo em seu telefone quer tornar seu telefone \"sempre detectável\" por outros dispositivos Bluetooth. Permitir?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Um aplicativo em seu tablet quer ativar o Bluetooth e tornar seu tablet detectável por outros dispositivos por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Permitir?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Um aplicativo em seu telefone quer ativar o Bluetooth e tornar seu telefone detectável por outros dispositivos por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Permitir?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Um aplicativo no seu tablet quer ativar o Bluetooth e tornar seu tablet detectável por outros dispositivos. Permitir?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Um aplicativo em seu telefone quer ativar o Bluetooth e tornar o telefone detectável por outros dispositivos. Permitir?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Um aplicativo quer ativar o Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Um aplicativo quer tornar seu tablet visível para outros dispositivos Bluetooth por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Um aplicativo quer tornar seu telefone visível para outros dispositivos Bluetooth por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Um aplicativo quer tornar seu tablet visível para outros dispositivos Bluetooth. Você pode alterar esta opção a qualquer momento nas configurações do Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Um aplicativo quer tornar seu telefone visível para outros dispositivos Bluetooth. Você pode alterar esta opção a qualquer momento nas configurações do Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Um aplicativo quer ativar o Bluetooth e tornar seu tablet visível para outros dispositivos por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Um aplicativo quer ativar o Bluetooth e tornar seu telefone visível para outros dispositivos por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Um aplicativo quer ativar o Bluetooth e tornar seu tablet visível para outros dispositivos. Você pode alterar esta opção a qualquer momento nas configurações do Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Um aplicativo quer ativar o Bluetooth e tornar seu telefone visível para outros dispositivos. Você pode alterar esta opção a qualquer momento nas configurações do Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Ativando Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Desligar o Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Conexão automática"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Muitas tentativas incorretas!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Tente novamente em <xliff:g id="NUMBER">%d</xliff:g> segundos."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"O aplicativo não está instalado no telefone."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Cancelar"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Avançar"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Como proteger seu tablet"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Proteção do seu telefone"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Proteja seu tablet contra uso não autorizado criando um padrão de desbloqueio de tela pessoal. Deslize o dedo para ligar os pontos em qualquer ordem na próxima tela. Será necessário que você conecte pelo menos quatro pontos. "\n\n"Pronto para começar? Toque em \"Avançar\"."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Proteja seu telefone contra uso não autorizado criando uma sequência de desbloqueio de tela pessoal. Deslize o dedo para ligar pelo menos quatro pontos em qualquer ordem na próxima tela. "\n\n"Pronto para começar? Toque em Avançar."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gerenciar aplicativos"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gerenciar e remover aplicativos instalados"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Aplicativos"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index d5e61c8..0666b16 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -20,9 +20,13 @@
     <string name="no" msgid="6731231425810196216">"Na"</string>
     <!-- no translation found for create (3578857613172647409) -->
     <skip />
-    <string name="device_info_default" msgid="7847265875578739287">"Nunenconuschent"</string>
-    <!-- no translation found for show_dev_countdown (5521163114237004821) -->
+    <!-- no translation found for allow (3349662621170855910) -->
     <skip />
+    <!-- no translation found for deny (6947806159746484865) -->
+    <skip />
+    <string name="device_info_default" msgid="7847265875578739287">"Nunenconuschent"</string>
+    <!-- no translation found for show_dev_countdown:one (5295687242294085452) -->
+    <!-- no translation found for show_dev_countdown:other (6722953419953594148) -->
     <!-- no translation found for show_dev_on (1110711554982716293) -->
     <skip />
     <!-- no translation found for show_dev_already (2151632240145446227) -->
@@ -127,7 +131,6 @@
     <!-- no translation found for battery_info_health_cold (3835692786176707318) -->
     <skip />
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Visibel"</string>
     <!-- no translation found for bluetooth_is_discoverable (8373421452106840526) -->
     <skip />
     <!-- no translation found for bluetooth_is_discoverable_always (2849387702249327748) -->
@@ -136,11 +139,8 @@
     <skip />
     <!-- no translation found for bluetooth_only_visible_to_paired_devices (2049983392373296028) -->
     <skip />
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Far daventar visibel l\'apparat"</string>
     <!-- no translation found for bluetooth_visibility_timeout (8002247464357005429) -->
     <skip />
-    <!-- no translation found for bluetooth_visibility_timeout_summary (6483353842671501585) -->
-    <skip />
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloccar la cumposiziun vocala"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Impedir l\'utilisaziun dal dialer bluetooth sch\'il visur è bloccà"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Apparats Bluetooth"</string>
@@ -192,23 +192,23 @@
     <!-- no translation found for device_picker (8398232791303186677) -->
     <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Dumonda d\'autorisaziun Bluetooth"</string>
-    <!-- no translation found for bluetooth_ask_enablement (5279027758886569301) -->
+    <!-- no translation found for bluetooth_ask_enablement (637355677176904990) -->
     <skip />
-    <!-- no translation found for bluetooth_ask_discovery (4420151924834278808) -->
+    <!-- no translation found for bluetooth_ask_discovery (786921566047356213) -->
     <skip />
-    <!-- no translation found for bluetooth_ask_discovery (4478906085771274647) -->
+    <!-- no translation found for bluetooth_ask_discovery (5510358858113713272) -->
     <skip />
-    <!-- no translation found for bluetooth_ask_lasting_discovery (8737516188038252313) -->
+    <!-- no translation found for bluetooth_ask_lasting_discovery (8863617309580598607) -->
     <skip />
-    <!-- no translation found for bluetooth_ask_lasting_discovery (7751530664834149084) -->
+    <!-- no translation found for bluetooth_ask_lasting_discovery (6487606808683607975) -->
     <skip />
-    <!-- no translation found for bluetooth_ask_enablement_and_discovery (8504403125440086020) -->
+    <!-- no translation found for bluetooth_ask_enablement_and_discovery (3346529092809011149) -->
     <skip />
-    <!-- no translation found for bluetooth_ask_enablement_and_discovery (3040361003987241057) -->
+    <!-- no translation found for bluetooth_ask_enablement_and_discovery (4724094889807196118) -->
     <skip />
-    <!-- no translation found for bluetooth_ask_enablement_and_lasting_discovery (7254712987802497615) -->
+    <!-- no translation found for bluetooth_ask_enablement_and_lasting_discovery (989613204829097159) -->
     <skip />
-    <!-- no translation found for bluetooth_ask_enablement_and_lasting_discovery (3947789545028519103) -->
+    <!-- no translation found for bluetooth_ask_enablement_and_lasting_discovery (6671615712909139801) -->
     <skip />
     <!-- no translation found for bluetooth_turning_on (4850574877288036646) -->
     <skip />
@@ -1546,15 +1546,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Empruvar anc ina giada en <xliff:g id="NUMBER">%d</xliff:g> secundas."</string>
     <!-- no translation found for activity_not_found (5551664692991605325) -->
     <skip />
-    <string name="skip_button_label" msgid="8680422740354436943">"Interrumper"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Vinavant"</string>
-    <!-- no translation found for lock_title (2909697418179419990) -->
-    <skip />
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Segirar Voss telefonin"</string>
-    <!-- no translation found for lock_intro_message (8616353869251700776) -->
-    <skip />
-    <!-- no translation found for lock_intro_message (8393155371327584659) -->
-    <skip />
     <!-- no translation found for manageapplications_settings_title (7041951105633616745) -->
     <skip />
     <!-- no translation found for manageapplications_settings_summary (1794401500935451259) -->
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 29a2719..49f9f65 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"Da"</string>
     <string name="no" msgid="6731231425810196216">"Nu"</string>
     <string name="create" msgid="3578857613172647409">"Creaţi"</string>
+    <string name="allow" msgid="3349662621170855910">"Permiteți"</string>
+    <string name="deny" msgid="6947806159746484865">"Refuzați"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Necunoscută"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"Mai aveţi de parcurs <xliff:g id="STEP_COUNT">%1$d</xliff:g> paşi pentru a deveni dezvoltator."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Mai aveți de parcurs <xliff:g id="STEP_COUNT">%1$d</xliff:g> pas pentru a deveni dezvoltator."</item>
+    <item quantity="other" msgid="6722953419953594148">"Mai aveți de parcurs <xliff:g id="STEP_COUNT">%1$d</xliff:g> pași pentru a deveni dezvoltator."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Aţi devenit dezvoltator!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Nu mai este nevoie, sunteţi deja dezvoltator."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"WIRELESS ŞI REŢELE"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Eroare necunoscută"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Golită"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Detectabil"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Vizibil pt. dispoz. Bluetooth din aprop. (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Vizibil pt. toate disp. Bluetooth din apropiere"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Nu este vizibil pentru alte dispozitive Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Vizibil numai pe dispozitivele asociate"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Setaţi dispozitivul ca detectabil"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Timp limită pentru vizibilitate"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Setaţi cât timp va fi detectabil dispozitivul"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Blocaţi apelarea vocală"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Împiedicaţi apelarea prin Bluetooth când este blocat ecranul"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Dispozitive Bluetooth"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Afişaţi fişierele primite"</string>
     <string name="device_picker" msgid="8398232791303186677">"Selector de dispozitive Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Solicitare de permisiune Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"O aplicaţie încearcă să activeze funcţia Bluetooth. Permiteţi?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"O aplicaţie de pe tableta dvs. încearcă să facă tableta detectabilă de alte dispozitive Bluetooth pentru <xliff:g id="TIMEOUT">%1$d</xliff:g> (de) secunde. Permiteţi?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"O aplicaţie de pe telefonul dvs. încearcă să facă telefonul detectabil de alte dispozitive Bluetooth pentru <xliff:g id="TIMEOUT">%1$d</xliff:g> (de) secunde. Permiteţi?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"O aplicaţie de pe tableta dvs. încearcă să facă tableta „detectabilă întotdeauna” de alte dispozitive Bluetooth. Permiteţi?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"O aplicaţie de pe telefonul dvs. încearcă să facă telefonul „detectabil întotdeauna” de alte dispozitive Bluetooth. Permiteţi?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"O aplicaţie de pe tableta dvs. încearcă să activeze Bluetooth, astfel încât aceasta să fie detectabilă de alte dispozitive pentru <xliff:g id="TIMEOUT">%1$d</xliff:g> (de) secunde. Permiteţi?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"O aplicaţie de pe telefonul dvs. încearcă să activeze Bluetooth, astfel încât acesta să fie detectabil de alte dispozitive pentru <xliff:g id="TIMEOUT">%1$d</xliff:g> (de) secunde. Permiteţi?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"O aplicaţie de pe tableta dvs. încearcă să activeze Bluetooth, astfel încât aceasta să fie detectabilă de alte dispozitive. Permiteţi?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"O aplicaţie de pe telefonul dvs. încearcă să activeze Bluetooth, astfel încât acesta să fie detectabil de alte dispozitive. Permiteţi?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"O aplicație încearcă să activeze Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"O aplicație încearcă să facă tableta vizibilă pentru alte gadgeturi Bluetooth pentru <xliff:g id="TIMEOUT">%1$d</xliff:g> (de) secunde."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"O aplicație încearcă să facă telefonul vizibil pentru alte gadgeturi Bluetooth pentru <xliff:g id="TIMEOUT">%1$d</xliff:g> (de) secunde."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"O aplicație încearcă să facă tableta vizibilă pentru alte gadgeturi Bluetooth. Puteți modifica ulterior acest lucru din setările Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"O aplicație încearcă să facă telefonul vizibil pentru alte gadgeturi Bluetooth. Puteți modifica ulterior acest lucru din setările Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"O aplicație încearcă să activeze Bluetooth și să facă tableta vizibilă pentru alte gadgeturi pentru <xliff:g id="TIMEOUT">%1$d</xliff:g> (de) secunde."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"O aplicație încearcă să activeze Bluetooth și să facă telefonul vizibil pentru alte gadgeturi pentru <xliff:g id="TIMEOUT">%1$d</xliff:g> (de) secunde."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"O aplicație încearcă să activeze Bluetooth și să facă tableta vizibilă pentru alte gadgeturi. Puteți modifica ulterior acest lucru din setările Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"O aplicație încearcă să activeze Bluetooth și să facă telefonul vizibil pentru alte gadgeturi. Puteți modifica ulterior acest lucru din setările Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Se activează Bluetooth?"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Se dezactivează Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Conectare automată"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Prea multe încercări incorecte!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Încercaţi din nou peste <xliff:g id="NUMBER">%d</xliff:g> (de) secunde."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Aplicaţia nu este instalată pe telefonul dvs."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Anulaţi"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Înainte"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Securizarea tabletei"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Securizarea telefonului"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Protejaţi tableta împotriva utilizării neautorizate, prin crearea unui model personal de deblocare a ecranului. Glisaţi uşor cu degetul pentru a conecta, în orice ordine doriţi, punctele de pe ecranul următor. Trebuie să conectaţi cel puţin patru puncte. "\n\n"Sunteţi gata să începeţi? Atingeţi „Înainte”"</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Protejaţi telefonul împotriva utilizării neautorizate, prin crearea unui model personal de deblocare a ecranului. Glisaţi uşor cu degetul pentru a conecta, în orice ordine doriţi, cel puţin patru puncte de pe ecranul următor. "\n\n"Sunteţi gata să începeţi? Atingeţi Înainte."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gestionaţi aplicaţii"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gestionaţi şi eliminaţi aplicaţiile instalate"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Aplicaţii"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 2416620..540051b 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"Да"</string>
     <string name="no" msgid="6731231425810196216">"Нет"</string>
     <string name="create" msgid="3578857613172647409">"Создать"</string>
+    <string name="allow" msgid="3349662621170855910">"Разрешить"</string>
+    <string name="deny" msgid="6947806159746484865">"Отклонить"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Неизвестно"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"Вы почти у цели. Осталось несколько шагов: <xliff:g id="STEP_COUNT">%1$d</xliff:g>."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Вы почти у цели. Осталось несколько шагов: <xliff:g id="STEP_COUNT">%1$d</xliff:g>."</item>
+    <item quantity="other" msgid="6722953419953594148">"Вы почти у цели. Осталось несколько шагов: <xliff:g id="STEP_COUNT">%1$d</xliff:g>."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Вы стали разработчиком!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Не нужно, вы уже разработчик."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"БЕСПРОВОДНЫЕ СЕТИ"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Неизвестная ошибка"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Холодная"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Видимость"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Время видимости для устройств Bluetooth: <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Отображать для ближайших устройств Bluetooth"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Не отображать для других Bluetooth-устройств"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Доступно только для подключенных устройств"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Сделать устройство видимым"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Тайм-аут видимости"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Укажите, в течение какого времени устройство будет видимым"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Заблокировать голосовой набор"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Предотвратить использование телефона Bluetooth, когда экран заблокирован"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Устройства Bluetooth"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Полученные файлы"</string>
     <string name="device_picker" msgid="8398232791303186677">"Выбор устройства"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Запрос разрешения на включение Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Приложение запрашивает разрешение включить Bluetooth. Разрешить?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Одному из приложений нужно, чтобы ваш планшетный ПК был доступен для поиска на других устройствах в течение <xliff:g id="TIMEOUT">%1$d</xliff:g> сек. Включить Bluetooth?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Одному из приложений нужно, чтобы ваш телефон был доступен для поиска на других устройствах в течение <xliff:g id="TIMEOUT">%1$d</xliff:g> сек. Включить Bluetooth?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Одному из приложений нужно, чтобы ваш планшетный ПК был доступен для поиска на других устройствах. Включить Bluetooth?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Одному из приложений нужно, чтобы ваш телефон был доступен для поиска на других устройствах. Включить Bluetooth?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Одному из приложений нужно, чтобы ваш планшетный ПК был доступен для поиска на других устройствах в течение <xliff:g id="TIMEOUT">%1$d</xliff:g> сек. Включить Bluetooth?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Одному из приложений нужно, чтобы ваш телефон был доступен для поиска на других устройствах в течение <xliff:g id="TIMEOUT">%1$d</xliff:g> сек. Включить Bluetooth?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Одному из приложений нужно, чтобы ваш планшетный ПК был доступен для поиска на других устройствах. Включить Bluetooth?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Одному из приложений нужно, чтобы ваш телефон был доступен для поиска на других устройствах. Включить Bluetooth?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Приложение запрашивает разрешение включить Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Одному из приложений требуется, чтобы ваш планшетный ПК был доступен для поиска через Bluetooth на других устройствах в течение <xliff:g id="TIMEOUT">%1$d</xliff:g> сек."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Одному из приложений требуется, чтобы ваш телефон был доступен для поиска через Bluetooth на других устройствах в течение <xliff:g id="TIMEOUT">%1$d</xliff:g> сек."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Одному из приложений требуется сделать ваш планшетный ПК доступным для поиска через Bluetooth на других устройствах. Позже эти настройки можно будет изменить."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Одному из приложений требуется сделать ваш телефон доступным для поиска через Bluetooth на других устройствах. Позже эти настройки можно будет изменить."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Одному из приложений требуется включить Bluetooth и сделать ваш планшетный ПК доступным для поиска на других устройствах в течение <xliff:g id="TIMEOUT">%1$d</xliff:g> сек."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Одному из приложений требуется включить Bluetooth и сделать ваш телефон доступным для поиска на других устройствах в течение <xliff:g id="TIMEOUT">%1$d</xliff:g> сек."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Одному из приложений требуется включить Bluetooth и сделать ваш планшетный ПК доступным для поиска на других устройствах. Позже эти настройки можно будет изменить."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Одному из приложений требуется включить Bluetooth и сделать ваш телефон доступным для поиска на других устройствах. Позже эти настройки можно будет изменить."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Включение Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Отключение Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Автоматическое подключение"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Слишком много неудачных попыток!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Повторите попытку через <xliff:g id="NUMBER">%d</xliff:g> с."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Приложение не установлено на телефоне."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Отмена"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Далее"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Безопасность планшетного ПК"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Обеспечение безопасности телефона"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Создайте графический ключ разблокировки экрана, и никто, кроме вас, не сможет воспользоваться вашим планшетным ПК. Для этого соедините в произвольном порядке не менее четырех точек на экране. "\n\n"Чтобы начать, нажмите \"Далее\"."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Чтобы никто, кроме вас, не мог воспользоваться вашим телефоном, создайте графический ключ разблокировки экрана. Для этого соедините в произвольном порядке не менее четырех точек на следующем экране. "\n\n"Чтобы начать, нажмите \"Далее\"."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Управление приложениями"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Управление установленными приложениями и их удаление"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Приложения"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 6b690ad..eb50b90 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"Áno"</string>
     <string name="no" msgid="6731231425810196216">"Nie"</string>
     <string name="create" msgid="3578857613172647409">"Vytvoriť"</string>
+    <string name="allow" msgid="3349662621170855910">"Povoliť"</string>
+    <string name="deny" msgid="6947806159746484865">"Odmietnuť"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Neznáme"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"Počet krokov do získania stavu vývojára: <xliff:g id="STEP_COUNT">%1$d</xliff:g>."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Počet krokov do získania stavu vývojára: <xliff:g id="STEP_COUNT">%1$d</xliff:g>."</item>
+    <item quantity="other" msgid="6722953419953594148">"Počet krokov do získania stavu vývojára: <xliff:g id="STEP_COUNT">%1$d</xliff:g>."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Teraz ste vývojár!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Nie je to potrebné, už ste vývojár."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"BEZDRÔTOVÉ PRIPOJENIE A SIETE"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Neznáma chyba"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Studené"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Viditeľné"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Viditeľné pre všetky okolité zariadenia Bluetooth (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Viditeľné pre všetky okolité zariadenia Bluetooth"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Neviditeľné pre ostatné zariadenia Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Viditeľné len pre spárované zariadenia"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Prepne zariadenie do viditeľného režimu"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Časový limit viditeľnosti"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Nastavte dobu, počas ktorej bude zariadenie vo viditeľnom režime"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Uzamknúť hlasové vytáčanie"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Zabrániť použitiu vytáčania Bluetooth pri uzamknutej obrazovke"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Zariadenia Bluetooth"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Zobraziť prijaté súbory"</string>
     <string name="device_picker" msgid="8398232791303186677">"Výber zariadenia Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Žiadosť o povolenie zariadenia Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Aplikácia chce zapnúť pripojenie Bluetooth. Povoliť?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Aplikácia v tablete chce prepnúť váš tablet do viditeľného režimu pre ostatné zariadenia Bluetooth na <xliff:g id="TIMEOUT">%1$d</xliff:g> sek. Povoliť?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Aplikácia v telefóne chce prepnúť váš telefón do viditeľného režimu pre ostatné zariadenia Bluetooth na <xliff:g id="TIMEOUT">%1$d</xliff:g> sek. Povoliť?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Aplikácia v tablete chce prepnúť váš tablet do trvalo viditeľného režimu pre ostatné zariadenia Bluetooth. Povoliť?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Aplikácia v telefóne chce prepnúť váš telefón do trvalo viditeľného režimu pre ostatné zariadenia Bluetooth. Povoliť?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Aplikácia v tablete chce zapnúť pripojenie Bluetooth a prepnúť váš tablet do viditeľného režimu na <xliff:g id="TIMEOUT">%1$d</xliff:g> sek. Povoliť?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Aplikácia v telefóne chce zapnúť pripojenie Bluetooth a prepnúť váš telefón do viditeľného režimu na <xliff:g id="TIMEOUT">%1$d</xliff:g> sek. Povoliť?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Aplikácia v tablete chce zapnúť pripojenie Bluetooth a prepnúť váš tablet do viditeľného režimu. Povoliť?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Aplikácia v telefóne chce zapnúť pripojenie Bluetooth a prepnúť váš telefón do viditeľného režimu. Povoliť?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Aplikácia chce zapnúť rozhranie Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Aplikácia chce na <xliff:g id="TIMEOUT">%1$d</xliff:g> s prepnúť váš tablet do režimu, v ktorom bude viditeľný pre ostatné zariadenia Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Aplikácia chce na <xliff:g id="TIMEOUT">%1$d</xliff:g> s prepnúť váš telefón do režimu, v ktorom bude viditeľný pre ostatné zariadenia Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Aplikácia chce váš tablet prepnúť do režimu, v ktorom bude viditeľný pre ostatné zariadenia Bluetooth. Toto nastavenie môžete neskôr zmeniť v nastaveniach rozhrania Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Aplikácia chce váš telefón prepnúť do režimu, v ktorom bude viditeľný pre ostatné zariadenia Bluetooth. Toto nastavenie môžete neskôr zmeniť v nastaveniach rozhrania Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Aplikácia chce na <xliff:g id="TIMEOUT">%1$d</xliff:g> s zapnúť rozhranie Bluetooth a prepnúť váš tablet do viditeľného režimu."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Aplikácia chce na <xliff:g id="TIMEOUT">%1$d</xliff:g> s zapnúť rozhranie Bluetooth a prepnúť váš telefón do viditeľného režimu."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Aplikácia chce zapnúť rozhranie Bluetooth a prepnúť váš tablet do režimu, v ktorom bude viditeľný pre ostatné zariadenia. Toto nastavenie môžete neskôr zmeniť v nastaveniach rozhrania Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Aplikácia chce zapnúť rozhranie Bluetooth a prepnúť váš telefón do režimu, v ktorom bude viditeľný pre ostatné zariadenia. Toto nastavenie môžete neskôr zmeniť v nastaveniach rozhrania Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Zapnúť Bluetooth?"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Vypínanie Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automaticky pripojiť"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Príliš veľa chybných pokusov."</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Počet sekúnd zostávajúcich do ďalšieho pokusu: <xliff:g id="NUMBER">%d</xliff:g>."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Aplikácia nie je v telefóne nainštalovaná."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Zrušiť"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Ďalej"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Zabezpečenie vášho tabletu"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Zabezpečenie telefónu"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Chráňte svoj tablet pred neoprávneným použitím vytvorením osobného vzoru na odomknutie obrazovky. Na ďalšej obrazovke pospájajte prstom body v ľubovoľnom poradí. Musíte spojiť aspoň štyri body. "\n\n"Ak chcete začať, dotknite sa tlačidla Ďalej."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Svoj telefón môžete chrániť pred neautorizovaným použitím pomocou osobného bezpečnostného vzoru obrazovky. Bodky na nasledujúcej obrazovke spojte prejdením prstom v akomkoľvek poradí. Spojiť treba aspoň štyri bodky. "\n\n"Keď chcete začať, dotknite sa tlačidla „Ďalej“."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Spravovať aplikácie"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Správa a odstraňovanie nainštalovaných aplikácií"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Aplikácie"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index faf3db1..a0628db 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"Da"</string>
     <string name="no" msgid="6731231425810196216">"Ne"</string>
     <string name="create" msgid="3578857613172647409">"Ustvari"</string>
+    <string name="allow" msgid="3349662621170855910">"Dovoli"</string>
+    <string name="deny" msgid="6947806159746484865">"Zavrni"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Neznano"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"Št. korakov, ki vas loči od tega, da postanete razvijalec: <xliff:g id="STEP_COUNT">%1$d</xliff:g>."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Št. korakov, ki vas loči od tega, da postanete razvijalec: <xliff:g id="STEP_COUNT">%1$d</xliff:g>."</item>
+    <item quantity="other" msgid="6722953419953594148">"Št. korakov, ki vas loči od tega, da postanete razvijalec: <xliff:g id="STEP_COUNT">%1$d</xliff:g>."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Zdaj ste razvijalec."</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Ni treba, ker ste že razvijalec."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"BREZŽIČNE IN OMREŽNE POVEZAVE"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Neznana napaka"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Hladno"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Viden"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Vidno vsem napravam Bluetooth v bližini (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Vidno vsem napravam Bluetooth v bližini"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Ni vidno drugim napravam Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Vidno samo seznanjenim napravam"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Naj bo naprava vidna drugim"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Časovna omejitev vidnosti"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Nastavite trajanje vidnosti naprave"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Zakleni glasovno klicanje"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Prepreči uporabo telefona Bluetooth, kadar je zaslon zaklenjen"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Naprave Bluetooth"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Pokaži prejete datoteke"</string>
     <string name="device_picker" msgid="8398232791303186677">"Izbirnik naprav Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Zahteva za dovoljenje za uporabo funkcije Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Program želi vklopiti Bluetooth. Želite omogočiti?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Program v tabličnem računalniku želi vklopiti Bluetooth in nastaviti tablični računalnik, da ga bodo lahko druge naprave odkrile <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Želite omogočiti?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Program v telefonu želi nastaviti telefon, da ga bodo lahko druge naprave odkrile <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Želite omogočiti?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Program v telefonu želi nastaviti tablični računalnik, da ga bodo lahko druge naprave Bluetooth kadar koli odkrile. Želite omogočiti?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Program v telefonu želi nastaviti telefon, da ga bodo lahko druge naprave Bluetooth kadar koli odkrile. Želite omogočiti?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Program v tabličnem računalniku želi vklopiti Bluetooth in nastaviti tablični računalnik, da ga bodo lahko druge naprave odkrile <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Želite omogočiti?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Program v telefonu želi za <xliff:g id="TIMEOUT">%1$d</xliff:g> s vklopiti Bluetooth in nastaviti telefon, da ga bodo lahko odkrile druge naprave. Želite dovoliti?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Program v tabličnem računalniku želi vklopiti Bluetooth in nastaviti tablični računalnik, da ga bodo lahko druge naprave odkrile. Želite omogočiti?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Program v telefonu želi vklopiti Bluetooth in nastaviti telefon, da ga bodo lahko druge naprave odkrile. Želite omogočiti?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Aplikacija želi vklopiti Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Aplikacija želi, da lahko druge naprave Bluetooth vidijo vaš tablični računalnik toliko sekund: <xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Aplikacija želi, da lahko druge naprave Bluetooth vidijo vaš telefon toliko sekund: <xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Aplikacija želi omogočiti, da lahko druge naprave Bluetooth vidijo vaš tablični računalnik. To lahko pozneje spremenite v nastavitvah Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Aplikacija želi omogočiti, da lahko druge naprave Bluetooth vidijo vaš telefon. To lahko pozneje spremenite v nastavitvah Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Aplikacija želi vklopiti Bluetooth in omogočiti, da lahko druge naprave vidijo vaš tablični računalnik toliko sekund: <xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Aplikacija želi vklopiti Bluetooth in omogočiti, da lahko druge naprave vidijo vaš telefon toliko sekund: <xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Aplikacija želi vklopiti Bluetooth in omogočiti, da lahko druge naprave vidijo vaš tablični računalnik. To lahko pozneje spremenite v nastavitvah Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Aplikacija želi vklopiti Bluetooth in omogočiti, da lahko druge naprave vidijo vaš telefon. To lahko pozneje spremenite v nastavitvah Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Vklop Bluetootha…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Izklop Bluetootha…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Samodejno poveži"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Preveč napačnih poskusov!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Čez <xliff:g id="NUMBER">%d</xliff:g> sekund poskusite znova."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Aplikacija ni nameščena v telefonu."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Prekliči"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Naprej"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Varnost tabličnega računalnika"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Zaščita telefona"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Zaščitite tablični računalnik pred nepooblaščeno uporabo tako, da ustvarite vzorec za odklepanje zaslona. Na naslednjem zaslonu s prstom v poljubnem vrstnem redu povežite pike. Povezati morate vsaj štiri pike. "\n\n"Ste pripravljeni? Dotaknite se možnosti »Naprej«."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Zaščitite telefon pred nepooblaščeno uporabo, tako da ustvarite osebni vzorec za odklepanje zaslona. Na naslednjem zaslonu s prstom v poljubnem vrstnem redu povežite vsaj štiri pike. "\n\n"Ste pripravljeni? Dotaknite se gumba »Naprej«."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Upravljaj programe"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Upravljanje in odstranjevanje nameščenih programov"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Programi"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 544d24f..32ff264 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"Да"</string>
     <string name="no" msgid="6731231425810196216">"Не"</string>
     <string name="create" msgid="3578857613172647409">"Направи"</string>
+    <string name="allow" msgid="3349662621170855910">"Дозволи"</string>
+    <string name="deny" msgid="6947806159746484865">"Одбиј"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Непознато"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"Треба да обавите још <xliff:g id="STEP_COUNT">%1$d</xliff:g> корака да бисте постали програмер."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Треба да обавите још <xliff:g id="STEP_COUNT">%1$d</xliff:g> корак да бисте постали програмер."</item>
+    <item quantity="other" msgid="6722953419953594148">"Треба да обавите још <xliff:g id="STEP_COUNT">%1$d</xliff:g> корака да бисте постали програмер."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Постали сте програмер!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Нема потребе, већ сте програмер."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"БЕЖИЧНА ВЕЗА И МРЕЖЕ"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Непозната грешка"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Незанимљиво"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Видљив"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Видљиво за све оближње Bluetooth уређаје (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Видљиво за све оближње Bluetooth уређаје"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Није видљиво за друге Bluetooth уређаје"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Видљиво само за упарене уређаје"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Нека уређај буде видљив"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Време чекања за видљивост"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Подешавање периода у коме ће уређај бити видљив"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Закључај говорно бирање"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Спречи коришћење bluetooth програма за бирање бројева када је екран закључан"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth уређаји"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Приказ примљених датотека"</string>
     <string name="device_picker" msgid="8398232791303186677">"Бирач Bluetooth уређаја"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Захтев за Bluetooth дозволу"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Апликација жели да укључи Bluetooth. Желите ли то да дозволите?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Апликација на таблету жели да учини таблет видљивим за друге Bluetooth уређаје на <xliff:g id="TIMEOUT">%1$d</xliff:g> секунде(и). Желите ли то да дозволите?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Апликација на телефону жели да учини телефон видљивим за друге Bluetooth уређаје на <xliff:g id="TIMEOUT">%1$d</xliff:g> секунде(и). Желите ли то да дозволите?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Апликација на таблету жели да учини таблет „увек видљивим“ за друге Bluetooth уређаје. Желите ли то да дозволите?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Апликација на телефону жели да учини телефон „увек видљивим“ за друге Bluetooth уређаје. Желите ли то да дозволите?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Апликација на таблету жели да укључи Bluetooth и учини таблет видљивим за друге уређаје на <xliff:g id="TIMEOUT">%1$d</xliff:g> секунде(и). Желите ли то да дозволите?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Апликација на телефону жели да укључи Bluetooth и учини телефон видљивим за друге уређаје на <xliff:g id="TIMEOUT">%1$d</xliff:g> секунде(и). Желите ли то да дозволите?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Апликација на таблету жели да укључи Bluetooth и учини таблет видљивим за друге уређаје. Желите ли то да дозволите?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Апликација на телефону жели да укључи Bluetooth и учини телефон видљивим за друге уређаје. Желите ли то да дозволите?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Апликација жели да укључи Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Апликација жели да учини таблет видљивим за друге Bluetooth уређаје на <xliff:g id="TIMEOUT">%1$d</xliff:g> сек."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Апликација жели да учини телефон видљивим за друге Bluetooth уређаје на <xliff:g id="TIMEOUT">%1$d</xliff:g> сек."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Апликација жели да учини таблет видљивим за друге Bluetooth уређаје. Ово можете касније да промените у подешавањима Bluetooth-а."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Апликација жели да учини телефон видљивим за друге Bluetooth уређаје. Ово можете касније да промените у подешавањима Bluetooth-а."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Апликација жели да укључи Bluetooth и учини таблет видљивим за друге уређаје на <xliff:g id="TIMEOUT">%1$d</xliff:g> сек."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Апликација жели да укључи Bluetooth и учини телефон видљивим за друге уређаје на <xliff:g id="TIMEOUT">%1$d</xliff:g> сек."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Апликација жели да укључи Bluetooth и учини таблет видљивим за друге уређаје. Ово можете касније да промените у подешавањима Bluetooth-а."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Апликација жели да укључи Bluetooth и учини телефон видљивим за друге уређаје. Ово можете касније да промените у подешавањима Bluetooth-а."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Укључивање Bluetooth-а…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Искључивање Bluetooth-а…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Аутоматско повезивање"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Превише нетачних покушаја!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Покушајте поново за <xliff:g id="NUMBER">%d</xliff:g> секунде(и)."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Апликација није инсталирана на телефону."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Откажи"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Следеће"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Обезбеђивање таблета"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Обезбеђивање телефона"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Заштитите таблет од неовлашћене употребе тако што ћете направити лични шаблон за откључавање екрана. На следећем екрану превлачите прстом да бисте повезали тачке било којим редоследом. Потребно је да повежете најмање четири тачке. "\n\n"Да ли сте спремни да почнете? Додирните Даље."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Заштитите телефон од неовлашћене употребе тако што ћете направити лични шаблон за откључавање екрана. На следећем екрану повежите прстом најмање четири тачке било којим редоследом. "\n\n"Спремни сте да почнете? Додирните Следеће."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Управљај апликацијама"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Управљање инсталираним апликацијама и њихово уклањање"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Апликације"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index a334717..057e497 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"Ja"</string>
     <string name="no" msgid="6731231425810196216">"Nej"</string>
     <string name="create" msgid="3578857613172647409">"Skapa"</string>
+    <string name="allow" msgid="3349662621170855910">"Tillåt"</string>
+    <string name="deny" msgid="6947806159746484865">"Neka"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Okänd"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"Du är nu <xliff:g id="STEP_COUNT">%1$d</xliff:g> steg från att bli utvecklare."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Du är nu <xliff:g id="STEP_COUNT">%1$d</xliff:g> steg från att bli utvecklare."</item>
+    <item quantity="other" msgid="6722953419953594148">"Du är nu <xliff:g id="STEP_COUNT">%1$d</xliff:g> steg från att bli utvecklare."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Nu är du en utvecklare!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Det behövs inte. Du är redan utvecklare."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"TRÅDLÖST OCH NÄTVERK"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Okänt fel"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Sval"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Synlighet"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Synlig för alla Bluetooth-enheter i närheten (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visas för alla närliggande Bluetooth-enheter"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Inte synlig för andra Bluetooth-enheter"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Bara synlig för kopplade enheter"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Gör enheten synlig"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Tidsgräns för synlighet"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Ange hur länge enheten ska vara synlig"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Röstuppringning med låsskärm"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Förhindra att bluetooth-uppringningsfunktionen används när skärmen är låst"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth-enheter"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Visa mottagna filer"</string>
     <string name="device_picker" msgid="8398232791303186677">"Bluetooth-enhetsväljare"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Begäran om Bluetooth-behörighet"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"En app vill aktivera Bluetooth. Vill du tillåta detta?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"En app på surfplattan vill göra den synlig för andra Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vill du tillåta detta?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"En app på mobilen vill göra mobilen synlig för andra Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vill du tillåta detta?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"En app på surfplattan vill att surfplattan alltid ska vara synlig för andra Bluetooth-enheter. Vill du tillåta detta?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"En app på mobilen vill att mobilen alltid ska vara synlig för andra Bluetooth-enheter. Vill du tillåta detta?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"En app på surfplattan vill aktivera Bluetooth och göra surfplattan synlig för andra enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vill du tillåta detta?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"En app på mobilen vill aktivera Bluetooth så att mobilen blir synlig för andra enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vill du tillåta detta?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"En app på surfplattan vill aktivera Bluetooth och göra surfplattan synlig för andra enheter. Vill du tillåta detta?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"En app på mobilen vill aktivera Bluetooth så att mobilen blir synlig för andra enheter. Vill du tillåta detta?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"En app vill aktivera Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"En app vill göra din surfplatta synlig för andra Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"En app vill göra din mobil synlig för andra Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"En app vill göra din surfplatta synlig för andra Bluetooth-enheter. Du kan ändra detta senare i inställningarna för Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"En app vill göra din mobil synlig för andra Bluetooth-enheter. Du kan ändra detta senare i inställningarna för Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"En app vill aktivera Bluetooth och göra din surfplatta synlig för andra enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"En app vill aktivera Bluetooth och göra din mobil synlig för andra enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"En app vill aktivera Bluetooth och göra din surfplatta synlig för andra enheter. Du kan ändra detta senare i inställningarna för Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"En app vill aktivera Bluetooth och göra din mobil synlig för andra enheter. Du kan ändra detta senare i inställningarna för Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth aktiveras"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Vill du stänga av Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automatisk anslutning"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"För många felaktiga försök!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Försök igen om <xliff:g id="NUMBER">%d</xliff:g> sekunder."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Appen är inte installerad på mobilen."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Avbryt"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Nästa"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Skydda din surfplatta"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Skydda din telefon"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Skydda surfplattan från obehörig användning genom att skapa ett personligt grafiskt lösenord. Anslut punkterna med fingret i valfri ordning på nästa sida. Du måste ansluta minst fyra punkter."\n\n"Tryck på Nästa när du är redo att sätta igång."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Skydda mobilen från obehörig användning genom att skapa ett personligt grafiskt lösenord på skärmen. Anslut minst fyra punkter i valfri ordning med fingret på nästa skärm."\n\n"Tryck på Nästa när du är redo att sätta igång."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Hantera appar"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Hantera och ta bort installerade appar"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Appar"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 97d8def..6ce5611 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"Ndiyo"</string>
     <string name="no" msgid="6731231425810196216">"Hapana"</string>
     <string name="create" msgid="3578857613172647409">"Unda"</string>
+    <string name="allow" msgid="3349662621170855910">"Ruhusu"</string>
+    <string name="deny" msgid="6947806159746484865">"Kana"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Haijulikani"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"Sasa uko katika hatua ya <xliff:g id="STEP_COUNT">%1$d</xliff:g> kuwa msanidi programu."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Sasa uko katika hatua ya <xliff:g id="STEP_COUNT">%1$d</xliff:g> kutoka kuwa msanidi programu."</item>
+    <item quantity="other" msgid="6722953419953594148">"Sasa uko katika hatua ya <xliff:g id="STEP_COUNT">%1$d</xliff:g> kutoka kuwa msanidi programu."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Sasa wewe ni msanidi programu!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Hakuna haja, tayari wewe ni msanidi programu."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"MITANDAO NA MITANDAO-HEWA"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Hitilafu isiyojulikana"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Baridi"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Inagundulika"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Inaonekana kwa zote zilizokaribu na vifaa vya Bluetooth (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Inaonekana kwa zote zilizokaribu na vifaa vya Bluetooth"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"haionekani kwa vifaa vingine vya Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Inaonekana tu kwa vifaa vilivyolinganishwa"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Fanya kifaa kiweze kutambuliwa"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Muda wa kuonekana"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Weka ni kwa muda kiasi gani ambao kifaa kitagundulika"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Funga sauti ya upigaji simu"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Zuia matumizi yakibonyezi cha bluetooth wakati skrini imefungwa"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Vifaa vya Bluetooth"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Onyesha faili zilizopokewa"</string>
     <string name="device_picker" msgid="8398232791303186677">"Kichagua kifaa cha Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Ombi la kibali cha Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Programu inataka kuwasha Bluetooth. Kubali?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Programu katika kompyuta yako ndogo inataka kufanya kompyuta yako ndogo igundulike na vifaa vingine vya Bluetooth kwa sekunde <xliff:g id="TIMEOUT">%1$d</xliff:g>. Kubali?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Programu katika simu yako inataka kufanya kompyuta yako ndogo igundulike na vifaa vingine vya Bluetooth kwa sekunde <xliff:g id="TIMEOUT">%1$d</xliff:g>. Kubali?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Programu katika kompyuta yako ndogo inataka kufanya kompyuta yako ndogo igundulike na vifaa vingine vya Bluetooth. Kubali?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Programu katika simu yako inataka kuwasha Bluetooth na kufanya simu yako \"igundulike daima\" na vifaa vingine. Kubali?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Programu katika kompyuta yako ndogo inataka kufanya kompyuta yako ndogo igundulike na vifaa vingine vya Bluetooth kwa sekunde <xliff:g id="TIMEOUT">%1$d</xliff:g>. Kubali?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Programu katika simu yako inataka kuwasha Bluetooth na kufanya simu yako igundulike na vifaa vingine kwa sekunde <xliff:g id="TIMEOUT">%1$d</xliff:g>. Kubali?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Programu katika kompyuta yako ndogo inataka kufanya kompyuta yako ndogo igundulike na vifaa vingine vya Bluetooth kwa sekunde. Kubali?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Programu katika simu yako inataka kuwasha Bluetooth na kufanya simu yako igundulike na vifaa vingine. Kubali?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Programu inataka kuwasha Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Programu inataka kufanya kompyuta yako ndogo ionekane kwenye vifaa vingine vya Bluetooth kwa sekunde <xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Programu inataka kufanya simu yako ionekane kwenye vifaa vingine vya Bluetooth kwa sekunde <xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Programu inataka kufanya kompyuta yako ndogo ionekane kwenye vifaa vingine vya Bluetooth. Unaweza kubadilisha hii baadaye kwenye mipangilio ya Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Programu inataka kufanya simu yako ionekane kwenye vifaa vingine vya Bluetooth. Unaweza kubadilisha hii baadaye kwenye mipangilio ya Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Programu inataka kuwasha Bluetooth na kufanya kompyuta yako ndogo ionekane kwa vifaa vingine kwa sekunde <xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Programu inataka kuwasha Bluetooth na kufanya simu yako ionekane kwa vifaa vingine kwa sekunde <xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Programu inataka kuwasha Bluetooth na kufanya kompyuta yako ndogo ionekane kwenye vifaa vingine. Unaweza kubadilisha hii baadaye kwenye mipangilio ya Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Programu inataka kuwasha Bluetooth na kufanya simu yako ionekane kwenye vifaa vingine. Unaweza kubadilisha hii baadaye kwenye mipangilio ya Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Inawasha Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Inazima Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Unganisha-kiotomatiki"</string>
@@ -674,10 +676,10 @@
     <string name="volume_ring_description" msgid="5936851631698298989">"Mlio wa simu na taarifa"</string>
     <string name="volume_notification_description" msgid="5810902320215328321">"Arifa"</string>
     <string name="volume_alarm_description" msgid="8322615148532654841">"Kengele"</string>
-    <string name="volume_ring_mute" msgid="3018992671608737202">"Nyamazisha mlio wa simu &amp; arifa"</string>
-    <string name="volume_media_mute" msgid="3399059928695998166">"Nyamazisha muziki &amp; midia nyingine"</string>
-    <string name="volume_notification_mute" msgid="7955193480006444159">"Nyamazisha arifa"</string>
-    <string name="volume_alarm_mute" msgid="4452239420351035936">"Nyamazisha kengele"</string>
+    <string name="volume_ring_mute" msgid="3018992671608737202">"Zima mlio wa simu na arifa"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Zima sauti ya muziki na midia nyingine"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Puuza arifa"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Zima kengele"</string>
     <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Tetema wakati wa kutoa mlio"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Gati"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Mipangilio ya gati"</string>
@@ -1014,12 +1016,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Mjarabio mengi yasiyo sahihi"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Jaribu tena baada ya sekunde <xliff:g id="NUMBER">%d</xliff:g>."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Programu haijasakinishwa kwenye simu yako."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Ghairi"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Ifuatayo"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Kulinda kompyuta yako ndogo"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Kulinda simu yako"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Linda kompyuta yako kibao dhidi ya matumizi ambayo hayajaidhinishwa kwa kuunda skrini ya kibinafsi ya mchoro wa kufungua. Sogeza kidole chako ili kuunganisha madoa katika mpangilio wowote kwenye skrini ifuatayo. Lazima uunganishe angalau madoa manne. "\n\n"Uko tayari kuanza? Gusa Ifuatayo."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Linda simu yako na matumizi yasiyoidhinishwa kwa kuunda umbizo la kufungua skrini ya kibinafsi. Tumia kidole chako kuunganisha angalau doti nne kwa mpangilio wowote kwenye skrini ifuatayo "\n\n"Tayari kuanza? Gusa “Ifuatayo”."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Dhibiti programu"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Dhibiti na ondoa programu zilizosakinishwa"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Programu"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 9f54bda..d1d66dc 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"ใช่"</string>
     <string name="no" msgid="6731231425810196216">"ไม่"</string>
     <string name="create" msgid="3578857613172647409">"สร้าง"</string>
+    <string name="allow" msgid="3349662621170855910">"อนุญาต"</string>
+    <string name="deny" msgid="6947806159746484865">"ปฏิเสธ"</string>
     <string name="device_info_default" msgid="7847265875578739287">"ไม่ทราบ"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"คุณเหลืออีกเพียง <xliff:g id="STEP_COUNT">%1$d</xliff:g> ขั้นตอนเพื่อเป็นนักพัฒนาซอฟต์แวร์"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"คุณเหลืออีกเพียง <xliff:g id="STEP_COUNT">%1$d</xliff:g> ขั้นตอนเพื่อเป็นนักพัฒนาซอฟต์แวร์"</item>
+    <item quantity="other" msgid="6722953419953594148">"คุณเหลืออีกเพียง <xliff:g id="STEP_COUNT">%1$d</xliff:g> ขั้นตอนเพื่อเป็นนักพัฒนาซอฟต์แวร์"</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"ตอนนี้คุณเป็นนักพัฒนาซอฟต์แวร์แล้ว!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"ไม่จำเป็น คุณเป็นนักพัฒนาซอฟต์แวร์อยู่แล้ว"</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"ระบบไร้สายและเครือข่าย"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"เกิดข้อผิดพลาดที่ไม่ทราบสาเหตุ"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"เย็น"</string>
     <string name="bluetooth" msgid="5549625000628014477">"บลูทูธ"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"ค้นพบได้"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"อุปกรณ์บลูทูธใกล้เคียงทั้งหมดมองเห็นได้ (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"อุปกรณ์บลูทูธใกล้เคียงทั้งหมดมองเห็นได้"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"ไม่ให้อุปกรณ์บลูทูธอื่นเห็น"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"อุปกรณ์ที่จับคู่เท่านั้นที่มองเห็น"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"ทำให้ค้นพบอุปกรณ์ได้"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"ระยะหมดเวลาการมองเห็น"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"ตั้งค่าระยะเวลาที่ให้สามารถค้นพบอุปกรณ์ได้"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"ล็อกการโทรด้วยเสียง"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"ป้องกันการใช้โปรแกรมโทรออกผ่านบลูทูธเมื่อล็อกหน้าจอไว้"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"อุปกรณ์บลูทูธ"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"แสดงไฟล์ที่ได้รับ"</string>
     <string name="device_picker" msgid="8398232791303186677">"ตัวเลือกอุปกรณ์บลูทูธ"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"คำขออนุญาตใช้บลูทูธ"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"แอปพลิเคชันต้องการเปิดบลูทูธ อนุญาตหรือไม่"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"แอปพลิเคชันบนแท็บเล็ตของคุณต้องการทำให้อุปกรณ์บลูทูธอื่นค้นพบแท็บเล็ตของคุณได้เป็นเวลา <xliff:g id="TIMEOUT">%1$d</xliff:g> วินาที คุณจะอนุญาตหรือไม่"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"แอปพลิเคชันบนโทรศัพท์ของคุณต้องการทำให้อุปกรณ์บลูทูธอื่นค้นพบโทรศัพท์ของคุณได้เป็นเวลา <xliff:g id="TIMEOUT">%1$d</xliff:g> วินาที คุณจะอนุญาตหรือไม่"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"แอปพลิเคชันบนแท็บเล็ตของคุณต้องการทำให้อุปกรณ์บลูทูธอื่น \"ค้นพบแท็บเล็ตของคุณได้เสมอ\" คุณจะอนุญาตหรือไม่"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"แอปพลิเคชันบนโทรศัพท์ของคุณต้องการทำให้อุปกรณ์บลูทูธอื่น \"ค้นพบโทรศัพท์ของคุณได้เสมอ\" คุณจะอนุญาตหรือไม่"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"แอปพลิเคชันบนแท็บเล็ตของคุณต้องการเปิดบลูทูธและทำให้อุปกรณ์อื่นค้นพบแท็บเล็ตของคุณได้เป็นเวลา <xliff:g id="TIMEOUT">%1$d</xliff:g> วินาที คุณจะอนุญาตหรือไม่"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"แอปพลิเคชันบนโทรศัพท์ของคุณต้องการเปิดบลูทูธ และทำให้อุปกรณ์อื่นค้นพบโทรศัพท์ของคุณได้เป็นเวลา <xliff:g id="TIMEOUT">%1$d</xliff:g> วินาที คุณจะอนุญาตหรือไม่"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"แอปพลิเคชันบนแท็บเล็ตของคุณต้องการเปิดบลูทูธและทำให้อุปกรณ์อื่นค้นพบแท็บเล็ตของคุณได้ คุณจะอนุญาตหรือไม่"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"แอปพลิเคชันบนโทรศัพท์ของคุณต้องการเปิดบลูทูธ และทำให้อุปกรณ์อื่นค้นพบโทรศัพท์ของคุณได้ คุณจะอนุญาตหรือไม่"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"แอปพลิเคชันต้องการเปิดบลูทูธ"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"แอปพลิเคชันต้องการทำให้อุปกรณ์บลูทูธอื่นสามารถมองเห็นแท็บเล็ตของคุณได้เป็นเวลา <xliff:g id="TIMEOUT">%1$d</xliff:g> วินาที"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"แอปพลิเคชันต้องการทำให้อุปกรณ์บลูทูธอื่นสามารถมองเห็นโทรศัพท์ของคุณได้เป็นเวลา <xliff:g id="TIMEOUT">%1$d</xliff:g> วินาที"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"แอปพลิเคชันต้องการทำให้อุปกรณ์บลูทูธอื่นสามารถมองเห็นแท็บเล็ตของคุณได้ คุณสามารถเปลี่ยนการตั้งค่านี้ได้ในภายหลังในการตั้งค่าบลูทูธ"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"แอปพลิเคชันต้องการทำให้อุปกรณ์บลูทูธอื่นสามารถมองเห็นโทรศัพท์ของคุณได้ คุณสามารถเปลี่ยนการตั้งค่านี้ได้ในภายหลังในการตั้งค่าบลูทูธ"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"แอปพลิเคชันต้องการเปิดบลูทูธและทำให้อุปกรณ์อื่นสามารถมองเห็นแท็บเล็ตของคุณได้เป็นเวลา <xliff:g id="TIMEOUT">%1$d</xliff:g> วินาที"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"แอปพลิเคชันต้องการเปิดบลูทูธและทำให้อุปกรณ์อื่นสามารถมองเห็นโทรศัพท์ของคุณได้เป็นเวลา <xliff:g id="TIMEOUT">%1$d</xliff:g> วินาที"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"แอปพลิเคชันต้องการเปิดบลูทูธและทำให้อุปกรณ์อื่นสามารถมองเห็นแท็บเล็ตของคุณได้ คุณสามารถเปลี่ยนการตั้งค่านี้ได้ในภายหลังในการตั้งค่าบลูทูธ"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"แอปพลิเคชันต้องการเปิดบลูทูธและทำให้อุปกรณ์อื่นสามารถมองเห็นโทรศัพท์ของคุณได้ คุณสามารถเปลี่ยนการตั้งค่านี้ได้ในภายหลังในการตั้งค่าบลูทูธ"</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"กำลังเปิดบลูทูธ..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"กำลังปิดบลูทูธ…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"เชื่อมต่ออัตโนมัติ"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"ลองผิดหลายครั้งมากเกินไป!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"ลองใหม่อีกครั้งใน <xliff:g id="NUMBER">%d</xliff:g> วินาที"</string>
     <string name="activity_not_found" msgid="5551664692991605325">"ไม่ได้ติดตั้งแอปพลิเคชันบนโทรศัพท์ของคุณ"</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"ยกเลิก"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"ถัดไป"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"การรักษาความปลอดภัยแท็บเล็ตของคุณ"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"การป้องกันโทรศัพท์ของคุณ"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"ปกป้องแท็บเล็ตของคุณจากการใช้งานที่ไม่ได้รับอนุญาตด้วยการสร้างรูปแบบการปลดล็อกหน้าจอส่วนบุคคล เลื่อนนิ้วเพื่อเชื่อมต่อจุดต่างๆ ในลำดับใดก็ได้บนหน้าจอถัดไป คุณต้องเชื่อมต่อจุดอย่างน้อยสี่จุด"\n\n"เมื่อพร้อมที่จะเริ่มแล้ว ให้แตะ \"ถัดไป\""</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"ปกป้องโทรศัพท์ของคุณจากการใช้งานที่ไม่ได้รับอนุญาต โดยสร้างรูปแบบการปลดล็อกหน้าจอส่วนบุคคล เลื่อนนิ้วของคุณเพื่อเชื่อมต่อจุดอย่างน้อยสี่จุดในลำดับใดก็ได้ในหน้าจอถัดไป"\n\n"เมื่อพร้อมที่จะเริ่มแล้ว ให้แตะ \"ถัดไป\""</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"จัดการแอปพลิเคชัน"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"จัดการและนำแอปพลิเคชันที่ติดตั้งไว้ออก"</string>
     <string name="applications_settings" msgid="1721442176406964682">"แอปพลิเคชัน"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 67867d8..4e9f157 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"Oo"</string>
     <string name="no" msgid="6731231425810196216">"Hindi"</string>
     <string name="create" msgid="3578857613172647409">"Likhain"</string>
+    <string name="allow" msgid="3349662621170855910">"Payagan"</string>
+    <string name="deny" msgid="6947806159746484865">"Tanggihan"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Hindi Kilala"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"<xliff:g id="STEP_COUNT">%1$d</xliff:g> (na) hakbang na lang ang layo mo mula sa pagiging isang developer."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"<xliff:g id="STEP_COUNT">%1$d</xliff:g> (na) hakbang na lang ang layo mo mula sa pagiging isang developer."</item>
+    <item quantity="other" msgid="6722953419953594148">"<xliff:g id="STEP_COUNT">%1$d</xliff:g> (na) hakbang na lang ang layo mo mula sa pagiging isang developer."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Isa ka nang developer!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Hindi na kailangan, isa ka nang developer."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"WIRELESS &amp; MGA NETWORK"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Hindi kilalang error"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Malamig"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Natutuklas"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Makikita ng lahat ng mga kalapit na device ng Bluetooth (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Makikita ng lahat ng kalapit na mga Bluetooth na device"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Hindi makikita ng iba pang mga device ng Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Makikita lamang ng mga nakapares na device"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Gawing natutuklas ang device"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Timeout ng visibility"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Itakda kung gaano katagal magiging natutuklasan ang aparato"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"I-lock ang pag-dial gamit ang boses"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Iwasan ang paggamit ng taga-dial ng bluetooth kapag naka-lock ang screen"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Mga device ng bluetooth"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Ipakita ang mga natanggap na file"</string>
     <string name="device_picker" msgid="8398232791303186677">"Tagapili ng device ng Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Kahilingan sa pahintulot ng bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Nais na i-on ng isang app ang Bluetooth. Payagan?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Nais ng isang app sa iyong tablet na gawing natutuklasan ng iba pang mga Bluetooth device ang iyong tablet sa loob ng <xliff:g id="TIMEOUT">%1$d</xliff:g> (na) segundo. Payagan?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Nais ng isang app sa iyong telepono na gawing natutuklasan ng iba pang mga Bluetooth device ang iyong telepono sa loob ng <xliff:g id="TIMEOUT">%1$d</xliff:g> (na) segundo. Payagan?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Nais ng isang app sa iyong tablet na gawing \"palaging natutuklasan\" ng iba pang mga Bluetooth device ang iyong tablet. Payagan?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Nais ng isang app sa iyong telepono na gawing \"palaging natutuklasan\" ang iyong telepono ng iba pang mga Bluetooth device. Payagan?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Nais ng isang app sa iyong tablet na i-on ang Bluetooth at gawing natutuklasan ng iba pang mga device ang iyong tablet sa loob ng <xliff:g id="TIMEOUT">%1$d</xliff:g> (na) segundo. Payagan?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Nais na i-on ng isang app sa iyong telepono ang Bluetooth at gawing natutuklasan ng iba pang mga device ang iyong telepono sa loob ng <xliff:g id="TIMEOUT">%1$d</xliff:g> (na) segundo. Payagan?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Nais ng isang app sa iyong tablet na i-on ang Bluetooth at gawing natutuklasan ng iba pang mga device ang iyong tablet. Payagan?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Nais na i-on ng isang app sa iyong telepono ang Bluetooth at gawing natutuklasan ng iba pang mga device ang iyong telepono. Payagan?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Gustong i-on ng isang app ang Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Gusto ng isang app na gawing nakikita ng iba pang mga Bluetooth device ang iyong tablet sa loob ng <xliff:g id="TIMEOUT">%1$d</xliff:g> (na) segundo."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Gusto ng isang app na gawing nakikita ng iba pang mga Bluetooth device ang iyong telepono sa loob ng <xliff:g id="TIMEOUT">%1$d</xliff:g> (na) segundo."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Gusto ng isang app na gawing nakikita ng iba pang mga Bluetooth device ang iyong tablet. Maaari mo itong palitan sa ibang pagkakataon sa mga setting ng Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Gusto ng isang app na gawing nakikita ng iba pang mga Bluetooth device ang iyong telepono. Maaari mo itong palitan sa ibang pagkakataon sa mga setting ng Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Gustong i-on ng isang app ang Bluetooth at gawing nakikita ng iba pang mga device ang iyong tablet sa loob ng <xliff:g id="TIMEOUT">%1$d</xliff:g> (na) segundo."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Gustong i-on ng isang app ang Bluetooth at gawing nakikita ng iba pang mga device ang iyong telepono sa loob ng <xliff:g id="TIMEOUT">%1$d</xliff:g> (na) segundo."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Gustong i-on ng isang app ang Bluetooth at gawing nakikita ng iba pang mga device ang iyong tablet. Maaari mo itong palitan sa ibang pagkakataon sa mga setting ng Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Gustong i-on ng isang app ang Bluetooth at gawing nakikita ng iba pang mga device ang iyong telepono. Maaari mo itong palitan sa ibang pagkakataon sa mga setting ng Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Binubuksan ang Bluetooth…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"I-no-off ang Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Auto-connect"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Masyadong maraming maling pagtatangka!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Subukang muli sa loob ng <xliff:g id="NUMBER">%d</xliff:g> (na) segundo."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Hindi naka-install ang application sa iyong telepono."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Kanselahin"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Susunod"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Sine-secure ang iyong tablet"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Pag-secure ng iyong telepono"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Protektahan ang iyong tablet mula sa hindi pinapahintulutang paggamit sa pamamagitan ng paglikha ng personal na pattern ng pag-unlock ng screen. I-slide ang iyong daliri upang ikonekta ang mga dot sa anumang pagkakaayos sa susunod na screen. Kailangan mong magkonekta ng hindi bababa sa apat na dot. "\n\n"Handa nang magsimula? Pindutin ang Susunod."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Protektahan ang iyong telepono mula sa hindi pinapahintulutang paggamit sa pamamagitan ng paglikha ng personal na pattern sa pag-unlock ng screen. I-slide ang iyong daliri upang magkonekta ng hindi bababa sa apat na dot sa anumang kaayusan sa susunod na screen. "\n\n"Handa na bang magsimula? Pindutin ang Susunod."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Pamahalaan ang apps"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Pamahalaan at alisin ang naka-install na apps"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Apps"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index d648f81..3a09990 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"Evet"</string>
     <string name="no" msgid="6731231425810196216">"Hayır"</string>
     <string name="create" msgid="3578857613172647409">"Oluştur"</string>
+    <string name="allow" msgid="3349662621170855910">"İzin ver"</string>
+    <string name="deny" msgid="6947806159746484865">"Reddet"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Bilinmiyor"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"Geliştirici olmanıza <xliff:g id="STEP_COUNT">%1$d</xliff:g> adım kaldı."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Geliştirici olmanıza <xliff:g id="STEP_COUNT">%1$d</xliff:g> adım kaldı."</item>
+    <item quantity="other" msgid="6722953419953594148">"Geliştirici olmanıza <xliff:g id="STEP_COUNT">%1$d</xliff:g> adım kaldı."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Artık siz bir geliştiricisiniz!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Gerekli değil, siz zaten bir geliştiricisiniz."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"KABLOSUZ ve AĞLAR"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Bilinmeyen hata"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Soğuk"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Keşfedilebilir"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Ykndki tüm Bluetooth chzlr trfndan görlblir (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Yakındki tüm Bluetooth cihazlrı trfndan görüleblir"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Diğer Bluetooth cihazları tarafından görülemez"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Sadece eşleştirilmiş chzlar tarafından görülebilir"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Cihazı keşfedilebilir yap"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Görünürlük zaman aşımı"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Cihazın ne süreyle keşfedilebilir olacağını ayarla"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Sesli aramayı kilitle"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Ekran kilitliyken blutooth çeviricinin kullanımını engelle"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth cihazlar"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Alınan dosyaları göster"</string>
     <string name="device_picker" msgid="8398232791303186677">"Bluetooth cihaz seçici"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth izin isteği"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Telefonunuzdaki bir uygulama, Bluetooth\'u açmak istiyor. İzin veriyor musunuz?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Tabletinizdeki bir uygulama, tabletinizi <xliff:g id="TIMEOUT">%1$d</xliff:g> saniye boyunca diğer Bluetooth cihazları tarafından bulunabilir duruma getirmek için izin istiyor. Bunu yapmak istiyor musunuz?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Telefonunuzdaki bir uygulama, telefonunuzu <xliff:g id="TIMEOUT">%1$d</xliff:g> saniye boyunca diğer Bluetooth cihazları tarafından bulunabilir duruma getirmek için izin istiyor. Buna izin veriyor musunuz?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Tabletinizdeki bir uygulama, tabletinizi diğer Bluetooth cihazları tarafından \"her zaman bulunabilir\" duruma getirmek için izin istiyor. Bunu yapmak istiyor musunuz?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Telefonunuzdaki bir uygulama, telefonunuzu diğer Bluetooth cihazları tarafından \"her zaman bulunabilir\" duruma getirmek için izin istiyor. Buna izin veriyor musunuz?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Tabletinizdeki bir uygulama, Bluetooth\'u açmak ve tabletinizi <xliff:g id="TIMEOUT">%1$d</xliff:g> saniye boyunca diğer Bluetooth cihazları tarafından bulunabilir duruma getirmek için izin istiyor. Bunu yapmak istiyor musunuz?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Telefonunuzdaki bir uygulama, Bluetooth\'u açmak ve <xliff:g id="TIMEOUT">%1$d</xliff:g> saniye boyunca telefonunuzu diğer cihazlar tarafından bulunabilir duruma getirmek istiyor. İzin veriyor musunuz?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Tabletinizdeki bir uygulama, Bluetooth\'u açmak ve tabletinizi diğer Bluetooth cihazları tarafından bulunabilir duruma getirmek için izin istiyor. Bunu yapmak istiyor musunuz?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Telefonunuzdaki bir uygulama, Bluetooth\'u açmak ve telefonunuzu diğer cihazlar tarafından bulunabilir duruma getirmek istiyor. İzin veriyor musunuz?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Bir uygulama Bluetooth\'u açmak istiyor."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Bir uygulama, tabletinizi <xliff:g id="TIMEOUT">%1$d</xliff:g> saniye boyunca diğer Bluetooth cihazlarına görünebilir yapmak istiyor."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Bir uygulama, telefonunuzu <xliff:g id="TIMEOUT">%1$d</xliff:g> saniye boyunca diğer Bluetooth cihazlarına görünebilir yapmak istiyor."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Bir uygulama tabletinizi diğer Bluetooth cihazlara görünebilir yapmak istiyor. Bunu daha sonra Bluetooth ayarlarından değiştirebilirsiniz."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Bir uygulama telefonunuzu diğer Bluetooth cihazlara görünebilir yapmak istiyor. Bunu daha sonra Bluetooth ayarlarından değiştirebilirsiniz."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Bir uygulama Bluetooth\'u açmak ve <xliff:g id="TIMEOUT">%1$d</xliff:g> saniye boyunca tabletinizi diğer cihazlara görünebilir yapmak istiyor."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Bir uygulama Bluetooth\'u açmak ve <xliff:g id="TIMEOUT">%1$d</xliff:g> saniye boyunca telefonunuzu diğer cihazlara görünebilir yapmak istiyor."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Bir uygulama Bluetooth\'u açmak ve tabletinizi diğer cihazlara görünebilir yapmak istiyor. Bunu daha sonra Bluetooth ayarlarından değiştirebilirsiniz."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Bir uygulama Bluetooth\'u açmak ve telefonunuzu diğer cihazlara görünebilir yapmak istiyor. Bunu daha sonra Bluetooth ayarlarından değiştirebilirsiniz."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth açılıyor..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth kapatılıyor..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Otomatik bağlan"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Çok fazla sayıda yanlış deneme yapıldı!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g> saniye içinde yeniden deneyin."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Uygulama, telefonunuzda yüklü değil."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"İptal"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"İleri"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Tabletinizin güvenliğini sağlama"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Telefonunuzu güvenlik altına alma"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Kişisel bir kilit açma deseni oluşturarak tabletinizi yetkisiz kullanıma karşı koruyun. Bir sonraki ekranda parmağınızı kaydırarak noktaları istediğiniz sırada birleştirin. En az dört noktayı birleştirmeniz gereklidir. "\n\n"Başlamaya hazır mısınız? İleri\'ye dokunun."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Kendinize özel bir ekran kilidi açma deseni oluşturarak telefonunuzu yetkisiz kullanıma karşı koruyun. Bir sonraki ekranda parmağınızı kullanarak en az dört noktayı istediğiniz sırayla birleştirin. "\n\n"Başlamaya hazır mısınız? \"İleri\"ye dokunun."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Uygulamaları yönet"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Yüklü uygulamaları yönet ve kaldır"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Uygulamalar"</string>
@@ -1674,7 +1670,7 @@
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Veri kullanımı"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Veri kullanım dönemi"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Veri dolaşımında"</string>
-    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Arka plan verileri sınırla"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Arka pl veri sınırla"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Ayrı 4G kullanımı"</string>
     <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Kablosuz kullanımını göster"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Ethernet kullanımını göster"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 63f083b..9f0a8cf 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"Так"</string>
     <string name="no" msgid="6731231425810196216">"Ні"</string>
     <string name="create" msgid="3578857613172647409">"Створити"</string>
+    <string name="allow" msgid="3349662621170855910">"Дозволити"</string>
+    <string name="deny" msgid="6947806159746484865">"Заборонити"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Невідомо"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"Щоб стати розробником, залишилося лише стільки кроків: <xliff:g id="STEP_COUNT">%1$d</xliff:g>."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Щоб стати розробником, залишився лише <xliff:g id="STEP_COUNT">%1$d</xliff:g> крок."</item>
+    <item quantity="other" msgid="6722953419953594148">"Щоб стати розробником, залишилося лише стільки кроків: <xliff:g id="STEP_COUNT">%1$d</xliff:g>."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Тепер ви – розробник!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Немає потреби, ви вже розробник."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"БЕЗДРОТОВИЙ ЗВ’ЯЗОК І МЕРЕЖІ"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Невідома помилка"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Низька"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Видимий"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Видимий для всіх пристроїв Bluetooth неподалік (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Видимий для всіх пристроїв Bluetooth неподалік"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Невидимий для інших пристроїв Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Видимий лише для спарених пристроїв"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Зробити пристрій видимим"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Час видимості"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Налаштуйте час видимості пристрою"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Заблок. голос. набір"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Запобігає використанню набору bluetooth, коли екран заблоковано"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Пристрої Bluetooth"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Показати отримані файли"</string>
     <string name="device_picker" msgid="8398232791303186677">"Інструмент вибору пристрою Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Запит на дозвіл Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Програма хоче ввімкнути Bluetooth. Дозволити?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Програма у вашому планшетному ПК хоче зробити його видимим для інших пристроїв Bluetooth упродовж <xliff:g id="TIMEOUT">%1$d</xliff:g> секунд. Дозволити?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Програма у вашому телефоні хоче зробити його видимим для інших пристроїв Bluetooth упродовж <xliff:g id="TIMEOUT">%1$d</xliff:g> секунд. Дозволити?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Програма у вашому планшетному ПК хоче зробити його \"постійно видимим\" для інших пристроїв Bluetooth. Дозволити?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Програма у вашому телефоні хоче зробити його \"постійно видимим\" для інших пристроїв Bluetooth. Дозволити?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Програма у вашому пристрої хоче ввімкнути Bluetooth і зробити планшетний ПК видимим для інших пристроїв упродовж <xliff:g id="TIMEOUT">%1$d</xliff:g> секунд. Дозволити?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Програма у вашому телефоні хоче ввімкнути Bluetooth і зробити телефон видимим для інших пристроїв упродовж <xliff:g id="TIMEOUT">%1$d</xliff:g> секунд. Дозволити?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Програма у вашому планшетному ПК хоче ввімкнути Bluetooth і зробити планшетний ПК видимим для інших пристроїв. Дозволити?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Програма у вашому телефоні хоче ввімкнути Bluetooth і зробити телефон видимим для інших пристроїв. Дозволити?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Програма хоче ввімкнути Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Програма хоче зробити ваш планшетний ПК видимим для інших пристроїв Bluetooth упродовж <xliff:g id="TIMEOUT">%1$d</xliff:g> секунд."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Програма хоче зробити ваш телефон видимим для інших пристроїв Bluetooth упродовж <xliff:g id="TIMEOUT">%1$d</xliff:g> секунд."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Програма хоче зробити ваш планшетний ПК видимим для інших пристроїв Bluetooth. Цей параметр можна змінити згодом у налаштуваннях Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Програма хоче зробити ваш телефон видимим для інших пристроїв Bluetooth. Цей параметр можна змінити згодом у налаштуваннях Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Програма хоче ввімкнути Bluetooth і зробити ваш планшетний ПК видимим для інших пристроїв упродовж <xliff:g id="TIMEOUT">%1$d</xliff:g> секунд."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Програма хоче ввімкнути Bluetooth і зробити ваш телефон видимим для інших пристроїв упродовж <xliff:g id="TIMEOUT">%1$d</xliff:g> секунд."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Програма хоче ввімкнути Bluetooth і зробити ваш планшетний ПК видимим для інших пристроїв. Цей параметр можна змінити згодом у налаштуваннях Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Програма хоче ввімкнути Bluetooth і зробити ваш телефон видимим для інших пристроїв. Цей параметр можна змінити згодом у налаштуваннях Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Увімкнення Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Вимкнення Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Автоматичне з’єднання"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Забагато неправильних спроб!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Спробуйте ще через <xliff:g id="NUMBER">%d</xliff:g> сек."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Програму не встановлено у вашому телефоні."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Скасувати"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Далі"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Захист вашого пристрою"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Захист вашого телефону"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Захистіть свій планшетний ПК від несанкціонованого використання, створивши особистий ключ розблокування екрана. На наступному екрані пальцем з’єднайте крапки в будь-якому порядку. Потрібно з’єднати принаймні чотири крапки. "\n\n"Готові? Торкніться опції \"Далі\"."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Захистіть свій телефон від несанкціонованого використання, створивши особистий ключ розблокування екрана. На наступному екрані пальцем з’єднайте принаймні чотири крапки в будь-якому порядку. "\n\n"Готові? Торкніться опції \"Далі\"."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Керувати програмами"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Керувати встановленими програмами та видаляти їх"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Програми"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index ea288f7..a976db8 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"Có"</string>
     <string name="no" msgid="6731231425810196216">"Không"</string>
     <string name="create" msgid="3578857613172647409">"Tạo"</string>
+    <string name="allow" msgid="3349662621170855910">"Cho phép"</string>
+    <string name="deny" msgid="6947806159746484865">"Từ chối"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Không xác định"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"Bây giờ, bạn giờ chỉ cần thực hiện <xliff:g id="STEP_COUNT">%1$d</xliff:g> bước nữa là sẽ trở thành nhà phát triển."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Bây giờ, bạn giờ chỉ cần thực hiện <xliff:g id="STEP_COUNT">%1$d</xliff:g> bước nữa là sẽ trở thành nhà phát triển."</item>
+    <item quantity="other" msgid="6722953419953594148">"Bây giờ, bạn giờ chỉ cần thực hiện <xliff:g id="STEP_COUNT">%1$d</xliff:g> bước nữa là sẽ trở thành nhà phát triển."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Bạn đã là nhà phát triển!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Không cần, bạn đã là nhà phát triển."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"KHÔNG DÂY &amp; MẠNG"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Lỗi không xác định"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Không hoạt động"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Có thể phát hiện"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Hiển thị với tất cả th.bị Bluetooth gần đó (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Hiển thị với tất cả các thiết bị Bluetooth gần đó"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Không hiển thị với các thiết bị Bluetooth khác"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Chỉ hiển thị với các thiết bị được ghép nối"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Đặt thiết bị ở chế độ có thể phát hiện"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Hết thời gian hiển thị"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Đặt thời gian thiết bị có thể phát hiện được"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Khoá quay số bằng giọng nói"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Ngăn việc sử dụng trình quay số bluetooth khi màn hình bị khóa."</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Thiết bị Bluetooth"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Hiển thị các tệp đã nhận"</string>
     <string name="device_picker" msgid="8398232791303186677">"Trình chọn thiết bị Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Yêu cầu quyền Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Một ứng dụng muốn bật Bluetooth. Cho phép?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Một ứng dụng trên máy tính bảng của bạn muốn đặt máy tính bảng của bạn ở chế độ có thể phát hiện được bởi các thiết bị Bluetooth khác trong <xliff:g id="TIMEOUT">%1$d</xliff:g> giây. Cho phép?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Một ứng dụng trên điện thoại của bạn muốn đặt điện thoại của bạn ở chế độ có thể phát hiện được bởi các thiết bị Bluetooth khác trong <xliff:g id="TIMEOUT">%1$d</xliff:g> giây. Cho phép?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Một ứng dụng trên máy tính bảng của bạn muốn đặt máy tính bảng ở chế độ “luôn có thể phát hiện được” bởi các thiết bị Bluetooth khác. Cho phép?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Một ứng dụng trên điện thoại của bạn muốn đặt điện thoại của bạn ở chế độ “luôn phát hiện được” bởi thiết bị Bluetooth khác. Cho phép?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Một ứng dụng trên máy tính bảng của bạn muốn bật Bluetooth và đặt máy tính bảng của bạn ở chế độ có thể phát hiện được bởi các thiết bị khác trong <xliff:g id="TIMEOUT">%1$d</xliff:g> giây. Cho phép?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Một ứng dụng trên điện thoại của bạn muốn bật Bluetooth và đặt điện thoại của bạn ở chế độ có thể phát hiện được bởi các thiết bị khác trong <xliff:g id="TIMEOUT">%1$d</xliff:g> giây. Cho phép?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Một ứng dụng trên máy tính bảng của bạn muốn bật Bluetooth và đặt máy tính bảng của bạn ở chế độ có thể phát hiện được bởi các thiết bị khác. Cho phép?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Một ứng dụng trên điện thoại của bạn muốn bật Bluetooth và đặt điện thoại của bạn ở chế độ có thể phát hiện được bởi các thiết bị khác. Cho phép?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Một ứng dụng muốn bật Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Một ứng dụng muốn đặt máy tính bảng của bạn ở chế độ hiển thị với các thiết bị Bluetooth khác trong <xliff:g id="TIMEOUT">%1$d</xliff:g> giây."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Một ứng dụng muốn đặt điện thoại của bạn ở chế độ hiển thị với các thiết bị Bluetooth khác trong <xliff:g id="TIMEOUT">%1$d</xliff:g> giây."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Một ứng dụng muốn đặt máy tính bảng của bạn ở chế độ hiển thị với các thiết bị khác. Bạn có thể thay đổi cài đặt này sau trong cài đặt Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Một ứng dụng muốn đặt điện thoại của bạn ở chế độ hiển thị với các thiết bị khác. Bạn có thể thay đổi cài đặt này sau trong cài đặt Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Một ứng dụng muốn bật Bluetooth và đặt máy tính bảng của bạn ở chế độ hiển thị với các thiết bị khác trong <xliff:g id="TIMEOUT">%1$d</xliff:g> giây."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Một ứng dụng muốn bật Bluetooth và đặt điện thoại của bạn ở chế độ hiển thị với các thiết bị khác trong <xliff:g id="TIMEOUT">%1$d</xliff:g> giây."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Một ứng dụng muốn bật Bluetooth và đặt máy tính bảng của bạn ở chế độ hiển thị với các thiết bị khác. Bạn có thể thay đổi cài đặt này sau trong cài đặt Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Một ứng dụng muốn bật Bluetooth và đặt điện thoại của bạn ở chế độ hiển thị với các thiết bị khác. Bạn có thể thay đổi cài đặt này sau trong cài đặt Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Đang bật Bluetooth…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Đang tắt Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Tự động kết nối"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Quá nhiều lần không chính xác!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Hãy thử lại sau <xliff:g id="NUMBER">%d</xliff:g> giây."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Ứng dụng chưa được cài đặt trên điện thoại của bạn."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Hủy"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Tiếp theo"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Đang bảo vệ máy tính bảng của bạn"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Đang bảo vệ điện thoại của bạn"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Bảo vệ máy tính bảng của bạn khỏi hành vi sử dụng trái phép bằng cách tạo hình mở khóa màn hình cá nhân. Trượt ngón tay để kết nối các điểm theo thứ tự bất kỳ trên màn hình tiếp theo. Bạn cần kết nối ít nhất bốn điểm. "\n\n"Bạn đã sẵn sàng bắt đầu chưa? Hãy chạm vào Tiếp theo."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Bảo vệ điện thoại của bạn khỏi hành vi sử dụng trái phép bằng cách tạo hình mở khóa màn hình cá nhân. Trượt ngón tay để kết nối ít nhất bốn điểm theo thứ tự bất kỳ trên màn hình tiếp theo. "\n\n"Bạn đã sẵn sàng bắt đầu chưa? Hãy chạm vào Tiếp theo."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Quản lý ứng dụng"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Quản lý và xóa ứng dụng đã cài đặt"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Ứng dụng"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 8aa8a8f..9d5ddeb 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"是"</string>
     <string name="no" msgid="6731231425810196216">"无"</string>
     <string name="create" msgid="3578857613172647409">"创建"</string>
+    <string name="allow" msgid="3349662621170855910">"允许"</string>
+    <string name="deny" msgid="6947806159746484865">"拒绝"</string>
     <string name="device_info_default" msgid="7847265875578739287">"未知"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"只需执行 <xliff:g id="STEP_COUNT">%1$d</xliff:g> 步操作即可进入开发者模式。"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"只需 <xliff:g id="STEP_COUNT">%1$d</xliff:g> 步操作即可进入开发者模式。"</item>
+    <item quantity="other" msgid="6722953419953594148">"只需 <xliff:g id="STEP_COUNT">%1$d</xliff:g> 步操作即可进入开发者模式。"</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"您现在处于开发者模式！"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"您已处于开发者模式，无需进行此操作。"</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"无线和网络"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"未知错误"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"电量低"</string>
     <string name="bluetooth" msgid="5549625000628014477">"蓝牙"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"可检测性"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"让附近所有的蓝牙设备均可检测到（<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>）"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"让附近所有的蓝牙设备均可检测到"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"不让其他蓝牙设备检测到"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"仅让已配对的设备检测到"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"可以检测到设备"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"检测超时设置"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"设置可检测到设备的时间"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"锁定语音拨号"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"屏幕锁定时停止使用蓝牙拨号器"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"蓝牙设备"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"显示接收到的文件"</string>
     <string name="device_picker" msgid="8398232791303186677">"蓝牙设备选择器"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"蓝牙权限请求"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"某个应用想要打开蓝牙。允许该程序打开蓝牙吗？"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"您平板电脑上的某个应用想让其他蓝牙设备在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的平板电脑。允许该程序执行相应操作吗？"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"您手机上的某个应用想让其他蓝牙设备在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的手机。允许该程序执行相应操作吗？"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"您平板电脑上的某个应用想让其他蓝牙设备“一直可检测到”您的平板电脑。允许该程序执行相应操作吗？"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"您手机上的某个应用想让其他蓝牙设备“一直可检测到”您的手机。允许该程序执行相应操作吗？"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"您平板电脑上的某个应用想要打开蓝牙，以便其他设备可在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的平板电脑。允许该程序打开蓝牙吗？"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"您手机上的某个应用想要打开蓝牙，以便其他设备可在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的手机。允许该程序打开蓝牙吗？"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"您平板电脑上的某个应用想要打开蓝牙，以便其他设备可检测到您的平板电脑。允许该程序打开蓝牙吗？"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"您手机上的某个应用想要打开蓝牙，以便其他设备可检测到您的手机。允许该程序打开蓝牙吗？"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"某个应用想要打开蓝牙。"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"某个应用想让其他蓝牙设备在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的平板电脑。"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"某个应用想让其他蓝牙设备在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的手机。"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"某个应用想让其他蓝牙设备检测到您的平板电脑。之后，您可以在“蓝牙”设置中更改此设置。"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"某个应用想让其他蓝牙设备检测到您的手机。之后，您可以在“蓝牙”设置中更改此设置。"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"某个应用想要打开蓝牙，以便其他设备可在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的平板电脑。"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"某个应用想要打开蓝牙，以便其他设备可在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的手机。"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"某个应用想要打开蓝牙，以便其他设备可检测到您的平板电脑。之后，您可以在“蓝牙”设置中更改此设置。"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"某个应用想要打开蓝牙，以便其他设备可检测到您的手机。之后，您可以在“蓝牙”设置中更改此设置。"</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"正在打开蓝牙..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"正在关闭蓝牙…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"自动连接"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"错误的尝试次数过多！"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g> 秒后重试。"</string>
     <string name="activity_not_found" msgid="5551664692991605325">"您的手机上未安装相应应用。"</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"取消"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"下一步"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"保护您的平板电脑"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"手机安全设置"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"创建个人屏幕解锁图案可防止他人未经许可使用您的平板电脑。在下一屏幕上用手指以任意顺序连接至少四个点。"\n\n"准备好开始了吗？请触摸“下一步”。"</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"创建个人屏幕解锁图案可防止他人未经许可使用您的手机。在下一屏幕上滑动手指以任意顺序连接至少四个点。"\n\n"准备好开始了吗？请触摸“下一步”。"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"管理应用"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"管理和删除已安装的应用"</string>
     <string name="applications_settings" msgid="1721442176406964682">"应用"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 1c9e713..8df51cb 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"是"</string>
     <string name="no" msgid="6731231425810196216">"否"</string>
     <string name="create" msgid="3578857613172647409">"建立"</string>
+    <string name="allow" msgid="3349662621170855910">"允許"</string>
+    <string name="deny" msgid="6947806159746484865">"拒絕"</string>
     <string name="device_info_default" msgid="7847265875578739287">"不明"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"您只需完成剩餘的 <xliff:g id="STEP_COUNT">%1$d</xliff:g> 個步驟，即可成為開發人員。"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"您只需完成剩餘的 <xliff:g id="STEP_COUNT">%1$d</xliff:g> 個步驟，即可成為開發人員。"</item>
+    <item quantity="other" msgid="6722953419953594148">"您只需完成剩餘的 <xliff:g id="STEP_COUNT">%1$d</xliff:g> 個步驟，即可成為開發人員。"</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"您現在已成為開發人員！"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"不需要了，您已經是開發人員。"</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"無線與網路"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"未知的錯誤"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"冷"</string>
     <string name="bluetooth" msgid="5549625000628014477">"藍牙"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"可偵測性"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"向附近所有藍牙裝置顯示 (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"向附近所有藍牙裝置顯示"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"不向其他藍牙裝置顯示"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"只向配對的裝置顯示"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"設定裝置為可偵測"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"偵測時限設定"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"設定裝置可供偵測的開放時間"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"鎖定語音撥號"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"螢幕鎖定時不要使用藍牙撥號"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"藍牙裝置"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"顯示已接收的檔案"</string>
     <string name="device_picker" msgid="8398232791303186677">"藍牙裝置選擇器"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"藍牙權限要求"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"應用程式要求開啟藍牙功能，您要允許這項要求嗎？"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"平板電腦上的某個應用程式要求將平板電腦設成開放其他藍牙裝置搜尋，開放的時間長度為 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒。您要允許這項要求嗎？"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"手機上的某個應用程式要求將手機設成開放其他藍牙裝置搜尋，開放的時間長度為 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒。您要允許這項要求嗎？"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"平板電腦上的某個應用程式要求將平板電腦「一律設成開放其他藍牙裝置搜尋」，您要允許這項要求嗎？"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"手機上的某個應用程式要求將手機設成「一律開放其他藍牙裝置搜尋」，您要允許這項要求嗎？"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"平板電腦上的某個應用程式要求將平板電腦設成開放其他藍牙裝置搜尋，開放的時間長度為 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒。您要允許這項要求嗎？"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"您手機中的某個應用程式要求開啟藍牙功能 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒鐘，讓其他藍牙裝置可在這段時間內搜尋到您的手機。您要允許這項要求嗎？"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"平板電腦上的某個應用程式要求將平板電腦設成開放其他藍牙裝置搜尋，您要允許這項要求嗎？"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"您手機中的某個應用程式要求開啟藍牙功能，讓其他藍牙裝置可在這段時間內搜尋到您的手機。您要允許這項要求嗎？"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"應用程式要求開啟藍牙功能。"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"應用程式要求將平板電腦設為對其他藍牙裝置顯示，顯示的時間長度為 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒。"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"應用程式要求將手機設為對其他藍牙裝置顯示，顯示的時間長度為 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒。"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"應用程式要求將平板電腦設為對其他藍牙裝置顯示。您日後可在 [藍牙] 設定中變更這項設定。"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"應用程式要求將手機設為對其他藍牙裝置顯示。您日後可在 [藍牙] 設定中變更這項設定。"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"應用程式要求開啟藍牙功能 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒，在這段時間內將平板電腦設為對其他裝置顯示。"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"應用程式要求開啟藍牙功能 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒，在這段時間內將手機設為對其他裝置顯示。"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"應用程式要求開啟藍牙功能，將平板電腦設為對其他裝置顯示。您日後可在 [藍牙] 設定中變更這項設定。"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"應用程式要求開啟藍牙功能，將手機設為對其他裝置顯示。您日後可在 [藍牙] 設定中變更這項設定。"</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"藍牙開啟中…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"正在關閉藍牙…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"自動連線"</string>
@@ -1022,12 +1024,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"錯誤嘗試太多！"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g> 秒後再試一次。"</string>
     <string name="activity_not_found" msgid="5551664692991605325">"您未在手機上安裝應用程式。"</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"取消"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"下一步"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"保護平板電腦的安全"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"手機安全設定"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"建立個人螢幕解鎖圖形，避免有心人士未經授權即擅自使用您的平板電腦。在下個畫面中，滑動手指任意連結螢幕中至少 4 個點。"\n\n"準備開始了嗎？請輕觸 [下一步]。"</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"建立個人螢幕解鎖圖形，避免他人未經授權擅自使用您的手機。請在下一個畫面中，滑動手指任意連接至少四個點。"\n\n"準備開始了嗎？請輕觸 [下一步]。"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"管理應用程式"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"管理和移除已安裝的應用程式"</string>
     <string name="applications_settings" msgid="1721442176406964682">"應用程式"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 7980974..6491e2c 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -19,8 +19,13 @@
     <string name="yes" msgid="4676390750360727396">"Yebo"</string>
     <string name="no" msgid="6731231425810196216">"Cha"</string>
     <string name="create" msgid="3578857613172647409">"Yakha"</string>
+    <string name="allow" msgid="3349662621170855910">"Vumela"</string>
+    <string name="deny" msgid="6947806159746484865">"Nqaba"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Akwaziwa"</string>
-    <string name="show_dev_countdown" msgid="5521163114237004821">"Manje usalelwe yizinyathelo ezingu-<xliff:g id="STEP_COUNT">%1$d</xliff:g> ukuthi ube ngunjiniyela."</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Manje usalelwe yizinyathelo ezingu-<xliff:g id="STEP_COUNT">%1$d</xliff:g> ukuthi ube ngunjiniyela."</item>
+    <item quantity="other" msgid="6722953419953594148">"Manje usalelwe yizinyathelo ezingu-<xliff:g id="STEP_COUNT">%1$d</xliff:g> ukuthi ube ngunjiniyela."</item>
+  </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Manje ungunjiniyela!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Asikho isidingo, usuvele ungunjiniyela."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"AMANETHIWEKHI NOKUNGENANTAMBO"</string>
@@ -105,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Iphutha elingaziwa"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Kuyabanda"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Iyatholakala"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Ibonakala kuwo wonke amadivayisi e-Bluetooth (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Iyabonakala kuwo wonke amadivaysi aseduze we-Bluetooth"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Ayibonakali kwamanye amadivayisi e-Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Ibonakala kuphela kumadivayisi apheyiwe"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Yenza idivaysi itholakale"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Ukubonakala kuphelelwe isikhathi"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Hlela ukuthi idivaysi izotholakala isikhathi esingakanani"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Vala ukudayela ngezwi"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Gwema ukusebenzisa isidayeli se-bluetooth lapho isikrini sivaliwe"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Amadivaysi e-Bluetooth"</string>
@@ -146,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Bonisa amafayili atholiwe"</string>
     <string name="device_picker" msgid="8398232791303186677">"Isikhethi sedivayisi ye-Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Isicelo semvume ye-Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Zonke izinhlelo zokulungiselela ukusebenza zifuna ukuvula i-Bluetooth. Ngabe uyakuvumela lokhu?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Uhlelo lokusebenza olukwi-tablet yakho lufuna ukwenza ukuthi i-tablet yakho ibonwe ngamanye amadivayisi e-Bluetooth  <xliff:g id="TIMEOUT">%1$d</xliff:g> imizuzwana. Ngabe uyakuvumela lokhu?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Kukhona uhlelo lokusebenza kwiselula yakho olufuna ukuvula i-Bluetooth bese lwenza ukuthi iselula yakho itholwe ngamanye amadivayisi <xliff:g id="TIMEOUT">%1$d</xliff:g> imizuzwana. Kuvunyelwe na?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Uhlelo lokusebenza olukwi-tablet yakho lufuna ukwenza ukuthi i-tablet yakho \"ibonwe ngaso sonke isikhathi\" ngamanye amadivayisi e-Bluetooth . Ngabe uyakuvumela lokhu?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Kukhona uhlelo lokusebenza kwiselula yakho olufuna ukuthi iselula yakho \"ihlale itholwe\" ngamanye amadivayisi e-Bluetooth. Kuvunyelwe na?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Uhlelo lokusebenza olukwi-tablet yakho lufuna ukwenza ukuthi i-tablet yakho ibonwe ngamanye amadivayisi e-Bluetooth  <xliff:g id="TIMEOUT">%1$d</xliff:g> imizuzwana. Ngabe uyakuvumela lokhu?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Kukhona uhlelo lokusebenza kwiselula yakho olufuna ukuvula i-Bluetooth bese lwenza ukuthi iselula yakho itholwe ngamanye amadivayisi <xliff:g id="TIMEOUT">%1$d</xliff:g> imizuzwana. Kuvunyelwe na?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Uhlelo lokusebenza olukwi-tablet yakho lufuna ukwenza ukuthi i-tablet yakho ibonwe ngamanye amadivayisi e-Bluetooth  {0}TIMEOUT{/0} imizuzwana. Ngabe uyakuvumela lokhu?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Kukhona uhlelo lokusebenza kwiselula yakho olufuna ukuvula i-Bluetooth bese lwenza ukuthi iselula yakho itholwe ngamanye amadivayisi {0}TIMEOUT{/0} imizuzwana. Kuvunyelwe na?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Uhlelo lokusebenza lifuna ukuvula i-Bluetooth"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Uhlelo lokusebenza oluthile lufuna ukwenza ithebulethi yakho ibonakale kwamanye amadivayisi we-Bluetooth kumasekhondi angu-<xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Uhlelo lokusebenza oluthile lufuna ukwenza ifoni yakho ibonakale kwamanye amadivayisi we-Bluetooth kumasekhondi angu-<xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Uhlelo lokusebenza lifuna ukuvula i-Bluetooth futhi lenze ithebulethi yakho ibonakale kwamanye amadivayisi we-Bluetooth. Ungakushintsha lokhu emuva kwesikhathi kuzilungiselelo ze-Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Uhlelo lokusebenza lifuna ukuvula i-Bluetooth futhi lenze ifoni yakho ibonakale kwamanye amadivayisi we-Bluetooth. Ungakushintsha lokhu emuva kwesikhathi kuzilungiselelo ze-Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Uhlelo lokusebenza lifuna ukuvula i-Bluetooth futhi lenze ithebulethi yakho ibonakale kwamanye amadivayisi kumasekhondi angu-<xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Uhlelo lokusebenza lifuna ukuvula i-Bluetooth futhi lenze ifoni yakho ibonakale kwamanye amadivayisi kumasekhondi angu-<xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Uhlelo lokusebenza lifuna ukuvula i-Bluetooth futhi lenze ithebulethi yakho ibonakale kwamanye amadivayisi. Ungakushintsha lokhu emuva kwesikhathi kuzilungiselelo ze-Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Uhlelo lokusebenza lifuna ukuvula i-Bluetooth futhi lenze ifoni yakho ibonakale kwamanye amadivayisi. Ungakushintsha lokhu emuva kwesikhathi kuzilungiselelo ze-Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Ivula i-Bluetooth"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Ivala i-Bluetooth"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Ukuxhuma okuzenzakalelayo"</string>
@@ -1023,12 +1025,6 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Kunemizamo engalungile eminingi kakhulu!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Zama futhi emaminithini angu- <xliff:g id="NUMBER">%d</xliff:g>."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Uhlelo lokusebenza alufakiwe efonini yakho."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Khansela"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Okulandelayo"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Ivikela ithebhulethi yakho"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Ukuphepha kwefoni yakho"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Vikela ithebhulethi yakho ekusetshenzisweni okungavumelekile ngokwenza iphathini yokuvula isikrini. Sebenzisa umunwe wakho ukuxhuma amachashazi nganoma yikuphi ukuhleleka kwsikrini esilandelayo. Kumele uxhume okungenani amachashazi amane. "\n\n"Ukulungele ukuqalisa? Thinta \"Okulandelayo\"."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Vikela ifoni yakho ekusetshenzisweni okungemthotho ngokwakha iphethini yakho siqu yokuvula isikrini. Sebenzisa umunwe wakho ukuxhuma okungenani amadothi amane kusikrini sombhalo. "\n\n"Usukulungele ukuqala? Thinta Okulandelayo."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Phatha izinhlelo zokusebenza"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Phatha futhi ukhiphe izinhlelo zokusebenza ezifakiwe"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Izinhlelo zokusebenza"</string>