summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorMartin Hibdon <mhibdon@google.com>2014-02-18 14:38:56 -0800
committerMartin Hibdon <mhibdon@google.com>2014-02-18 14:40:36 -0800
commit719097387788a32256cfcc3c0a96eff7f170078f (patch)
treefe61816c1cf1996d267330f9ecf33266e3faa2e9 /res/values
parent30cb139f30b51550269a55398db0e166e7899dc6 (diff)
downloadandroid_packages_apps_Email-719097387788a32256cfcc3c0a96eff7f170078f.tar.gz
android_packages_apps_Email-719097387788a32256cfcc3c0a96eff7f170078f.tar.bz2
android_packages_apps_Email-719097387788a32256cfcc3c0a96eff7f170078f.zip
Fix authentication view
Unfortunately, there are problems with making a single view handle all kinds of authentication and certificate selection. The layouts for the account settings screen on phones versus tablets are just too different. So now the certificate selection code has moved back to the fragments themselves, and the authenticationView only handles passwords and oauth. Change-Id: I1ef0c69687a00029717b836458c85c1b0667ff95
Diffstat (limited to 'res/values')
-rw-r--r--res/values/strings.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 36e932351..1bda51870 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -208,12 +208,12 @@
<!-- Label for signing in with Google using OAuth -->
<string name="sign_in_with_google">Sign in with Google</string>
- <!-- On "Set up email" screen, hint for account email password text field -->
- <string name="account_setup_basics_password_label">Password</string>
+ <!-- hint for account email password text field -->
+ <string name="password_label">Password</string>
<!-- On the "Setup up email" screen, label indicating what service we are signed in with [CHAR LIMIT=40] -->
<string name="signed_in_with_service_label">Signed in with %s</string>
<!-- Label for the authentication section [CHAR LIMIT=20] -->
- <string name="authenticiation_label">Authentication</string>
+ <string name="authentication_label">Authentication</string>
<!-- Label for the add authentication icon [CHAR LIMIT=40] -->
<string name="add_authentication_label">Add authentication</string>
<!-- Label for the add authentication icon [CHAR LIMIT=40] -->