diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-07-02 17:39:58 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-07-02 17:39:58 +0200 |
| commit | 0454c57431f55003648f9a328a0f5a0fde6e54b6 (patch) | |
| tree | 9f9da21526dd955e3dbf89d02965f292002fe6a7 /OpenKeychain/src/main/res | |
| parent | 9dac8ddbac60997e16b7cb1a4fc9bad71cc0ab87 (diff) | |
| parent | 8b2ae99412906041182634771a2792cfadca65cd (diff) | |
| download | open-keychain-0454c57431f55003648f9a328a0f5a0fde6e54b6.tar.gz open-keychain-0454c57431f55003648f9a328a0f5a0fde6e54b6.tar.bz2 open-keychain-0454c57431f55003648f9a328a0f5a0fde6e54b6.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/drawable-hdpi/ic_stat_retyped_bad.png (renamed from OpenKeychain/src/main/res/drawable-hdpi/uid_mail_bad.png) | bin | 942 -> 942 bytes | |||
| -rw-r--r-- | OpenKeychain/src/main/res/drawable-hdpi/ic_stat_retyped_ok.png (renamed from OpenKeychain/src/main/res/drawable-hdpi/uid_mail_ok.png) | bin | 1252 -> 1252 bytes | |||
| -rw-r--r-- | OpenKeychain/src/main/res/drawable-mdpi/ic_stat_retyped_bad.png (renamed from OpenKeychain/src/main/res/drawable-mdpi/uid_mail_bad.png) | bin | 647 -> 647 bytes | |||
| -rw-r--r-- | OpenKeychain/src/main/res/drawable-mdpi/ic_stat_retyped_ok.png (renamed from OpenKeychain/src/main/res/drawable-mdpi/uid_mail_ok.png) | bin | 862 -> 862 bytes | |||
| -rw-r--r-- | OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_retyped_bad.png (renamed from OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_bad.png) | bin | 1299 -> 1299 bytes | |||
| -rw-r--r-- | OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_retyped_ok.png (renamed from OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_ok.png) | bin | 1606 -> 1606 bytes | |||
| -rw-r--r-- | OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_retyped_bad.png (renamed from OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_bad.png) | bin | 2338 -> 2338 bytes | |||
| -rw-r--r-- | OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_retyped_ok.png (renamed from OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_ok.png) | bin | 2364 -> 2364 bytes | |||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 3 |
9 files changed, 2 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/uid_mail_bad.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_retyped_bad.png Binary files differindex dc20b0f03..dc20b0f03 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/uid_mail_bad.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_retyped_bad.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/uid_mail_ok.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_retyped_ok.png Binary files differindex 76944469c..76944469c 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/uid_mail_ok.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_retyped_ok.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/uid_mail_bad.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_retyped_bad.png Binary files differindex 262d53027..262d53027 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/uid_mail_bad.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_retyped_bad.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/uid_mail_ok.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_retyped_ok.png Binary files differindex e16ec810a..e16ec810a 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/uid_mail_ok.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_retyped_ok.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_bad.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_retyped_bad.png Binary files differindex fc7ba24a3..fc7ba24a3 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_bad.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_retyped_bad.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_ok.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_retyped_ok.png Binary files differindex e2aef1177..e2aef1177 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_ok.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_retyped_ok.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_bad.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_retyped_bad.png Binary files differindex bc71d3a65..bc71d3a65 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_bad.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_retyped_bad.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_ok.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_retyped_ok.png Binary files differindex 501a75d63..501a75d63 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_ok.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_retyped_ok.png diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index a1a863e17..18f642e3a 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -687,7 +687,8 @@ <string name="add_keyserver_without_verification">"Keyserver added without verification."</string> <string name="add_keyserver_invalid_url">"Invalid URL!"</string> <string name="add_keyserver_connection_failed">"Failed to connect to keyserver. Please check the URL and your internet connection."</string> - <string name="keyserver_deleted">"%s deleted"</string> + <string name="keyserver_preference_deleted">"%s deleted"</string> + <string name="keyserver_preference_cannot_delete_last">"Cannot delete last keyserver. At least one is required!"</string> <!-- Navigation Drawer --> <string name="nav_keys">"Keys"</string> |
