diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-04-29 21:36:53 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-04-29 21:36:53 +0200 |
| commit | 0e67b49e1a930f1e59ef6ee3a37d0f31b2e65605 (patch) | |
| tree | 15212b10909a4a9f2c70020b143fcc89c1549afc /OpenKeychain/src/main/res | |
| parent | 120f71d791ade04b30957556916909939c1d0b05 (diff) | |
| parent | 249b8d7d785c9f5703de0c12a9d00e9a391a75a9 (diff) | |
| download | open-keychain-0e67b49e1a930f1e59ef6ee3a37d0f31b2e65605.tar.gz open-keychain-0e67b49e1a930f1e59ef6ee3a37d0f31b2e65605.tar.bz2 open-keychain-0e67b49e1a930f1e59ef6ee3a37d0f31b2e65605.zip | |
Merge pull request #1831 from fiaxh/key_creation_flexible
Handle user input on key creation more generously
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/create_key_final_fragment.xml | 6 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml index 46b5d186d..dbd53db08 100644 --- a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml @@ -39,7 +39,9 @@ android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:layout_marginLeft="8dp" - android:textAppearance="?android:attr/textAppearanceMedium" /> + android:textAppearance="?android:attr/textAppearanceMedium" + android:focusable="true" + android:focusableInTouchMode="true" /> <TextView android:layout_width="match_parent" @@ -54,6 +56,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceMedium" + android:focusable="true" + android:focusableInTouchMode="true" android:layout_marginBottom="8dp" android:layout_marginLeft="8dp" /> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 57c70d7bc..4c89bd6ee 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -770,6 +770,7 @@ <string name="create_key_passphrases_not_equal">"Passwords do not match"</string> <string name="create_key_final_text">"You entered the following identity:"</string> <string name="create_key_final_robot_text">"Creating a key may take a while, have a cup of coffee in the meantime…"</string> + <string name="create_key_final_email_valid_warning">"Many applications work better when provided with keys only containing valid email addresses"</string> <string name="create_key_rsa">"(3 subkeys, RSA, 4096 bit)"</string> <string name="create_key_custom">"(custom key configuration)"</string> <string name="create_key_name_text">"Choose a name associated with this key. This can be a full name, e.g., 'John Doe', or a nickname, e.g., 'Johnny'."</string> @@ -780,7 +781,7 @@ <string name="create_key_add_email">"Add email address"</string> <string name="create_key_add_email_text">"Additional email addresses are also associated to this key and can be used for secure communication."</string> <string name="create_key_email_already_exists_text">"Email address has already been added"</string> - <string name="create_key_email_invalid_email">"Email address format is invalid"</string> + <string name="create_key_email_empty_email">"Email address can not be empty"</string> <string name="create_key_yubi_key_pin_text">"Please choose a PIN with 6 numbers."</string> <string name="create_key_yubi_key_admin_pin_text">"Please write down the Admin PIN and store it in a safe place (required when you used a wrong PIN 3 times)."</string> <string name="create_key_yubi_key_pin">"PIN"</string> |