From 62f97b7defcf91661feb910bdae515f2cffd7a72 Mon Sep 17 00:00:00 2001
From: nils <nils@34ebc366-c3a9-4b3c-9f84-69acf7962910>
Date: Mon, 5 Mar 2012 22:28:03 +0000
Subject: Merge branch '0.3.2-local'

Conflicts:
	TODO

git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@847 34ebc366-c3a9-4b3c-9f84-69acf7962910
---
 TODO | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'TODO')

diff --git a/TODO b/TODO
index 52ec1fa..7598092 100644
--- a/TODO
+++ b/TODO
@@ -52,8 +52,9 @@ Release 0.3.2
 - Change file encryption to single dialog for en- and decryption [DONE]
 	- change docu on file de- and encryption
 - replace qDebug messages with tr() by messagebox (?) 
-- credits for key image 
 - disable tab related actions when no tab is shown [DONE]
+- credits for key image [DONE]
+- finally remove obsolete strings from translations
 
 BUGS:
 - import key toolbar dropdown shows text, even if only icon should be shown [DONE]
-- 
cgit