Merge pull request #315 from jessicayuen/master

#226: Added cancel option to ProgressDialogFragments. Create Key is now cancelable.

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

@@ -296,6 +296,7 @@
 
     <!-- progress dialogs, usually ending in '…' -->
     <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>