diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-16 19:00:06 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-16 19:00:06 +0200 |
| commit | 676262b052b12f1d72162acb9bf435a8630644a0 (patch) | |
| tree | a1e952b622377904d43d9f33f33d668407acde19 /OpenKeychain/src/main/java/org/sufficientlysecure | |
| parent | b8b6fc5f6f1bfacb8bb2d714bae0ae0a73881dd5 (diff) | |
| download | open-keychain-676262b052b12f1d72162acb9bf435a8630644a0.tar.gz open-keychain-676262b052b12f1d72162acb9bf435a8630644a0.tar.bz2 open-keychain-676262b052b12f1d72162acb9bf435a8630644a0.zip | |
Translations from transifex, fix some strings references
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure')
3 files changed, 4 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java index 89b0963d7..adbce496e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java @@ -709,7 +709,7 @@ public class PgpKeyOperation { { if (certificationKey == null) { - throw new PgpGeneralMsgIdException(R.string.error_signature_failed); + throw new PgpGeneralMsgIdException(R.string.error_no_signature_key); } PBESecretKeyDecryptor keyDecryptor = new JcePBESecretKeyDecryptorBuilder().setProvider( diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java index 7b5461075..a44c9a586 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java @@ -188,7 +188,7 @@ public class OpenPgpService extends RemoteService { } catch (PgpSignEncrypt.NoPassphraseException e) { throw new Exception(getString(R.string.error_no_signature_passphrase)); } catch (PgpSignEncrypt.NoSigningKeyException e) { - throw new Exception(getString(R.string.error_signature_failed)); + throw new Exception(getString(R.string.error_no_signature_key)); } } finally { is.close(); @@ -292,7 +292,7 @@ public class OpenPgpService extends RemoteService { } catch (PgpSignEncrypt.NoPassphraseException e) { throw new Exception(getString(R.string.error_no_signature_passphrase)); } catch (PgpSignEncrypt.NoSigningKeyException e) { - throw new Exception(getString(R.string.error_signature_failed)); + throw new Exception(getString(R.string.error_no_signature_key)); } } finally { is.close(); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java index 3f04a155b..bb54a9fe0 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java @@ -871,7 +871,7 @@ public class KeychainIntentService extends IntentService } else if (e instanceof PgpSignEncrypt.NoPassphraseException) { message = getString(R.string.error_no_signature_passphrase); } else if (e instanceof PgpSignEncrypt.NoSigningKeyException) { - message = getString(R.string.error_signature_failed); + message = getString(R.string.error_no_signature_key); } else if (e instanceof PgpDecryptVerify.InvalidDataException) { message = getString(R.string.error_invalid_data); } else if (e instanceof PgpDecryptVerify.KeyExtractionException) { |