moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-16 13:55:03 -05:00
Code Issues Releases Wiki Activity

Fix strings

Browse Source
This commit is contained in:
Dominik Schürmann 2014-08-19 18:12:19 +02:00
parent 9930ab7f6f
commit 16ab761006
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
View File

@ -972,7 +972,7 @@ public class ProviderHelper {
if (recovery) { if (recovery) {
if (numSecrets >= 0 && numPublics >= 0) { 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 { } else {
log(LogLevel.START, LogType.MSG_CON_RECOVER_UNKNOWN); log(LogLevel.START, LogType.MSG_CON_RECOVER_UNKNOWN);
} }

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
View File

@ -403,9 +403,9 @@ public class OperationResultParcel implements Parcelable {
MSG_CON_ERROR_SECRET (R.string.msg_con_error_secret), MSG_CON_ERROR_SECRET (R.string.msg_con_error_secret),
MSG_CON_RECOVER (R.plurals.msg_con_recover), MSG_CON_RECOVER (R.plurals.msg_con_recover),
MSG_CON_RECOVER_UNKNOWN (R.string.msg_con_recover_unknown), 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_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_REIMPORT_SECRET_SKIP (R.string.msg_con_reimport_secret_skip),
MSG_CON (R.string.msg_con), MSG_CON (R.string.msg_con),
MSG_CON_SAVE_PUBLIC (R.string.msg_con_save_public), MSG_CON_SAVE_PUBLIC (R.string.msg_con_save_public),

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

@ -688,18 +688,18 @@
<string name="msg_con_error_public">Error reimporting public keys!</string> <string name="msg_con_error_public">Error reimporting public keys!</string>
<string name="msg_con_error_secret">Error reimporting secret keys!</string> <string name="msg_con_error_secret">Error reimporting secret keys!</string>
<plurals name="msg_con_recover"> <plurals name="msg_con_recover">
<item quantity="one">Recovering consolidation with one secret and %s public keys</item> <item quantity="one">Recovering consolidation with %1$d secret and %2$d public keys</item>
<item quantity="many">Recovering consolidation with %d secret and %s public keys</item> <item quantity="other">Recovering consolidation with %1$d secret and %2$d public keys</item>
</plurals> </plurals>
<string name="msg_con_recover_unknown">Recovering from unknown state</string> <string name="msg_con_recover_unknown">Recovering from unknown state</string>
<plurals name="msg_con_reimport_public"> <plurals name="msg_con_reimport_public">
<item quantity="one">Reimporting one public key</item> <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> </plurals>
<string name="msg_con_reimport_public_skip">No public keys to reimport, skipping…</string> <string name="msg_con_reimport_public_skip">No public keys to reimport, skipping…</string>
<plurals name="msg_con_reimport_secret"> <plurals name="msg_con_reimport_secret">
<item quantity="one">Reimporting one secret key</item> <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> </plurals>
<string name="msg_con_reimport_secret_skip">No secret keys to reimport, skipping…</string> <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> <string name="msg_con_warn_delete_public">Exception deleting public cache file</string>