diff options
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r-- | OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml | 54 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/menu/encrypt_activity.xml | 2 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 5 |
3 files changed, 31 insertions, 30 deletions
diff --git a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml index e9e439d65..4d82477bc 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml @@ -1,39 +1,39 @@ <?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingTop="4dp" + android:paddingBottom="4dp" + android:paddingRight="16dp" + android:paddingLeft="16dp"> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingTop="4dp" - android:paddingBottom="4dp" - android:paddingRight="16dp" - android:paddingLeft="16dp"> + android:padding="0dp" + android:layout_margin="0dp" + style="@android:style/Widget.EditText"> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:padding="0dp" - android:layout_margin="0dp" - style="@android:style/Widget.EditText"> <TextView - android:paddingLeft="12dp" - android:paddingTop="8dp" - android:paddingBottom="8dp" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/label_asymmetric_from"/> + android:paddingLeft="12dp" + android:paddingTop="8dp" + android:paddingBottom="8dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/label_asymmetric_from" /> + <Spinner - android:id="@+id/sign" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical"/> + android:id="@+id/sign" + android:layout_width="match_parent" + android:layout_height="wrap_content" + 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"/> + 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/menu/encrypt_activity.xml b/OpenKeychain/src/main/res/menu/encrypt_activity.xml index c852fbb5c..05d85ee2a 100644 --- a/OpenKeychain/src/main/res/menu/encrypt_activity.xml +++ b/OpenKeychain/src/main/res/menu/encrypt_activity.xml @@ -2,6 +2,6 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item android:id="@+id/check_use_symmetric" android:title="@string/label_symmetric" android:checkable="true"/> - <item android:id="@+id/check_use_armor" android:title="@string/label_ascii_armor" android:checkable="true" /> + <item android:id="@+id/check_use_armor" android:title="@string/label_file_ascii_armor" android:checkable="true" /> <item android:id="@+id/check_delete_after_encrypt" android:title="@string/label_delete_after_encryption" android:checkable="true" /> </menu>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index fca17f837..6abca0548 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -113,12 +113,13 @@ <string name="label_passphrase_again">Repeat Passphrase</string> <string name="label_algorithm">Algorithm</string> <string name="label_ascii_armor">ASCII Armor</string> + <string name="label_file_ascii_armor">Files: ASCII Armor</string> <string name="label_conceal_pgp_application">Let others know that you\'re using OpenKeychain</string> <string name="label_conceal_pgp_application_summary">Writes \'OpenKeychain v2.7\' to OpenPGP signatures, ciphertext, and exported keys</string> <string name="label_select_public_keys">Recipients</string> <string name="label_asymmetric_from">From:</string> <string name="label_to">To</string> - <string name="label_delete_after_encryption">Delete After Encryption</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_share_after_encryption">Share After Encryption</string> <string name="label_encryption_algorithm">Encryption Algorithm</string> @@ -538,7 +539,7 @@ <string name="my_keys">My Keys</string> <!-- hints --> - <string name="encrypt_content_edit_text_hint">Write message here to encrypt and/or sign…</string> + <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="decrypt_content_edit_text_hint">Enter ciphertext here to decrypt and/or verify…</string> <!-- certs --> |