diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-14 01:11:08 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-14 01:11:08 +0200 |
| commit | 13ffd2038d56d90ffc583663a98c378ee9d9aa00 (patch) | |
| tree | 0009143b39833be11bc428c340ffc602f2e3069b /OpenKeychain/src/main/res/values | |
| parent | 55bad4cac747cedfdda978a94d41f8069358373f (diff) | |
| download | open-keychain-13ffd2038d56d90ffc583663a98c378ee9d9aa00.tar.gz open-keychain-13ffd2038d56d90ffc583663a98c378ee9d9aa00.tar.bz2 open-keychain-13ffd2038d56d90ffc583663a98c378ee9d9aa00.zip | |
key edit: fix crash when create date was after expiry date, change from gregorian calendar to calendar with creation from instance, experimental result status for decrypt activity
Diffstat (limited to 'OpenKeychain/src/main/res/values')
| -rw-r--r-- | OpenKeychain/src/main/res/values/colors.xml | 4 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml index d1dc6c1f4..f03d316db 100644 --- a/OpenKeychain/src/main/res/values/colors.xml +++ b/OpenKeychain/src/main/res/values/colors.xml @@ -4,4 +4,8 @@ <color name="emphasis">#31b6e7</color> <color name="bg_gray">#cecbce</color> + <color name="result_red">#CC0000</color> + <color name="result_orange">#FF8800</color> + <color name="result_green">#669900</color> + <color name="result_blue">#336699</color> </resources>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 71340f6ec..3a73735cd 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -209,9 +209,10 @@ <string name="file_delete_confirmation">Are you sure you want to delete\n%s?</string> <string name="file_delete_successful">Successfully deleted.</string> <string name="no_file_selected">Select a file first.</string> - <string name="decryption_successful">Successfully decrypted and/or verified.</string> - <string name="encryption_successful">Successfully signed and/or encrypted.</string> - <string name="encryption_to_clipboard_successful">Successfully signed and/or encrypted to clipboard.</string> + <string name="decrypt_successful">Successfully decrypted.</string> + <string name="decrypt_verified_successful">Successfully decrypted and/or verified.</string> + <string name="encrypt_sign_successful">Successfully signed and/or encrypted.</string> + <string name="encrypt_sign_clipboard_successful">Successfully signed and/or encrypted to clipboard.</string> <string name="enter_passphrase_twice">Enter the passphrase twice.</string> <string name="select_encryption_key">Select at least one encryption key.</string> <string name="select_encryption_or_signature_key">Select at least one encryption key or a signature key.</string> |