aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-08-04 00:54:57 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-08-04 00:54:57 +0200
commitc39cf197f4b1d03ff5d973441a1ffe70b2601a62 (patch)
tree6a1e9314b77d7df25d3debcfbc2eb0a471a80cef /OpenKeychain/src
parentd9ffc26d6491cff5a924acc0b14565b9f3af70af (diff)
downloadopen-keychain-c39cf197f4b1d03ff5d973441a1ffe70b2601a62.tar.gz
open-keychain-c39cf197f4b1d03ff5d973441a1ffe70b2601a62.tar.bz2
open-keychain-c39cf197f4b1d03ff5d973441a1ffe70b2601a62.zip
button language in encrypt
Diffstat (limited to 'OpenKeychain/src')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java1
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml3
2 files changed, 1 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java
index cd5671801..35170fc37 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java
@@ -35,7 +35,6 @@ import android.widget.TextView;
import android.widget.ImageButton;
import org.sufficientlysecure.keychain.R;
-import org.sufficientlysecure.keychain.pgp.PgpConversionHelper;
import org.sufficientlysecure.keychain.pgp.UncachedSecretKey;
import org.sufficientlysecure.keychain.service.KeychainIntentService;
import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 6abca0548..5f801398b 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -55,7 +55,6 @@
<string name="btn_decrypt_verify_clipboard">From Clipboard</string>
<string name="btn_encrypt_file">Encrypt and save file</string>
<string name="btn_encrypt_share_file">Encrypt and share file</string>
- <string name="btn_encrypt_sign_share">Encrypt, sign and share</string>
<string name="btn_save">Save</string>
<string name="btn_do_not_save">Cancel</string>
<string name="btn_delete">Delete</string>
@@ -71,7 +70,7 @@
<string name="btn_lookup_key">Lookup key</string>
<string name="btn_encryption_advanced_settings_show">Show advanced settings</string>
<string name="btn_encryption_advanced_settings_hide">Hide advanced settings</string>
- <string name="btn_share_encrypted_signed">Share encrypted/signed message…</string>
+ <string name="btn_share_encrypted_signed">Encrypt and share message</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>