am b1f3a008: am c4427491: am f8811a59: Merge "Strings for next change" into lmp-dev

* commit 'b1f3a00884dd1e68e460313b1dbb33fbe3c56ba2':
  Strings for next change
This commit is contained in:
Paul Lawrence
2014-08-08 23:11:24 +00:00
committed by Android Git Automerger

View File

@@ -897,6 +897,27 @@
to restore any data that was backed up to your Google Account.
</string>
<!-- Title of the encryption screen when decrypting the device failed -->
<string name="crypt_keeper_data_corrupt_title">Decryption unsuccessful</string>
<!-- Informational text when encryption fails -->
<string name="crypt_keeper_data_corrupt_summary" product="tablet">
The password you entered is correct, but unfortunately your data is
corrupt.
\n\nTo resume using your tablet, you need to perform a factory reset.
When you set up your tablet after the reset, you\'ll have an opportunity
to restore any data that was backed up to your Google Account.
</string>
<!-- Informational text when encryption fails -->
<string name="crypt_keeper_data_corrupt_summary" product="default">
The password you entered is correct, but unfortunately your data is
corrupt.
\n\nTo resume using your phone, you need to perform a factory reset.
When you set up your phone after the reset, you\'ll have an opportunity
to restore any data that was backed up to your Google Account.
</string>
<!-- Image button description to switch input method -->
<string name="crypt_keeper_switch_input_method">Switch input method</string>