diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-18 21:09:04 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-18 21:09:04 +0200 |
| commit | 5f20b8de1a052d366e5dcb24f2539062ae903156 (patch) | |
| tree | e069499d3c045e45d8c7126fe3688544f4b28622 /OpenKeychain/src/main/res | |
| parent | 3bffe4da559d0ee45c44df1afee6d5b4de9b89d1 (diff) | |
| parent | 4bff50bffc43c23e08f87ff7c5b19fe790874d01 (diff) | |
| download | open-keychain-5f20b8de1a052d366e5dcb24f2539062ae903156.tar.gz open-keychain-5f20b8de1a052d366e5dcb24f2539062ae903156.tar.bz2 open-keychain-5f20b8de1a052d366e5dcb24f2539062ae903156.zip | |
Merge branch 'new-edit'
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
OpenKeychain/src/main/res/values/strings.xml
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 6b921b681..3221cd9cd 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -600,7 +600,6 @@ <string name="msg_kc_uid_revoke_old">Removing outdated revocation certificate for user id "%s"</string> <string name="msg_kc_uid_no_cert">No valid self-certificate found for user id %s, removing from ring</string> - <!-- Keyring merging log entries --> <string name="msg_mg_public">Merging into public keyring %s</string> <string name="msg_mg_secret">Merging into secret keyring %s</string> @@ -609,6 +608,25 @@ <string name="msg_mg_new_subkey">Adding new subkey %s</string> <string name="msg_mg_found_new">Found %s new certificates in keyring</string> + <!-- modifySecretKeyRing --> + <string name="msg_mr">Modifying keyring %s</string> + <string name="msg_mf_error_encode">Encoding exception!</string> + <string name="msg_mf_error_pgp">PGP internal exception!</string> + <string name="msg_mf_error_sig">Signature exception!</string> + <string name="msg_mf_passphrase">Changing passphrase</string> + <string name="msg_mf_subkey_change">Modifying subkey %s</string> + <string name="msg_mf_subkey_missing">Tried to operate on missing subkey %s!</string> + <string name="msg_mf_subkey_new">Generating new %1$s bit %2$s subkey</string> + <string name="msg_mf_subkey_new_id">New subkey id: %s</string> + <string name="msg_mf_subkey_past_expiry">Expiry date cannot be in the past!</string> + <string name="msg_mf_subkey_revoke">Revoking subkey %s</string> + <string name="msg_mf_success">Keyring successfully modified</string> + <string name="msg_mf_uid_add">Adding user id %s</string> + <string name="msg_mf_uid_primary">Changing primary uid to %s</string> + <string name="msg_mf_uid_revoke">Revoking user id %s</string> + <string name="msg_mf_unlock_error">Error unlocking keyring!</string> + <string name="msg_mf_unlock">Unlocking keyring</string> + <!-- unsorted --> <string name="section_certifier_id">Certifier</string> <string name="section_cert">Certificate Details</string> |