diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2012-07-02 17:29:08 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2012-07-02 17:29:08 +0200 |
| commit | a142f5a6ebeeaa6b4f8e8ac559b3ea08d0677bf1 (patch) | |
| tree | a36907b4ff206527720d4a414a021e4f5211461f /res/values/strings.xml | |
| parent | 6a4ba5d3976f6d219400a46c634dd479bc5981a5 (diff) | |
| parent | 6ae2a24edf3255f998ffee8cd6d79e25557f5572 (diff) | |
Merge
Diffstat (limited to 'res/values/strings.xml')
| -rw-r--r-- | res/values/strings.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index ba4f6b02..59b89042 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -33,7 +33,6 @@ <string name="client_key_title">Client Certificate Key</string> <string name="client_pkcs12_title">PKCS12 File</string> <string name="ca_title">CA Certificate</string> - <string name="select_certificate">Select</string> <string name="no_certificate">Nothing selected</string> <string name="opevpn_copyright" translatable="false">Copyright © 2002–2010 OpenVPN Technologies, Inc. <sales@openvpn.net>\n @@ -220,6 +219,7 @@ <string name="keppstatus_summary">Keep the notification displayed after the connection is established to show traffic statistics.</string> <string name="keepstatus">Show Traffic Statistics</string> <string name="mobile_info">Running on %1$s (%2$s) %3$s, Android API %4$d</string> - <string name="error_rsa_sign">Error signing with Android keystore key %s</string> + <string name="error_rsa_sign">Error signing with Android keystore key %1$s: %2$s</string> + <string name="keychain_jellybeans">Reading from Android Keystore does not work in Jelly Beans (Google change the way private keys are returned)</string> </resources> |