diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-11-04 20:24:11 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-11-04 20:24:11 +0100 |
| commit | 3ca8af060b2f6452df794a8770714d1f02b36734 (patch) | |
| tree | 438d92f9107bd76e10c5f72f41c4d7bc12e44ced /OpenKeychain/src/main/res/values | |
| parent | a4518c43c2fdff3852668242978a8b9739447d0b (diff) | |
| parent | 31a45759ccfbca76f89e6e51bf94c4a3af3a874f (diff) | |
| download | open-keychain-3ca8af060b2f6452df794a8770714d1f02b36734.tar.gz open-keychain-3ca8af060b2f6452df794a8770714d1f02b36734.tar.bz2 open-keychain-3ca8af060b2f6452df794a8770714d1f02b36734.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/res/values')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 1 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/themes.xml | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 486176fc2..2f7c703ad 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -88,6 +88,7 @@ <string name="btn_match_phrases">"Phrases match"</string> <string name="btn_share_encrypted_signed">"Encrypt/sign and share text"</string> <string name="btn_copy_encrypted_signed">"Encrypt/sign and copy text"</string> + <string name="btn_paste_encrypted_signed">"Encrypt/sign and paste text"</string> <string name="btn_view_cert_key">"View certification key"</string> <string name="btn_create_key">"Create key"</string> <string name="btn_add_files">"Add file(s)"</string> diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml index 38cf8a3db..fc6ae3846 100644 --- a/OpenKeychain/src/main/res/values/themes.xml +++ b/OpenKeychain/src/main/res/values/themes.xml @@ -85,11 +85,9 @@ <item name="alertDialogTheme">@style/Theme.Keychain.Dark.Dialog.Alert</item> </style> - <style name="Theme.Keychain.Light" parent="Base.Theme.Keychain.Light"> - </style> + <style name="Theme.Keychain.Light" parent="Base.Theme.Keychain.Light"></style> - <style name="Theme.Keychain.Dark" parent="Base.Theme.Keychain.Dark"> - </style> + <style name="Theme.Keychain.Dark" parent="Base.Theme.Keychain.Dark"></style> <!-- http://android-developers.blogspot.de/2014/10/appcompat-v21-material-design-for-pre.html --> <style name="Widget.Keychain.SearchView" parent="Widget.AppCompat.SearchView"> @@ -134,4 +132,6 @@ <item name="windowActionBar">false</item> <item name="windowNoTitle">true</item> </style> + + <style name="Theme.Keychain.Transparent" parent="@android:style/Theme.NoDisplay" /> </resources> |