diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-26 02:44:59 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-26 02:44:59 +0200 |
commit | dce4503ac5223b7b8e3daa5ecd47c1438607885e (patch) | |
tree | 89f5cf9c40902e0db0f5353db5967437cf0c9373 /OpenKeychain/src/main/res | |
parent | a990044fd9eab711e4de7c74aa453f362456050b (diff) | |
parent | 51d35c7a834bce7c49e74ded61b9434ffd94a911 (diff) | |
download | open-keychain-dce4503ac5223b7b8e3daa5ecd47c1438607885e.tar.gz open-keychain-dce4503ac5223b7b8e3daa5ecd47c1438607885e.tar.bz2 open-keychain-dce4503ac5223b7b8e3daa5ecd47c1438607885e.zip |
Merge remote-tracking branch 'origin/master' into v/multi-decrypt
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r-- | OpenKeychain/src/main/res/drawable-hdpi/ic_stat_notify_24dp.png | bin | 0 -> 919 bytes | |||
-rw-r--r-- | OpenKeychain/src/main/res/drawable-mdpi/ic_stat_notify_24dp.png | bin | 0 -> 654 bytes | |||
-rw-r--r-- | OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_notify_24dp.png | bin | 0 -> 1249 bytes | |||
-rw-r--r-- | OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_notify_24dp.png | bin | 0 -> 1948 bytes | |||
-rw-r--r-- | OpenKeychain/src/main/res/drawable-xxxhdpi/ic_stat_notify_24dp.png | bin | 0 -> 2710 bytes | |||
-rw-r--r-- | OpenKeychain/src/main/res/layout/key_list_selectable_item.xml | 22 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 9 |
7 files changed, 28 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_notify_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_notify_24dp.png Binary files differnew file mode 100644 index 000000000..2b7f41971 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_notify_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_notify_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_notify_24dp.png Binary files differnew file mode 100644 index 000000000..c24b41148 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_notify_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_notify_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_notify_24dp.png Binary files differnew file mode 100644 index 000000000..b9198e624 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_notify_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_notify_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_notify_24dp.png Binary files differnew file mode 100644 index 000000000..8ff2b8041 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_notify_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_stat_notify_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_stat_notify_24dp.png Binary files differnew file mode 100644 index 000000000..9dad48842 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_stat_notify_24dp.png diff --git a/OpenKeychain/src/main/res/layout/key_list_selectable_item.xml b/OpenKeychain/src/main/res/layout/key_list_selectable_item.xml new file mode 100644 index 000000000..311eaabd6 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/key_list_selectable_item.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:singleLine="true" + android:orientation="horizontal" + android:descendantFocusability="blocksDescendants" + android:focusable="false"> + + <CheckBox + android:id="@+id/selected" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:clickable="false" + android:focusable="false" + android:focusableInTouchMode="false" + android:layout_margin="6dp" /> + + <include layout="@layout/key_list_item" /> + +</LinearLayout> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 1f1acc2a8..e05186c61 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1221,9 +1221,12 @@ <string name="msg_export_log_success">"Log exported successfully!"</string> <!-- PassphraseCache --> - <string name="passp_cache_notif_click_to_clear">"Click to clear cached passwords"</string> - <string name="passp_cache_notif_n_keys">"OpenKeychain has cached %d passwords"</string> - <string name="passp_cache_notif_keys">"Cached Passwords:"</string> + <string name="passp_cache_notif_click_to_clear">"Touch to clear password cache."</string> + <plurals name="passp_cache_notif_n_keys"> + <item quantity="one">"%d password cached"</item> + <item quantity="other">"%d passwords cached"</item> + </plurals> + <string name="passp_cache_notif_keys">"Cached passwords"</string> <string name="passp_cache_notif_clear">"Clear Cache"</string> <string name="passp_cache_notif_pwd">"Password"</string> |