updated README

git-svn-id: http://cpunk.de/svn/src/gpg4usb/branches/0.3.2@880 34ebc366-c3a9-4b3c-9f84-69acf7962910

3 files changed, 15 insertions, 13 deletions

diff --git a/README b/README
index 9cce610..ac1ed34 100644
--- a/README
+++ b/README
@@ -19,16 +19,11 @@ For retrieving the source checkout http://cpunk.de/svn/src/ .
 
 HOWTO USE
 ---------
-1. Unzip gpg4usblib.zip on your usb-stick.
+1. Unzip gpg4usb.zip on your usb-stick.
 2. start programm with start_windows.exe or start_linux (depending on your os)
 3. import your private key and some public keys
 4. enjoy portable encryption ;-)
 
-UPDATING FROM OLDER VERSION
----------------------------
-You can continue using your already imported Keys by overwriting the directory
-keydb from the new version with the directory keydb of your old copy.
-
 CONTACT
 -------
 If you have any questions and/or suggestions contact us at
@@ -38,9 +33,9 @@ Our homepage is located at http://gpg4usb.cpunk.de .
 
 LICENSES
 --------
-gpg4usblib itself is licensed under the GPL (see COPYING).
+gpg4usb itself is licensed under the GPLv3 (see COPYING).
 
-There are some libries and the gpg-binary included in the zip-file / a static
+There are some libraries and the gpg-binary included in the zip-file / a static
 gpg-build which (may) have different licenses, for more information check
 their homepages. You can also obtain the sources from there.
 
@@ -48,3 +43,7 @@ GPG: http://gnupg.org/
 QT: http://trolltech.no/ , http://trolltech.no/downloads/opensource
 
 Iconset used is Nuvola (http://icon-king.com/?p=15), which has a LGPL License
+
+The key image in the wizard (keys12.jpg) is a croped version of 
+http://www.flickr.com/photos/laureenp/6141822934/, which is licensed cc by-nc-sa.
+Our derived work is also cc by-nc-sa
diff --git a/TODO b/TODO
index 94569d4..e37e4aa 100644
--- a/TODO
+++ b/TODO
@@ -38,7 +38,7 @@ Release 0.3.2
 	- import conf from old gpg4usb [DONE]
 	- only show one import detail dialog, when importing public/private keys [DONE]
 	- add messagebox for succesful import of settings from old gpg4usb [DONE]
-	- before restart maybesave should be called on mainwindow
+
 - Update Qt to 4.8 [DONE]
 	- add Qt language files for Qt locales
 - investigate in adding a offline help system [DONE]
@@ -46,16 +46,17 @@ Release 0.3.2
 	- images should be included in paragraph [DONE]
                      - every html should have prev, next, toc link [DONE]
                      - remove menu and logo from subpages [DONE]
-                     - docs for sign&verify
+                     - docs for sign&verify [DONE]
 - dropdown from menubar instead of dialog for import [DONE]
 	- resize dropdown button, cause letter are cut at the bottom [DONE]
 - 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 (?) 
 - disable tab related actions when no tab is shown [DONE]
-- credits for key image [DONE]
 - on key generation set maximum keysize to 65536 bits for elgamal subkey [DONE]
 - finally remove obsolete strings from translations
+- credits for key image [DONE]
+- translator list [DONE]
 
 BUGS:
 - import key toolbar dropdown shows text, even if only icon should be shown [DONE]
@@ -85,8 +86,10 @@ Release 0.3.3
 	- add tab for editor options, like font-size, line-break, tab-width, line-numbers,..
 - remember Password:
 	- checkbox in password dialog to remember password
+	- before restart maybesave should be called on mainwindow	
 	- Timer to remember password for x minutes?
 
+
 Release 0.3.4
 - keylist rewrite using tablemodel
 	- make keylist browsable with keyboard
diff --git a/release/README b/release/README
index 7b14c80..ac1ed34 100644
--- a/release/README
+++ b/release/README
@@ -19,7 +19,7 @@ For retrieving the source checkout http://cpunk.de/svn/src/ .
 
 HOWTO USE
 ---------
-1. Unzip gpg4usblib.zip on your usb-stick.
+1. Unzip gpg4usb.zip on your usb-stick.
 2. start programm with start_windows.exe or start_linux (depending on your os)
 3. import your private key and some public keys
 4. enjoy portable encryption ;-)
@@ -35,7 +35,7 @@ LICENSES
 --------
 gpg4usb itself is licensed under the GPLv3 (see COPYING).
 
-There are some libries and the gpg-binary included in the zip-file / a static
+There are some libraries and the gpg-binary included in the zip-file / a static
 gpg-build which (may) have different licenses, for more information check
 their homepages. You can also obtain the sources from there.