diff options
| author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-03-02 22:31:13 +0530 |
|---|---|---|
| committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-03-02 22:31:13 +0530 |
| commit | c2c8ee1efde0aa7e29671dcfb0f39a3fbc7bc236 (patch) | |
| tree | 169ad00d1a1e5d1249144de3b0474f7fb2de7fd7 /OpenKeychain/src/main/res | |
| parent | e69ee812d2a73ef6d4a1c2df3e180bb61fa050e3 (diff) | |
| parent | 7127c2205e6e0f671388a04785b1e7879c536c64 (diff) | |
| download | open-keychain-c2c8ee1efde0aa7e29671dcfb0f39a3fbc7bc236.tar.gz open-keychain-c2c8ee1efde0aa7e29671dcfb0f39a3fbc7bc236.tar.bz2 open-keychain-c2c8ee1efde0aa7e29671dcfb0f39a3fbc7bc236.zip | |
Merge branch 'development' of https://github.com/open-keychain/open-keychain into development
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/values/colors.xml | 2 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 3 |
2 files changed, 3 insertions, 2 deletions
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> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index ed1dd1233..b81fd730f 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -363,8 +363,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> |