diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java index 4f8b50a94..2867967ff 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java @@ -972,7 +972,7 @@ public class ProviderHelper { if (recovery) { if (numSecrets >= 0 && numPublics >= 0) { - log(LogLevel.START, LogType.MSG_CON_RECOVER, numSecrets, Integer.toString(numPublics)); + log(LogLevel.START, LogType.MSG_CON_RECOVER, numSecrets, numPublics); } else { log(LogLevel.START, LogType.MSG_CON_RECOVER_UNKNOWN); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java index cf9f69033..91939739a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java @@ -403,9 +403,9 @@ public class OperationResultParcel implements Parcelable { MSG_CON_ERROR_SECRET (R.string.msg_con_error_secret), MSG_CON_RECOVER (R.plurals.msg_con_recover), MSG_CON_RECOVER_UNKNOWN (R.string.msg_con_recover_unknown), - MSG_CON_REIMPORT_PUBLIC (R.string.msg_con_reimport_public), + MSG_CON_REIMPORT_PUBLIC (R.plurals.msg_con_reimport_public), MSG_CON_REIMPORT_PUBLIC_SKIP (R.string.msg_con_reimport_public_skip), - MSG_CON_REIMPORT_SECRET (R.string.msg_con_reimport_secret), + MSG_CON_REIMPORT_SECRET (R.plurals.msg_con_reimport_secret), MSG_CON_REIMPORT_SECRET_SKIP (R.string.msg_con_reimport_secret_skip), MSG_CON (R.string.msg_con), MSG_CON_SAVE_PUBLIC (R.string.msg_con_save_public), diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index c00449f8e..1bd412d4d 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -688,18 +688,18 @@ Error reimporting public keys! Error reimporting secret keys! - Recovering consolidation with one secret and %s public keys - Recovering consolidation with %d secret and %s public keys + Recovering consolidation with %1$d secret and %2$d public keys + Recovering consolidation with %1$d secret and %2$d public keys Recovering from unknown state Reimporting one public key - Reimporting %d public keys + Reimporting %d public keys No public keys to reimport, skipping… Reimporting one secret key - Reimporting %d secret keys + Reimporting %d secret keys No secret keys to reimport, skipping… Exception deleting public cache file