From 0ee455edb62a254fb1b7e6faa9448121215ed219 Mon Sep 17 00:00:00 2001
From: ubbo <ubbo@34ebc366-c3a9-4b3c-9f84-69acf7962910>
Date: Mon, 2 Apr 2012 20:47:43 +0000
Subject: merge with 0.3.2

git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@877 34ebc366-c3a9-4b3c-9f84-69acf7962910
---
 release/ts/gpg4usb_en.ts | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

(limited to 'release/ts/gpg4usb_en.ts')

diff --git a/release/ts/gpg4usb_en.ts b/release/ts/gpg4usb_en.ts
index 72417f2..c56be76 100644
--- a/release/ts/gpg4usb_en.ts
+++ b/release/ts/gpg4usb_en.ts
@@ -329,6 +329,11 @@
         <source>Wrong password</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../gpgcontext.cpp" line="484"/>
+        <source>Enter Password for</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../../gpgcontext.cpp" line="488"/>
         <source>Enter Password</source>
@@ -1896,27 +1901,32 @@ Weak -&gt; Strong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../verifynotification.cpp" line="120"/>
+        <location filename="../../verifynotification.cpp" line="47"/>
+        <source>Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../verifynotification.cpp" line="117"/>
         <source>Key not present with id 0x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../verifynotification.cpp" line="162"/>
+        <location filename="../../verifynotification.cpp" line="159"/>
         <source>Error validating signature by: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../verifynotification.cpp" line="167"/>
+        <location filename="../../verifynotification.cpp" line="164"/>
         <source>Text was completely signed by: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../verifynotification.cpp" line="172"/>
+        <location filename="../../verifynotification.cpp" line="169"/>
         <source>Text was partially signed by: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../verifynotification.cpp" line="150"/>
+        <location filename="../../verifynotification.cpp" line="147"/>
         <source>Error for key with fingerprint </source>
         <translation type="unfinished"></translation>
     </message>
-- 
cgit