diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-27 09:46:42 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-27 09:46:42 +0100 |
| commit | e8780b4410c4e4a45f08b4002722b32f0d22d279 (patch) | |
| tree | 431846d5aba6b86a7a7ed3afd99976b9201dd471 /OpenKeychain/src/main/res/values/strings.xml | |
| parent | fd29d27e61e531378f0c37c78028fb2e86989dea (diff) | |
| parent | e77f9a535119f25b0f3ad31ef8065db18ceddff7 (diff) | |
| download | open-keychain-e8780b4410c4e4a45f08b4002722b32f0d22d279.tar.gz open-keychain-e8780b4410c4e4a45f08b4002722b32f0d22d279.tar.bz2 open-keychain-e8780b4410c4e4a45f08b4002722b32f0d22d279.zip | |
Merge branch 'development' into detached-sigs-api
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
Diffstat (limited to 'OpenKeychain/src/main/res/values/strings.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 6c4ba7b08..dfb675a37 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -924,6 +924,7 @@ <string name="msg_dc_askip_no_key">"Data not encrypted with known key, skipping…"</string> <string name="msg_dc_askip_not_allowed">"Data not encrypted with allowed key, skipping…"</string> <string name="msg_dc_asym">"Found block of asymmetrically encrypted data for key %s"</string> + <string name="msg_dc_charset">"Found charset header: '%s'"</string> <string name="msg_dc_clear_data">"Processing literal data"</string> <string name="msg_dc_clear_decompress">"Unpacking compressed data"</string> <string name="msg_dc_clear_meta_file">"Filename: %s"</string> @@ -1022,6 +1023,7 @@ <string name="msg_import_fingerprint_ok">"Fingerprint check OK"</string> <string name="msg_import_merge">"Merging retrieved data"</string> <string name="msg_import_error">"Import operation failed!"</string> + <string name="msg_import_error_io">"Import operation failed due to i/o error!"</string> <string name="msg_import_partial">"Import operation successful, with errors!"</string> <string name="msg_import_success">"Import operation successful!"</string> |