Merge remote-tracking branch 'origin/master'

Conflicts:
	OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml

OpenPGP-Keychain/src/main/res/values/strings.xml

@@ -317,8 +317,8 @@
     </plurals>
 
     <!-- progress dialogs, usually ending in '…' -->
-    <string name="progress_done">done.</string>
-    <string name="progress_cancel">cancel</string>
+    <string name="progress_done">Done.</string>
+    <string name="progress_cancel">Cancel</string>
     <string name="progress_saving">saving…</string>
     <string name="progress_importing">importing…</string>
     <string name="progress_exporting">exporting…</string>