diff options
Diffstat (limited to 'OpenKeychain/src')
4 files changed, 13 insertions, 12 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java index ceb3f665f..76d8fb2dc 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java @@ -72,7 +72,7 @@ public class EncryptKeyCompletionView extends TokenCompleteTextView { private void initView() { swapCursor(null); - setPrefix(getContext().getString(R.string.label_to)); + setPrefix(getContext().getString(R.string.label_to) + " "); allowDuplicates(false); } diff --git a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml index 2189a1f34..cd31009f4 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml @@ -8,6 +8,11 @@ android:paddingRight="16dp" android:paddingLeft="16dp"> + <org.sufficientlysecure.keychain.ui.widget.EncryptKeyCompletionView + android:id="@+id/recipient_list" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" @@ -22,7 +27,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/label_asymmetric_from" /> + android:text="@string/label_asymmetric_from" + android:paddingRight="8dp"/> <org.sufficientlysecure.keychain.ui.widget.SignKeySpinner android:id="@+id/sign" @@ -31,9 +37,4 @@ android:layout_gravity="center_vertical" /> </LinearLayout> - - <org.sufficientlysecure.keychain.ui.widget.EncryptKeyCompletionView - android:id="@+id/recipient_list" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> </LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/recipient_box_entry.xml b/OpenKeychain/src/main/res/layout/recipient_box_entry.xml index a7862c515..72a0bee48 100644 --- a/OpenKeychain/src/main/res/layout/recipient_box_entry.xml +++ b/OpenKeychain/src/main/res/layout/recipient_box_entry.xml @@ -9,9 +9,9 @@ <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" - android:padding="4dip" android:id="@android:id/text1" - android:layout_gravity="center_vertical"/> + android:layout_gravity="center_vertical" + android:padding="4dp"/> <ImageView android:id="@android:id/icon" diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index b13d14eb0..a04f925cd 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -92,8 +92,8 @@ <string name="label_file_ascii_armor">Files: ASCII Armor</string> <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_asymmetric_from">From:</string> - <string name="label_to">To:</string> + <string name="label_asymmetric_from">Signed by:</string> + <string name="label_to">Encrypt to:</string> <string name="label_delete_after_encryption">Files: Delete After Encryption</string> <string name="label_delete_after_decryption">Delete After Decryption</string> <string name="label_encryption_algorithm">Encryption Algorithm</string> @@ -506,7 +506,7 @@ <string name="my_keys">My Keys</string> <!-- hints --> - <string name="encrypt_content_edit_text_hint">The message entered here will be signed using the key selected in \'From\' and encrypted for all recipients selected in \'To\'.</string> + <string name="encrypt_content_edit_text_hint">The message entered here will be signed using the key selected in \'Signed by\' and encrypted for all recipients selected in \'Encrypt to\'.</string> <string name="decrypt_content_edit_text_hint">Enter ciphertext here to decrypt and/or verify…</string> <!-- certs --> |