diff options
author | Dan Pasanen <dan.pasanen@gmail.com> | 2017-04-05 07:26:34 -0500 |
---|---|---|
committer | Dan Pasanen <dan.pasanen@gmail.com> | 2017-04-05 07:26:34 -0500 |
commit | 4f8e6f18ca8790d99ad6a961d40749bb85401dac (patch) | |
tree | 82e25618e66133c4d5b7bcb92bb63318c32dfe80 /res/values-watch/strings.xml | |
parent | 0fc5fe15f2571c7b117e87737b633ad9cc2aaf08 (diff) | |
parent | e1dbf0e2600ab6c7f5cc47621d85d0c38a27f5ff (diff) | |
download | android_packages_apps_PackageInstaller-4f8e6f18ca8790d99ad6a961d40749bb85401dac.tar.gz android_packages_apps_PackageInstaller-4f8e6f18ca8790d99ad6a961d40749bb85401dac.tar.bz2 android_packages_apps_PackageInstaller-4f8e6f18ca8790d99ad6a961d40749bb85401dac.zip |
Merge tag 'android-7.1.2_r2' into cm-14.1staging/cm-14.1_android-7.1.2_r2
Android 7.1.2 Release 2 (N2G47E)
# gpg: Signature made Mon 03 Apr 2017 01:41:50 AM CDT
# gpg: using DSA key E8AD3F819AB10E78
# gpg: Can't check signature: No public key
Diffstat (limited to 'res/values-watch/strings.xml')
-rw-r--r-- | res/values-watch/strings.xml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/res/values-watch/strings.xml b/res/values-watch/strings.xml index 82fe4ae9..f940eae6 100644 --- a/res/values-watch/strings.xml +++ b/res/values-watch/strings.xml @@ -30,8 +30,9 @@ <!-- Summary of a permission switch when it's enforced by policy [CHAR LIMIT=17] --> <string name="permission_summary_enforced_by_policy">Can\'t be changed</string> - <!-- Generic text to indicate that a setting is enabled. Should be in all caps. [CHAR LIMIT=40] --> - <string name="generic_enabled">ENABLED</string> - <!-- Generic text to indicate that a setting is disabled. Should be in all caps. [CHAR LIMIT=40] --> - <string name="generic_disabled">DISABLED</string> + <!-- Generic text to indicate a yes. [CHAR LIMIT=10] --> + <string name="generic_yes">Yes</string> + + <!-- Generic text to indicate Cancel. [CHAR LIMIT=10] --> + <string name="generic_cancel">Cancel</string> </resources> |