From d686c55a0a86ef845795fc03a8a5de44b5fe73cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 17 Sep 2014 13:45:16 +0200
Subject: Work on new result handling (WIP)

---
 OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml | 2 +-
 OpenKeychain/src/main/res/values/strings.xml               | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml
index fab983fa5..f724604c2 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml
@@ -13,7 +13,7 @@
         android:orientation="vertical">
 
         <EditText
-            android:id="@+id/message"
+            android:id="@+id/encrypt_text_text"
             android:layout_width="match_parent"
             android:layout_height="0dip"
             android:gravity="top"
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 5d0127f5c..9f3a2dedf 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -823,6 +823,7 @@
     <string name="msg_se_key_warn">"Bad key for encryption: %s"</string>
     <string name="msg_se_ok">"Sign/Encrypt operation successful!"</string>
     <string name="msg_se_pending_nfc">"NFC token required, requesting user input…"</string>
+    <string name="msg_se_pending_passphrase">"Passphrase required, requesting user input…"</string>
     <string name="msg_se_signing">"Signing data (without encryption)"</string>
     <string name="msg_se_sigcrypting">"Encrypting data with signature"</string>
     <string name="msg_se">"Starting sign and/or encrypt operation"</string>
-- 
cgit v1.2.3