diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-02 18:34:51 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-02 18:34:51 +0100 |
| commit | e6af789bf50f9636d3455c4bd1b662ab5d04e3e2 (patch) | |
| tree | 35e7560cd785aa20c1fa814332d16bd094921282 /OpenKeychain/src/main/res/values | |
| parent | 5e53a5417c11f54f437d9f220d3e2e8579b8bf1b (diff) | |
| parent | 145e793db1d732bdd230be92750123cd20c9502d (diff) | |
| download | open-keychain-e6af789bf50f9636d3455c4bd1b662ab5d04e3e2.tar.gz open-keychain-e6af789bf50f9636d3455c4bd1b662ab5d04e3e2.tar.bz2 open-keychain-e6af789bf50f9636d3455c4bd1b662ab5d04e3e2.zip | |
Merge branch 'development' into linked-identities
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java
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 b9f892687..4260cac3f 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -360,8 +360,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> |