aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'OpenPGP-Keychain/src/main/res')
-rw-r--r--OpenPGP-Keychain/src/main/res/layout/edit_key_key_item.xml54
-rw-r--r--OpenPGP-Keychain/src/main/res/values/strings.xml9
2 files changed, 55 insertions, 8 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..ef913b039 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
@@ -97,11 +97,54 @@
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>
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:paddingRight="10dip" />
+ <CheckBox
+ android:id="@+id/chkSign"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/flag_sign" />
+ </TableRow>
+
+ <TableRow>
+
+ <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>
+
+ <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 +165,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/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index fb7b60b7c..438a5384c 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -153,9 +153,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>
@@ -176,6 +173,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>