From 9514719719908f13ca730ca7ba89f2d91a49eb00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 2 Mar 2015 16:29:40 +0100
Subject: Re-add black color

---
 OpenKeychain/src/main/res/values/colors.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'OpenKeychain/src/main/res/values')

diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml
index c49e06b4b..8c5358fd0 100644
--- a/OpenKeychain/src/main/res/values/colors.xml
+++ b/OpenKeychain/src/main/res/values/colors.xml
@@ -13,6 +13,8 @@
 
     <!-- Other colors -->
 
+    <color name="black">#000000</color>
+
     <color name="primary_light">#C8E6C9</color>
     <color name="fab">@color/accent</color>
     <color name="fab_pressed">#1976D2</color>
-- 
cgit v1.2.3


From dae0873f5eabadc83b4eab3dfbbc2fd0c9336974 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 2 Mar 2015 17:39:30 +0100
Subject: Search string simplified

---
 OpenKeychain/src/main/res/values/strings.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'OpenKeychain/src/main/res/values')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 2d599e984..ca6ce1f7d 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -359,8 +359,7 @@
     <string name="progress_con_reimport">"consolidate: reimporting…"</string>
 
     <!-- action strings -->
-    <string name="hint_keyserver_search_hint">"Name/Email/Key ID…"</string>
-    <string name="hint_cloud_search_hint">"Name/Email/Proof/Key…"</string>
+    <string name="hint_cloud_search_hint">"Search via Name, Email…"</string>
 
     <!-- key bit length selections -->
     <string name="key_size_512">"512"</string>
-- 
cgit v1.2.3