commit 66788a79f734f292d6136c8f4a4e9c7a033ab82e
author Patrick Scott <phanna@android.com> Tue Mar 08 12:11:09 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 08 12:11:09 2011 -0800
tree 59c201ffa9daa40f563f69d229935b2a78c4ddc5
parent 85e0de11091234d728bce9eff2c132388cf8adf5
parent e363e936bcf679a442e9a191a41b512cbb374425

Merge "Add new strings for auto-login UI." into honeycomb-mr1

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6eb13e3..b0ddaaa 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -391,6 +391,12 @@
     <string name="pref_autologin_progress">Signing into Google sites using <xliff:g>%s</xliff:g>\nYour Privacy &amp; Security settings control automatic Google sign-in</string>
     <!-- Option in account list to disable autologin [CHAR-LIMIT=50] -->
     <string name="pref_autologin_disable">Don\'t sign in automatically</string>
+    <!-- Auto-login bar description [CHAR-LIMIT=40] -->
+    <string name="autologin_bar_text">Automatic sign-in is available.</string>
+    <!-- Login button [CHAR-LIMIT=10] -->
+    <string name="autologin_bar_login_text">Login</string>
+    <!-- Login failure text [CHAR-LIMIT=25] -->
+    <string name="autologin_bar_error">Login failed.</string>
 
     <!-- Heading for the AutoFill profile editor to tell the user what AutoFill does and why they should fill out the profile. [CHAR-LIMIT=None] -->
     <string name="autofill_profile_editor_heading">AutoFill will use your profile to help you complete web forms in a single click.</string>