From 2f9dbcb49174d85218dd18e3b2097d3b9fc789c7 Mon Sep 17 00:00:00 2001
From: Jim Miller <jaggies@google.com>
Date: Tue, 9 Feb 2010 19:08:02 -0800
Subject: Fix 2373088: Update SecuritySettings with new layout and minor logic
 tweaks.

---
 res/values/strings.xml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'res/values')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 47421e2..39198ef 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -534,6 +534,10 @@
     <string name="manage_device_admin">Select device administrators</string>
     <!-- Summary of preference to manage device policies -->
     <string name="manage_device_admin_summary">Add or remove device administrators</string>
+    <!-- Label for ChoosePassword/PIN OK button -->
+    <string name="password_ok_button_label">OK</string>
+    <!-- Label for ChoosePassword/PIN OK button -->
+    <string name="password_cancel_button_label">Cancel</string>
 
     <!-- Bluetooth settings -->
     <!-- Bluetooth settings check box title on Main Settings screen -->
@@ -966,7 +970,7 @@
     <string name="dock_not_found_title">Dock not found</string>
     <!-- Dock not found dialog text -->
     <string name="dock_not_found_text">The phone must be docked to configure dock audio</string>
-    
+
     <!-- Acounts & Sync settings screen setting option name to go into the screen for data sync settings-->
     <string name="sync_settings">Accounts &amp; sync</string>
     <!-- Main Settings screen setting option summary text for the itme to go into the screen with data sync settings-->
@@ -1125,7 +1129,7 @@
     <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   -->
     <string name="sd_eject_summary">Unmount the SD card for safe removal</string>
 
-   
+
     <!-- SD card & phone storage settings item summary that is displayed when no SD card is inserted -->
     <string name="sd_insert_summary">Insert an SD card for mounting</string>
     <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
@@ -2006,7 +2010,7 @@ found in the list of installed applications.</string>
     <string name="voice_search_settings_title">Voice search</string>
     <!-- Title of keyboard settings list item within voice input/output settings -->
     <string name="keyboard_settings_title">Android keyboard</string>
-    
+
     <!-- Text-To-Speech (TTS) settings --><skip />
     <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings related to the text-to-speech functionality -->
     <string name="tts_settings">Text-to-speech</string>
@@ -2313,7 +2317,7 @@ found in the list of installed applications.</string>
     <string name="device_admin_status">This administrator is active and allows
         the application <xliff:g id="app_name">%1$s</xliff:g> to perform the
         following operations:</string>
-    
+
     <!-- Name to assign to a Network Access Point that was saved without a name -->
     <string name="untitled_apn">Untitled</string>
 </resources>
-- 
cgit v1.1