Merge branch 'development' of github.com:open-keychain/open-keychain into development

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java

@@ -173,16 +173,6 @@ public class MultiCertifyKeyFragment extends LoaderFragment
             }
         });
 
-        // UI tidbit: "my key" is the area above the checkbox, if the user clicks there he
-        // probably actually wants to hit the checkbox
-        View vMyKeyLabel = view.findViewById(R.id.label_my_key);
-        vMyKeyLabel.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                mUploadKeyCheckbox.performClick();
-            }
-        });
-
         return root;
     }
 

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/KeyFormattingUtils.java

@@ -286,7 +286,7 @@ public class KeyFormattingUtils {
     }
 
     public static String beautifyKeyIdWithPrefix(Context context, String idHex) {
-        return "ID: " + beautifyKeyId(idHex);
+        return "Key ID: " + beautifyKeyId(idHex);
     }
 
     public static String beautifyKeyIdWithPrefix(Context context, long keyId) {