diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-19 18:12:19 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-19 18:12:19 +0200 |
| commit | 16ab7610061726110f917533348f4c37a0690321 (patch) | |
| tree | 874cabbecba13715e77831eafeecce1ccdc295e8 /OpenKeychain/src/main | |
| parent | 9930ab7f6ff9400d6e3aa36ce06c663ce09be633 (diff) | |
| download | open-keychain-16ab7610061726110f917533348f4c37a0690321.tar.gz open-keychain-16ab7610061726110f917533348f4c37a0690321.tar.bz2 open-keychain-16ab7610061726110f917533348f4c37a0690321.zip | |
Fix strings
Diffstat (limited to 'OpenKeychain/src/main')
3 files changed, 7 insertions, 7 deletions
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 @@ <string name="msg_con_error_public">Error reimporting public keys!</string> <string name="msg_con_error_secret">Error reimporting secret keys!</string> <plurals name="msg_con_recover"> - <item quantity="one">Recovering consolidation with one secret and %s public keys</item> - <item quantity="many">Recovering consolidation with %d secret and %s public keys</item> + <item quantity="one">Recovering consolidation with %1$d secret and %2$d public keys</item> + <item quantity="other">Recovering consolidation with %1$d secret and %2$d public keys</item> </plurals> <string name="msg_con_recover_unknown">Recovering from unknown state</string> <plurals name="msg_con_reimport_public"> <item quantity="one">Reimporting one public key</item> - <item quantity="many">Reimporting %d public keys</item> + <item quantity="other">Reimporting %d public keys</item> </plurals> <string name="msg_con_reimport_public_skip">No public keys to reimport, skipping…</string> <plurals name="msg_con_reimport_secret"> <item quantity="one">Reimporting one secret key</item> - <item quantity="many">Reimporting %d secret keys</item> + <item quantity="other">Reimporting %d secret keys</item> </plurals> <string name="msg_con_reimport_secret_skip">No secret keys to reimport, skipping…</string> <string name="msg_con_warn_delete_public">Exception deleting public cache file</string> |