diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2012-05-24 20:20:05 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2012-05-24 20:20:05 +0200 |
| commit | a3733e0a42ee9d75d3572d11dc25b0166031313f (patch) | |
| tree | e0ff36bde7c7d1d0bfc8163cee57409b54f5bb6d /res | |
| parent | 7e02edb743934f4040fd1aac1cba4a121b66a228 (diff) | |
Add querying certificate key password (closes issue #23)
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/basic_settings.xml | 23 | ||||
| -rw-r--r-- | res/values/strings.xml | 5 |
2 files changed, 27 insertions, 1 deletions
diff --git a/res/layout/basic_settings.xml b/res/layout/basic_settings.xml index 6d4b8cc1..d47ba207 100644 --- a/res/layout/basic_settings.xml +++ b/res/layout/basic_settings.xml @@ -140,6 +140,29 @@ android:layout_width="match_parent" android:layout_height="wrap_content" blinkt:title="@string/client_key_title" /> + + <LinearLayout + android:id="@+id/key_password_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:visibility="gone" > + + <TextView + style="@style/item" + android:layout_marginLeft="8dip" + android:layout_marginRight="8dip" + android:text="@string/private_key_password" + android:textAppearance="?android:attr/textAppearanceSmall" /> + + <EditText + android:id="@+id/key_password" + style="@style/item" + android:layout_marginLeft="8dip" + android:layout_marginRight="8dip" + android:hint="@string/pw_query_hint" + android:inputType="textPassword" /> + </LinearLayout> </LinearLayout> <LinearLayout diff --git a/res/values/strings.xml b/res/values/strings.xml index fc684ae6..005dc587 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -225,5 +225,8 @@ <string name="converted_profile_i">imported profile %d</string> <string name="broken_images">Broken Images</string> <string name="broken_images_faq"><p>Offical HTC images are known to have a strange routing problem causing traffic not to flow through the tunnel (See also <a href=\"http://code.google.com/p/ics-openvpn/issues/detail?id=18\">Issue 18</a> in the bug tracker.)</p><p>The offical SONY images from Xperia arc S and Xperia Ray have been reported to be missing the VPNService completly from the image. Other Sony images may be affected as well. (See also <a href=\"http://code.google.com/p/ics-openvpn/issues/detail?id=29\">Issue 29</a> in the bug tracker.)</p><p>On custom build images the tun module might be missing or the rights of /dev/tun might be wrong. On the experimental CM9 Defy image a <i>chown system /dev/tun</i> is needed to make the VPNService API work.</p></string> - <string name="error_empty_username">The username must not be empty.</string> + <string name="error_empty_username">The username must not be empty.</string> + <string name="pkcs12_file_encryption_key">PKCS12 File Encryption Key</string> + <string name="private_key_password">Private Key Password</string> + <string name="password">Password</string> </resources> |