diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-10-15 21:48:01 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-10-15 21:48:01 +0200 |
commit | 53680b621320512b44e961f0453043a31c40dfee (patch) | |
tree | feff220dd5a59f2e89e4e89e8a7488e25bc767da /OpenKeychain/src/main/res | |
parent | 52c6d8f8e03ab0047f5e8ed6f46273ac24a87205 (diff) | |
download | open-keychain-53680b621320512b44e961f0453043a31c40dfee.tar.gz open-keychain-53680b621320512b44e961f0453043a31c40dfee.tar.bz2 open-keychain-53680b621320512b44e961f0453043a31c40dfee.zip |
Cleanup, fix advanced sharing
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml | 17 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 4 |
2 files changed, 2 insertions, 19 deletions
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml index d82506e74..c08d66cc1 100644 --- a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml @@ -126,23 +126,6 @@ android:background="?android:attr/listDivider" /> <ImageButton - android:id="@+id/view_key_action_key_export" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:padding="8dp" - android:src="@drawable/ic_save_grey_24dp" - android:layout_gravity="center_vertical" - android:background="?android:selectableItemBackground" /> - - <View - android:layout_width="1dip" - android:layout_height="match_parent" - android:gravity="right" - android:layout_marginBottom="8dp" - android:layout_marginTop="8dp" - android:background="?android:attr/listDivider" /> - - <ImageButton android:id="@+id/view_key_action_key_nfc" android:layout_width="wrap_content" android:layout_height="match_parent" diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index f1154645d..55f64c25e 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -293,7 +293,8 @@ <string name="no_filemanager_installed">"No compatible file manager installed."</string> <string name="passphrases_do_not_match">"The passwords didn't match."</string> <string name="passphrase_must_not_be_empty">"Please enter a password."</string> - <string name="passphrase_for_symmetric_encryption">"Symmetric encryption."</string> + <string name="passphrase_for_symmetric_encryption">"Enter password"</string> + <string name="passphrase_for_backup">"Enter backup code"</string> <string name="passphrase_for">"Enter password for '%s'"</string> <string name="pin_for">"Enter PIN for '%s'"</string> <string name="yubikey_pin_for">"Enter PIN to access YubiKey for '%s'"</string> @@ -337,7 +338,6 @@ <string name="key_copied_to_clipboard">"Key has been copied to the clipboard!"</string> <string name="fingerprint_copied_to_clipboard">"Fingerprint has been copied to the clipboard!"</string> <string name="select_key_to_certify">"Please select a key to be used for confirmation!"</string> - <string name="key_too_big_for_sharing">"Key is too big to be shared this way!"</string> <string name="text_copied_to_clipboard">"Text has been copied to the clipboard!"</string> <!-- |