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

Merge branch 'master' of github.com:open-keychain/open-keychain

Browse Source
This commit is contained in:
Vincent Breitmoser committed 2014-10-03 23:10:37 +02:00
2 parents f03822fefd f6e0d0f495
commit 2b5341f0d4
37 files changed
+169 -72
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/OperationResult.java
+1 -1
View File
@@ -438,7 +438,7 @@ public abstract class OperationResult implements Parcelable {
MSG_CON_ERROR_IO_SECRET (LogLevel.ERROR, R.string.msg_con_error_io_secret),
MSG_CON_ERROR_PUBLIC (LogLevel.ERROR, R.string.msg_con_error_public),
MSG_CON_ERROR_SECRET (LogLevel.ERROR, R.string.msg_con_error_secret),
MSG_CON_RECOVER (LogLevel.DEBUG, R.plurals.msg_con_recover),
MSG_CON_RECOVER (LogLevel.DEBUG, R.string.msg_con_recover),
MSG_CON_REIMPORT_PUBLIC (LogLevel.DEBUG, R.plurals.msg_con_reimport_public),
MSG_CON_REIMPORT_PUBLIC_SKIP (LogLevel.DEBUG, R.string.msg_con_reimport_public_skip),
MSG_CON_REIMPORT_SECRET (LogLevel.DEBUG, R.plurals.msg_con_reimport_secret),