am 38a9daff: Fix secret EditText display and other fixes.

Merge commit '38a9daffa5d3c5cd478bf5a81334cdbc02d4727c'

* commit '38a9daffa5d3c5cd478bf5a81334cdbc02d4727c':
  Fix secret EditText display and other fixes.
This commit is contained in:
Hung-ying Tyan
2009-07-26 21:46:17 -07:00
committed by Android Git Automerger
6 changed files with 171 additions and 106 deletions

View File

@@ -1842,7 +1842,7 @@ found in the list of installed applications.</string>
<string name="vpn_yes_button">Yes</string>
<string name="vpn_no_button">No</string>
<string name="vpn_back_button">Back</string>
<string name="vpn_mistake_button">No, it's a mistake</string>
<string name="vpn_mistake_button">No</string>
<string name="vpn_menu_done">Save</string>
<string name="vpn_menu_cancel">Cancel</string>
@@ -1948,6 +1948,10 @@ found in the list of installed applications.</string>
<string name="vpn_settings_title">VPN settings</string>
<!-- Summary of preference to enter the VPN settings activity -->
<string name="vpn_settings_summary">Set up &amp; manage Virtual Private Networks (VPNs)</string>
<!-- A secret edit field's grayed out value when it has not been modified -->
<string name="vpn_secret_unchanged">(unchanged)</string>
<!-- A secret edit field's grayed out value when it has not been set -->
<string name="vpn_secret_not_set">(not set)</string>
<!-- Title of preference group for credential storage settings -->
<string name="cstor_settings_category">Credential storage</string>