diff options
Diffstat (limited to 'OpenKeychain/src/main/res')
4 files changed, 63 insertions, 10 deletions
diff --git a/OpenKeychain/src/main/res/layout/api_remote_select_allowed_keys.xml b/OpenKeychain/src/main/res/layout/api_remote_select_allowed_keys.xml new file mode 100644 index 000000000..e052ff333 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/api_remote_select_allowed_keys.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <include + android:id="@+id/toolbar_include" + layout="@layout/toolbar_standalone" /> + + <LinearLayout + android:layout_below="@id/toolbar_include" + android:padding="16dp" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical"> + + <TextView + android:id="@+id/api_select_keys_text" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="8dp" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/api_select_keys_text" /> + + <ScrollView + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <FrameLayout + android:id="@+id/api_allowed_keys_list_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + </ScrollView> + + </LinearLayout> +</RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/create_yubikey_wait_fragment.xml b/OpenKeychain/src/main/res/layout/create_yubikey_wait_fragment.xml index c7f9821eb..4e4b53118 100644 --- a/OpenKeychain/src/main/res/layout/create_yubikey_wait_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_yubikey_wait_fragment.xml @@ -22,8 +22,7 @@ android:layout_marginTop="16dp" android:layout_marginLeft="8dp" android:textAppearance="?android:attr/textAppearanceMedium" - android:text="Hold Yubikey against device dawg" - /> + android:text="@string/yubikey_create" /> <ImageView android:layout_width="match_parent" diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml index fbe5f1326..6078b898f 100644 --- a/OpenKeychain/src/main/res/layout/key_list_item.xml +++ b/OpenKeychain/src/main/res/layout/key_list_item.xml @@ -26,7 +26,7 @@ android:id="@+id/key_list_item_name" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/label_main_user_id" + tools:text="@string/label_main_user_id" android:textAppearance="?android:attr/textAppearanceMedium" /> <TextView @@ -35,8 +35,20 @@ android:layout_height="wrap_content" android:singleLine="true" android:ellipsize="end" - android:text="user@example.com" + tools:text="user@example.com" android:textAppearance="?android:attr/textAppearanceSmall" /> + + <TextView + android:id="@+id/key_list_item_creation" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:singleLine="true" + android:textAppearance="?android:attr/textAppearanceSmall" + android:visibility="gone" + tools:visibility="visible" + tools:text="Created on 10/10/2010 10:00" + /> + </LinearLayout> <LinearLayout diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index f77570a88..72ba46702 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -41,7 +41,7 @@ <!-- section --> <string name="section_user_ids">"Identities"</string> - <string name="section_yubikey">"Yubikey"</string> + <string name="section_yubikey">"YubiKey"</string> <string name="section_linked_system_contact">"Linked System Contact"</string> <string name="section_should_you_trust">"Should you trust this key?"</string> <string name="section_proof_details">Proof verification</string> @@ -137,6 +137,7 @@ <string name="label_file_compression">"File compression"</string> <string name="label_keyservers">"Keyservers"</string> <string name="label_key_id">"Key ID"</string> + <string name="label_key_created">"Key created %s"</string> <string name="label_creation">"Creation"</string> <string name="label_expiry">"Expiry"</string> <string name="label_usage">"Usage"</string> @@ -287,6 +288,7 @@ <string name="decrypt_result_no_signature">"Not Signed"</string> <string name="decrypt_result_invalid_signature">"Invalid signature!"</string> <string name="decrypt_result_signature_uncertified">"Signed by <b>unconfirmed</b> key"</string> + <string name="decrypt_result_signature_secret">"Signed by your key"</string> <string name="decrypt_result_signature_certified">"Signed by confirmed key"</string> <string name="decrypt_result_signature_expired_key">"Signed by <b>expired</b> key!"</string> <string name="decrypt_result_signature_revoked_key">"Signed by <b>revoked</b> key!"</string> @@ -502,7 +504,7 @@ <string name="api_settings_delete_account">"Delete account"</string> <string name="api_settings_package_name">"Package Name"</string> <string name="api_settings_package_signature">"SHA-256 of Package Signature"</string> - <string name="api_settings_accounts">"Accounts (deprecated API)"</string> + <string name="api_settings_accounts">"Accounts (old API)"</string> <string name="api_settings_advanced">"Extended Information"</string> <string name="api_settings_allowed_keys">"Allowed Keys"</string> <string name="api_settings_settings">"Settings"</string> @@ -520,6 +522,7 @@ <string name="api_select_pub_keys_text_no_user_ids">"Please select the recipients!"</string> <string name="api_error_wrong_signature">"Signature check failed! Have you installed this app from a different source? If you are sure that this is not an attack, revoke this app's registration in OpenKeychain and then register the app again."</string> <string name="api_select_sign_key_text">"Please select one of your existing keys or create a new one."</string> + <string name="api_select_keys_text">"None of the allowed keys is able to decrypt the content. Please select the allowed keys."</string> <!-- Share --> <string name="share_qr_code_dialog_title">"Share with QR Code"</string> @@ -1278,11 +1281,12 @@ <string name="yubikey_serno">"Serial No: %s"</string> <string name="yubikey_key_holder">"Key holder: "</string> <string name="yubikey_key_holder_unset">"Key holder: <unset>"</string> - <string name="yubikey_status_bound">"Yubikey matches and is bound to key"</string> - <string name="yubikey_status_unbound">"Yubikey matches, can be bound to key"</string> - <string name="yubikey_status_partly">"Yubikey matches, partly bound to key"</string> + <string name="yubikey_status_bound">"YubiKey matches and is bound to key"</string> + <string name="yubikey_status_unbound">"YubiKey matches, can be bound to key"</string> + <string name="yubikey_status_partly">"YubiKey matches, partly bound to key"</string> + <string name="yubikey_create">"Hold YubiKey against the back of your device."</string> <string name="btn_import">"Import"</string> - <string name="snack_yubi_other">Different key stored on Yubikey!</string> + <string name="snack_yubi_other">Different key stored on YubiKey!</string> <string name="error_nfc">"NFC Error: %s"</string> <string name="error_pin_nodefault">Default PIN was rejected!</string> |