diff options
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/decrypt_content.xml | 56 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml | 6 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 10 |
3 files changed, 55 insertions, 17 deletions
diff --git a/OpenKeychain/src/main/res/layout/decrypt_content.xml b/OpenKeychain/src/main/res/layout/decrypt_content.xml index 1fa6ea848..7cd066b5b 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_content.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_content.xml @@ -21,7 +21,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:text="Files" /> + android:text="@string/section_decrypt_files" /> <TextView @@ -34,7 +34,7 @@ android:minHeight="?android:attr/listPreferredItemHeight" android:clickable="true" style="@style/SelectableItem" - android:text="Decrypt files" + android:text="@string/btn_decrypt_files" android:drawableRight="@drawable/ic_action_collection" android:drawablePadding="8dp" android:gravity="center_vertical" /> @@ -50,22 +50,51 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="32dp" - android:text="Text" /> + android:text="@string/section_decrypt_text" /> - <TextView + <LinearLayout android:id="@+id/decrypt_from_clipboard" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="?android:attr/listPreferredItemHeight" + android:layout_height="?android:attr/listPreferredItemHeight" android:clickable="true" + android:paddingRight="4dp" style="@style/SelectableItem" - android:text="Decrypt from clipboard" - android:drawableRight="@drawable/ic_action_paste" - android:drawablePadding="8dp" - android:gravity="center_vertical" /> + android:orientation="horizontal"> + + <LinearLayout + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:paddingRight="4dp" + android:gravity="center_vertical" + android:orientation="vertical"> + + <TextView + android:paddingLeft="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/btn_decrypt_clipboard" /> + + <TextView + android:paddingLeft="8dp" + android:textAppearance="?android:attr/textAppearanceSmall" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textColor="@color/tertiary_text_light" + android:text="@string/btn_decrypt_and_verify" + android:gravity="center_vertical" /> + + </LinearLayout> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:padding="8dp" + android:src="@drawable/ic_action_paste" + android:layout_gravity="center_vertical" /> + + </LinearLayout> <View android:layout_width="match_parent" @@ -75,4 +104,5 @@ </LinearLayout> + </LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml index f6cc892d7..1c6097495 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml @@ -43,7 +43,7 @@ <LinearLayout - android:id="@+id/action_encrypt_share_plaintext" + android:id="@+id/action_decrypt_share_plaintext" android:layout_width="match_parent" android:layout_height="wrap_content" android:clickable="true" @@ -57,7 +57,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" - android:text="Share plaintext" + android:text="@string/btn_add_share_decrypted_text" android:drawableRight="@drawable/ic_action_share" android:drawablePadding="8dp" android:gravity="center_vertical" @@ -72,7 +72,7 @@ android:background="?android:attr/listDivider" /> <ImageButton - android:id="@+id/action_copy_plaintext" + android:id="@+id/action_decrypt_copy_plaintext" android:layout_width="wrap_content" android:layout_height="match_parent" android:padding="8dp" diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 3478acbbd..e77106705 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -51,6 +51,8 @@ <string name="section_key_server">"Keyserver"</string> <string name="section_fingerprint">"Fingerprint"</string> <string name="section_key_to_certify">"Key to be certified"</string> + <string name="section_decrypt_files">"Files"</string> + <string name="section_decrypt_text">"Text"</string> <!-- button --> <string name="btn_decrypt_verify_file">"Decrypt, verify, and save file"</string> @@ -70,6 +72,10 @@ <string name="btn_view_cert_key">"View certification key"</string> <string name="btn_create_key">"Create key"</string> <string name="btn_add_files">"Add file(s)"</string> + <string name="btn_add_share_decrypted_text">"Share decrypted text"</string> + <string name="btn_decrypt_clipboard">"Decrypt from clipboard"</string> + <string name="btn_decrypt_and_verify">"and verify signatures"</string> + <string name="btn_decrypt_files">"Decrypt files"</string> <!-- menu --> <string name="menu_preferences">"Settings"</string> @@ -225,6 +231,7 @@ <string name="fingerprint_copied_to_clipboard">"Fingerprint has been copied to the clipboard!"</string> <string name="select_key_to_certify">"Please select a key to be used for certification!"</string> <string name="key_too_big_for_sharing">"Key is too big to be shared this way!"</string> + <string name="text_copied_to_clipboard">"Text has been copied to the clipboard!"</string> <!-- errors @@ -241,7 +248,7 @@ <string name="error_key_needs_a_user_id">"need at least one identity"</string> <string name="error_no_signature_passphrase">"no passphrase given"</string> <string name="error_no_signature_key">"no signature key given"</string> - <string name="error_invalid_data">"not valid encryption data"</string> + <string name="error_invalid_data">"No valid encrypted or signed OpenPGP content!"</string> <string name="error_integrity_check_failed">"integrity check failed! Data has been modified!"</string> <string name="error_wrong_passphrase">"wrong passphrase"</string> <string name="error_could_not_extract_private_key">"could not extract private key"</string> @@ -424,6 +431,7 @@ <string name="api_settings_select_key">"Select key"</string> <string name="api_settings_create_key">"Create new key for this account"</string> <string name="api_settings_save">"Save"</string> + <string name="api_settings_save_msg">"Account has been saved"</string> <string name="api_settings_cancel">"Cancel"</string> <string name="api_settings_revoke">"Revoke access"</string> <string name="api_settings_start">"Start application"</string> |