diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-02 17:44:50 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-02 17:44:50 +0100 |
| commit | 817afffecc5454e7a185a85c4f9dcdc11fb9cd32 (patch) | |
| tree | 4f54745c9b2e5037e49c4409809eb83b8dbda59b /OpenKeychain/src/main/res/values | |
| parent | 1f828528d37ba272a07af67babc85cc7f362f4d9 (diff) | |
| parent | dae0873f5eabadc83b4eab3dfbbc2fd0c9336974 (diff) | |
| download | open-keychain-817afffecc5454e7a185a85c4f9dcdc11fb9cd32.tar.gz open-keychain-817afffecc5454e7a185a85c4f9dcdc11fb9cd32.tar.bz2 open-keychain-817afffecc5454e7a185a85c4f9dcdc11fb9cd32.zip | |
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Diffstat (limited to 'OpenKeychain/src/main/res/values')
| -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 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> |