From 7b5c35ee8787934d97d24f3d6f79fd6340ab8a4d Mon Sep 17 00:00:00 2001 From: Adithya Abraham Philip Date: Thu, 2 Jul 2015 05:43:23 +0530 Subject: prevent deletion of last keyserver in preference --- OpenKeychain/src/main/res/values/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'OpenKeychain/src/main/res') diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 619c67ee3..c216cd869 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -685,7 +685,8 @@ "Keyserver added without verification." "Invalid URL!" "Failed to connect to keyserver. Please check the URL and your internet connection." - "%s deleted" + "%s deleted" + "Cannot delete last keyserver. At least one is required!" "Keys" -- cgit v1.2.3 From 51ac309bcf537f944c75bdc2415b411944e46b0a Mon Sep 17 00:00:00 2001 From: Ishit Date: Thu, 2 Jul 2015 20:13:50 +0530 Subject: Change PassphraseEditAgain status icons. --- .../src/main/res/drawable-hdpi/ic_stat_retyped_bad.png | Bin 0 -> 942 bytes .../src/main/res/drawable-hdpi/ic_stat_retyped_ok.png | Bin 0 -> 1252 bytes OpenKeychain/src/main/res/drawable-hdpi/uid_mail_bad.png | Bin 942 -> 0 bytes OpenKeychain/src/main/res/drawable-hdpi/uid_mail_ok.png | Bin 1252 -> 0 bytes .../src/main/res/drawable-mdpi/ic_stat_retyped_bad.png | Bin 0 -> 647 bytes .../src/main/res/drawable-mdpi/ic_stat_retyped_ok.png | Bin 0 -> 862 bytes OpenKeychain/src/main/res/drawable-mdpi/uid_mail_bad.png | Bin 647 -> 0 bytes OpenKeychain/src/main/res/drawable-mdpi/uid_mail_ok.png | Bin 862 -> 0 bytes .../src/main/res/drawable-xhdpi/ic_stat_retyped_bad.png | Bin 0 -> 1299 bytes .../src/main/res/drawable-xhdpi/ic_stat_retyped_ok.png | Bin 0 -> 1606 bytes .../src/main/res/drawable-xhdpi/uid_mail_bad.png | Bin 1299 -> 0 bytes OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_ok.png | Bin 1606 -> 0 bytes .../src/main/res/drawable-xxhdpi/ic_stat_retyped_bad.png | Bin 0 -> 2338 bytes .../src/main/res/drawable-xxhdpi/ic_stat_retyped_ok.png | Bin 0 -> 2364 bytes .../src/main/res/drawable-xxhdpi/uid_mail_bad.png | Bin 2338 -> 0 bytes .../src/main/res/drawable-xxhdpi/uid_mail_ok.png | Bin 2364 -> 0 bytes 16 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_stat_retyped_bad.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_stat_retyped_ok.png delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/uid_mail_bad.png delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/uid_mail_ok.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_stat_retyped_bad.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_stat_retyped_ok.png delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/uid_mail_bad.png delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/uid_mail_ok.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_retyped_bad.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_retyped_ok.png delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_bad.png delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_ok.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_retyped_bad.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_retyped_ok.png delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_bad.png delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_ok.png (limited to 'OpenKeychain/src/main/res') diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_retyped_bad.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_retyped_bad.png new file mode 100644 index 000000000..dc20b0f03 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_retyped_bad.png differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_retyped_ok.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_retyped_ok.png new file mode 100644 index 000000000..76944469c Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_retyped_ok.png differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/uid_mail_bad.png b/OpenKeychain/src/main/res/drawable-hdpi/uid_mail_bad.png deleted file mode 100644 index dc20b0f03..000000000 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/uid_mail_bad.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/uid_mail_ok.png b/OpenKeychain/src/main/res/drawable-hdpi/uid_mail_ok.png deleted file mode 100644 index 76944469c..000000000 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/uid_mail_ok.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_retyped_bad.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_retyped_bad.png new file mode 100644 index 000000000..262d53027 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_retyped_bad.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_retyped_ok.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_retyped_ok.png new file mode 100644 index 000000000..e16ec810a Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_retyped_ok.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/uid_mail_bad.png b/OpenKeychain/src/main/res/drawable-mdpi/uid_mail_bad.png deleted file mode 100644 index 262d53027..000000000 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/uid_mail_bad.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/uid_mail_ok.png b/OpenKeychain/src/main/res/drawable-mdpi/uid_mail_ok.png deleted file mode 100644 index e16ec810a..000000000 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/uid_mail_ok.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_retyped_bad.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_retyped_bad.png new file mode 100644 index 000000000..fc7ba24a3 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_retyped_bad.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_retyped_ok.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_retyped_ok.png new file mode 100644 index 000000000..e2aef1177 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_retyped_ok.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_bad.png b/OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_bad.png deleted file mode 100644 index fc7ba24a3..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_bad.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_ok.png b/OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_ok.png deleted file mode 100644 index e2aef1177..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_ok.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_retyped_bad.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_retyped_bad.png new file mode 100644 index 000000000..bc71d3a65 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_retyped_bad.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_retyped_ok.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_retyped_ok.png new file mode 100644 index 000000000..501a75d63 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_retyped_ok.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_bad.png b/OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_bad.png deleted file mode 100644 index bc71d3a65..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_bad.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_ok.png b/OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_ok.png deleted file mode 100644 index 501a75d63..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_ok.png and /dev/null differ -- cgit v1.2.3