diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-09 12:52:17 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-09 12:52:17 +0100 |
| commit | 80f2822dd876d0b296059c8db8f1367e679653d2 (patch) | |
| tree | ad0e2db7ebc4b76a755a7d3c36e794d535dd96f9 /OpenKeychain/src/main/res | |
| parent | 4013a36276004e28e25e83684fc3f6b4690d2748 (diff) | |
| parent | 7ac4f63ea367eaa4d560b04a211ed936da920685 (diff) | |
| download | open-keychain-80f2822dd876d0b296059c8db8f1367e679653d2.tar.gz open-keychain-80f2822dd876d0b296059c8db8f1367e679653d2.tar.bz2 open-keychain-80f2822dd876d0b296059c8db8f1367e679653d2.zip | |
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Diffstat (limited to 'OpenKeychain/src/main/res')
3 files changed, 14 insertions, 28 deletions
diff --git a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml index b320885d0..850f22716 100644 --- a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml @@ -58,33 +58,15 @@ android:layout_height="wrap_content" android:text="@string/label_passphrase" /> - <FrameLayout + <org.sufficientlysecure.keychain.ui.widget.PassphraseEditText + android:id="@+id/create_key_passphrase" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp"> - - <org.sufficientlysecure.keychain.ui.widget.PasswordEditText - android:id="@+id/create_key_passphrase" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:imeOptions="actionNext" - android:hint="@string/label_passphrase" - android:ems="10" - android:layout_gravity="center_horizontal" /> - - <org.sufficientlysecure.keychain.ui.widget.passwordstrengthindicator.PasswordStrengthBarView - android:id="@+id/create_key_passphrase_strength" - android:layout_width="48dp" - android:layout_height="8dp" - android:layout_gravity="end|center_vertical" - custom:strength="medium" - custom:showGuides="false" - custom:color_fail="@color/android_red_light" - custom:color_weak="@color/android_orange_light" - custom:color_strong="@color/android_green_light" /> - - </FrameLayout> + android:imeOptions="actionNext" + android:inputType="textPassword" + android:hint="@string/label_passphrase" + android:ems="10" + android:layout_gravity="center_horizontal" /> <EditText android:id="@+id/create_key_passphrase_again" diff --git a/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml b/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml index 11355bbc0..5f323716c 100644 --- a/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml +++ b/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml @@ -21,7 +21,7 @@ android:layout_marginTop="8dp" android:layout_marginBottom="8dp"> - <org.sufficientlysecure.keychain.ui.widget.PasswordEditText + <org.sufficientlysecure.keychain.ui.widget.PassphraseEditText android:id="@+id/passphrase_passphrase" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -29,6 +29,7 @@ android:layout_marginBottom="8dp" android:imeOptions="actionNext" android:hint="@string/label_passphrase" + android:inputType="textPassword" 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 c0540082c..a53558532 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1073,11 +1073,14 @@ <string name="msg_pse_symmetric">"Preparing symmetric encryption"</string> <string name="msg_crt_certifying">"Generating certifications"</string> - <string name="msg_crt_certify_all">"Certifying all user IDs for key %s"</string> - <plurals name="msg_crt_certify_some"> + <plurals name="msg_crt_certify_uids"> <item quantity="one">"Certifying one user ID for key %2$s"</item> <item quantity="other">"Certifying %1$d user IDs for key %2$s"</item> </plurals> + <plurals name="msg_crt_certify_uats"> + <item quantity="one">"Certifying one user attribute for key %2$s"</item> + <item quantity="other">"Certifying %1$d user attributes for key %2$s"</item> + </plurals> <string name="msg_crt_error_self">"Cannot issue self-certificate like this!"</string> <string name="msg_crt_error_master_not_found">"Master key not found!"</string> <string name="msg_crt_error_nothing">"No keys certified!"</string> |