diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-08 17:32:41 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-08 17:32:41 +0200 |
| commit | 158f22a799e6a51dff64aa54303bf4bb7b495b4e (patch) | |
| tree | 515d2f304dbbd16e27305d46295005d5eb15c9c5 /OpenKeychain/src/main/res | |
| parent | b573afe2359653d0ddeb9f35075ca22af40b0ab4 (diff) | |
| parent | 590650a3039ebabe820241bf8709569812aad7a8 (diff) | |
| download | open-keychain-158f22a799e6a51dff64aa54303bf4bb7b495b4e.tar.gz open-keychain-158f22a799e6a51dff64aa54303bf4bb7b495b4e.tar.bz2 open-keychain-158f22a799e6a51dff64aa54303bf4bb7b495b4e.zip | |
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/multi_certify_key_fragment.xml | 7 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/res/layout/multi_certify_key_fragment.xml b/OpenKeychain/src/main/res/layout/multi_certify_key_fragment.xml index 729a78545..d2335cbe9 100644 --- a/OpenKeychain/src/main/res/layout/multi_certify_key_fragment.xml +++ b/OpenKeychain/src/main/res/layout/multi_certify_key_fragment.xml @@ -60,7 +60,6 @@ android:layout_height="wrap_content"> <TextView - android:id="@+id/label_my_key" android:paddingLeft="8dp" android:layout_width="wrap_content" android:layout_height="match_parent" @@ -82,10 +81,10 @@ android:id="@+id/sign_key_upload_checkbox" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="8dp" - android:layout_marginTop="8dp" android:checked="false" - android:text="@string/label_send_key" /> + android:text="@string/label_send_key" + android:paddingTop="12dp" + android:paddingBottom="12dp"/> <View android:layout_width="match_parent" diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 04054b3aa..3850f3a68 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -946,7 +946,7 @@ <string name="empty_certs">"No certificates for this key"</string> <string name="certs_text">"Only validated self-certificates and validated certificates created with your keys are displayed here."</string> <string name="section_uids_to_certify">"Identities"</string> - <string name="certify_text">"Are the selected identities corresponding to the persons you are exchanging keys with?\nDeselect all unknown ones."</string> + <string name="certify_text">"Do the selected identities match the persons you are exchanging keys with? Deselect all unknown ones."</string> <string name="label_revocation">"Revocation Reason"</string> <string name="label_verify_status">"Verification Status"</string> <string name="label_cert_type">"Type"</string> |