diff options
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/drawable-hdpi/ic_action_qr_code.png | bin | 2388 -> 2134 bytes | |||
| -rw-r--r-- | OpenKeychain/src/main/res/drawable-mdpi/ic_action_qr_code.png | bin | 1502 -> 1314 bytes | |||
| -rw-r--r-- | OpenKeychain/src/main/res/drawable-xhdpi/ic_action_qr_code.png | bin | 2592 -> 2959 bytes | |||
| -rw-r--r-- | OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_qr_code.png | bin | 3339 -> 4129 bytes | |||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/passphrase_dialog.xml | 1 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 7 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/xml/adv_preferences.xml | 6 |
7 files changed, 9 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_qr_code.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_qr_code.png Binary files differindex 1c65e5af8..ceb3b1645 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_qr_code.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_qr_code.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_qr_code.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_qr_code.png Binary files differindex 570212461..21594e62f 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_qr_code.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_qr_code.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_qr_code.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_qr_code.png Binary files differindex ce8965396..93bdac866 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_qr_code.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_qr_code.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_qr_code.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_qr_code.png Binary files differindex c56b128e4..7ede90609 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_qr_code.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_qr_code.png diff --git a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml index f003e6994..2ca5199fd 100644 --- a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml +++ b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml @@ -19,7 +19,6 @@ android:layout_marginTop="8dp" android:layout_marginBottom="8dp" android:imeOptions="actionDone" - android:inputType="textPassword" android:hint="@string/label_passphrase" android:ems="10" android:layout_gravity="center_horizontal" /> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 0b0f0b4fd..d94f9e800 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -49,7 +49,7 @@ <string name="section_advanced">"Advanced"</string> <string name="section_certify">"Certify"</string> <string name="section_actions">"Actions"</string> - <string name="section_share_key">"Public key"</string> + <string name="section_share_key">"Key"</string> <string name="section_certification_key">"Your Key used for certification"</string> <string name="section_upload_key">"Synchronize Key"</string> <string name="section_key_server">"Keyserver"</string> @@ -112,6 +112,7 @@ <string name="label_write_version_header">"Let others know that you're using OpenKeychain"</string> <string name="label_write_version_header_summary">"Writes 'OpenKeychain v2.7' to OpenPGP signatures, ciphertext, and exported keys"</string> <string name="label_use_default_yubikey_pin">"Use default Yubikey PIN"</string> + <string name="label_use_num_keypad_for_yubikey_pin">Use number keypad for Yubikey PIN</string> <string name="label_label_use_default_yubikey_pin_summary">"Uses default PIN (123456) to access Yubikeys over NFC"</string> <string name="label_asymmetric_from">"Signed by:"</string> <string name="label_to">"Encrypt to:"</string> @@ -836,8 +837,8 @@ <string name="msg_con_error_io_secret">"IO error writing secret keys to cache!"</string> <string name="msg_con_error_public">"Error reimporting public keys!"</string> <string name="msg_con_error_secret">"Error reimporting secret keys!"</string> - <string name="msg_con_recover">"Recovering consolidation"</string> - <string name="msg_con_recover_unknown">"Recovering from unknown state"</string> + <string name="msg_con_recover">"Resuming consolidation process"</string> + <string name="msg_con_recover_unknown">"Resuming consolidation process from unknown state"</string> <plurals name="msg_con_reimport_public"> <item quantity="one">"Reimporting one public key"</item> <item quantity="other">"Reimporting %d public keys"</item> diff --git a/OpenKeychain/src/main/res/xml/adv_preferences.xml b/OpenKeychain/src/main/res/xml/adv_preferences.xml index 92e0f2ffc..fcca59abe 100644 --- a/OpenKeychain/src/main/res/xml/adv_preferences.xml +++ b/OpenKeychain/src/main/res/xml/adv_preferences.xml @@ -44,5 +44,9 @@ android:defaultValue="true" android:title="@string/label_use_default_yubikey_pin" android:summary="@string/label_label_use_default_yubikey_pin_summary" /> - + <CheckBoxPreference + android:key="useNumKeypadForYubikeyPin" + android:persistent="false" + android:defaultValue="false" + android:title="@string/label_use_num_keypad_for_yubikey_pin" /> </PreferenceScreen> |
