PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix encryption strings" into lmp-dev

Browse Source
This commit is contained in:
Paul Lawrence
2014-08-19 20:50:14 +00:00
committed by Android (Google) Code Review
parent d5a497b837 ad8bd85d7a
commit b7b686cadf
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
res/values/strings.xml
View File

@@ -790,21 +790,21 @@
<!-- Informational text in the first confirmation screen before starting device encryption --> <!-- Informational text in the first confirmation screen before starting device encryption -->
<string name="crypt_keeper_desc" product="tablet"> <string name="crypt_keeper_desc" product="tablet">
You can encrypt your accounts, settings, downloaded apps and their data, You can encrypt your accounts, settings, downloaded apps and their data,
media, and other files. After you encrypt your tablet, assuming you\’ve set up a screen lock media, and other files. After you encrypt your tablet, assuming you\'ve set up a screen lock
(that is, a pattern or numeric PIN or password), you\'ll need to unlock the screen to decrypt (that is, a pattern or numeric PIN or password), you\'ll need to unlock the screen to decrypt
the tablet every time you power it on. The only other way to decrypt is to perform a factory the tablet every time you power it on. The only other way to decrypt is to perform a factory
data reset, erasing all your data.\n\nEncryption takes an hour or more. You must start with data reset, erasing all your data.\n\nEncryption takes an hour or more. You must start with
a charged battery and keep your tablet plugged in throughout the process. If you interrupt, a charged battery and keep your tablet plugged in throughout the process. If you interrupt it,
you\’ll lose some or all of your data</string> you\'ll lose some or all of your data</string>
<!-- Informational text in the first confirmation screen before starting device encryption --> <!-- Informational text in the first confirmation screen before starting device encryption -->
<string name="crypt_keeper_desc" product="default"> <string name="crypt_keeper_desc" product="default">
You can encrypt your accounts, settings, downloaded apps and their data, You can encrypt your accounts, settings, downloaded apps and their data,
media, and other files. After you encrypt your phone, assuming you’ve set up a screen lock media, and other files. After you encrypt your phone, assuming you\'ve set up a screen lock
(that is, a pattern or numeric PIN or password), you\'ll need to unlock the screen to decrypt (that is, a pattern or numeric PIN or password), you\'ll need to unlock the screen to decrypt
the phone every time you power it on. The only other way to decrypt is to perform a factory the phone every time you power it on. The only other way to decrypt is to perform a factory
data reset, erasing all your data.\n\nEncryption takes an hour or more. You must start with data reset, erasing all your data.\n\nEncryption takes an hour or more. You must start with
a charged battery and keep your phone plugged in throughout the process. If you interrupt, a charged battery and keep your phone plugged in throughout the process. If you interrupt it,
you\’ll lose some or all of your data.</string> you\'ll lose some or all of your data.</string>
<!-- Button text to start encryption process --> <!-- Button text to start encryption process -->
<string name="crypt_keeper_button_text" product="tablet">Encrypt tablet</string> <string name="crypt_keeper_button_text" product="tablet">Encrypt tablet</string>