Merge pull request #315 from jessicayuen/master

#226: Added cancel option to ProgressDialogFragments. Create Key is now cancelable.
This commit is contained in:
Dominik Schürmann
2014-03-04 10:51:26 +01:00
7 changed files with 87 additions and 11 deletions

View File

@@ -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>