diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2012-05-12 21:18:37 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2012-05-12 21:18:37 +0200 |
| commit | 5a65e0c5e80d147909acffa14b04d3c99d48de1a (patch) | |
| tree | 0987dc015729bc6e3201198102bd44ffcc69664a /res | |
| parent | 016c2b5baddc374bebb606d3bcbef559c1bc7588 (diff) | |
Almost working configuration import
Diffstat (limited to 'res')
| -rw-r--r-- | res/menu/import_menu.xml | 18 | ||||
| -rw-r--r-- | res/values/strings.xml | 13 | ||||
| -rw-r--r-- | res/xml/vpn_headers.xml | 1 |
3 files changed, 30 insertions, 2 deletions
diff --git a/res/menu/import_menu.xml b/res/menu/import_menu.xml new file mode 100644 index 00000000..27498da3 --- /dev/null +++ b/res/menu/import_menu.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item
+ android:id="@+id/ok"
+ android:icon="@android:drawable/ic_menu_save"
+ android:showAsAction="ifRoom|withText"
+ android:title="@string/add_profile"
+ android:titleCondensed="@string/clear"/>
+ <item
+ android:id="@+id/cancel"
+ android:icon="@android:drawable/ic_menu_close_clear_cancel"
+ android:showAsAction="ifRoom|withText"
+ android:title="@android:string/cancel"
+ android:titleCondensed="@string/cancel"/>
+
+
+</menu>
\ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 5d605e08..a5a88219 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -195,5 +195,16 @@ <string name="error_importing_file">Error importing File</string> <string name="import_error_message">Could not import File from Filesystem</string> <string name="inline_file_data">[[Inline file data]]</string> - <string name="opentun_no_ipaddr">Refusing to open tun device without IP information</string> + <string name="opentun_no_ipaddr">Refusing to open tun device without IP information</string> + <string name="menu_import">Import Profile from ovpn file</string> + <string name="menu_import_short">Import</string> + <string name="import_content_resolve_error">Could not read Profile to import</string> + <string name="error_reading_config_file">Error reading Config file</string> + <string name="add_profile">add Profile</string> + <string name="trying_to_read">Trying to read file: %1$s</string> + <string name="import_could_not_open">Could not find file %1$s mentioned in the imported Config file</string> + <string name="importing_config">Importing config file from source %1$s</string> + <string name="import_pkcs12_to_keystore">Your config file specified a pkcs12 file. Please import the file by selecting select in the Basic Settings configuration of the converted VPN</string> + <string name="import_warning_custom_options">Your configuration had a few configuration options that could be parsed. These options were added as custom configuration options. The custom configuration is displayed below:</string> + <string name="import_done">Done reading config file.</string> </resources> diff --git a/res/xml/vpn_headers.xml b/res/xml/vpn_headers.xml index 60ddce7c..c299d2a5 100644 --- a/res/xml/vpn_headers.xml +++ b/res/xml/vpn_headers.xml @@ -4,7 +4,6 @@ <header android:tag="BasicSettings" android:fragment="de.blinkt.openvpn.Settings_Basic" - android:summary="Server, port and authentication method. Normally you should only settings specified here." android:title="Basic Settings" android:id="@+id/basicsettingsid"/> <!-- android:icon="@drawable/ic_settings_applications" --> |