am 0844554f: am 83b4fac5: am 41c19779: Merge "Add a new flow for decryption checking." into lmp-mr1-dev

* commit '0844554f82b0db64cb2eeb8f0aac681edb7ad6f6':
  Add a new flow for decryption checking.
This commit is contained in:
Paul Crowley
2014-11-07 04:15:35 +00:00
committed by Android Git Automerger
2 changed files with 43 additions and 11 deletions

View File

@@ -4675,8 +4675,19 @@
<string name="enter_pin">To start Android, enter your PIN</string>
<!-- Informational text on the pattern entry screen prompting the user for their pattern -->
<string name="enter_pattern">To start Android, draw your pattern</string>
<!-- This is displayed when the password is entered incorrectly -->
<string name="try_again">Try again.</string>
<!-- Message shown when user enters wrong pattern -->
<string name="cryptkeeper_wrong_pattern">Wrong Pattern</string>
<!-- Message shown when user enters wrong password -->
<string name="cryptkeeper_wrong_password">Wrong Password</string>
<!-- Message shown when user enters wrong PIN -->
<string name="cryptkeeper_wrong_pin">Wrong PIN</string>
<!-- Shown when a password has been entered, and we're checking it -->
<string name="checking_decryption">Checking\u2026</string>
<!-- Shown when password is correct, and we're starting Android -->
<string name="starting_android">Starting Android</string>
<!-- the following are for Settings Storage screen -->
<!-- Menu item/button 'delete' -->