From c39cf197f4b1d03ff5d973441a1ffe70b2601a62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 4 Aug 2014 00:54:57 +0200
Subject: button language in encrypt

---
 .../java/org/sufficientlysecure/keychain/ui/widget/SectionView.java    | 1 -
 OpenKeychain/src/main/res/values/strings.xml                           | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'OpenKeychain')

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>
-- 
cgit v1.2.3