diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-03 23:10:37 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-03 23:10:37 +0200 |
| commit | 2b5341f0d48ad6567ef4457c2f722607faf1692d (patch) | |
| tree | b595d7156c7e5148e8dc4b627c0796ec02cee2ab /OpenKeychain/src/main/java/org | |
| parent | f03822fefdfefba0dbe0d249a16a3783974ffb45 (diff) | |
| parent | f6e0d0f4958c0ab75e64681d955fa5f649524a03 (diff) | |
| download | open-keychain-2b5341f0d48ad6567ef4457c2f722607faf1692d.tar.gz open-keychain-2b5341f0d48ad6567ef4457c2f722607faf1692d.tar.bz2 open-keychain-2b5341f0d48ad6567ef4457c2f722607faf1692d.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/java/org')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/OperationResult.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/OperationResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/OperationResult.java index b9b4cfddb..29924ee5d 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/OperationResult.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/OperationResult.java @@ -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), |