diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/config_converter.xml | 22 | ||||
| -rw-r--r-- | res/values/strings.xml | 3 |
2 files changed, 24 insertions, 1 deletions
diff --git a/res/layout/config_converter.xml b/res/layout/config_converter.xml new file mode 100644 index 00000000..13733fb3 --- /dev/null +++ b/res/layout/config_converter.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" > +<CheckBox + android:id="@+id/importpkcs12" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:checked="true" + android:text="@string/importpkcs12fromconfig" + android:visibility="gone" + /> + <ListView + android:id="@android:id/list" + android:layout_width="fill_parent" + android:layout_height="fill_parent" /> + + + + </LinearLayout> + diff --git a/res/values/strings.xml b/res/values/strings.xml index f33cd74d..fca7a777 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -138,7 +138,7 @@ <string name="ip_not_cidr">Got interface information %1$s and %2$s, assuming second address is peer address of remote. Using /32 netmask for local IP. Mode given by OpenVPN is \"%3$s\".</string> <string name="route_not_cidr">Cannot make sense of %1$s and %2$s as IP route with CIDR netmask, using /32 as netmask.</string> <string name="route_not_netip">Corrected route %1$s/%2$s to %3$s/%2$s</string> - <string name="keychain_access">Cannot access the Android Keychain Certificates. If you restored a backup of the app/app settings re-select the certificate to recreate the permission to access the certificate.</string> + <string name="keychain_access">Cannot access the Android Keychain Certificates. (Can be caused by a firmware upgrade or by restoring a backup of the app/app settings). Please edit the VPN and reselect the certificate under basic settings to recreate the permission to access the certificate.</string> <string name="version_info">%1$s %2$s</string> <string name="send_logfile">Send log file</string> <string name="send">Send</string> @@ -237,4 +237,5 @@ <string name="faq_howto_title">Quick Start</string> <string name="setting_loadtun_summary">Try to load the tun.ko kernel module before trying to connect. Needs rooted devices.</string> <string name="setting_loadtun">Load tun module</string> + <string name="importpkcs12fromconfig">Import PKCS12 from configuration into Android Keystore</string> </resources> |