diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-18 13:19:44 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-18 13:19:44 +0200 |
| commit | 0cfbe4ad06577715bfd9b16aa912a21cb9c64cbc (patch) | |
| tree | 55e0fec27153eee44ad1865ee8f59a0557af41cb /OpenKeychain/src/main/res/values | |
| parent | 0cb868ff250e8d86a1a8f8ace79cc18e4cbc721e (diff) | |
| parent | 2b26f293b8cb03a0b605e3a95365160f5c034329 (diff) | |
| download | open-keychain-0cfbe4ad06577715bfd9b16aa912a21cb9c64cbc.tar.gz open-keychain-0cfbe4ad06577715bfd9b16aa912a21cb9c64cbc.tar.bz2 open-keychain-0cfbe4ad06577715bfd9b16aa912a21cb9c64cbc.zip | |
Merge branch 'master' into v/multi-decrypt
Diffstat (limited to 'OpenKeychain/src/main/res/values')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index c21b34d55..bf6669441 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1332,5 +1332,6 @@ <string name="snack_compression_on">"Compression <b>enabled</b>."</string> <string name="snack_compression_off">"Compression <b>disabled</b>."</string> <string name="error_loading_keys">Error loading keys!</string> + <string name="error_empty_log">(error, empty log)</string> </resources> |