diff options
Diffstat (limited to 'OpenPGP-Keychain/src/main/res')
| -rw-r--r-- | OpenPGP-Keychain/src/main/res/layout/edit_key_key_item.xml | 63 | ||||
| -rw-r--r-- | OpenPGP-Keychain/src/main/res/menu/key_edit.xml | 6 | ||||
| -rw-r--r-- | OpenPGP-Keychain/src/main/res/values/strings.xml | 15 |
3 files changed, 73 insertions, 11 deletions
diff --git a/OpenPGP-Keychain/src/main/res/layout/edit_key_key_item.xml b/OpenPGP-Keychain/src/main/res/layout/edit_key_key_item.xml index 4bf4aa38a..499fd5aa9 100644 --- a/OpenPGP-Keychain/src/main/res/layout/edit_key_key_item.xml +++ b/OpenPGP-Keychain/src/main/res/layout/edit_key_key_item.xml @@ -11,6 +11,7 @@ android:orientation="horizontal" > <TableLayout + android:id="@+id/table_keylayout" android:layout_width="0dip" android:layout_height="wrap_content" android:layout_weight="1" @@ -88,7 +89,8 @@ bootstrapbutton:bb_type="default" /> </TableRow> - <TableRow> + <TableRow + android:id="@+id/row_certify"> <TextView android:id="@+id/label_usage" @@ -97,11 +99,59 @@ android:layout_gravity="center_vertical" android:paddingRight="10dip" android:text="@string/label_usage" /> + <CheckBox + android:id="@+id/chkCertify" + android:enabled = "false" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/flag_certify" /> + </TableRow> - <Spinner - android:id="@+id/usage" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> + <TableRow + android:id="@+id/row_sign"> + + <TextView + android:id="@+id/label_usage2" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:paddingRight="10dip" + android:text="@string/label_usage" /> + <CheckBox + android:id="@+id/chkSign" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/flag_sign" /> + </TableRow> + + <TableRow + android:id="@+id/row_encrypt"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:paddingRight="10dip" /> + <CheckBox + android:id="@+id/chkEncrypt" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/flag_encrypt" /> + </TableRow> + + <TableRow + android:id="@+id/row_authenticate"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:paddingRight="10dip" /> + <CheckBox + android:id="@+id/chkAuthenticate" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/flag_authenticate" /> </TableRow> </TableLayout> @@ -122,4 +172,5 @@ android:layout_height="1dip" android:background="?android:attr/listDivider" /> -</org.sufficientlysecure.keychain.ui.widget.KeyEditor>
\ No newline at end of file +</org.sufficientlysecure.keychain.ui.widget.KeyEditor> + diff --git a/OpenPGP-Keychain/src/main/res/menu/key_edit.xml b/OpenPGP-Keychain/src/main/res/menu/key_edit.xml index 16992affb..ede1d03c0 100644 --- a/OpenPGP-Keychain/src/main/res/menu/key_edit.xml +++ b/OpenPGP-Keychain/src/main/res/menu/key_edit.xml @@ -3,6 +3,12 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> <item + android:id="@+id/menu_key_edit_save" + android:icon="@drawable/ic_action_done" + app:showAsAction="always" + android:title="@string/btn_save"> + </item> + <item android:id="@+id/menu_key_edit_export_file" app:showAsAction="never" android:title="@string/menu_export_key" /> diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml index 178ef8f17..861a50eaa 100644 --- a/OpenPGP-Keychain/src/main/res/values/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values/strings.xml @@ -57,8 +57,8 @@ <string name="btn_delete">Delete</string> <string name="btn_no_date">None</string> <string name="btn_okay">Okay</string> - <string name="btn_change_passphrase">Change Passphrase</string> - <string name="btn_set_passphrase">Set Passphrase</string> + <string name="btn_change_passphrase">Change New Passphrase</string> + <string name="btn_set_passphrase">Set New Passphrase</string> <string name="btn_search">Search</string> <string name="btn_export_to_server">Upload To Keyserver</string> <string name="btn_next">Next</string> @@ -155,9 +155,6 @@ <!-- choice --> <string name="choice_none">None</string> - <string name="choice_sign_only">Sign only</string> - <string name="choice_encrypt_only">Encrypt only</string> - <string name="choice_sign_and_encrypt">Sign and Encrypt</string> <string name="choice_15secs">15 secs</string> <string name="choice_1min">1 min</string> <string name="choice_3mins">3 mins</string> @@ -178,6 +175,12 @@ <string name="error">Error</string> <string name="error_message">Error: %s</string> + <!-- key flags --> + <string name="flag_certify">Certify</string> + <string name="flag_sign">Sign</string> + <string name="flag_encrypt">Encrypt</string> + <string name="flag_authenticate">Authenticate</string> + <!-- sentences --> <string name="wrong_passphrase">Wrong passphrase.</string> <string name="using_clipboard_content">Using clipboard content.</string> @@ -203,6 +206,7 @@ <string name="key_deletion_confirmation">Do you really want to delete the key \'%s\'?\nYou can\'t undo this!</string> <string name="key_deletion_confirmation_multi">Do you really want to delete all selected keys?\nYou can\'t undo this!</string> <string name="secret_key_deletion_confirmation">Do you really want to delete the SECRET key \'%s\'?\nYou can\'t undo this!</string> + <string name="ask_save_changed_key">You have made changes to the keyring, would you like to save it?</string> <plurals name="keys_added_and_updated_1"> <item quantity="one">Successfully added %d key</item> @@ -284,6 +288,7 @@ <string name="error_nfc_needed">NFC is not available on your device!</string> <string name="error_nothing_import">Nothing to import!</string> <string name="error_expiry_must_come_after_creation">expiry date must come after creation date</string> + <string name="error_save_first">please save the keyring first</string> <string name="error_can_not_delete_contact">you can not delete this contact because it is your own.</string> <string name="error_can_not_delete_contacts">you can not delete the following contacts because they are your own:\n%s</string> <plurals name="error_can_not_delete_info"> |