diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/faq.xml | 31 | ||||
| -rw-r--r-- | res/layout/file_dialog_main.xml | 7 | ||||
| -rw-r--r-- | res/values/strings.xml | 8 | ||||
| -rw-r--r-- | res/xml/general_settings.xml | 18 |
4 files changed, 41 insertions, 23 deletions
diff --git a/res/layout/faq.xml b/res/layout/faq.xml index 4107ea7e..b18446c0 100644 --- a/res/layout/faq.xml +++ b/res/layout/faq.xml @@ -8,17 +8,22 @@ android:layout_height="wrap_content" android:orientation="vertical" > - + <TextView + style="@style/faqhead" + android:text="@string/faq_howto_title" /> + + <TextView + android:id="@+id/faq_howto" + style="@style/faqitem" /> + <TextView style="@style/faqhead" android:text="@string/faq_system_dialogs_title" /> - - + <TextView style="@style/faqitem" android:text="@string/faq_system_dialogs" /> - - + <TextView style="@style/faqhead" android:text="@string/tap_mode" /> @@ -35,22 +40,18 @@ style="@style/faqitem" android:text="@string/faq_security" /> - <TextView style="@style/faqhead" - android:text="@string/broken_images" - /> - + android:text="@string/broken_images" /> + <TextView - style="@style/faqitem" - android:id="@+id/brokenimages" /> - - + android:id="@+id/brokenimages" + style="@style/faqitem" /> + <TextView style="@style/faqhead" android:text="@string/faq_shortcut" /> - - + <TextView style="@style/faqitem" android:text="@string/faq_howto_shortcut" /> diff --git a/res/layout/file_dialog_main.xml b/res/layout/file_dialog_main.xml index 68af9b18..2a623dc6 100644 --- a/res/layout/file_dialog_main.xml +++ b/res/layout/file_dialog_main.xml @@ -25,6 +25,13 @@ android:layout_height="wrap_content" android:text="@string/select_file" > </Button> + + <Button + android:id="@+id/fdClear" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/clear" > + </Button> </LinearLayout> <LinearLayout diff --git a/res/values/strings.xml b/res/values/strings.xml index 6e280c19..d4604db7 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -235,6 +235,8 @@ <string name="export_config_title">ICS Openvpn Config</string> <string name="warn_no_dns">No DNS servers being used. Name resolution may not work. Consider setting custom DNS Servers</string> <string name="dns_add_error">Could not add DNS Server \"%1$s\", rejected by the system: %2$s</string> - - -</resources>
\ No newline at end of file + <string name="faq_howto"><p>Get a working config (tested on your computer or download from your provider/organisation)</p><p>If it is a single file no with no extra pem/pks12 files you can email the file yourself and open the attachment. If you have multiple files put them on your sd card.</p><p>Click on the email attachment/Use the folder icon in the vpn list to import the config file</p><p>If there are errors about missing files put the missing files on your sd card.</p><p>Click on the save symbol to add the imported VPN to your VPN list</p><p>Connect the VPN by clicking on the name of the VPN</p><p>If there are error or warnings in the log try to understand the warnings/error and try to fix them</p> </string> + <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> +</resources> diff --git a/res/xml/general_settings.xml b/res/xml/general_settings.xml index 69316d18..73b66b00 100644 --- a/res/xml/general_settings.xml +++ b/res/xml/general_settings.xml @@ -7,11 +7,6 @@ android:summary="@string/netchange_summary" android:title="@string/netchange" /> <CheckBoxPreference - android:defaultValue="false" - android:key="useCM9Fix" - android:summary="@string/owner_fix_summary" - android:title="@string/owner_fix" /> - <CheckBoxPreference android:defaultValue="true" android:key="showlogwindow" android:summary="@string/show_log_summary" @@ -22,4 +17,17 @@ android:summary="@string/keppstatus_summary" android:title="@string/keepstatus" /> + <PreferenceCategory android:title="Device specifics Hacks" > + <CheckBoxPreference + android:defaultValue="false" + android:key="useCM9Fix" + android:summary="@string/owner_fix_summary" + android:title="@string/owner_fix" /> + <CheckBoxPreference + android:defaultValue="false" + android:key="loadTunModule" + android:summary="@string/setting_loadtun_summary" + android:title="@string/setting_loadtun" /> + </PreferenceCategory> + </PreferenceScreen>
\ No newline at end of file |