diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2012-06-17 17:48:52 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2012-06-17 17:48:52 +0200 |
| commit | 39197a456562402ad42c5d78deafbbcefa024582 (patch) | |
| tree | 3649b57711229c91e4f028bd6b42b9567d6ea255 /res/layout | |
| parent | 5cd8e4b40aab5512c7e9c1d606b841df39ae8c81 (diff) | |
- Fix last commit
- Implement reading extra CA cert from file to fix keystore error on some mobile phones
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/basic_settings.xml | 6 | ||||
| -rw-r--r-- | res/layout/file_dialog_main.xml | 2 | ||||
| -rw-r--r-- | res/layout/keystore_selector.xml | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/res/layout/basic_settings.xml b/res/layout/basic_settings.xml index d47ba207..409936e1 100644 --- a/res/layout/basic_settings.xml +++ b/res/layout/basic_settings.xml @@ -106,6 +106,12 @@ android:visibility="gone" > <include layout="@layout/keystore_selector" /> + + <TextView + style="@style/item" + android:singleLine="false" + android:text="@string/extracahint" + android:textAppearance="?android:attr/textAppearanceSmall" /> </LinearLayout> <LinearLayout diff --git a/res/layout/file_dialog_main.xml b/res/layout/file_dialog_main.xml index 2f88ffb7..68af9b18 100644 --- a/res/layout/file_dialog_main.xml +++ b/res/layout/file_dialog_main.xml @@ -23,7 +23,7 @@ android:id="@+id/fdButtonSelect" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/select" > + android:text="@string/select_file" > </Button> </LinearLayout> diff --git a/res/layout/keystore_selector.xml b/res/layout/keystore_selector.xml index 21945104..211e977b 100644 --- a/res/layout/keystore_selector.xml +++ b/res/layout/keystore_selector.xml @@ -28,7 +28,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentRight="true" - android:text="@string/select_certificate" /> + android:text="@string/select" /> <TextView android:id="@+id/title" |