WIP! Merge branch 'v/eventbus' into v/multi-decrypt

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
This commit is contained in:
Vincent Breitmoser committed 2015-06-07 00:05:14 +02:00
commit cfa2ecca61
22 files changed
+511 -578

No files matched your search

@@ -341,6 +341,7 @@
<item quantity="other">"exporting keys…"</item>
</plurals>
<string name="progress_start">"preparing operation…"</string>
<string name="progress_extracting_signature_key">"extracting signature key…"</string>
<string name="progress_extracting_key">"extracting key…"</string>
<string name="progress_preparing_streams">"preparing streams…"</string>