cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
This commit is contained in:
Vincent Breitmoser
2015-06-07 00:05:14 +02:00
parent b779211f55 074b6633b0
commit cfa2ecca61
22 changed files with 511 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenKeychain/src/main/res/values/strings.xml
View File

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